Merge pull request #18489 from abpframework/auto-merge/rel-8-0/2360

Merge branch dev with rel-8.0

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/CheckRedisPreRequirements.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CheckRedisPreRequirements.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
-using Volo.Abp.Cli.ProjectBuilding.Building;
 
-namespace Volo.Abp.Cli.ProjectBuilding.Templates;
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps;
 
 public class CheckRedisPreRequirements : ProjectBuildPipelineStep
 {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs

@@ -31,20 +31,14 @@ public abstract class TemplateInfo
     public virtual IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)
     {
         var steps = new List<ProjectBuildPipelineStep>();
-        ConfigureCheckPreRequirements(context, steps);
         return steps;
     }
 
-    protected void ConfigureCheckPreRequirements(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
-    {
-        steps.Add(new CheckRedisPreRequirements());
-    }
-
     public bool IsPro()
     {
         return Name.EndsWith("-pro", StringComparison.OrdinalIgnoreCase);
     }
-    
+
     public bool IsNoLayer()
     {
         return Name is AppNoLayersTemplate.TemplateName or AppNoLayersProTemplate.TemplateName;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs

@@ -1,6 +1,7 @@
 using System;
 using NuGet.Versioning;
 using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+using Volo.Abp.Cli.ProjectBuilding.Templates;
 using Volo.Abp.Cli.ProjectBuilding.Templates.App;
 using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice;
 using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
@@ -56,6 +57,8 @@ public static class TemplateProjectBuildPipelineBuilder
             pipeline.Steps.Add(new RemoveRootFolderStep());
         }
 
+        pipeline.Steps.Add(new CheckRedisPreRequirements());
+
         pipeline.Steps.Add(new CreateProjectResultZipStep());
 
         return pipeline;