diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 5876ab5d2e..6a0b8ea07d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -38,7 +38,7 @@ true - + net8.0;net9.0;net10.0 @@ -58,15 +58,19 @@ net9.0;net10.0 net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0 - net9.0;net10.0 - net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0 - - net9.0;net10.0;$(ReactiveUIAndroidTargets) + $(ReactiveUIMauiWindowsTargets) + $(ReactiveUIMauiTestTargets);net9.0;net10.0 + + $(ReactiveUIMauiWindowsTargets) + $(ReactiveMauiTargets);net9.0;net10.0;$(ReactiveUIAndroidTargets) $(ReactiveMauiTargets);$(ReactiveUIAppleTargets) net8.0;net9.0;net10.0 + netstandard2.0;$(ReactiveUIModernTargets) + $(ReactiveUITestingTargets);net462;net472 + netstandard2.0;$(ReactiveUICoreTargets) @@ -81,22 +85,22 @@ $(ReactiveUIModernTargets) - $(ReactiveUIFrameworkTargets);$(ReactiveUIWindowsTargets) + $(ReactiveUIFinalModernTargetFrameworks);$(ReactiveUIFrameworkTargets);$(ReactiveUIWindowsTargets) - + $(MSBuildThisFileDirectory)tests.runsettings - + true - + true - + @@ -107,7 +111,7 @@ - + diff --git a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj index 55b6c65cd1..4b5e1bc00e 100644 --- a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj +++ b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj @@ -1,6 +1,6 @@  - $(ReactiveUIFinalModernTargetFrameworks) + $(ReactiveUITestingTargets) ReactiveUI.Testing ReactiveUI.Testing Provides extensions for testing ReactiveUI based applications diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet10_0.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet10_0.verified.txt index 27cebf302d..fae8f43ebc 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet10_0.verified.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet10_0.verified.txt @@ -1,6 +1,4 @@ -[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.19041.0")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")] -[assembly: System.Runtime.Versioning.TargetPlatform("Windows10.0.19041.0")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")] namespace ReactiveUI.Testing { public abstract class AppBuilderTestBase diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet9_0.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet9_0.verified.txt index 6878897438..657a91b7f3 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet9_0.verified.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet9_0.verified.txt @@ -1,6 +1,4 @@ -[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.19041.0")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v9.0", FrameworkDisplayName=".NET 9.0")] -[assembly: System.Runtime.Versioning.TargetPlatform("Windows10.0.19041.0")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v9.0", FrameworkDisplayName=".NET 9.0")] namespace ReactiveUI.Testing { public abstract class AppBuilderTestBase