From c14863a6b7ac22cd94cdc8efd9a0f051041f6529 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <enginveske@gmail.com>
Date: Sun, 18 Sep 2022 15:19:45 +0300
Subject: [PATCH] CLI: Rename RemoveFoldersStep.cs

---
 .../Building/Steps/RemoveFilesStep.cs         | 16 ++++++++++++++++
 .../Building/Steps/RemoveFoldersStep.cs       | 19 -------------------
 .../Templates/App/AppTemplateBase.cs          |  4 ++--
 3 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs
 delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs
new file mode 100644
index 0000000000..4390e02f1d
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs
@@ -0,0 +1,16 @@
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+public class RemoveFilesStep : ProjectBuildPipelineStep
+{
+    private readonly string _filePath;
+
+    public RemoveFilesStep(string filePath)
+    {
+        _filePath = filePath;
+    }
+
+    public override void Execute(ProjectBuildContext context)
+    {
+        context.Files.RemoveAll(file => file.Name.Contains(_filePath));
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs
deleted file mode 100644
index 18e2ca482e..0000000000
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-
-namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps;
-
-public class RemoveFoldersStep : ProjectBuildPipelineStep
-{
-    private readonly string _folderPath;
-
-    public RemoveFoldersStep(string folderPath)
-    {
-        _folderPath = folderPath;
-    }
-
-    public override void Execute(ProjectBuildContext context)
-    {
-        context.Files.RemoveAll(file => file.Name.Contains(_folderPath));
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index 5fff1ebcdc..737f7a2369 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -219,12 +219,12 @@ public abstract class AppTemplateBase : TemplateInfo
     {
         if (context.BuildArgs.Theme is not Theme.Lepton && IsPro())
         {
-            steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/lepton"));
+            steps.Add(new RemoveFilesStep("/wwwroot/images/logo/lepton"));
         }
         
         if (context.BuildArgs.Theme is not Theme.LeptonX or Theme.LeptonXLite)
         {
-            steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/leptonx"));
+            steps.Add(new RemoveFilesStep("/wwwroot/images/logo/leptonx"));
         }
     }