From 714ab6fa2705bf9be91f2aaffff665768de1aeb3 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 8 Jan 2020 21:12:17 +0800
Subject: [PATCH] Remove the angular folder on module project creation with
 --no-ui option

Resolve #2585
---
 .../Cli/ProjectBuilding/Building/Steps/RemoveFolderStep.cs   | 5 +++--
 .../ProjectBuilding/Templates/Module/ModuleTemplateBase.cs   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFolderStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFolderStep.cs
index ddf7010dd73..636175f0b17 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFolderStep.cs
+++ b/framework/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/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
index 09b75ac0e20..3faf920ab05 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
+++ b/framework/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)