Skip to content

Commit 4d40ee8

Browse files
Add .NET 10 target framework support alongside .NET 9 (#281)
* Initial plan * Add .NET 10 target framework support Co-authored-by: glennawatson <[email protected]> * Consolidate .NET 9 and 10 TFMs into single property groups Co-authored-by: glennawatson <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: glennawatson <[email protected]>
1 parent eb38bff commit 4d40ee8

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

src/Directory.Build.props

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,28 @@
5757

5858
<!--<UnoTargetFrameworks>net9.0;net9.0-android;net9.0-browserwasm;net9.0-desktop;net9.0-ios;net9.0-windows10.0.19041.0</UnoTargetFrameworks>-->
5959

60-
<!-- Cross-platform .NET 9 target (non-Windows only) -->
61-
<UnoCrossPlatformNet9>net9.0;net9.0-desktop;net9.0-browserwasm</UnoCrossPlatformNet9>
60+
<!-- Cross-platform targets (non-Windows only) -->
61+
<UnoCrossPlatformTargets>net9.0;net9.0-desktop;net9.0-browserwasm;net10.0;net10.0-desktop;net10.0-browserwasm</UnoCrossPlatformTargets>
6262

63-
<!-- Windows-specific desktop TFMs (includes Windows-specific .NET 9) -->
64-
<UnoWindowsDesktopTargets>net9.0-windows10.0.19041.0</UnoWindowsDesktopTargets>
63+
<!-- Windows-specific desktop TFMs -->
64+
<UnoWindowsDesktopTargets>net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</UnoWindowsDesktopTargets>
6565

6666
<!-- Mobile TFMs separated by platform -->
67-
<UnoMobileAndroidTargets>net9.0-android</UnoMobileAndroidTargets>
68-
<UnoMobileAppleTargets>net9.0-ios</UnoMobileAppleTargets>
67+
<UnoMobileAndroidTargets>net9.0-android;net10.0-android</UnoMobileAndroidTargets>
68+
<UnoMobileAppleTargets>net9.0-ios;net10.0-ios</UnoMobileAppleTargets>
69+
70+
<!-- Test project target frameworks -->
71+
<TestProjectTargetFrameworks>net9.0;net10.0</TestProjectTargetFrameworks>
6972
</PropertyGroup>
7073

7174
<PropertyGroup>
7275
<!-- Start with base TFMs that are always included -->
73-
<UnoTargetFrameworks>$(UnoCrossPlatformNet9)</UnoTargetFrameworks>
76+
<UnoTargetFrameworks>$(UnoCrossPlatformTargets)</UnoTargetFrameworks>
7477

7578
<!-- Add Android targets (Linux, macOS, Windows can all compile Android) -->
7679
<UnoTargetFrameworks>$(UnoTargetFrameworks);$(UnoMobileAndroidTargets)</UnoTargetFrameworks>
7780

78-
<!-- Add Windows Desktop TFMs only when building on Windows (includes net9.0-windows) -->
81+
<!-- Add Windows Desktop TFMs only when building on Windows -->
7982
<UnoTargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(UnoTargetFrameworks);$(UnoWindowsDesktopTargets)</UnoTargetFrameworks>
8083

8184
<!-- Add Apple Mobile TFMs when building on macOS or Windows (both can compile Apple frameworks) -->

src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFrameworks>$(TestProjectTargetFrameworks)</TargetFrameworks>
55
<IsTestProject>true</IsTestProject>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>

0 commit comments

Comments
 (0)