From 211fe8853665db5ccaaa5cddf13e86f219f7403a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 4 Oct 2025 06:53:53 +0000 Subject: [PATCH 1/3] Initial plan From 9877e928ee1b1cc44e9fdb9fd122c89914823e5d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 4 Oct 2025 07:01:52 +0000 Subject: [PATCH 2/3] Add .NET 10 target framework support Co-authored-by: glennawatson <5834289+glennawatson@users.noreply.github.com> --- src/Directory.Build.props | 20 ++++++++++++++----- .../ReactiveUI.Uno.Tests.csproj | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a5ab002..b14215e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -60,26 +60,36 @@ net9.0;net9.0-desktop;net9.0-browserwasm + + net10.0;net10.0-desktop;net10.0-browserwasm + net9.0-windows10.0.19041.0 + + net10.0-windows10.0.19041.0 + net9.0-android net9.0-ios + + + net10.0-android + net10.0-ios - $(UnoCrossPlatformNet9) + $(UnoCrossPlatformNet9);$(UnoCrossPlatformNet10) - $(UnoTargetFrameworks);$(UnoMobileAndroidTargets) + $(UnoTargetFrameworks);$(UnoMobileAndroidTargets);$(UnoMobileAndroidTargetsNet10) - - $(UnoTargetFrameworks);$(UnoWindowsDesktopTargets) + + $(UnoTargetFrameworks);$(UnoWindowsDesktopTargets);$(UnoWindowsDesktopTargetsNet10) - $(UnoTargetFrameworks);$(UnoMobileAppleTargets) + $(UnoTargetFrameworks);$(UnoMobileAppleTargets);$(UnoMobileAppleTargetsNet10) diff --git a/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj b/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj index fd94ba9..677a6e9 100644 --- a/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj +++ b/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 true enable enable From ab9bd0d012a5620b021989f34915669bbb7402ca Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 4 Oct 2025 07:18:04 +0000 Subject: [PATCH 3/3] Consolidate .NET 9 and 10 TFMs into single property groups Co-authored-by: glennawatson <5834289+glennawatson@users.noreply.github.com> --- src/Directory.Build.props | 33 ++++++++----------- .../ReactiveUI.Uno.Tests.csproj | 2 +- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b14215e..66ef8c4 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -57,39 +57,32 @@ - - net9.0;net9.0-desktop;net9.0-browserwasm + + net9.0;net9.0-desktop;net9.0-browserwasm;net10.0;net10.0-desktop;net10.0-browserwasm - - net10.0;net10.0-desktop;net10.0-browserwasm - - - net9.0-windows10.0.19041.0 - - - net10.0-windows10.0.19041.0 + + net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0 - net9.0-android - net9.0-ios + net9.0-android;net10.0-android + net9.0-ios;net10.0-ios - - net10.0-android - net10.0-ios + + net9.0;net10.0 - $(UnoCrossPlatformNet9);$(UnoCrossPlatformNet10) + $(UnoCrossPlatformTargets) - $(UnoTargetFrameworks);$(UnoMobileAndroidTargets);$(UnoMobileAndroidTargetsNet10) + $(UnoTargetFrameworks);$(UnoMobileAndroidTargets) - - $(UnoTargetFrameworks);$(UnoWindowsDesktopTargets);$(UnoWindowsDesktopTargetsNet10) + + $(UnoTargetFrameworks);$(UnoWindowsDesktopTargets) - $(UnoTargetFrameworks);$(UnoMobileAppleTargets);$(UnoMobileAppleTargetsNet10) + $(UnoTargetFrameworks);$(UnoMobileAppleTargets) diff --git a/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj b/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj index 677a6e9..97ee765 100644 --- a/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj +++ b/src/ReactiveUI.Uno.Tests/ReactiveUI.Uno.Tests.csproj @@ -1,7 +1,7 @@  - net10.0 + $(TestProjectTargetFrameworks) true enable enable