release: v5.0.1

Updated for .NET Core January 2020 Updates adding support for .NET Core 2.1.15, 3.0.2, and 3.1.1. Updated dependencies as recommended in security notices for .NET Core January 2020 Updates. Finbuckle.MultiTenant.AspNetCore targets netcoreapp3.1, netcoreapp3.0, and netcoreapp2.1. Finbuckle.MultiTenant.Core targets netstandard2.1 and netstandard2.0. Finbuckle.MultiTenant.EntityFrameworkCore targets netstandard2.1 and netstandard2.0.
Finbuckle · Jan 15, 2020 · 5ab02c7 · 5ab02c7
1 parent decda4b
commit 5ab02c7
Show file tree

Hide file tree

Showing 40 changed files with 108 additions and 97 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 ## Version
+**5.0.1**
+* Updated for [.NET Core January 2020 Updates](https://devblogs.microsoft.com/dotnet/net-core-january-2020/) adding support for .NET Core 2.1.15, 3.0.2, and 3.1.1.
+* Updated dependencies as recommended in security notices for [.NET Core January 2020 Updates](https://devblogs.microsoft.com/dotnet/net-core-january-2020/).
+* *Finbuckle.MultiTenant.AspNetCore* targets `netcoreapp3.1`, `netcoreapp3.0`, and `netcoreapp2.1`.
+* *Finbuckle.MultiTenant.Core* targets `netstandard2.1` and `netstandard2.0`.
+* *Finbuckle.MultiTenant.EntityFrameworkCore* targets `netstandard2.1` and `netstandard2.0`.
+
 **5.0.0**
 * Added support for ASP.NET Core 3.1.
 * Major refactor of how Entity Framework multitenant data isolation works. No longer need to derive from `MultiTenantDbContext` greatly improving flexibility. `IdentityMultiTenantDbContext` reworked under this new model and no longer requires or recommends use of multitenant support classes, e.g. `MultiTenantIdentityUser`. Attempted to minimize impact, but if using `IdentityMultiTenantDbContext` **this may be a breaking change!** Thanks **@GordonBlahut**!

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>5.0.0</Version>
+        <Version>5.0.1</Version>
         <Authors>Andrew White</Authors>
         <Copyright>Copyright ©2020 Andrew White</Copyright>
         <PackageIconUrl>https://www.finbuckle.com/images/favicon-64x64.png</PackageIconUrl>
@@ -9,6 +9,5 @@
         <RepositoryUrl>https://github.com/Finbuckle/Finbuckle.MultiTenant</RepositoryUrl>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <PackageOutputPath>/Users/acw/Dev/Nuget</PackageOutputPath>
     </PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Finbuckle.MultiTenant 5.0.0
+# Finbuckle.MultiTenant 5.0.1
 
 Finbuckle.MultiTenant is a multitenancy library for ASP.NET Core. It provides functionality for tenant resolution, per-tenant app configuration, and per-tenant data isolation.
 

diff --git a/docs/EFCore.md b/docs/EFCore.md
@@ -89,7 +89,7 @@ protected override void OnModelCreating(ModelBuilder builder)
 }
 ```
 
-## Deriving from from MultiTenantDbContext
+## Deriving from MultiTenantDbContext
 See the data isolation sample projects in the [GitHub repository](https://github.com/Finbuckle/Finbuckle.MultiTenant/tree/master/samples) for examples of this approach.
 
 Start by adding the `Finbuckle.MultiTenant` package to the project:

diff --git a/docs/Introduction.md b/docs/Introduction.md
@@ -1,5 +1,5 @@
 # Finbuckle.MultiTenant Docs
-Current version: 5.0.0
+Current version: 5.0.1
 [Version History](https://github.com/Finbuckle/Finbuckle.MultiTenant/blob/master/CHANGELOG.md)
 
 Finbuckle.MultiTenant is a multitenancy library for ASP.NET Core. It provides functionality for tenant resolution, per-tenant app configuration, and per-tenant data isolation.

diff --git a/samples/ASP.NET Core 2/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj b/samples/ASP.NET Core 2/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/BasePathStrategySample/BasePathStrategySample.csproj b/samples/ASP.NET Core 2/BasePathStrategySample/BasePathStrategySample.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/DataIsolationSample/DataIsolationSample.csproj b/samples/ASP.NET Core 2/DataIsolationSample/DataIsolationSample.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.14" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/DelegateStrategySample/DelegateStrategySample.csproj b/samples/ASP.NET Core 2/DelegateStrategySample/DelegateStrategySample.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/EFCoreStoreSample/EFCoreStoreSample.csproj b/samples/ASP.NET Core 2/EFCoreStoreSample/EFCoreStoreSample.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.14" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/FallbackStrategySample/FallbackStrategySample.csproj b/samples/ASP.NET Core 2/FallbackStrategySample/FallbackStrategySample.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/HostStrategySample/HostStrategySample.csproj b/samples/ASP.NET Core 2/HostStrategySample/HostStrategySample.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj b/samples/ASP.NET Core 2/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App"/>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.14" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/RouteStrategySample/RouteStrategySample.csproj b/samples/ASP.NET Core 2/RouteStrategySample/RouteStrategySample.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/SharedLoginSample/SharedLoginSample.csproj b/samples/ASP.NET Core 2/SharedLoginSample/SharedLoginSample.csproj
@@ -6,9 +6,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" PrivateAssets="All" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.14" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.10" PrivateAssets="All" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 2/StaticStrategySample/StaticStrategySample.csproj b/samples/ASP.NET Core 2/StaticStrategySample/StaticStrategySample.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj b/samples/ASP.NET Core 3/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj
@@ -6,10 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.0" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/BasePathStrategySample/BasePathStrategySample.csproj b/samples/ASP.NET Core 3/BasePathStrategySample/BasePathStrategySample.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/DataIsolationSample/DataIsolationSample.csproj b/samples/ASP.NET Core 3/DataIsolationSample/DataIsolationSample.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/DelegateStrategySample/DelegateStrategySample.csproj b/samples/ASP.NET Core 3/DelegateStrategySample/DelegateStrategySample.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/EFCoreStoreSample/EFCoreStoreSample.csproj b/samples/ASP.NET Core 3/EFCoreStoreSample/EFCoreStoreSample.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.1" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/HostStrategySample/HostStrategySample.csproj b/samples/ASP.NET Core 3/HostStrategySample/HostStrategySample.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...s/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSample/HttpRemoteStoreSample.csproj b/...s/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSample/HttpRemoteStoreSample.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.0" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.1" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...re 3/HttpRemoteStoreSample/HttpRemoteStoreSampleServer/HttpRemoteStoreSampleServer.csproj b/...re 3/HttpRemoteStoreSample/HttpRemoteStoreSampleServer/HttpRemoteStoreSampleServer.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj b/samples/ASP.NET Core 3/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj
@@ -5,12 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" PrivateAssets="All" />
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/RouteStrategySample/RouteStrategySample.csproj b/samples/ASP.NET Core 3/RouteStrategySample/RouteStrategySample.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ASP.NET Core 3/StaticStrategySample/StaticStrategySample.csproj b/samples/ASP.NET Core 3/StaticStrategySample/StaticStrategySample.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Extensions/MultiTenantBuilderExtensions.cs b/src/Finbuckle.MultiTenant.AspNetCore/Extensions/MultiTenantBuilderExtensions.cs
@@ -12,7 +12,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 
-#if NETSTANDARD2_0
+#if NETCOREAPP2_1
 
 using System;
 using Microsoft.Extensions.DependencyInjection.Extensions;

diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj b/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp3.0;netstandard2.0</TargetFrameworks>
-
+    <TargetFrameworks>netcoreapp3.1;netcoreapp3.0;netcoreapp2.1</TargetFrameworks>
     <Title>Finbuckle.MultiTenant.AspNetCore</Title>
     <Description>ASP.NET Core support for Finbuckle.MultiTenant.</Description>
   </PropertyGroup>
@@ -15,20 +14,20 @@
     <When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
       <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.1" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
       <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.0.2" />
       </ItemGroup>
     </When>
-    <When Condition=" '$(TargetFramework)' == 'netstandard2.0' " >
+    <When Condition=" '$(TargetFramework)' == 'netcoreapp2.1' " >
       <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.1.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.11" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.1.2" />
       </ItemGroup>
     </When>
   </Choose>

diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RemoteAuthenticationStrategy.cs b/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RemoteAuthenticationStrategy.cs
@@ -30,6 +30,10 @@ public class RemoteAuthenticationStrategy : IMultiTenantStrategy
     {
         private readonly ILogger<RemoteAuthenticationStrategy> logger;
 
+        public RemoteAuthenticationStrategy()
+        {
+        }
+
         public RemoteAuthenticationStrategy(ILogger<RemoteAuthenticationStrategy> logger)
         {
             this.logger = logger;

diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RouteStrategy.cs b/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RouteStrategy.cs
@@ -12,7 +12,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 
-#if NETSTANDARD2_0
+#if NETCOREAPP2_1
 
 using System;
 using System.Threading.Tasks;

diff --git a/src/Finbuckle.MultiTenant.Core/Finbuckle.MultiTenant.Core.csproj b/src/Finbuckle.MultiTenant.Core/Finbuckle.MultiTenant.Core.csproj
@@ -1,19 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
 
     <Title>Finbuckle.MultiTenant.Core</Title>
     <Description>Core package for Finbuckle.MultiTenant.</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
+
+<Choose>
+    <When Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+      <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
+      </ItemGroup>
+    </When>
+    <When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+      <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.1" />
+      </ItemGroup>
+    </When>
+  </Choose>
 </Project>