Skip to content

Commit dbf160a

Browse files
authored
breaking: Remove net 5 support (#831)
1 parent 0195fde commit dbf160a

File tree

33 files changed

+496
-53
lines changed

33 files changed

+496
-53
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Splat currently supports:
7171

7272
[Always Be NuGetting](https://nuget.org/packages/Splat/). Package contains binaries for:
7373

74-
* .NET Framework 4.6.1, .NET Framework 4.7.2, .NET Standard 2.0 and .NET 5.0
74+
* .NET Framework 4.6.1, .NET Framework 4.7.2, .NET Standard 2.0 and .NET 6.0
7575
* WPF
7676
* Windows Forms
7777
* UWP

src/Benchmarks/Splat.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<PlatformTarget>AnyCPU</PlatformTarget>
77
<DebugType>pdbonly</DebugType>
88
<DebugSymbols>true</DebugSymbols>

src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net472;netcoreapp3.1;net5.0;</TargetFrameworks>
4+
<TargetFrameworks>net472;net6.0;</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591;CA1707;SA1633;CA2000</NoWarn>
66
<IsPackable>false</IsPackable>
77
<LangVersion>latest</LangVersion>
88
</PropertyGroup>
99

1010
<Choose>
11-
<When Condition="$(TargetFramework.StartsWith('net462'))">
12-
<ItemGroup>
13-
<!--<Compile Remove="DryIocReactiveUIDependencyTests.cs" />-->
14-
<Compile Remove="AutoFacReactiveUIDependencyTests.cs" />
15-
<Compile Remove="NinjectReactiveUIDependencyTests.cs" />
16-
<Compile Remove="SimpleInjectorReactiveUIDependencyTests.cs" />
17-
<ProjectReference Include="..\Splat.DryIoc\Splat.DryIoc.csproj" />
18-
</ItemGroup>
19-
</When>
2011
<When Condition="$(TargetFramework.StartsWith('net472'))">
2112
<ItemGroup>
2213
<Compile Remove="DryIocReactiveUIDependencyTests.cs" />
@@ -26,16 +17,7 @@
2617
<ProjectReference Include="..\Splat.Autofac\Splat.Autofac.csproj" />
2718
</ItemGroup>
2819
</When>
29-
<When Condition="$(TargetFramework.StartsWith('netcoreapp3.1'))">
30-
<ItemGroup>
31-
<Compile Remove="DryIocReactiveUIDependencyTests.cs" />
32-
<Compile Remove="AutoFacReactiveUIDependencyTests.cs" />
33-
<!--<Compile Remove="NinjectReactiveUIDependencyTests.cs" />-->
34-
<Compile Remove="SimpleInjectorReactiveUIDependencyTests.cs" />
35-
<ProjectReference Include="..\Splat.Ninject\Splat.Ninject.csproj" />
36-
</ItemGroup>
37-
</When>
38-
<When Condition="$(TargetFramework.StartsWith('net5.0'))">
20+
<When Condition="$(TargetFramework.StartsWith('net6.0'))">
3921
<ItemGroup>
4022
<Compile Remove="DryIocReactiveUIDependencyTests.cs" />
4123
<Compile Remove="AutoFacReactiveUIDependencyTests.cs" />

src/Splat.AppCenter/Splat.AppCenter.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0-windows10.0.17763.0</TargetFrameworks>
55
<!--need to consider? monoandroid50;xamarin.ios10,uap10.0 -->
66
<AssemblyName>Splat.AppCenter</AssemblyName>
77
<RootNamespace>Splat</RootNamespace>

src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
55
<AssemblyName>Splat.ApplicationInsights</AssemblyName>
66
<RootNamespace>Splat</RootNamespace>

src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows10.0.17763.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
<NoWarn>$(NoWarn);1591;CA1707;SA1633;CA2000</NoWarn>

src/Splat.Autofac/Splat.Autofac.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
66
<Description>Autofac adapter for Splat</Description>
77
<LangVersion>latest</LangVersion>

src/Splat.Common.Test/Splat.Common.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA2000</NoWarn>
66
<LangVersion>latest</LangVersion>
77
<Nullable>enable</Nullable>

0 commit comments

Comments
 (0)