diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs index 039e819b38..2b38af50f1 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs @@ -7,9 +7,9 @@ namespace Microsoft.AspNetCore.Hosting { public static IConfigurationRoot BuildConfiguration( this IWebHostEnvironment env, - ConfigurationBuilderOptions options = null) + AbpConfigurationBuilderOptions options = null) { - options = options ?? new ConfigurationBuilderOptions(); + options = options ?? new AbpConfigurationBuilderOptions(); if (options.BasePath.IsNullOrEmpty()) { diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs index 9d754b8da4..ecb641df34 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs @@ -12,13 +12,13 @@ namespace Microsoft.Extensions.DependencyInjection } [Obsolete] - public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null) + public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, AbpConfigurationBuilderOptions options = null) { return services.GetHostingEnvironment().BuildConfiguration(options); } [Obsolete] - public static IConfigurationRoot AddConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null) + public static IConfigurationRoot AddConfiguration(this IServiceCollection services, AbpConfigurationBuilderOptions options = null) { var configuration = services.BuildConfiguration(options); services.SetConfiguration(configuration); diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationBuilderOptions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs similarity index 96% rename from framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationBuilderOptions.cs rename to framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs index aa55c0e876..b9ca026791 100644 --- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationBuilderOptions.cs +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs @@ -2,7 +2,7 @@ namespace Microsoft.Extensions.Configuration { - public class ConfigurationBuilderOptions + public class AbpConfigurationBuilderOptions { /// /// Used to set assembly which is used to get the user secret id for the application. diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs index 37e721f1af..6c0fe12b15 100644 --- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs @@ -5,9 +5,9 @@ namespace Microsoft.Extensions.Configuration { public static class ConfigurationHelper { - public static IConfigurationRoot BuildConfiguration(ConfigurationBuilderOptions options = null) + public static IConfigurationRoot BuildConfiguration(AbpConfigurationBuilderOptions options = null) { - options = options ?? new ConfigurationBuilderOptions(); + options = options ?? new AbpConfigurationBuilderOptions(); if (options.BasePath.IsNullOrEmpty()) { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs index 005471d9b9..e4d7744ae8 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs @@ -14,13 +14,13 @@ namespace Volo.Abp public PlugInSourceList PlugInSources { get; } [NotNull] - public ConfigurationBuilderOptions Configuration {get; } + public AbpConfigurationBuilderOptions Configuration {get; } public AbpApplicationCreationOptions([NotNull] IServiceCollection services) { Services = Check.NotNull(services, nameof(services)); PlugInSources = new PlugInSourceList(); - Configuration = new ConfigurationBuilderOptions(); + Configuration = new AbpConfigurationBuilderOptions(); } } } \ No newline at end of file