From bc5fd577a1c542b0c87148e7127a52570e897eaf Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 15 Oct 2019 14:28:53 +0300
Subject: [PATCH] SettingOptions to AbpSettingOptions

---
 .../Abp/Settings/{SettingOptions.cs => AbpSettingOptions.cs}  | 4 ++--
 .../Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs  | 4 ++--
 .../Volo/Abp/Settings/SettingDefinitionManager.cs             | 4 ++--
 .../Volo/Abp/Settings/SettingValueProviderManager.cs          | 4 ++--
 .../Volo/Abp/Settings/AbpSettingsTestModule.cs                | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename framework/src/Volo.Abp.Settings/Volo/Abp/Settings/{SettingOptions.cs => AbpSettingOptions.cs} (85%)

diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingOptions.cs
similarity index 85%
rename from framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs
rename to framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingOptions.cs
index d916f1a95d..194a608c3f 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingOptions.cs
@@ -2,13 +2,13 @@
 
 namespace Volo.Abp.Settings
 {
-    public class SettingOptions
+    public class AbpSettingOptions
     {
         public ITypeList<ISettingDefinitionProvider> DefinitionProviders { get; }
 
         public ITypeList<ISettingValueProvider> ValueProviders { get; }
 
-        public SettingOptions()
+        public AbpSettingOptions()
         {
             DefinitionProviders = new TypeList<ISettingDefinitionProvider>();
             ValueProviders = new TypeList<ISettingValueProvider>();
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
index 5f7f6ce7f5..48a85dd7d9 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
@@ -22,7 +22,7 @@ namespace Volo.Abp.Settings
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<SettingOptions>(options =>
+            Configure<AbpSettingOptions>(options =>
             {
                 options.ValueProviders.Add<DefaultValueSettingValueProvider>();
                 options.ValueProviders.Add<GlobalSettingValueProvider>();
@@ -43,7 +43,7 @@ namespace Volo.Abp.Settings
                 }
             });
 
-            services.Configure<SettingOptions>(options =>
+            services.Configure<AbpSettingOptions>(options =>
             {
                 options.DefinitionProviders.AddIfNotContains(definitionProviders);
             });
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs
index 387ea77d05..649d07f641 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs
@@ -12,12 +12,12 @@ namespace Volo.Abp.Settings
     {
         protected Lazy<IDictionary<string, SettingDefinition>> SettingDefinitions { get; }
 
-        protected SettingOptions Options { get; }
+        protected AbpSettingOptions Options { get; }
 
         protected IServiceProvider ServiceProvider { get; }
 
         public SettingDefinitionManager(
-            IOptions<SettingOptions> options,
+            IOptions<AbpSettingOptions> options,
             IServiceProvider serviceProvider)
         {
             ServiceProvider = serviceProvider;
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs
index ce10a20a31..4b8c0ddca3 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs
@@ -10,12 +10,12 @@ namespace Volo.Abp.Settings
     public class SettingValueProviderManager : ISettingValueProviderManager, ISingletonDependency
     {
         public List<ISettingValueProvider> Providers => _lazyProviders.Value;
-        protected SettingOptions Options { get; }
+        protected AbpSettingOptions Options { get; }
         private readonly Lazy<List<ISettingValueProvider>> _lazyProviders;
 
         public SettingValueProviderManager(
             IServiceProvider serviceProvider,
-            IOptions<SettingOptions> options)
+            IOptions<AbpSettingOptions> options)
         {
 
             Options = options.Value;
diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs
index 09a50daa5d..0ada68f0e4 100644
--- a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs
+++ b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.Settings
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<SettingOptions>(options =>
+            Configure<AbpSettingOptions>(options =>
             {
                 options.ValueProviders.Add<TestSettingValueProvider>();
             });