Skip to content

Update target frameworks for Maui and Testing projects #4174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 9, 2025
+18 −18
Merged

Update target frameworks for Maui and Testing projects #4174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e4e8c7
Fix ReactiveUIFinalModernTargetFrameworks missing initially set value…
Cheesebaron Oct 6, 2025
aed4359
Update target frameworks for Maui and Testing projects
ChrisPulman Oct 7, 2025
30260b6
Merge branch 'FixTFMsForMauiAndTesting' into pr/4171
ChrisPulman Oct 7, 2025
89e61cd
Merge branch 'main' into CP_4171
ChrisPulman Oct 7, 2025
6df6d33
Merge branch 'main' into CP_4171
glennawatson Oct 9, 2025
7bc4714
Update test target frameworks for ReactiveUI.Testing
ChrisPulman Oct 9, 2025
7ac638f
Merge branch 'CP_4171' of https://github.com/reactiveui/ReactiveUI in…
ChrisPulman Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<!-- Enable building Windows-specific targets on non-Windows platforms -->
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<PropertyGroup>
<!-- Granular Target Framework definitions for cross-platform builds -->
<ReactiveUICoreTargets>net8.0;net9.0;net10.0</ReactiveUICoreTargets>
Expand All @@ -58,15 +58,19 @@
<ReactiveUITestTargets>net9.0;net10.0</ReactiveUITestTargets>
<ReactiveUITestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUITestTargets>

<ReactiveUIMauiTestTargets>net9.0;net10.0</ReactiveUIMauiTestTargets>
<ReactiveUIMauiTestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIMauiTestTargets>

<ReactiveMauiTargets>net9.0;net10.0;$(ReactiveUIAndroidTargets)</ReactiveMauiTargets>
<ReactiveUIMauiTestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIMauiWindowsTargets)</ReactiveUIMauiTestTargets>
<ReactiveUIMauiTestTargets>$(ReactiveUIMauiTestTargets);net9.0;net10.0</ReactiveUIMauiTestTargets>

<ReactiveMauiTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIMauiWindowsTargets)</ReactiveMauiTargets>
<ReactiveMauiTargets>$(ReactiveMauiTargets);net9.0;net10.0;$(ReactiveUIAndroidTargets)</ReactiveMauiTargets>
<ReactiveMauiTargets Condition="$([MSBuild]::IsOsPlatform('Windows')) or $([MSBuild]::IsOsPlatform('OSX'))">$(ReactiveMauiTargets);$(ReactiveUIAppleTargets)</ReactiveMauiTargets>

<!-- Modern targets for tests and benchmarks (no netstandard) -->
<ReactiveUIModernTargets>net8.0;net9.0;net10.0</ReactiveUIModernTargets>

<ReactiveUITestingTargets>netstandard2.0;$(ReactiveUIModernTargets)</ReactiveUITestingTargets>
<ReactiveUITestingTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUITestingTargets);net462;net472</ReactiveUITestingTargets>

<!-- Start with core targets available on all platforms -->
<ReactiveUIFinalTargetFrameworks>netstandard2.0;$(ReactiveUICoreTargets)</ReactiveUIFinalTargetFrameworks>

Expand All @@ -81,22 +85,22 @@

<!-- Final target frameworks for tests/benchmarks (modern .NET only, with platform-specific additions) -->
<ReactiveUIFinalModernTargetFrameworks>$(ReactiveUIModernTargets)</ReactiveUIFinalModernTargetFrameworks>
<ReactiveUIFinalModernTargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIFrameworkTargets);$(ReactiveUIWindowsTargets)</ReactiveUIFinalModernTargetFrameworks>
<ReactiveUIFinalModernTargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIFinalModernTargetFrameworks);$(ReactiveUIFrameworkTargets);$(ReactiveUIWindowsTargets)</ReactiveUIFinalModernTargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<!-- Ensure all test runs use our runsettings to control cross-assembly parallelism -->
<RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
</PropertyGroup>

<PropertyGroup Condition="$(MSBuildProjectName.Contains('WPF')) != 'true' and '$(IsTestProject)' != 'true' and ($(TargetFramework.StartsWith('net8.0')) or $(TargetFramework.StartsWith('net9.0')) or $(TargetFramework.StartsWith('net10.0')))">
<IsAotCompatible>true</IsAotCompatible>
</PropertyGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

<ItemGroup Condition="$(IsTestProject)">
<PackageReference Include="NUnit"/>
<PackageReference Include="NUnit3TestAdapter"/>
Expand All @@ -107,7 +111,7 @@
<PackageReference Include="coverlet.msbuild" PrivateAssets="All"/>
<PackageReference Include="Verify.NUnit"/>
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(ReactiveUIFinalModernTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>$(ReactiveUITestingTargets)</TargetFrameworks>
<AssemblyName>ReactiveUI.Testing</AssemblyName>
<RootNamespace>ReactiveUI.Testing</RootNamespace>
<PackageDescription>Provides extensions for testing ReactiveUI based applications</PackageDescription>
Expand Down
4 changes: 1 addition & 3 deletions src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet10_0.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.DotNet9_0.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading