From adb71a5e65a4e62e39d2e0ab1ac13affd61fb5d5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:26:37 +0300 Subject: [PATCH] FeatureOptions to AbpFeatureOptions --- .../Abp/Features/{FeatureOptions.cs => AbpFeatureOptions.cs} | 4 ++-- .../Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs | 4 ++-- .../src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs | 4 ++-- .../Volo/Abp/Features/FeatureDefinitionManager.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.Features/Volo/Abp/Features/{FeatureOptions.cs => AbpFeatureOptions.cs} (85%) diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureOptions.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureOptions.cs similarity index 85% rename from framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureOptions.cs rename to framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureOptions.cs index f988acf34c..e0526832fb 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureOptions.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureOptions.cs @@ -2,13 +2,13 @@ namespace Volo.Abp.Features { - public class FeatureOptions + public class AbpFeatureOptions { public ITypeList DefinitionProviders { get; } public ITypeList ValueProviders { get; } - public FeatureOptions() + public AbpFeatureOptions() { DefinitionProviders = new TypeList(); ValueProviders = new TypeList(); diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs index e66dd03010..f30017feed 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.Features public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.Configure(options => + context.Services.Configure(options => { options.ValueProviders.Add(); options.ValueProviders.Add(); @@ -43,7 +43,7 @@ namespace Volo.Abp.Features } }); - services.Configure(options => + services.Configure(options => { options.DefinitionProviders.AddIfNotContains(definitionProviders); }); diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs index bc9f8565ed..0c653c3448 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Features { public class FeatureChecker : FeatureCheckerBase { - protected FeatureOptions Options { get; } + protected AbpFeatureOptions Options { get; } protected IServiceProvider ServiceProvider { get; } protected IFeatureDefinitionManager FeatureDefinitionManager { get; } protected List Providers => _providers.Value; @@ -17,7 +17,7 @@ namespace Volo.Abp.Features private readonly Lazy> _providers; public FeatureChecker( - IOptions options, + IOptions options, IServiceProvider serviceProvider, IFeatureDefinitionManager featureDefinitionManager) { diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs index 84b9088a3d..f8e8d9e9fe 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs @@ -16,12 +16,12 @@ namespace Volo.Abp.Features protected IDictionary FeatureDefinitions => _lazyFeatureDefinitions.Value; private readonly Lazy> _lazyFeatureDefinitions; - protected FeatureOptions Options { get; } + protected AbpFeatureOptions Options { get; } private readonly IServiceScopeFactory _serviceScopeFactory; public FeatureDefinitionManager( - IOptions options, + IOptions options, IServiceScopeFactory serviceScopeFactory) { _serviceScopeFactory = serviceScopeFactory;