Skip to content

Commit 872da86

Browse files
ChrisPulmanChrisPulman
authored
Update to Net 9.0 (#854)
1 parent 72be97d commit 872da86

16 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Mobile/ReactiveUI.UnoRouting.Mobile.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
44
<SingleProject>true</SingleProject>
55
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
7-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
8-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
6+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net9.0-ios'">iossimulator-x64</RuntimeIdentifier>
7+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net9.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
8+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net9.0-macos'">osx-x64</RuntimeIdentifier>
99
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
1010
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
1111
<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
1212
<!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
1313
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>-->
1414
<IsUnoHead>true</IsUnoHead>
15-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">15.4</SupportedOSPlatformVersion>
16-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">15.4</SupportedOSPlatformVersion>
17-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">31.0</SupportedOSPlatformVersion>
18-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
15+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-ios'">15.4</SupportedOSPlatformVersion>
16+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-maccatalyst'">15.4</SupportedOSPlatformVersion>
17+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-android'">31.0</SupportedOSPlatformVersion>
18+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net9.0-macos'">10.14</SupportedOSPlatformVersion>
1919
</PropertyGroup>
2020
<ItemGroup>
2121
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2727
</ItemGroup>
2828
<Choose>
29-
<When Condition="'$(TargetFramework)'=='net7.0-android'">
29+
<When Condition="'$(TargetFramework)'=='net9.0-android'">
3030
<ItemGroup>
3131
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
3232
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.37" />
@@ -35,8 +35,8 @@
3535
<AndroidEnvironment Include="Android/environment.conf" />
3636
</ItemGroup>
3737
</When>
38-
<When Condition="'$(TargetFramework)'=='net7.0-ios'">
39-
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
38+
<When Condition="'$(TargetFramework)'=='net9.0-ios'">
39+
<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios'">
4040
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
4141
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
4242
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
4646
</ItemGroup>
4747
</When>
48-
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
48+
<When Condition="'$(TargetFramework)'=='net9.0-maccatalyst'">
4949
<PropertyGroup>
5050
<!-- Configure the GC -->
5151
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -60,7 +60,7 @@
6060
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
6161
</ItemGroup>
6262
</When>
63-
<When Condition="'$(TargetFramework)'=='net7.0-macos'">
63+
<When Condition="'$(TargetFramework)'=='net9.0-macos'">
6464
<PropertyGroup>
6565
</PropertyGroup>
6666
</When>

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Skia.Gtk/ReactiveUI.UnoRouting.Skia.Gtk.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
44
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ApplicationManifest>app.manifest</ApplicationManifest>
77
</PropertyGroup>
88
<ItemGroup Condition="exists('..\ReactiveUI.UwpRouting.Windows')">

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Skia.Wpf/ReactiveUI.UnoRouting.Skia.Wpf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
44
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
5-
<TargetFramework>net7.0-windows</TargetFramework>
5+
<TargetFramework>net9.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
</PropertyGroup>

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Wasm/ReactiveUI.UnoRouting.Wasm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<NoWarn>NU1701</NoWarn>
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)'=='Debug'">

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Windows/ReactiveUI.UnoRouting.Windows.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
55
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
66
<RootNamespace>ReactiveUI.UnoRouting</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>

‎avalonia/hello-world/HelloWorld/HelloWorld.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ApplicationIcon />
66
<StartupObject />
77
</PropertyGroup>

‎avalonia/hello-world/RandomBuddyStalker/RandomBuddyStalker.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ApplicationIcon />
66
<StartupObject />
77
</PropertyGroup>
@@ -14,15 +14,15 @@
1414
</AvaloniaResource>
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Avalonia" Version="11.0.11" />
18-
<PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
19-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.11" />
20-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.11" />
21-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
22-
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.11" />
23-
<PackageReference Include="Flurl.Http" Version="3.2.4" />
24-
<PackageReference Include="Flurl" Version="3.0.7" />
25-
<PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
17+
<PackageReference Include="Avalonia" Version="11.3.3" />
18+
<PackageReference Include="Avalonia.Desktop" Version="11.3.3" />
19+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.3" />
20+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.3" />
21+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.3" />
22+
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.3" />
23+
<PackageReference Include="Flurl.Http" Version="4.0.2" />
24+
<PackageReference Include="Flurl" Version="4.0.0" />
25+
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
2626
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2727
<PackageReference Include="Serilog" Version="3.0.1" />
2828
</ItemGroup>

‎avalonia/suspension/ReactiveUI.Samples.Suspension/ReactiveUI.Samples.Suspension.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77

‎blazor/ClientSideExample/ClientSideExample/ClientSideExample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RazorLangVersion>3.0</RazorLangVersion>
66
</PropertyGroup>
77

‎blazor/HostedExample/HostedExample/Client/HostedExample.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RazorLangVersion>3.0</RazorLangVersion>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)