|
38 | 38 | <!-- Enable building Windows-specific targets on non-Windows platforms -->
|
39 | 39 | <EnableWindowsTargeting>true</EnableWindowsTargeting>
|
40 | 40 | </PropertyGroup>
|
41 |
| - |
| 41 | + |
42 | 42 | <PropertyGroup>
|
43 | 43 | <!-- Granular Target Framework definitions for cross-platform builds -->
|
44 | 44 | <ReactiveUICoreTargets>net8.0;net9.0;net10.0</ReactiveUICoreTargets>
|
|
58 | 58 | <ReactiveUITestTargets>net9.0;net10.0</ReactiveUITestTargets>
|
59 | 59 | <ReactiveUITestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUITestTargets>
|
60 | 60 |
|
61 |
| - <ReactiveUIMauiTestTargets>net9.0;net10.0</ReactiveUIMauiTestTargets> |
62 |
| - <ReactiveUIMauiTestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIMauiTestTargets> |
63 |
| - |
64 |
| - <ReactiveMauiTargets>net9.0;net10.0;$(ReactiveUIAndroidTargets)</ReactiveMauiTargets> |
| 61 | + <ReactiveUIMauiTestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIMauiWindowsTargets)</ReactiveUIMauiTestTargets> |
| 62 | + <ReactiveUIMauiTestTargets>$(ReactiveUIMauiTestTargets);net9.0;net10.0</ReactiveUIMauiTestTargets> |
| 63 | + |
| 64 | + <ReactiveMauiTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIMauiWindowsTargets)</ReactiveMauiTargets> |
| 65 | + <ReactiveMauiTargets>$(ReactiveMauiTargets);net9.0;net10.0;$(ReactiveUIAndroidTargets)</ReactiveMauiTargets> |
65 | 66 | <ReactiveMauiTargets Condition="$([MSBuild]::IsOsPlatform('Windows')) or $([MSBuild]::IsOsPlatform('OSX'))">$(ReactiveMauiTargets);$(ReactiveUIAppleTargets)</ReactiveMauiTargets>
|
66 | 67 |
|
67 | 68 | <!-- Modern targets for tests and benchmarks (no netstandard) -->
|
68 | 69 | <ReactiveUIModernTargets>net8.0;net9.0;net10.0</ReactiveUIModernTargets>
|
69 | 70 |
|
| 71 | + <ReactiveUITestingTargets>netstandard2.0;$(ReactiveUIModernTargets)</ReactiveUITestingTargets> |
| 72 | + <ReactiveUITestingTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUITestingTargets);net462;net472</ReactiveUITestingTargets> |
| 73 | + |
70 | 74 | <!-- Start with core targets available on all platforms -->
|
71 | 75 | <ReactiveUIFinalTargetFrameworks>netstandard2.0;$(ReactiveUICoreTargets)</ReactiveUIFinalTargetFrameworks>
|
72 | 76 |
|
|
81 | 85 |
|
82 | 86 | <!-- Final target frameworks for tests/benchmarks (modern .NET only, with platform-specific additions) -->
|
83 | 87 | <ReactiveUIFinalModernTargetFrameworks>$(ReactiveUIModernTargets)</ReactiveUIFinalModernTargetFrameworks>
|
84 |
| - <ReactiveUIFinalModernTargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIFrameworkTargets);$(ReactiveUIWindowsTargets)</ReactiveUIFinalModernTargetFrameworks> |
| 88 | + <ReactiveUIFinalModernTargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIFinalModernTargetFrameworks);$(ReactiveUIFrameworkTargets);$(ReactiveUIWindowsTargets)</ReactiveUIFinalModernTargetFrameworks> |
85 | 89 | </PropertyGroup>
|
86 |
| - |
| 90 | + |
87 | 91 | <PropertyGroup>
|
88 | 92 | <!-- Ensure all test runs use our runsettings to control cross-assembly parallelism -->
|
89 | 93 | <RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
|
90 | 94 | </PropertyGroup>
|
91 |
| - |
| 95 | + |
92 | 96 | <PropertyGroup Condition="$(MSBuildProjectName.Contains('WPF')) != 'true' and '$(IsTestProject)' != 'true' and ($(TargetFramework.StartsWith('net8.0')) or $(TargetFramework.StartsWith('net9.0')) or $(TargetFramework.StartsWith('net10.0')))">
|
93 | 97 | <IsAotCompatible>true</IsAotCompatible>
|
94 | 98 | </PropertyGroup>
|
95 |
| - |
| 99 | + |
96 | 100 | <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
|
97 | 101 | <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
98 | 102 | </PropertyGroup>
|
99 |
| - |
| 103 | + |
100 | 104 | <ItemGroup Condition="$(IsTestProject)">
|
101 | 105 | <PackageReference Include="NUnit"/>
|
102 | 106 | <PackageReference Include="NUnit3TestAdapter"/>
|
|
107 | 111 | <PackageReference Include="coverlet.msbuild" PrivateAssets="All"/>
|
108 | 112 | <PackageReference Include="Verify.NUnit"/>
|
109 | 113 | </ItemGroup>
|
110 |
| - |
| 114 | + |
111 | 115 | <ItemGroup Condition="'$(IsTestProject)' != 'true'">
|
112 | 116 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
|
113 | 117 | </ItemGroup>
|
|
0 commit comments