diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/CheckRedisPreRequirements.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CheckRedisPreRequirements.cs similarity index 83% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/CheckRedisPreRequirements.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CheckRedisPreRequirements.cs index aee6da8f99..a16e42d954 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/CheckRedisPreRequirements.cs +++ b/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 { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs index 8a59d2d8b1..c70fed4625 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs @@ -31,20 +31,14 @@ public abstract class TemplateInfo public virtual IEnumerable GetCustomSteps(ProjectBuildContext context) { var steps = new List(); - ConfigureCheckPreRequirements(context, steps); return steps; } - protected void ConfigureCheckPreRequirements(ProjectBuildContext context, List 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; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs index a453173095..ad0bd7dea4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs +++ b/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;