Skip to content

Commit 518c807

Browse files
ChrisPulmanChrisPulman
authored
Housekeeping Update to Net 9.0 (#3933)
<!-- Please be sure to read the [Contribute](https://github.com/reactiveui/reactiveui#contribute) section of the README --> **What kind of change does this PR introduce?** <!-- Bug fix, feature, docs update, ... --> update **What is the current behavior?** <!-- You can also link to an open issue here. --> Supports Net 6 **What is the new behavior?** <!-- If this is a feature change --> Net 6 retired and added Net 9.0 **What might this PR break?** Users of Net 6.0 will need to migrate to net 8 or net 9 **Please check if the PR fulfills these requirements** - [ ] Tests for the changes have been added (for bug fixes / features) - [ ] Docs have been added / updated (for bug fixes / features) **Other information**:
1 parent 4d3f486 commit 518c807

26 files changed

+1496
-38
lines changed

‎src/Directory.Packages.props

+19-17
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<PropertyGroup>
7-
<SplatVersion>15.1.1</SplatVersion>
7+
<SplatVersion>15.2.22</SplatVersion>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
10+
<PackageVersion Include="coverlet.msbuild" Version="6.0.3" />
1111
<PackageVersion Include="DynamicData" Version="9.0.4" />
12-
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
12+
<PackageVersion Include="FluentAssertions" Version="8.0.0" />
1313
<PackageVersion Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
1414
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
1515
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
16-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1717
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
1818
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1919
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
2020
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
2121
<PackageVersion Include="Mocks.Maui" Version="1.1.8" />
22-
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.143" />
23-
<PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
22+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
23+
<PackageVersion Include="PublicApiGenerator" Version="11.3.0" />
2424
<PackageVersion Include="Reactive.Wasm" Version="2.1.2" />
25-
<PackageVersion Include="Roslynator.Analyzers" Version="4.12.6" />
25+
<PackageVersion Include="Roslynator.Analyzers" Version="4.12.10" />
2626
<PackageVersion Include="Splat" Version="$(SplatVersion)" />
2727
<PackageVersion Include="Splat.Autofac" Version="$(SplatVersion)" />
2828
<PackageVersion Include="Splat.Drawing" Version="$(SplatVersion)" />
@@ -32,11 +32,11 @@
3232
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
3333
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
3434
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
35-
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
36-
<PackageVersion Include="Verify.Xunit" Version="26.6.0" />
37-
<PackageVersion Include="xunit" Version="2.9.2" />
38-
<PackageVersion Include="xunit.runner.console" Version="2.9.2" />
39-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
35+
<PackageVersion Include="System.Text.Json" Version="9.0.1" />
36+
<PackageVersion Include="Verify.Xunit" Version="28.9.0" />
37+
<PackageVersion Include="xunit" Version="2.9.3" />
38+
<PackageVersion Include="xunit.runner.console" Version="2.9.3" />
39+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
4040
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
4141
<PackageVersion Include="Xamarin.AndroidX.Core" Version="1.13.1.4" />
4242
<PackageVersion Include="Xamarin.AndroidX.Preference" Version="1.2.1.9" />
@@ -45,19 +45,21 @@
4545
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.4.1" />
4646
</ItemGroup>
4747
<ItemGroup Condition="'$(UseMaui)' != 'true'">
48-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
48+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
4949
</ItemGroup>
5050
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
5151
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
5252
</ItemGroup>
53-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0'))">
53+
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0'))">
5454
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
5555
</ItemGroup>
56-
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
57-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
56+
<ItemGroup Condition="$(TargetFramework.StartsWith('net9'))">
57+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.1" />
58+
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
59+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
5860
</ItemGroup>
5961
<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
60-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
62+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.12" />
6163
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
6264
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
6365
</ItemGroup>

‎src/Directory.build.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReleaseNotes>https://github.com/reactiveui/ReactiveUI/releases</PackageReleaseNotes>
1818
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
20-
<NoWarn>$(NoWarn);IDE0060;IDE1006;VSSpell001</NoWarn>
20+
<NoWarn>$(NoWarn);IDE0060;IDE1006;IDE0130;VSSpell001</NoWarn>
2121
<!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
2222
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2323
<!-- Embed source files that are not tracked by the source control manager in the PDB -->
@@ -32,9 +32,9 @@
3232
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3333
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
3434
<PublishRepositoryUrl>true</PublishRepositoryUrl>
35-
<WindowsTargetFrameworks>net462;net472;net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</WindowsTargetFrameworks>
36-
<MobileTargetFrameworks>net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst</MobileTargetFrameworks>
37-
<BaseTargetFrameworks>netstandard2.0;net6.0;net8.0</BaseTargetFrameworks>
35+
<WindowsTargetFrameworks>net462;net472;net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0;net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0</WindowsTargetFrameworks>
36+
<MobileTargetFrameworks>net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst;net9.0-android;net9.0-ios;net9.0-tvos;net9.0-macos;net9.0-maccatalyst</MobileTargetFrameworks>
37+
<BaseTargetFrameworks>netstandard2.0;net8.0;net9.0</BaseTargetFrameworks>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
4040
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

‎src/ReactiveUI.LeakTests/ReactiveUI.LeakTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net472;net9.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>

‎src/ReactiveUI.Maui/ReactiveUI.Maui.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
4-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0</TargetFrameworks>
55
<PackageDescription>Contains the ReactiveUI platform specific extensions for Microsoft Maui</PackageDescription>
66
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;maui;android;ios;mac;windows;net</PackageTags>
77
<UseMaui>true</UseMaui>

‎src/ReactiveUI.Splat.Tests/ReactiveUI.Splat.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net472;net9.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>

‎src/ReactiveUI.Testing.Tests/ReactiveUI.Testing.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net472;net9.0</TargetFrameworks>
44
<FodyTargetFramework>netstandard2.0</FodyTargetFramework>
55
<FodyTargetFramework Condition=" $(TargetFramework.StartsWith('net4')) ">$(TargetFramework)</FodyTargetFramework>
66
</PropertyGroup>

0 commit comments

Comments
 (0)