Merge pull request #2587 from abpframework/maliming/module-without-ui

Remove the angular folder on module project creation with --no-ui option
abpframework · Jan 8, 2020 · a9715d9 · a9715d9
2 parents 748efaf + 714ab6f
commit a9715d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ork/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFolderStep.cs b/...ork/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFolderStep.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
@@ -14,7 +15,7 @@ public RemoveFolderStep(string folderPath)
         public override void Execute(ProjectBuildContext context)
         {
             //Remove the folder content
-            var folderPathWithSlash = _folderPath + "/";
+            var folderPathWithSlash = _folderPath.EnsureEndsWith('/');
             context.Files.RemoveAll(file => file.Name.StartsWith(folderPathWithSlash));
 
             //Remove the folder

diff --git a/...src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs b/...src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
@@ -43,6 +43,8 @@ private void DeleteUnrelatedProjects(ProjectBuildContext context, List<ProjectBu
                 "MyCompanyName.MyProjectName.Web.Unified",
                 projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified"
             ));
+
+            steps.Add(new RemoveFolderStep("/angular"));
         }
 
         private void RandomizeSslPorts(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)