From 27dab01f1fe06c33471cfcd6688db631d9520be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 5 Jan 2018 17:27:02 +0300 Subject: [PATCH] Renamed multitenancy module --- Volo.Abp.sln | 21 ++++++++++++------- .../AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj | 1 + .../Volo.Abp.AspNetCore.MultiTenancy.csproj | 2 +- .../AbpAspNetCoreMultiTenancyModule.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../Volo.Abp.MultiTenancy.Domain.csproj} | 4 ++-- .../MultiTenantConnectionStringResolver.cs | 0 .../AbpMultiTenancyDomainModule.cs} | 4 ++-- .../AsyncLocalTenantScopeProvider.cs | 0 .../MultiTenancy/ConfigurationTenantStore.cs | 1 + .../ConfigurationTenantStoreOptions.cs | 0 .../Abp/MultiTenancy/IMultiTenancyManager.cs | 0 .../Abp/MultiTenancy/ITenantScopeProvider.cs | 0 .../Volo/Abp/MultiTenancy/ITenantStore.cs | 0 .../Abp/MultiTenancy/MultiTenancyManager.cs | 0 .../MultiTenancyManagerCurrentTenant.cs | 0 .../Volo/Abp/MultiTenancy/Tenant.cs | 0 .../MultiTenancy/TenantConnectionString.cs | 0 .../Volo/Abp/MultiTenancy/TenantScope.cs | 0 ...bp.MultiTenancy.EntityFrameworkCore.csproj | 20 ++++++++++++++++++ ...o.Abp.AspNetCore.MultiTenancy.Tests.csproj | 1 + .../Volo/Abp/AspNetCore/App/AppModule.cs | 3 ++- .../Volo.Abp.MultiTenancy.Tests.csproj | 2 +- .../MultiTenancy/MultiTenancyTestModule.cs | 2 +- 24 files changed, 47 insertions(+), 16 deletions(-) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Properties/AssemblyInfo.cs (100%) rename src/{Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj => Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj} (87%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs (100%) rename src/{Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs => Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs} (69%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs (95%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/ITenantStore.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/MultiTenancyManager.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/Tenant.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/TenantConnectionString.cs (100%) rename src/{Volo.Abp.MultiTenancy => Volo.Abp.MultiTenancy.Domain}/Volo/Abp/MultiTenancy/TenantScope.cs (100%) create mode 100644 src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo.Abp.MultiTenancy.EntityFrameworkCore.csproj diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 0294f91101..410a6bec56 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -42,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore", "src\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Tests", "test\Volo.Abp.AspNetCore.Tests\Volo.Abp.AspNetCore.Tests.csproj", "{B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy", "src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj", "{58FA9F8F-216D-4C93-8929-D40D22B11CA7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Tests", "test\Volo.Abp.MultiTenancy.Tests\Volo.Abp.MultiTenancy.Tests.csproj", "{05271341-7A15-484C-9FD6-802A4193F4DE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.MultiTenancy", "src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj", "{7CC7946B-E026-4F66-8D4F-4F78F4801D43}" @@ -230,6 +228,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{282A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.MultiTenancy", "Abp.MultiTenancy", "{CA154803-3589-47B3-B7CB-B18F94FE1EB6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.MultiTenancy.EntityFrameworkCore", "src\Volo.Abp.MultiTenancy.EntityFrameworkCore\Volo.Abp.MultiTenancy.EntityFrameworkCore.csproj", "{9D7C2C19-1EE4-40BB-A1A4-27B175F1BFDD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Domain", "src\Volo.Abp.MultiTenancy.Domain\Volo.Abp.MultiTenancy.Domain.csproj", "{3FA1F4A4-BF5A-4CE3-B76F-2147FE31AB43}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -252,10 +254,6 @@ Global {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}.Debug|Any CPU.Build.0 = Debug|Any CPU {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}.Release|Any CPU.ActiveCfg = Release|Any CPU {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}.Release|Any CPU.Build.0 = Release|Any CPU - {58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Release|Any CPU.Build.0 = Release|Any CPU {05271341-7A15-484C-9FD6-802A4193F4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {05271341-7A15-484C-9FD6-802A4193F4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {05271341-7A15-484C-9FD6-802A4193F4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -596,6 +594,14 @@ Global {93B574B5-2827-4E0A-86FB-B07EF40BB39F}.Debug|Any CPU.Build.0 = Debug|Any CPU {93B574B5-2827-4E0A-86FB-B07EF40BB39F}.Release|Any CPU.ActiveCfg = Release|Any CPU {93B574B5-2827-4E0A-86FB-B07EF40BB39F}.Release|Any CPU.Build.0 = Release|Any CPU + {9D7C2C19-1EE4-40BB-A1A4-27B175F1BFDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D7C2C19-1EE4-40BB-A1A4-27B175F1BFDD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D7C2C19-1EE4-40BB-A1A4-27B175F1BFDD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D7C2C19-1EE4-40BB-A1A4-27B175F1BFDD}.Release|Any CPU.Build.0 = Release|Any CPU + {3FA1F4A4-BF5A-4CE3-B76F-2147FE31AB43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FA1F4A4-BF5A-4CE3-B76F-2147FE31AB43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FA1F4A4-BF5A-4CE3-B76F-2147FE31AB43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FA1F4A4-BF5A-4CE3-B76F-2147FE31AB43}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -613,7 +619,6 @@ Global {1020F5FD-6A97-40C2-AFCA-EBDF641DF111} = {447C8A77-E5F0-4538-8687-7383196D04EA} {02BE03BA-3411-448C-AB61-CB36407CC49A} = {C4C6961D-01CC-49A5-8B96-2A36E71CF01F} {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510} = {37087D1B-3693-4E96-983D-A69F210BDE53} - {58FA9F8F-216D-4C93-8929-D40D22B11CA7} = {CA154803-3589-47B3-B7CB-B18F94FE1EB6} {05271341-7A15-484C-9FD6-802A4193F4DE} = {37087D1B-3693-4E96-983D-A69F210BDE53} {7CC7946B-E026-4F66-8D4F-4F78F4801D43} = {C4C6961D-01CC-49A5-8B96-2A36E71CF01F} {2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA} = {37087D1B-3693-4E96-983D-A69F210BDE53} @@ -707,6 +712,8 @@ Global {3B481ACC-5BB3-4189-880C-5F7A27EAEB70} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {282A5684-F573-47BB-B044-10F3F710E22A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {CA154803-3589-47B3-B7CB-B18F94FE1EB6} = {3B481ACC-5BB3-4189-880C-5F7A27EAEB70} + {9D7C2C19-1EE4-40BB-A1A4-27B175F1BFDD} = {CA154803-3589-47B3-B7CB-B18F94FE1EB6} + {3FA1F4A4-BF5A-4CE3-B76F-2147FE31AB43} = {CA154803-3589-47B3-B7CB-B18F94FE1EB6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj index b98d7ce2f5..94469818fd 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj @@ -27,6 +27,7 @@ + diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj index fcf93cf456..51012c099c 100644 --- a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj +++ b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs index c3e418ba5e..ccf49b2666 100644 --- a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs +++ b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs @@ -4,7 +4,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.MultiTenancy { - [DependsOn(typeof(AbpMultiTenancyModule), typeof(AbpAspNetCoreModule))] + [DependsOn(typeof(AbpMultiTenancyAbstractionsModule), typeof(AbpAspNetCoreModule))] public class AbpAspNetCoreMultiTenancyModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.MultiTenancy/Properties/AssemblyInfo.cs b/src/Volo.Abp.MultiTenancy.Domain/Properties/AssemblyInfo.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Properties/AssemblyInfo.cs rename to src/Volo.Abp.MultiTenancy.Domain/Properties/AssemblyInfo.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj b/src/Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj similarity index 87% rename from src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj rename to src/Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj index 44ce9b002e..d1979fd5cf 100644 --- a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj @@ -4,8 +4,8 @@ netstandard2.0 - Volo.Abp.MultiTenancy - Volo.Abp.MultiTenancy + Volo.Abp.MultiTenancy.Domain + Volo.Abp.MultiTenancy.Domain $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs similarity index 69% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs index dae8550524..064e4b82ab 100644 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs @@ -7,11 +7,11 @@ namespace Volo.Abp.MultiTenancy [DependsOn(typeof(AbpDataModule))] [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))] [DependsOn(typeof(AbpDddModule))] - public class AbpMultiTenancyModule : AbpModule //TODO: This should be Volo.Abp.MultiTenancy.Domain! + public class AbpMultiTenancyDomainModule : AbpModule { public override void ConfigureServices(IServiceCollection services) { - services.AddAssemblyOf(); + services.AddAssemblyOf(); } } } diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs similarity index 95% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs index 57c6ad9874..f71997e91c 100644 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs @@ -5,6 +5,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MultiTenancy { + //TODO: Move to another package. [Dependency(TryRegister = true)] public class ConfigurationTenantStore : ITenantStore, ITransientDependency { diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantStore.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantStore.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManager.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManager.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/Tenant.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/Tenant.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/Tenant.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/Tenant.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConnectionString.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConnectionString.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantScope.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantScope.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantScope.cs rename to src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantScope.cs diff --git a/src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo.Abp.MultiTenancy.EntityFrameworkCore.csproj b/src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo.Abp.MultiTenancy.EntityFrameworkCore.csproj new file mode 100644 index 0000000000..9fca1e96ac --- /dev/null +++ b/src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo.Abp.MultiTenancy.EntityFrameworkCore.csproj @@ -0,0 +1,20 @@ + + + + + + netstandard2.0 + Volo.Abp.MultiTenancy.EntityFrameworkCore + Volo.Abp.MultiTenancy.EntityFrameworkCore + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj index 5340dc86c9..459df49b3a 100644 --- a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj +++ b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj @@ -13,6 +13,7 @@ + diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs index 19dd121908..c7d6292e5e 100644 --- a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs +++ b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs @@ -13,7 +13,8 @@ namespace Volo.Abp.AspNetCore.App { [DependsOn( typeof(AbpAspNetCoreMultiTenancyModule), - typeof(AbpAspNetCoreTestBaseModule) + typeof(AbpAspNetCoreTestBaseModule), + typeof(AbpMultiTenancyDomainModule) )] public class AppModule : AbpModule { diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj b/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj index 82c7281f37..a14cc94a90 100644 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj @@ -12,8 +12,8 @@ + - diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs index 7c4b0c1574..cd1093b6ac 100644 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.MultiTenancy { - [DependsOn(typeof(AbpMultiTenancyModule))] + [DependsOn(typeof(AbpMultiTenancyDomainModule))] public class MultiTenancyTestModule : AbpModule {