diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs index f689518fc1..2414803970 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.Data { var configuration = context.Services.GetConfiguration(); - Configure(configuration); + Configure(configuration); context.Services.AddSingleton(typeof(IDataFilter<>), typeof(DataFilter<>)); } diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DbConnectionOptions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs similarity index 69% rename from framework/src/Volo.Abp.Data/Volo/Abp/Data/DbConnectionOptions.cs rename to framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs index 9c3e8e856a..863bffb743 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DbConnectionOptions.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.Data { - public class DbConnectionOptions + public class AbpDbConnectionOptions { public ConnectionStrings ConnectionStrings { get; set; } - public DbConnectionOptions() + public AbpDbConnectionOptions() { ConnectionStrings = new ConnectionStrings(); } diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs index b0f1fdf38a..84221fb271 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs @@ -7,9 +7,9 @@ namespace Volo.Abp.Data { public class DefaultConnectionStringResolver : IConnectionStringResolver, ITransientDependency { - protected DbConnectionOptions Options { get; } + protected AbpDbConnectionOptions Options { get; } - public DefaultConnectionStringResolver(IOptionsSnapshot options) + public DefaultConnectionStringResolver(IOptionsSnapshot options) { Options = options.Value; } diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs index fe061d0b8d..d92409fe0d 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.MultiTenancy private readonly IServiceProvider _serviceProvider; public MultiTenantConnectionStringResolver( - IOptionsSnapshot options, + IOptionsSnapshot options, ICurrentTenant currentTenant, IServiceProvider serviceProvider) : base(options) diff --git a/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs b/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs index 82a00d8edc..4f4dabf36a 100644 --- a/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs +++ b/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs @@ -42,7 +42,7 @@ namespace Volo.Abp.Data { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.ConnectionStrings.Default = DefaultConnString; options.ConnectionStrings[Database1Name] = Database1ConnString; diff --git a/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs index c7f5d38bbe..7e5d9fcb6b 100644 --- a/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs +++ b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.MemoryDb { var connStr = Guid.NewGuid().ToString(); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connStr; }); diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs index 383fea8a91..86620366b3 100644 --- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs +++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs index aea2810d5e..a6e5fab1c8 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs @@ -25,7 +25,7 @@ namespace Volo.Abp.Data.MultiTenancy protected override void BeforeAddApplication(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.ConnectionStrings.Default = "default-value"; options.ConnectionStrings["db1"] = "db1-default-value"; diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs index f5cedd3cf5..7c70d720ec 100644 --- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs +++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.AuditLogging.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs index 4df77e4e5a..e8eba4eb12 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.BackgroundJobs.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index e6f266a433..5037d4dc31 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -66,7 +66,7 @@ namespace Volo.BloggingTestApp options.RoutePrefix = null; }); - Configure(options => + Configure(options => { #if MONGODB const string connStringName = "MongoDb"; diff --git a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs index a782b23354..4c4b34ef54 100644 --- a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs +++ b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Blogging.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs b/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs index 07aece7a5e..66c2130b35 100644 --- a/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs +++ b/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs @@ -15,7 +15,7 @@ namespace VoloDocs.Migrator context.Services.AddAbpDbContext(); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = configuration["ConnectionString"]; }); diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 54ff29fea1..16869e1b87 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -68,7 +68,7 @@ namespace VoloDocs.Web options.RoutePrefix = null; }); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = configuration["ConnectionString"]; }); diff --git a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs index aa451f045e..c5fef83ddb 100644 --- a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs +++ b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Docs.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs index df3b64a7de..00b5b22871 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.FeatureManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs index 8025ef7661..6e9f3806a2 100644 --- a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs +++ b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Identity.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs index de8dc5690e..ebfa34404d 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.IdentityServer "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs index d36516b887..d3d4d5d6e9 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.PermissionManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs index d0d8b35415..1b9faefdbd 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.SettingManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs index c9e72adaa2..911839d510 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.TenantManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs b/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs index c503db6112..a2235ee03e 100644 --- a/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs +++ b/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.Users.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs index 9a2eacad43..4602f9c727 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace Acme.BookStore.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs index 23dd76cc2f..09b6c8f1b1 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Acme.BookStore.BookManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs index dad85e765b..270ad2102c 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs index b02f017a01..149db59bcc 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace MyCompanyName.MyProjectName.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; });