Skip to content

Commit 80b6fd2

Browse files
authored
(#274) Avalonia update to .NET 9 (#283)
1 parent ba322cb commit 80b6fd2

File tree

8 files changed

+14
-20
lines changed

8 files changed

+14
-20
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<Nullable>enable</Nullable>
4-
<AvaloniaVersion>11.1.0</AvaloniaVersion>
4+
<AvaloniaVersion>11.2.3</AvaloniaVersion>
55
</PropertyGroup>
66
</Project>

samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Android/TodoApp.Avalonia.Android.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0-android</TargetFramework>
5-
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
4+
<TargetFramework>net9.0-android</TargetFramework>
5+
<SupportedOSPlatformVersion>34</SupportedOSPlatformVersion>
66
<Nullable>enable</Nullable>
77
<ApplicationId>com.CompanyName.TodoApp.Avalonia</ApplicationId>
88
<ApplicationVersion>1</ApplicationVersion>

samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Desktop/TodoApp.Avalonia.Desktop.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<OutputType>WinExe</OutputType>
44
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
55
One for Windows with net8.0-windows TFM, one for MacOS with net8.0-macos and one with net8.0 TFM for Linux.-->
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<Nullable>enable</Nullable>
88
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
99
</PropertyGroup>

samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.iOS/TodoApp.Avalonia.iOS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0-ios</TargetFramework>
5-
<SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
4+
<TargetFramework>net9.0-ios</TargetFramework>
5+
<SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApp.Avalonia", "TodoApp
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApp.Avalonia.Desktop", "TodoApp.Avalonia.Desktop\TodoApp.Avalonia.Desktop.csproj", "{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApp.Avalonia.Browser", "TodoApp.Avalonia.Browser\TodoApp.Avalonia.Browser.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}"
11-
EndProject
1210
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApp.Avalonia.iOS", "TodoApp.Avalonia.iOS\TodoApp.Avalonia.iOS.csproj", "{EBD9022F-BC83-4846-9A11-6F7F3772DC64}"
1311
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApp.Avalonia.Android", "TodoApp.Avalonia.Android\TodoApp.Avalonia.Android.csproj", "{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}"
@@ -32,10 +30,6 @@ Global
3230
{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Debug|Any CPU.Build.0 = Debug|Any CPU
3331
{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Release|Any CPU.ActiveCfg = Release|Any CPU
3432
{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.Build.0 = Release|Any CPU
3933
{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4034
{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
4135
{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.ActiveCfg = Release|Any CPU

samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia/TodoApp.Avalonia.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
5-
<LangVersion>latest</LangVersion>
5+
<LangVersion>preview</LangVersion>
66
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
77
</PropertyGroup>
88

@@ -16,8 +16,8 @@
1616
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
1717
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
1818
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
19-
<PackageReference Include="CommunityToolkit.Datasync.Client" Version="8.0.4" />
20-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0"/>
21-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
19+
<PackageReference Include="CommunityToolkit.Datasync.Client" Version="9.0.0" />
20+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
21+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
2222
</ItemGroup>
2323
</Project>

samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia/ViewModels/TodoListViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public partial class TodoListViewModel(AppDbContext context) : ViewModelBase, ID
2222
/// Gets or sets if the data is currently being refreshed.
2323
/// </summary>
2424
[ObservableProperty]
25-
private bool isRefreshing;
25+
public partial bool IsRefreshing { get; set; }
2626

2727
/// <summary>
2828
/// Gets or sets a collection of <see cref="TodoItemViewModel"/>s
2929
/// </summary>
3030
[ObservableProperty]
31-
private ConcurrentObservableCollection<TodoItemViewModel> items = [];
31+
public partial ConcurrentObservableCollection<TodoItemViewModel> Items { get; set; } = [];
3232

3333
// -- Adding new Items --
3434

@@ -68,7 +68,7 @@ private async Task AddItemAsync(CancellationToken cancellationToken)
6868
/// </summary>
6969
[ObservableProperty]
7070
[NotifyCanExecuteChangedFor(nameof(AddItemCommand))] // This attribute will invalidate the command each time this property changes
71-
private string? _newItemContent;
71+
public partial string? NewItemContent { get; set; }
7272

7373
/// <summary>
7474
/// Returns <c>true</c> if a new Item can be added. We require to have the NewItem some text.

0 commit comments

Comments
 (0)