Merge branch 'dev' into npm

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

@@ -176,6 +176,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
 
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor", null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", null,
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor",
                     "/services/product/MyCompanyName.MyProjectName.ProductService.sln",
                     "/services/product/src/MyCompanyName.MyProjectName.ProductService.Blazor"));
@@ -221,6 +223,13 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor",
                     null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client",
+                    "/apps/blazor/MyCompanyName.MyProjectName.Blazor.sln",
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client",
+                    null,
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
                 steps.Add(new RemoveProjectFromTyeStep("blazor"));
 
                 steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.Server",
@@ -234,6 +243,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
             case UiFramework.NotSpecified:
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor", null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", null,
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server", null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor",