Remove AdvancedConfig - move InstalledPlugins to the ExtensionsConfig

grandnode · Jul 24, 2023 · 946eb0d · 946eb0d
1 parent de93e99
commit 946eb0d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/src/Core/Grand.Infrastructure/Configuration/AdvancedConfig.cs b/src/Core/Grand.Infrastructure/Configuration/AdvancedConfig.cs
diff --git a/src/Core/Grand.Infrastructure/Configuration/ExtensionsConfig.cs b/src/Core/Grand.Infrastructure/Configuration/ExtensionsConfig.cs
@@ -25,5 +25,9 @@ public class ExtensionsConfig
         /// </summary>
         public bool UseRoslynScripts { get; set; }        
 
+        /// <summary>
+        ///List of installed plugins (comma separated) 
+        /// </summary>
+        public string InstalledPlugins { get; set; }
     }
 }
diff --git a/src/Core/Grand.Infrastructure/Plugins/PluginManager.cs b/src/Core/Grand.Infrastructure/Plugins/PluginManager.cs
@@ -48,10 +48,7 @@ public static void Load(IMvcCoreBuilder mvcCoreBuilder, IConfiguration configura
         {
             _config = new ExtensionsConfig();
             configuration.GetSection("Extensions").Bind(_config);
-
-            var advConfig = new AdvancedConfig();
-            configuration.GetSection("Advanced").Bind(advConfig);
-
+
             lock (_synLock)
             {
                 if (mvcCoreBuilder == null)
@@ -64,7 +61,7 @@ public static void Load(IMvcCoreBuilder mvcCoreBuilder, IConfiguration configura
                 try
                 {
                     var installedPluginSystemNames =
-                        !string.IsNullOrEmpty(advConfig.InstalledPlugins) ? advConfig.InstalledPlugins.Split(",").Select(x=>x.Trim()) :
+                        !string.IsNullOrEmpty(_config.InstalledPlugins) ? _config.InstalledPlugins.Split(",").Select(x=>x.Trim()) :
                         PluginExtensions.ParseInstalledPluginsFile(CommonPath.InstalledPluginsFilePath);
 
                     Log.Information("Creating shadow copy folder and querying for dlls");

diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -108,7 +108,10 @@
     "ClearPluginShadowDirectoryOnStartup": true,
 
     //For develop you should enable if you want to copy plugin dll files to directory /Plugins/bin on application startup
-    "PluginShadowCopy": true
+    "PluginShadowCopy": true,
+
+    //separator comma
+    "InstalledPlugins": ""
   },
 
   "Performance": {
@@ -244,11 +247,7 @@
   },
   "UseSwagger": false,
   //Settings only for advanced users
-  "Advanced": {
-    //separator comma
-    "InstalledPlugins": ""
-  },
-
+
   "Serilog": {
     "Using": [ "Serilog.Sinks.File" ]
     //,