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 d4a74d9364..1ac2f3bfe2 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 @@ -10,6 +10,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building var pipeline = new ProjectBuildPipeline(context); pipeline.Steps.Add(new FileEntryListReadStep()); + pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); pipeline.Steps.Add(new ProjectReferenceReplaceStep()); pipeline.Steps.Add(new ReplaceCommonPropsStep()); pipeline.Steps.Add(new ReplaceConfigureAwaitPropsStep()); 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 new file mode 100644 index 0000000000..e15d60a24c --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs @@ -0,0 +1,39 @@ +using System; +using System.Linq; +using Volo.Abp.Cli.ProjectBuilding.Files; + +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps +{ + public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep + { + private const string FileName = "appsettings.secrets.json"; + private const string AppSettingsFileName = "appsettings.json"; + + public override void Execute(ProjectBuildContext context) + { + var appSettingsFiles = context.Files.Where(x => x.Name.EndsWith(AppSettingsFileName) && NotTestProject(x.Name) && NotBlazorWasmProject(x.Name)).ToList(); + + var content = context.Template.IsPro() + ? $"{{{Environment.NewLine} \"AbpLicenseCode\": \"\" {Environment.NewLine}}}" + : $"{{{Environment.NewLine}}}"; + + foreach (var appSettingsFile in appSettingsFiles) + { + context.Files.Add(new FileEntry( + appSettingsFile.Name.Replace(AppSettingsFileName, FileName), + content.GetBytes(), + false)); + } + } + + private bool NotTestProject(string fileName) + { + return !fileName.StartsWith("/aspnet-core/test"); + } + + private bool NotBlazorWasmProject(string fileName) + { + return !fileName.Contains("Blazor/wwwroot") && !fileName.Contains("Blazor.Host/wwwroot"); + } + } +} 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 137674dcc6..10970932f0 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 @@ -30,5 +30,10 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building { return Array.Empty(); } + + public bool IsPro() + { + return Name.EndsWith("pro", StringComparison.OrdinalIgnoreCase); + } } } \ No newline at end of file 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 3785475e27..e72a854c68 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 @@ -12,6 +12,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building var pipeline = new ProjectBuildPipeline(context); pipeline.Steps.Add(new FileEntryListReadStep()); + pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); pipeline.Steps.AddRange(context.Template.GetCustomSteps(context)); diff --git a/templates/app/aspnet-core/.gitignore b/templates/app/aspnet-core/.gitignore index f938140c1e..c412a346fc 100644 --- a/templates/app/aspnet-core/.gitignore +++ b/templates/app/aspnet-core/.gitignore @@ -260,13 +260,4 @@ src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Logs/* src/MyCompanyName.MyProjectName.DbMigrator/Logs/* src/MyCompanyName.MyProjectName.Blazor.Server/Logs/* src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Logs/* - -# appsettings.secrets.json -src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json -src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json -src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json -src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json -src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json -src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json -src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json -src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json \ No newline at end of file +appsettings.secrets.json \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/module/aspnet-core/.gitignore b/templates/module/aspnet-core/.gitignore index 1f7451087c..9a86ee0025 100644 --- a/templates/module/aspnet-core/.gitignore +++ b/templates/module/aspnet-core/.gitignore @@ -257,10 +257,4 @@ host/MyCompanyName.MyProjectName.HttpApi.Host/Logs/logs.txt host/MyCompanyName.MyProjectName.Web.Host/Logs/logs.txt host/MyCompanyName.MyProjectName.Web.Unified/Logs/logs.txt host/MyCompanyName.MyProjectName.Blazor.Server.Host/Logs/logs.txt - -# appsettings.secrets.json -host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json -host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json -host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json -host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json -host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json \ No newline at end of file +appsettings.secrets.json \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json deleted file mode 100644 index d177980a92..0000000000 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -}