Skip to content

Commit b514962

Browse files
ChrisPulmanChrisPulman
authored
Housekeeping Retire Net 7 (#3811)
<!-- 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. --> Net 7 is supported **What is the new behavior?** <!-- If this is a feature change --> Net 7 targets have been removed in line with Microsoft **What might this PR break?** Users are recommended to update to Net 8 **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 97f77fc commit b514962

10 files changed

+41
-109
lines changed

‎.editorconfig

+5-2
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ dotnet_diagnostic.SA1006.severity = error
296296
dotnet_diagnostic.SA1007.severity = error
297297
dotnet_diagnostic.SA1008.severity = error
298298
dotnet_diagnostic.SA1009.severity = error
299-
dotnet_diagnostic.SA1010.severity = suggestion
299+
dotnet_diagnostic.SA1010.severity = none
300300
dotnet_diagnostic.SA1011.severity = error
301301
dotnet_diagnostic.SA1012.severity = error
302302
dotnet_diagnostic.SA1013.severity = error
@@ -469,10 +469,11 @@ dotnet_diagnostic.CA1825.severity=error
469469
dotnet_diagnostic.CA1812.severity=error
470470
dotnet_diagnostic.CA1805.severity=error
471471
dotnet_diagnostic.RCS1197.severity=error
472-
dotnet_diagnostic.RCS1198.severity=suggestion
472+
dotnet_diagnostic.RCS1198.severity=none
473473
dotnet_diagnostic.RCS1231.severity=suggestion
474474
dotnet_diagnostic.RCS1235.severity=error
475475
dotnet_diagnostic.RCS1242.severity=error
476+
dotnet_diagnostic.RCS1256.severity=none
476477
dotnet_diagnostic.CA2016.severity=warning
477478
dotnet_diagnostic.CA2014.severity=error
478479
dotnet_diagnostic.RCS1010.severity=error
@@ -489,6 +490,8 @@ dotnet_diagnostic.RCS1105.severity=error
489490
dotnet_diagnostic.RCS1112.severity=error
490491
dotnet_diagnostic.RCS1128.severity=error
491492
dotnet_diagnostic.RCS1143.severity=error
493+
dotnet_diagnostic.RCS1158.severity=none
494+
dotnet_diagnostic.RCS1163.severity=none
492495
dotnet_diagnostic.RCS1171.severity=error
493496
dotnet_diagnostic.RCS1173.severity=error
494497
dotnet_diagnostic.RCS1176.severity=error

‎src/Directory.Packages.props

+7-30
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<PropertyGroup>
7-
<FodyVersion>6.8.0</FodyVersion>
8-
<SplatVersion>15.0.1</SplatVersion>
9-
<XamarinAndroidSupportVersion>28.0.0.3</XamarinAndroidSupportVersion>
10-
<XUnitVersion>2.8.0</XUnitVersion>
11-
<VerifyXUnitVersion>24.2.0</VerifyXUnitVersion>
7+
<SplatVersion>15.1.1</SplatVersion>
128
</PropertyGroup>
139
<ItemGroup>
1410
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
1511
<PackageVersion Include="DynamicData" Version="8.4.1" />
1612
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
17-
<PackageVersion Include="Fody" Version="$(FodyVersion)" />
18-
<PackageVersion Include="FodyHelpers" Version="$(FodyVersion)" />
19-
<PackageVersion Include="FodyPackaging" Version="$(FodyVersion)" />
2013
<PackageVersion Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
2114
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
2215
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
@@ -40,22 +33,9 @@
4033
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
4134
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
4235
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
43-
<PackageVersion Include="Verify.Xunit" Version="$(VerifyXUnitVersion)" />
44-
<PackageVersion Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="$(XamarinAndroidSupportVersion)" />
45-
<PackageVersion Include="Xamarin.Android.Support.v4" Version="$(XamarinAndroidSupportVersion)" />
46-
<PackageVersion Include="Xamarin.Android.Support.v7.AppCompat" Version="$(XamarinAndroidSupportVersion)" />
47-
<PackageVersion Include="Xamarin.Android.Support.v7.Preference" Version="$(XamarinAndroidSupportVersion)" />
48-
<PackageVersion Include="Xamarin.Android.Support.v7.RecyclerView" Version="$(XamarinAndroidSupportVersion)" />
49-
<PackageVersion Include="Xamarin.Android.Support.Vector.Drawable" Version="$(XamarinAndroidSupportVersion)" />
50-
<PackageVersion Include="Xamarin.AndroidX.Core" Version="1.13.0" />
51-
<PackageVersion Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.24" />
52-
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.7.0.1" />
53-
<PackageVersion Include="Xamarin.AndroidX.Preference" Version="1.2.1.4" />
54-
<PackageVersion Include="Xamarin.Forms" Version="5.0.0.2662" />
55-
<PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
56-
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
57-
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
58-
<PackageVersion Include="xunit.runner.console" Version="$(XUnitVersion)" />
36+
<PackageVersion Include="Verify.Xunit" Version="24.2.0" />
37+
<PackageVersion Include="xunit" Version="2.8.0" />
38+
<PackageVersion Include="xunit.runner.console" Version="2.8.0" />
5939
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
6040
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
6141
</ItemGroup>
@@ -65,17 +45,14 @@
6545
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
6646
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
6747
</ItemGroup>
68-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0'))">
48+
<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'))">
6949
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
7050
</ItemGroup>
7151
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
72-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.29" />
73-
</ItemGroup>
74-
<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
75-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.18" />
52+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.30" />
7653
</ItemGroup>
7754
<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
78-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.4" />
55+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.5" />
7956
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
8057
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
8158
</ItemGroup>

‎src/Directory.build.props

+5-12
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
1313
<DefaultPackageDescription>A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. Supports Xamarin.iOS, Xamarin.Android, Xamarin.Mac, Xamarin Forms, Xamarin.TVOS, Tizen, WPF, Windows Forms, Universal Windows Platform (UWP) and the Uno Platform.</DefaultPackageDescription>
1414
<PackageDescription>$(DefaultPackageDescription)</PackageDescription>
15-
<Owners>xanaisbettsx;ghuntley</Owners>
15+
<Owners>anaisbetts;ghuntley</Owners>
1616
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;xamarin.tvos;wpf;net;netstandard;net462;winui;maui;tizen;unoplatform</PackageTags>
1717
<PackageReleaseNotes>https://github.com/reactiveui/ReactiveUI/releases</PackageReleaseNotes>
1818
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
20-
<NoWarn>$(NoWarn);SA1010;RCS1198;RCS1158;RCS1163;RCS1256;IDE0060;IDE1006;VSSpell001</NoWarn>
20+
<NoWarn>$(NoWarn);IDE0060;IDE1006;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,16 +32,9 @@
3232
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3333
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
3434
<PublishRepositoryUrl>true</PublishRepositoryUrl>
35-
<WindowsTargetFrameworks>net462;net472;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</WindowsTargetFrameworks>
36-
<MobileTargetFrameworks>net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst;net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst</MobileTargetFrameworks>
37-
<BaseTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</BaseTargetFrameworks>
38-
</PropertyGroup>
39-
<!--<PropertyGroup Condition="$(IsTestProject) != 'true'">
40-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
41-
</PropertyGroup>-->
42-
<!-- MonoAndroid doesn't seem to want to allow debugging for maintainers -->
43-
<PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
44-
<DebugType>portable</DebugType>
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>
4538
</PropertyGroup>
4639
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
4740
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

‎src/Directory.build.targets

+4-37
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,16 @@
1313
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
1414
<DefineConstants>$(DefineConstants);NET_461;XAML</DefineConstants>
1515
</PropertyGroup>
16-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-ios'))">
16+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-maccatalyst')) or $(TargetFramework.EndsWith('0-ios'))">
1717
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
1818
</PropertyGroup>
19-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-maccatalyst'))">
20-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-ios'))">
23-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
24-
</PropertyGroup>
25-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-maccatalyst'))">
26-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
27-
</PropertyGroup>
28-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-ios'))">
29-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-maccatalyst'))">
32-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
33-
</PropertyGroup>
34-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-macos'))">
35-
<DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
36-
</PropertyGroup>
37-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-macos'))">
38-
<DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
39-
</PropertyGroup>
40-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-macos'))">
19+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-macos'))">
4120
<DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
4221
</PropertyGroup>
43-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-tvos'))">
22+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-tvos'))">
4423
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
4524
</PropertyGroup>
46-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-tvos'))">
47-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
48-
</PropertyGroup>
49-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-tvos'))">
50-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
51-
</PropertyGroup>
52-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android'))">
53-
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
54-
</PropertyGroup>
55-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-android'))">
56-
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
57-
</PropertyGroup>
58-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-android'))">
25+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-android'))">
5926
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
6027
</PropertyGroup>
6128

‎src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="Reactive.Wasm" />
10-
</ItemGroup>
11-
<ItemGroup>
1210
<PackageReference Include="Microsoft.AspNetCore.Components" />
1311
</ItemGroup>
1412
<ItemGroup>

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
4-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.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>
88
<DefineConstants>$(DefineConstants);IS_MAUI</DefineConstants>
99
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
1010
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
1111
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
12-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
13-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
12+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
13+
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
1414
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
1515
</PropertyGroup>
1616
<PropertyGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
@@ -19,7 +19,7 @@
1919
<ItemGroup>
2020
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
2121
</ItemGroup>
22-
<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
22+
<ItemGroup>
2323
<PackageReference Include="Microsoft.Maui.Controls" />
2424
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
2525
</ItemGroup>

‎src/ReactiveUI.Tests/ReactiveUI.Tests.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>net6.0;net7.0;net8.0</TargetFrameworks>
4-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net472;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net472;net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
</PropertyGroup>
77
<ItemGroup>

‎src/ReactiveUI.WinUI/ReactiveUI.WinUI.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>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</TargetFrameworks>
44
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
55
<PackageDescription>Contains the ReactiveUI platform specific extensions for WinUI Desktop</PackageDescription>
66
<RootNamespace>ReactiveUI.WinUI.Desktop</RootNamespace>

‎src/ReactiveUI/ReactiveUI.csproj

+11-17
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@
2222
<EmbeddedResource Remove="Resources\**" />
2323
<None Remove="Resources\**" />
2424
</ItemGroup>
25-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
25+
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
2626
<Compile Include="Platforms\netstandard2.0\**\*.cs" />
2727
<Compile Include="Platforms\shared\**\*.cs" />
28+
<PackageReference Include="System.ComponentModel" />
29+
<PackageReference Include="System.ComponentModel.Annotations" />
30+
<PackageReference Include="System.Diagnostics.Contracts" />
31+
<PackageReference Include="System.Dynamic.Runtime" />
32+
<PackageReference Include="System.Runtime.Serialization.Primitives" />
2833
</ItemGroup>
2934
<ItemGroup Condition="$(TargetFramework.EndsWith('-ios')) or $(TargetFramework.EndsWith('-maccatalyst'))">
3035
<Compile Include="Platforms\apple-common\**\*.cs" />
@@ -47,27 +52,16 @@
4752
<Compile Include="Platforms\android\**\*.cs" />
4853
<Compile Include="Platforms\mobile-common\**\*.cs" />
4954
</ItemGroup>
50-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0')) ">
55+
<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')) ">
5156
<Compile Include="Platforms\net\**\*.cs" />
52-
</ItemGroup>
53-
<ItemGroup>
54-
<PackageReference Include="Splat" />
55-
<PackageReference Include="DynamicData" />
56-
</ItemGroup>
57-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
58-
<PackageReference Include="System.Text.Json" />
5957
<PackageReference Include="System.ComponentModel.Annotations" />
6058
</ItemGroup>
61-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
62-
<PackageReference Include="System.ComponentModel" />
63-
<PackageReference Include="System.ComponentModel.Annotations" />
64-
<PackageReference Include="System.Diagnostics.Contracts" />
65-
<PackageReference Include="System.Dynamic.Runtime" />
66-
<PackageReference Include="System.Runtime.Serialization.Primitives" />
59+
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('net6'))">
6760
<PackageReference Include="System.Text.Json" />
6861
</ItemGroup>
69-
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
70-
<PackageReference Include="System.Text.Json" />
62+
<ItemGroup>
63+
<PackageReference Include="Splat" />
64+
<PackageReference Include="DynamicData" />
7165
</ItemGroup>
7266
<ItemGroup>
7367
<None Update="VariadicTemplates.tt" Generator="TextTemplatingFileGenerator" LastGenOutput="VariadicTemplates.cs" />

‎version.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "20.0",
3+
"version": "20.1",
44
"publicReleaseRefSpec": [
55
"^refs/heads/master$", // we release out of master
66
"^refs/heads/main$",

0 commit comments

Comments
 (0)