Merge pull request #13698 from abpframework/auto-merge/rel-6-0/1282

Merge branch dev with rel-6.0

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

@@ -285,14 +285,12 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             {"Domain.Shared", "MyCompanyName.MyProjectName.Domain.Shared.csproj"},
             {"Application", "MyCompanyName.MyProjectName.Application.csproj"},
             {"Application.Contracts", "MyCompanyName.MyProjectName.Application.Contracts.csproj"},
-            {"Blazor.WebAssembly", "MyCompanyName.MyProjectName.Blazor.csproj"},
-            {"Blazor.Server", "MyCompanyName.MyProjectName.Blazor.Server.csproj"},
             {"HttpApi", "MyCompanyName.MyProjectName.HttpApi.csproj"},
-            {"HttpApi.Client", "MyCompanyName.MyProjectName.HttpApi.Client.csproj"},
-            {"Web.Host", "MyCompanyName.MyProjectName.Web.Host.csproj"},
-            {"Web", "MyCompanyName.MyProjectName.Web.csproj"},
+            {"HttpApi.Client", "MyCompanyName.MyProjectName.HttpApi.Client.csproj"}
         };
-
+        
+        AddUiProjectToProjects(projects, context);
+        
         foreach (var project in projects)
         {
             AddLeptonThemeManagementReference(context, project);
@@ -314,6 +312,28 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             AddLeptonThemeManagementReference(context, microserviceServiceProject);
         }
     }
+
+    private void AddUiProjectToProjects(Dictionary<string, string> projects, ProjectBuildContext context)
+    {
+        if (projects.IsNullOrEmpty())
+        {
+            return;
+        }
+        
+        switch (context.BuildArgs.UiFramework)
+        {
+            case UiFramework.Mvc:
+                projects["Web.Host"] = "MyCompanyName.MyProjectName.Web.Host.csproj";
+                projects["Web"] = "MyCompanyName.MyProjectName.Web.csproj";
+                break;
+            case UiFramework.Blazor:
+                projects["Blazor.WebAssembly"] = "MyCompanyName.MyProjectName.Blazor.csproj";
+                break;
+            case UiFramework.BlazorServer:
+                projects["Blazor.Server"] = "MyCompanyName.MyProjectName.Blazor.csproj";
+                break;
+        }
+    }
     
     private void AddLeptonThemeManagementReference(ProjectBuildContext context, KeyValuePair<string, string> projectInfo) 
     {