Browse Source

Add CreateAppSettingsSecretsStep

pull/9195/head
liangshiwei 5 years ago
parent
commit
ad930b30f6
  1. 1
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs
  2. 39
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs
  3. 5
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs
  4. 1
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
  5. 11
      templates/app/aspnet-core/.gitignore
  6. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json
  7. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json
  8. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json
  9. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json
  10. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json
  11. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json
  12. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json
  13. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json
  14. 8
      templates/module/aspnet-core/.gitignore
  15. 3
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json
  16. 3
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json
  17. 3
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json
  18. 3
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json
  19. 3
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json

1
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());

39
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\": \"<LICENSE_CODE/>\" {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");
}
}
}

5
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<ProjectBuildPipelineStep>();
}
public bool IsPro()
{
return Name.EndsWith("pro", StringComparison.OrdinalIgnoreCase);
}
}
}

1
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));

11
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
appsettings.secrets.json

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

8
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
appsettings.secrets.json

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json

@ -1,3 +0,0 @@
{
}
Loading…
Cancel
Save