Browse Source
Merge pull request #13836 from abpframework/auto-merge/rel-6-0/1312
Merge branch dev with rel-6.0
pull/13840/head
Yunus Emre Kalkan
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
9 additions and
0 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
|
|
|
@ -37,6 +37,7 @@ public abstract class AppTemplateBase : TemplateInfo |
|
|
|
ConfigureTieredArchitecture(context, steps); |
|
|
|
ConfigurePublicWebSite(context, steps); |
|
|
|
ConfigureTheme(context, steps); |
|
|
|
ConfigureVersion(context, steps); |
|
|
|
RemoveUnnecessaryPorts(context, steps); |
|
|
|
RandomizeSslPorts(context, steps); |
|
|
|
RandomizeStringEncryption(context, steps); |
|
|
|
@ -489,6 +490,14 @@ public abstract class AppTemplateBase : TemplateInfo |
|
|
|
steps.Add(new RemoveUnnecessaryPortsStep()); |
|
|
|
} |
|
|
|
|
|
|
|
protected void ConfigureVersion(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps) |
|
|
|
{ |
|
|
|
if (context.BuildArgs.Version == null || SemanticVersion.Parse(context.BuildArgs.Version) >= SemanticVersion.Parse("6.0.0-rc.1")) |
|
|
|
{ |
|
|
|
context.Symbols.Add("newer-than-6.0"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
protected void RandomizeSslPorts(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps) |
|
|
|
{ |
|
|
|
if (context.BuildArgs.ExtraProperties.ContainsKey("no-random-port")) |
|
|
|
|
