Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch dev with rel-4.4 #9621

Merged
merged 2 commits into from
Jul 21, 2021
Merged

Merge branch dev with rel-4.4 #9621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
713da3c
Add AppSettingsSecret.json if template version greater than or equal …
realLiangshiwei Jul 14, 2021
cf8d33e
Merge pull request #9597 from abpframework/liangshiwei/cli-patch-1
maliming Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using NuGet.Versioning;
using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
using Volo.Abp.Cli.ProjectBuilding.Templates.App;
using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice;
Expand All @@ -13,7 +14,11 @@ public static ProjectBuildPipeline Build(ProjectBuildContext context)
var pipeline = new ProjectBuildPipeline(context);

pipeline.Steps.Add(new FileEntryListReadStep());
pipeline.Steps.Add(new CreateAppSettingsSecretsStep());

if (SemanticVersion.Parse(context.TemplateFile.Version) > new SemanticVersion(4, 3, 99))
{
pipeline.Steps.Add(new CreateAppSettingsSecretsStep());
}

pipeline.Steps.AddRange(context.Template.GetCustomSteps(context));

Expand Down