fix: drop .net 5.0 target (#569)

Microsoft ended support for .NET 5.0 in May 2022
Finbuckle · Jul 17, 2022 · 38fa9e1 · 38fa9e1
1 parent a675684
commit 38fa9e1
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 142 deletions.
diff --git a/.github/workflows/linux-5.0.yml b/.github/workflows/linux-5.0.yml
diff --git a/.github/workflows/macos-5.0.yml b/.github/workflows/macos-5.0.yml
diff --git a/.github/workflows/windows-5.0.yml b/.github/workflows/windows-5.0.yml
diff --git a/docs/Introduction.md b/docs/Introduction.md
@@ -11,9 +11,9 @@ Finbuckle.MultiTenant is open source multitenancy middleware library for .NET. I
 ![Build Status MacOS 3.1](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/macos-3.1.yml/badge.svg?)  
 ![Build Status Windows 3.1](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/windows-3.1.yml/badge.svg)
 
-![Build Status Linux 5.0](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/linux-5.0.yml/badge.svg)  
-![Build Status MacOS 5.0](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/macos-5.0.yml/badge.svg)  
-![Build Status Windows 5.0](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/windows-5.0.yml/badge.svg)
+![Build Status Linux 6.0](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/linux-6.0.yml/badge.svg)  
+![Build Status MacOS 6.0](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/macos-6.0.yml/badge.svg)  
+![Build Status Windows 6.0](https://github.com/Finbuckle/Finbuckle.MultiTenant/actions/workflows/windows-6.0.yml/badge.svg)
 
 ## License
 

diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj b/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <Title>Finbuckle.MultiTenant.AspNetCore</Title>
     <Description>ASP.NET Core support for Finbuckle.MultiTenant.</Description>
     <Nullable>enable</Nullable>
@@ -19,12 +19,6 @@
         <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
       </ItemGroup>
     </When>
-    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
-      <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0" />
-      </ItemGroup>
-    </When>
     <When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
       <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />

diff --git a/...inbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj b/...inbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
     <Title>Finbuckle.MultiTenant.EntityFrameworkCore</Title>
     <Description>Entity Framework Core support for Finbuckle.MultiTenant.</Description>
     <Nullable>enable</Nullable>
@@ -20,13 +20,6 @@
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
       </ItemGroup>
     </When>
-    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
-      <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
-      </ItemGroup>
-    </When>
     <When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
       <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />

diff --git a/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj b/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net5.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
         <Title>Finbuckle.MultiTenant</Title>
         <Description>Main library package for Finbuckle.MultiTenant.</Description>
         <Nullable>enable</Nullable>
@@ -23,17 +23,6 @@
                 <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
             </ItemGroup>
         </When>
-        <When Condition=" '$(TargetFramework)' == 'net5.0' ">
-            <ItemGroup>
-                <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-                <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
-                <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
-                <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-                <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-                <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-                <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
-          </ItemGroup>
-        </When>
         <When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
             <ItemGroup>
                 <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />

diff --git a/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj b/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -20,13 +20,7 @@
     <When Condition=" '$(TargetFramework)' == 'net6.0' ">
       <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.*-*" />
-      </ItemGroup>
-    </When>
-    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
-      <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.*" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.*" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">

diff --git a/...ultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj b/...ultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -14,14 +14,8 @@
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'net6.0' ">
       <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.*-*" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.*-*" />
-      </ItemGroup>
-    </When>
-    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
-      <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.*" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.*" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
@@ -33,7 +27,6 @@
   </Choose>
 
   <ItemGroup>
-<!--    <ProjectReference Include="../Finbuckle.MultiTenant.Test/Finbuckle.MultiTenant.Test.csproj" />-->
     <ProjectReference Include="../../src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Finbuckle.MultiTenant.Test\Finbuckle.MultiTenant.Test.csproj" />
   </ItemGroup>

diff --git a/test/Finbuckle.MultiTenant.Test/Finbuckle.MultiTenant.Test.csproj b/test/Finbuckle.MultiTenant.Test/Finbuckle.MultiTenant.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -15,16 +15,9 @@
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'net6.0' ">
       <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*-*" />
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.*-*" />
-        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.*-*" />
-      </ItemGroup>
-    </When>
-    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
-      <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.*" />
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.*" />
-        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.*" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.*" />
+        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.*" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">