From c5db087f58e7d6aad62f2a6dab233ce1df852b5a Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 21 Apr 2022 15:40:03 +0300 Subject: [PATCH 1/2] Cli: Add license code to module source code downloads --- .../ModuleProjectBuildPipelineBuilder.cs | 2 ++ .../Steps/CreateAppSettingsSecretsStep.cs | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs index 35bcb71d53..2d28143921 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs @@ -14,6 +14,8 @@ public static class ModuleProjectBuildPipelineBuilder pipeline.Steps.Add(new ReplaceCommonPropsStep()); pipeline.Steps.Add(new MakeProxyJsonFileEmbeddedStep()); pipeline.Steps.Add(new ReplaceConfigureAwaitPropsStep()); + pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); + pipeline.Steps.Add(new LicenseCodeReplaceStep()); pipeline.Steps.Add(new UpdateNuGetConfigStep("/NuGet.Config")); pipeline.Steps.Add(new CreateProjectResultZipStep()); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs index 5a84bda994..7a5f792b15 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs @@ -40,7 +40,21 @@ public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep private static byte[] GetAppSettingsSecretJsonContent(ProjectBuildContext context) { - return context.Template.IsPro() + bool condition; + if (context.Template != null) + { + condition = context.Template.IsPro(); + } + else if (context.Module != null) + { + condition = context.Module.IsPro; + } + else + { + condition = false; + } + + return condition ? $"{{{Environment.NewLine} \"AbpLicenseCode\": \"{CliConsts.LicenseCodePlaceHolder}\" {Environment.NewLine}}}".GetBytes() : $"{{{Environment.NewLine}}}".GetBytes(); } From a1e284fa951c603118d0c754b4fc21d553292a04 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 21 Apr 2022 15:42:26 +0300 Subject: [PATCH 2/2] Update ModuleProjectBuildPipelineBuilder.cs --- .../Building/ModuleProjectBuildPipelineBuilder.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs index 2d28143921..9a5eecb4f6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs @@ -14,8 +14,13 @@ public static class ModuleProjectBuildPipelineBuilder pipeline.Steps.Add(new ReplaceCommonPropsStep()); pipeline.Steps.Add(new MakeProxyJsonFileEmbeddedStep()); pipeline.Steps.Add(new ReplaceConfigureAwaitPropsStep()); - pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); - pipeline.Steps.Add(new LicenseCodeReplaceStep()); + + if (context.Module.IsPro) + { + pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); + pipeline.Steps.Add(new LicenseCodeReplaceStep()); + } + pipeline.Steps.Add(new UpdateNuGetConfigStep("/NuGet.Config")); pipeline.Steps.Add(new CreateProjectResultZipStep());