Browse Source

DefaultTenantStoreOptions to AbpDefaultTenantStoreOptions

pull/1919/head
Yunus Emre Kalkan 7 years ago
parent
commit
64cf179f93
  1. 2
      framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
  2. 4
      framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs
  3. 4
      framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
  4. 2
      framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
  5. 2
      framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
  6. 2
      framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
  7. 2
      framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs

2
framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs

@ -17,7 +17,7 @@ namespace Volo.Abp.MultiTenancy
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
Configure<DefaultTenantStoreOptions>(configuration); Configure<AbpDefaultTenantStoreOptions>(configuration);
} }
} }
} }

4
framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs → framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs

@ -1,10 +1,10 @@
namespace Volo.Abp.MultiTenancy.ConfigurationStore namespace Volo.Abp.MultiTenancy.ConfigurationStore
{ {
public class DefaultTenantStoreOptions public class AbpDefaultTenantStoreOptions
{ {
public TenantConfiguration[] Tenants { get; set; } public TenantConfiguration[] Tenants { get; set; }
public DefaultTenantStoreOptions() public AbpDefaultTenantStoreOptions()
{ {
Tenants = new TenantConfiguration[0]; Tenants = new TenantConfiguration[0];
} }

4
framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs

@ -9,9 +9,9 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore
[Dependency(TryRegister = true)] [Dependency(TryRegister = true)]
public class DefaultTenantStore : ITenantStore, ITransientDependency public class DefaultTenantStore : ITenantStore, ITransientDependency
{ {
private readonly DefaultTenantStoreOptions _options; private readonly AbpDefaultTenantStoreOptions _options;
public DefaultTenantStore(IOptionsSnapshot<DefaultTenantStoreOptions> options) public DefaultTenantStore(IOptionsSnapshot<AbpDefaultTenantStoreOptions> options)
{ {
_options = options.Value; _options = options.Value;
} }

2
framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs

@ -27,7 +27,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
{ {
return base.CreateWebHostBuilder().ConfigureServices(services => return base.CreateWebHostBuilder().ConfigureServices(services =>
{ {
services.Configure<DefaultTenantStoreOptions>(options => services.Configure<AbpDefaultTenantStoreOptions>(options =>
{ {
options.Tenants = new[] options.Tenants = new[]
{ {

2
framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs

@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
{ {
return base.CreateWebHostBuilder().ConfigureServices(services => return base.CreateWebHostBuilder().ConfigureServices(services =>
{ {
services.Configure<DefaultTenantStoreOptions>(options => services.Configure<AbpDefaultTenantStoreOptions>(options =>
{ {
options.Tenants = new[] options.Tenants = new[]
{ {

2
framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs

@ -31,7 +31,7 @@ namespace Volo.Abp.Data.MultiTenancy
options.ConnectionStrings["db1"] = "db1-default-value"; options.ConnectionStrings["db1"] = "db1-default-value";
}); });
services.Configure<DefaultTenantStoreOptions>(options => services.Configure<AbpDefaultTenantStoreOptions>(options =>
{ {
options.Tenants = new[] options.Tenants = new[]
{ {

2
framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs

@ -28,7 +28,7 @@ namespace Volo.Abp.MultiTenancy
protected override void BeforeAddApplication(IServiceCollection services) protected override void BeforeAddApplication(IServiceCollection services)
{ {
services.Configure<DefaultTenantStoreOptions>(options => services.Configure<AbpDefaultTenantStoreOptions>(options =>
{ {
options.Tenants = new[] options.Tenants = new[]
{ {

Loading…
Cancel
Save