diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fc085d9..e00c602c 100644 --- 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 index 29df15b9..ab1e0c57 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 5.0.0 + 5.0.1 Andrew White Copyright ©2020 Andrew White https://www.finbuckle.com/images/favicon-64x64.png @@ -9,6 +9,5 @@ https://github.com/Finbuckle/Finbuckle.MultiTenant true snupkg - /Users/acw/Dev/Nuget \ No newline at end of file diff --git a/README.md b/README.md index c725a4ad..1bdc09e7 100644 --- 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 index fc81496b..0b8cb661 100644 --- 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 index 156201c2..cb95aa2d 100644 --- 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 index 228ff770..566dd4c0 100644 --- a/samples/ASP.NET Core 2/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj +++ b/samples/ASP.NET Core 2/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/ASP.NET Core 2/BasePathStrategySample/BasePathStrategySample.csproj b/samples/ASP.NET Core 2/BasePathStrategySample/BasePathStrategySample.csproj index 6df6109e..9693ca3a 100644 --- a/samples/ASP.NET Core 2/BasePathStrategySample/BasePathStrategySample.csproj +++ b/samples/ASP.NET Core 2/BasePathStrategySample/BasePathStrategySample.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/ASP.NET Core 2/DataIsolationSample/DataIsolationSample.csproj b/samples/ASP.NET Core 2/DataIsolationSample/DataIsolationSample.csproj index 5446ec09..5e8101c1 100644 --- a/samples/ASP.NET Core 2/DataIsolationSample/DataIsolationSample.csproj +++ b/samples/ASP.NET Core 2/DataIsolationSample/DataIsolationSample.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/samples/ASP.NET Core 2/DelegateStrategySample/DelegateStrategySample.csproj b/samples/ASP.NET Core 2/DelegateStrategySample/DelegateStrategySample.csproj index 93bd19ca..824ee3f4 100644 --- a/samples/ASP.NET Core 2/DelegateStrategySample/DelegateStrategySample.csproj +++ b/samples/ASP.NET Core 2/DelegateStrategySample/DelegateStrategySample.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/ASP.NET Core 2/EFCoreStoreSample/EFCoreStoreSample.csproj b/samples/ASP.NET Core 2/EFCoreStoreSample/EFCoreStoreSample.csproj index a7476f1c..1b135845 100644 --- a/samples/ASP.NET Core 2/EFCoreStoreSample/EFCoreStoreSample.csproj +++ b/samples/ASP.NET Core 2/EFCoreStoreSample/EFCoreStoreSample.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/ASP.NET Core 2/FallbackStrategySample/FallbackStrategySample.csproj b/samples/ASP.NET Core 2/FallbackStrategySample/FallbackStrategySample.csproj index 93bd19ca..824ee3f4 100644 --- a/samples/ASP.NET Core 2/FallbackStrategySample/FallbackStrategySample.csproj +++ b/samples/ASP.NET Core 2/FallbackStrategySample/FallbackStrategySample.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/ASP.NET Core 2/HostStrategySample/HostStrategySample.csproj b/samples/ASP.NET Core 2/HostStrategySample/HostStrategySample.csproj index 1b262af8..8635d420 100644 --- a/samples/ASP.NET Core 2/HostStrategySample/HostStrategySample.csproj +++ b/samples/ASP.NET Core 2/HostStrategySample/HostStrategySample.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/ASP.NET Core 2/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj b/samples/ASP.NET Core 2/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj index b571a609..8d9b900f 100644 --- a/samples/ASP.NET Core 2/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj +++ b/samples/ASP.NET Core 2/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj @@ -8,7 +8,7 @@ - + diff --git a/samples/ASP.NET Core 2/RouteStrategySample/RouteStrategySample.csproj b/samples/ASP.NET Core 2/RouteStrategySample/RouteStrategySample.csproj index 93bd19ca..824ee3f4 100644 --- a/samples/ASP.NET Core 2/RouteStrategySample/RouteStrategySample.csproj +++ b/samples/ASP.NET Core 2/RouteStrategySample/RouteStrategySample.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/ASP.NET Core 2/SharedLoginSample/SharedLoginSample.csproj b/samples/ASP.NET Core 2/SharedLoginSample/SharedLoginSample.csproj index 139110aa..f7b3f1a7 100644 --- a/samples/ASP.NET Core 2/SharedLoginSample/SharedLoginSample.csproj +++ b/samples/ASP.NET Core 2/SharedLoginSample/SharedLoginSample.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/samples/ASP.NET Core 2/StaticStrategySample/StaticStrategySample.csproj b/samples/ASP.NET Core 2/StaticStrategySample/StaticStrategySample.csproj index 93bd19ca..824ee3f4 100644 --- a/samples/ASP.NET Core 2/StaticStrategySample/StaticStrategySample.csproj +++ b/samples/ASP.NET Core 2/StaticStrategySample/StaticStrategySample.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/ASP.NET Core 3/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj b/samples/ASP.NET Core 3/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj index 3e78ac25..6df8b69f 100644 --- a/samples/ASP.NET Core 3/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj +++ b/samples/ASP.NET Core 3/AuthenticationOptionsSample/AuthenticationOptionsSample.csproj @@ -6,10 +6,11 @@ - - - - + + + + + diff --git a/samples/ASP.NET Core 3/BasePathStrategySample/BasePathStrategySample.csproj b/samples/ASP.NET Core 3/BasePathStrategySample/BasePathStrategySample.csproj index 90f4a570..a501d311 100644 --- a/samples/ASP.NET Core 3/BasePathStrategySample/BasePathStrategySample.csproj +++ b/samples/ASP.NET Core 3/BasePathStrategySample/BasePathStrategySample.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/ASP.NET Core 3/DataIsolationSample/DataIsolationSample.csproj b/samples/ASP.NET Core 3/DataIsolationSample/DataIsolationSample.csproj index 53d5ebdd..c725fbc7 100644 --- a/samples/ASP.NET Core 3/DataIsolationSample/DataIsolationSample.csproj +++ b/samples/ASP.NET Core 3/DataIsolationSample/DataIsolationSample.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/samples/ASP.NET Core 3/DelegateStrategySample/DelegateStrategySample.csproj b/samples/ASP.NET Core 3/DelegateStrategySample/DelegateStrategySample.csproj index 68495314..c44bc845 100644 --- a/samples/ASP.NET Core 3/DelegateStrategySample/DelegateStrategySample.csproj +++ b/samples/ASP.NET Core 3/DelegateStrategySample/DelegateStrategySample.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/ASP.NET Core 3/EFCoreStoreSample/EFCoreStoreSample.csproj b/samples/ASP.NET Core 3/EFCoreStoreSample/EFCoreStoreSample.csproj index 21650905..88d96c25 100644 --- a/samples/ASP.NET Core 3/EFCoreStoreSample/EFCoreStoreSample.csproj +++ b/samples/ASP.NET Core 3/EFCoreStoreSample/EFCoreStoreSample.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/samples/ASP.NET Core 3/HostStrategySample/HostStrategySample.csproj b/samples/ASP.NET Core 3/HostStrategySample/HostStrategySample.csproj index 0a8c8029..dec697c3 100644 --- a/samples/ASP.NET Core 3/HostStrategySample/HostStrategySample.csproj +++ b/samples/ASP.NET Core 3/HostStrategySample/HostStrategySample.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSample/HttpRemoteStoreSample.csproj b/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSample/HttpRemoteStoreSample.csproj index cd65ed83..ed0bfbde 100644 --- a/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSample/HttpRemoteStoreSample.csproj +++ b/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSample/HttpRemoteStoreSample.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSampleServer/HttpRemoteStoreSampleServer.csproj b/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSampleServer/HttpRemoteStoreSampleServer.csproj index 02f9e8dc..88304758 100644 --- a/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSampleServer/HttpRemoteStoreSampleServer.csproj +++ b/samples/ASP.NET Core 3/HttpRemoteStoreSample/HttpRemoteStoreSampleServer/HttpRemoteStoreSampleServer.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/ASP.NET Core 3/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj b/samples/ASP.NET Core 3/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj index efe4a613..14566ec9 100644 --- a/samples/ASP.NET Core 3/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj +++ b/samples/ASP.NET Core 3/IdentityDataIsolationSample/IdentityDataIsolationSample.csproj @@ -5,12 +5,12 @@ - - - - + + + + - + diff --git a/samples/ASP.NET Core 3/RouteStrategySample/RouteStrategySample.csproj b/samples/ASP.NET Core 3/RouteStrategySample/RouteStrategySample.csproj index 68495314..c44bc845 100644 --- a/samples/ASP.NET Core 3/RouteStrategySample/RouteStrategySample.csproj +++ b/samples/ASP.NET Core 3/RouteStrategySample/RouteStrategySample.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/ASP.NET Core 3/StaticStrategySample/StaticStrategySample.csproj b/samples/ASP.NET Core 3/StaticStrategySample/StaticStrategySample.csproj index 68495314..c44bc845 100644 --- a/samples/ASP.NET Core 3/StaticStrategySample/StaticStrategySample.csproj +++ b/samples/ASP.NET Core 3/StaticStrategySample/StaticStrategySample.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Extensions/MultiTenantBuilderExtensions.cs b/src/Finbuckle.MultiTenant.AspNetCore/Extensions/MultiTenantBuilderExtensions.cs index 07ec5395..e37ed265 100644 --- 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 index e90a05d7..9440e30b 100644 --- a/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj +++ b/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj @@ -1,8 +1,7 @@  - netcoreapp3.1;netcoreapp3.0;netstandard2.0 - + netcoreapp3.1;netcoreapp3.0;netcoreapp2.1 Finbuckle.MultiTenant.AspNetCore ASP.NET Core support for Finbuckle.MultiTenant. @@ -15,20 +14,20 @@ - + - + - + - - - + + + diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RemoteAuthenticationStrategy.cs b/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RemoteAuthenticationStrategy.cs index 451627c1..f2b82fe6 100644 --- 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 logger; + public RemoteAuthenticationStrategy() + { + } + public RemoteAuthenticationStrategy(ILogger logger) { this.logger = logger; diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RouteStrategy.cs b/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RouteStrategy.cs index 7d0a0788..cb835b53 100644 --- 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 index 88a6f29b..23afe469 100644 --- a/src/Finbuckle.MultiTenant.Core/Finbuckle.MultiTenant.Core.csproj +++ b/src/Finbuckle.MultiTenant.Core/Finbuckle.MultiTenant.Core.csproj @@ -1,19 +1,36 @@  - netstandard2.0 + netstandard2.1;netstandard2.0 Finbuckle.MultiTenant.Core Core package for Finbuckle.MultiTenant. - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj index 70928dbd..c2595357 100644 --- a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj +++ b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj @@ -9,12 +9,12 @@ - + - + diff --git a/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj b/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj index 4e7f125c..79357974 100644 --- a/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj +++ b/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;netcoreapp3.0;netstandard2.0 + netcoreapp3.1;netcoreapp3.0;netcoreapp2.1 false Metapackage for Finbuckle.MultiTenant. finbuckle;multitenant;multitenancy;aspnet;aspnetcore;entityframework;entityframework-core;efcore diff --git a/test/Finbuckle.MultiTenant.AspNetCore.Test/AssemblyInfo.cs b/test/Finbuckle.MultiTenant.AspNetCore.Test/AssemblyInfo.cs deleted file mode 100644 index 4b386822..00000000 --- a/test/Finbuckle.MultiTenant.AspNetCore.Test/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2018 Andrew White -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System.Runtime.CompilerServices; -[assembly:InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/test/Finbuckle.MultiTenant.AspNetCore.Test/Extensions/MultiTenantBuilderExtensionsShould.cs b/test/Finbuckle.MultiTenant.AspNetCore.Test/Extensions/MultiTenantBuilderExtensionsShould.cs index a87d8d6b..fb63711a 100644 --- a/test/Finbuckle.MultiTenant.AspNetCore.Test/Extensions/MultiTenantBuilderExtensionsShould.cs +++ b/test/Finbuckle.MultiTenant.AspNetCore.Test/Extensions/MultiTenantBuilderExtensionsShould.cs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if NETCOREAPP2_2 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System; using Microsoft.Extensions.DependencyInjection; 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 c6c4889a..982777f5 100644 --- a/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj +++ b/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj @@ -5,10 +5,10 @@ - - - - + + + + @@ -19,19 +19,19 @@ - + - + - + diff --git a/test/Finbuckle.MultiTenant.AspNetCore.Test/Strategies/RouteStrategyShould.cs b/test/Finbuckle.MultiTenant.AspNetCore.Test/Strategies/RouteStrategyShould.cs index 68acd940..309a5e32 100644 --- a/test/Finbuckle.MultiTenant.AspNetCore.Test/Strategies/RouteStrategyShould.cs +++ b/test/Finbuckle.MultiTenant.AspNetCore.Test/Strategies/RouteStrategyShould.cs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if NETCOREAPP2_2 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System; using System.Threading.Tasks; diff --git a/test/Finbuckle.MultiTenant.Core.Test/Finbuckle.MultiTenant.Core.Test.csproj b/test/Finbuckle.MultiTenant.Core.Test/Finbuckle.MultiTenant.Core.Test.csproj index 0061f25b..cce3a8a9 100644 --- a/test/Finbuckle.MultiTenant.Core.Test/Finbuckle.MultiTenant.Core.Test.csproj +++ b/test/Finbuckle.MultiTenant.Core.Test/Finbuckle.MultiTenant.Core.Test.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + 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 df79656c..d9438375 100644 --- a/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj +++ b/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj @@ -5,25 +5,25 @@ - - - + + + - + - + - +