Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,11 @@
<ReactiveUITestTargets>net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0;net11.0-windows10.0.19041.0</ReactiveUITestTargets>

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

<!-- MAUI net9 heads (Android/Apple/plain) are EOL; MAUI targets net10+ only. Windows/WinUI3 targets keep net9 elsewhere. -->
<ReactiveMauiTargets>$(ReactiveUIMauiWindowsTargets)</ReactiveMauiTargets>
<ReactiveMauiTargets>$(ReactiveMauiTargets);net9.0;net10.0;$(ReactiveUIAndroidTargets)</ReactiveMauiTargets>
<ReactiveMauiTargets>$(ReactiveMauiTargets);net10.0;$(ReactiveUIAndroidTargets)</ReactiveMauiTargets>
<ReactiveMauiTargets Condition="$([MSBuild]::IsOsPlatform('Windows')) or $([MSBuild]::IsOsPlatform('OSX'))">$(ReactiveMauiTargets);$(ReactiveUIAppleTargets)</ReactiveMauiTargets>

<!-- Modern targets for tests and benchmarks (no netstandard) -->
Expand Down
15 changes: 7 additions & 8 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@

<PropertyGroup Label="Shared Version Variables">
<SplatVersion>20.0.0</SplatVersion>
<PrimitivesVersion>5.8.0</PrimitivesVersion>
<TUnitVersion>1.57.0</TUnitVersion>
<PrimitivesVersion>6.0.0</PrimitivesVersion>
<TUnitVersion>1.58.0</TUnitVersion>
<XamarinAndroidXLifecycleLiveDataVersion>2.11.0.1</XamarinAndroidXLifecycleLiveDataVersion>
</PropertyGroup>

<PropertyGroup Label="Framework-Aligned Versions">
<MauiVersion Condition="$(TargetFramework.StartsWith('net9'))">9.0.120</MauiVersion>
<MauiVersion Condition="$(TargetFramework.StartsWith('net10'))">10.0.80</MauiVersion>
<MauiVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.5.26304.4</MauiVersion>

Expand Down Expand Up @@ -50,7 +49,7 @@
</ItemGroup>

<ItemGroup Label="Rx Ecosystem">
<PackageVersion Include="DynamicData" Version="9.4.31"/>
<PackageVersion Include="DynamicData" Version="9.4.33"/>
<PackageVersion Include="Reactive.Wasm" Version="3.0.1"/>
<PackageVersion Include="Splat" Version="$(SplatVersion)"/>
<PackageVersion Include="Splat.Autofac" Version="$(SplatVersion)"/>
Expand Down Expand Up @@ -80,10 +79,10 @@
<ItemGroup Label="Analyzers">
<PackageVersion Include="StyleSharp.Analyzers" Version="3.13.4"/>
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0"/>
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.27.0.140913"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114"/>
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.28.0.143324"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.6.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.6.0"/>
</ItemGroup>

<ItemGroup Label="Build / SourceLink / Versioning">
Expand Down
Loading