Merge pull request #13910 from abpframework/auto-merge/rel-6-0/1328

Merge branch dev with rel-6.0

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -194,12 +194,16 @@ public abstract class AppTemplateBase : TemplateInfo
             return;
         }
 
+        if (context.BuildArgs.Theme != Theme.NotSpecified)
+        {
+            context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper());
+        }
+
         if (context.BuildArgs.Theme == Theme.LeptonX)
         {
-            context.Symbols.Add("LEPTONX");
             steps.Add(new ChangeThemeStyleStep());
         }
-
+        
         if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value))
         {
             return;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs

@@ -35,10 +35,14 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
         {
             return;
         }
+        
+        if (context.BuildArgs.Theme != Theme.NotSpecified)
+        {
+            context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper());
+        }
 
         if (context.BuildArgs.Theme == Theme.LeptonX)
         {
-            context.Symbols.Add("LEPTONX");
             steps.Add(new ChangeThemeStyleStep());
             return;
         }