From 38fa9e1cac660822f091c3e71b1746803394308f Mon Sep 17 00:00:00 2001
From: Andrew White <andrew@finbuckle.com>
Date: Sun, 17 Jul 2022 00:25:22 -0600
Subject: [PATCH] fix: drop .net 5.0 target (#569)

Microsoft ended support for .NET 5.0 in May 2022
---
 .github/workflows/linux-5.0.yml               | 29 -------------------
 .github/workflows/macos-5.0.yml               | 26 -----------------
 .github/workflows/windows-5.0.yml             | 28 ------------------
 docs/Introduction.md                          |  6 ++--
 .../Finbuckle.MultiTenant.AspNetCore.csproj   |  8 +----
 ...kle.MultiTenant.EntityFrameworkCore.csproj |  9 +-----
 .../Finbuckle.MultiTenant.csproj              | 13 +--------
 ...nbuckle.MultiTenant.AspNetCore.Test.csproj | 10 ++-----
 ...ultiTenant.EntityFrameworkCore.Test.csproj | 13 ++-------
 .../Finbuckle.MultiTenant.Test.csproj         | 15 +++-------
 10 files changed, 15 insertions(+), 142 deletions(-)
 delete mode 100644 .github/workflows/linux-5.0.yml
 delete mode 100644 .github/workflows/macos-5.0.yml
 delete mode 100644 .github/workflows/windows-5.0.yml

diff --git a/.github/workflows/linux-5.0.yml b/.github/workflows/linux-5.0.yml
deleted file mode 100644
index 196ed425..00000000
--- a/.github/workflows/linux-5.0.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Linux (.NET 5.0)
-
-on:
-  push:
-    branches: [main]
-  pull_request_target:
-
-jobs:
-  os-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@v2
-      - name: setup dotnet
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-        env:
-          DOTNET_INSTALL_DIR: /usr/share/dotnet
-      - name: test Finbuckle.MultiTenanant
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.Test
-      - name: test Finbuckle.MultiTenanant.AspNetCore
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test
-      - name: test Finbuckle.MultiTenanant.EntityFrameworkCore
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test
-        
diff --git a/.github/workflows/macos-5.0.yml b/.github/workflows/macos-5.0.yml
deleted file mode 100644
index ff8706b0..00000000
--- a/.github/workflows/macos-5.0.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: MacOS (.NET 5.0)
-
-on:
-  push:
-    branches: [main]
-  pull_request_target:
-
-jobs:
-  os-tests:
-    runs-on: macos-latest
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@v2
-      - name: setup dotnet
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-      - name: test Finbuckle.MultiTenanant
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.Test
-      - name: test Finbuckle.MultiTenanant.AspNetCore
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test
-      - name: test Finbuckle.MultiTenanant.EntityFrameworkCore
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test
diff --git a/.github/workflows/windows-5.0.yml b/.github/workflows/windows-5.0.yml
deleted file mode 100644
index 63b242c7..00000000
--- a/.github/workflows/windows-5.0.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Windows (.NET 5.0)
-
-on:
-  push:
-    branches: [main]
-  pull_request_target:
-
-jobs:
-  os-tests:
-    runs-on: windows-latest
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@v2
-      - name: setup dotnet
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-        env:
-          DOTNET_INSTALL_DIR: 'C:\Program Files\dotnet'
-      - name: test Finbuckle.MultiTenanant
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.Test
-      - name: test Finbuckle.MultiTenanant.AspNetCore
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test
-      - name: test Finbuckle.MultiTenanant.EntityFrameworkCore
-        run: dotnet test -f net5.0
-        working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test
diff --git a/docs/Introduction.md b/docs/Introduction.md
index ad9df48d..e8608719 100644
--- 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
index eeee8ba5..aa03389b 100644
--- 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/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj
index 67d4f99f..32a4b505 100644
--- a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj
+++ b/src/Finbuckle.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
index 8c936ff6..35c562fa 100644
--- 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
index 85b8a097..9b8a75f5 100644
--- 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/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj b/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj
index d92b7e51..c28b6aa8 100644
--- a/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj
+++ b/test/Finbuckle.MultiTenant.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
index cc83bc86..4556dc0e 100644
--- 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' ">