Merge pull request #8102 from abpframework/volo/issue/5822

Cli: Rename/Move microservice folders

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -274,14 +274,18 @@ namespace Volo.Abp.Cli.Commands
 
         private UiFramework FindMicroserviceSolutionUiFramework(string outputFolderRoot)
         {
-            if (Directory.Exists(Path.Combine(outputFolderRoot, "applications", "blazor")))
+            if (Directory.Exists(Path.Combine(outputFolderRoot, "apps", "blazor")))
             {
                 return UiFramework.Blazor;
             }
-            if (Directory.Exists(Path.Combine(outputFolderRoot, "applications", "web")))
+            if (Directory.Exists(Path.Combine(outputFolderRoot, "apps", "web")))
             {
                 return UiFramework.Mvc;
             }
+            if (Directory.Exists(Path.Combine(outputFolderRoot, "apps", "angular")))
+            {
+                return UiFramework.Angular;
+            }
 
             return UiFramework.None;
         }

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

@@ -23,7 +23,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice
         {
             serviceName = serviceName.ToCamelCase().RemovePostFix("Service");
 
-            return Path.Combine(mainSolutionFolder, "microservices", serviceName);
+            return Path.Combine(mainSolutionFolder, "services", serviceName);
         }
 
         public override IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)

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

@@ -34,37 +34,37 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice
             {
                 case UiFramework.None:
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web",null,
-                        "/applications/web/src/MyCompanyName.MyProjectName.Web"));
+                        "/apps/web/src/MyCompanyName.MyProjectName.Web"));
-                    steps.Add(new RemoveFolderStep("/applications/web"));
+                    steps.Add(new RemoveFolderStep("/apps/web"));
                     steps.Add(new RemoveProjectFromTyeStep("web"));
                     steps.Add(new RemoveProjectFromPrometheusStep("web"));
 
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor",null,
-                        "/applications/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+                        "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
-                    steps.Add(new RemoveFolderStep("/applications/blazor"));
+                    steps.Add(new RemoveFolderStep("/apps/blazor"));
                     steps.Add(new RemoveProjectFromTyeStep("blazor"));
 
-                    steps.Add(new RemoveFolderStep("/angular"));
+                    steps.Add(new RemoveFolderStep("/apps/angular"));
                     break;
 
                 case UiFramework.Angular:
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web",null,
-                        "/applications/web/src/MyCompanyName.MyProjectName.Web"));
+                        "/apps/web/src/MyCompanyName.MyProjectName.Web"));
-                    steps.Add(new RemoveFolderStep("/applications/web"));
+                    steps.Add(new RemoveFolderStep("/apps/web"));
                     steps.Add(new RemoveProjectFromTyeStep("web"));
                     steps.Add(new RemoveProjectFromPrometheusStep("web"));
 
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor",null,
-                        "/applications/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+                        "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
-                    steps.Add(new RemoveFolderStep("/applications/blazor"));
+                    steps.Add(new RemoveFolderStep("/apps/blazor"));
                     steps.Add(new RemoveProjectFromTyeStep("blazor"));
                     break;
 
                 case UiFramework.Blazor:
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web",null,
-                        "/applications/web/src/MyCompanyName.MyProjectName.Web"));
+                        "/apps/web/src/MyCompanyName.MyProjectName.Web"));
-                    steps.Add(new RemoveFolderStep("/applications/web"));
+                    steps.Add(new RemoveFolderStep("/apps/web"));
-                    steps.Add(new RemoveFolderStep("/angular"));
+                    steps.Add(new RemoveFolderStep("/apps/angular"));
                     steps.Add(new RemoveProjectFromTyeStep("web"));
                     steps.Add(new RemoveProjectFromPrometheusStep("web"));
                     break;
@@ -72,15 +72,15 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice
                 case UiFramework.Mvc:
                 case UiFramework.NotSpecified:
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor",null,
-                        "/applications/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+                        "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
-                    steps.Add(new RemoveFolderStep("/applications/blazor"));
+                    steps.Add(new RemoveFolderStep("/apps/blazor"));
                     steps.Add(new RemoveProjectFromTyeStep("blazor"));
 
-                    steps.Add(new RemoveFolderStep("/angular"));
+                    steps.Add(new RemoveFolderStep("/apps/angular"));
                     break;
             }
 
-            steps.Add(new RemoveFolderStep("/microservices/template"));
+            steps.Add(new RemoveFolderStep("/services/template"));
         }
 
         private static void RandomizeStringEncryption(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)