From 0be2c0723258f42a0f0b30e25d08b7c6d035136a Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 31 May 2021 17:06:50 +0800 Subject: [PATCH 1/6] Add appsettings.secrets.json to template --- templates/app/aspnet-core/.gitignore | 10 ++++++++++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../MyCompanyName.MyProjectName.DbMigrator.csproj | 4 ++++ .../MyCompanyName.MyProjectName.DbMigrator/Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../MyCompanyName.MyProjectName.Web.Host/Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../src/MyCompanyName.MyProjectName.Web/Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ templates/module/aspnet-core/.gitignore | 8 ++++++++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../MyCompanyName.MyProjectName.Web.Host/Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ .../MyCompanyName.MyProjectName.Web.Unified/Program.cs | 5 +++++ .../appsettings.secrets.json | 3 +++ 29 files changed, 126 insertions(+) create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json diff --git a/templates/app/aspnet-core/.gitignore b/templates/app/aspnet-core/.gitignore index 94d7155bfc..f938140c1e 100644 --- a/templates/app/aspnet-core/.gitignore +++ b/templates/app/aspnet-core/.gitignore @@ -260,3 +260,13 @@ 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 diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Program.cs index 155344b668..5b9b0d2617 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Program.cs index d0b78dfe8f..0c1f77c869 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName.Blazor.Server public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index 471cab6cda..c2ee46c95e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -16,6 +16,10 @@ PreserveNewest Always + + PreserveNewest + Always + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs index 85ea0e1111..0bc45f3f34 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -31,6 +32,10 @@ namespace MyCompanyName.MyProjectName.DbMigrator public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureLogging((context, logging) => logging.ClearProviders()) .ConfigureServices((hostContext, services) => { 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs index 94c39716dd..75cea3c4d9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs index 94c39716dd..75cea3c4d9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs index ec99b96d37..5ffee2ba95 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs index 75f75a25b6..7ef69fa2b3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName.Web internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs index 75f75a25b6..7ef69fa2b3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName.Web internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/module/aspnet-core/.gitignore b/templates/module/aspnet-core/.gitignore index 09f6d97377..1f7451087c 100644 --- a/templates/module/aspnet-core/.gitignore +++ b/templates/module/aspnet-core/.gitignore @@ -256,3 +256,11 @@ host/MyCompanyName.MyProjectName.IdentityServer/Logs/logs.txt 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 diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Program.cs index 941fa4ba4b..80a6d4b8b7 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Program.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Program.cs @@ -1,5 +1,6 @@ using System; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Host public static IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs index 80441853d0..0c22a68c1d 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs index 80441853d0..0c22a68c1d 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs index 80441853d0..0c22a68c1d 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -44,6 +45,10 @@ namespace MyCompanyName.MyProjectName internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs index d2561fbf4d..1a36da255f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -40,6 +41,10 @@ namespace MyCompanyName.MyProjectName internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); 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 new file mode 100644 index 0000000000..d177980a92 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json @@ -0,0 +1,3 @@ +{ + +} From 0e438c7c8dfd34e71d15786475aef9940211d1b7 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 31 May 2021 17:10:37 +0800 Subject: [PATCH 2/6] Update LicenseCodeReplaceStep --- .../ProjectBuilding/Building/Steps/LicenseCodeReplaceStep.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/LicenseCodeReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/LicenseCodeReplaceStep.cs index b2dee80867..1b2525efef 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/LicenseCodeReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/LicenseCodeReplaceStep.cs @@ -12,7 +12,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps var licenseCode = context.BuildArgs.ExtraProperties.GetOrDefault("license-code"); var appSettingsJsonFiles = context.Files.Where(f => - f.Name.EndsWith("appsettings.json", StringComparison.OrdinalIgnoreCase)); + f.Name.EndsWith("appsettings.json", StringComparison.OrdinalIgnoreCase) || + f.Name.EndsWith("appsettings.secrets.json", StringComparison.OrdinalIgnoreCase)); foreach (var appSettingsJson in appSettingsJsonFiles) { From ad930b30f62f4fc0f7635a943353db9027bc344e Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 7 Jun 2021 22:21:35 +0800 Subject: [PATCH 3/6] Add CreateAppSettingsSecretsStep --- .../ModuleProjectBuildPipelineBuilder.cs | 1 + .../Steps/CreateAppSettingsSecretsStep.cs | 39 +++++++++++++++++++ .../ProjectBuilding/Building/TemplateInfo.cs | 5 +++ .../TemplateProjectBuildPipelineBuilder.cs | 1 + templates/app/aspnet-core/.gitignore | 11 +----- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- templates/module/aspnet-core/.gitignore | 8 +--- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- .../appsettings.secrets.json | 3 -- 19 files changed, 48 insertions(+), 56 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.secrets.json delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.secrets.json delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.secrets.json delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.secrets.json delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.secrets.json delete mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.secrets.json delete mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.secrets.json delete mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.secrets.json delete mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.secrets.json delete mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/appsettings.secrets.json 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 @@ -{ - -} From 4ed2da7793ec9ebb783757937ab7b1fcae690945 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 7 Jun 2021 22:28:45 +0800 Subject: [PATCH 4/6] Improve --- .../MyCompanyName.MyProjectName.DbMigrator.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index c2ee46c95e..471cab6cda 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -16,10 +16,6 @@ PreserveNewest Always - - PreserveNewest - Always - From 809a56a2dd44c491ae0490061a59c6a02ea22cde Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 7 Jun 2021 23:40:35 +0800 Subject: [PATCH 5/6] Ignore DbMigrator project --- .../Steps/CreateAppSettingsSecretsStep.cs | 17 ++++++++++++++--- .../Program.cs | 5 ----- 2 files changed, 14 insertions(+), 8 deletions(-) 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 e15d60a24c..e8a8be959e 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 @@ -11,7 +11,13 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps public override void Execute(ProjectBuildContext context) { - var appSettingsFiles = context.Files.Where(x => x.Name.EndsWith(AppSettingsFileName) && NotTestProject(x.Name) && NotBlazorWasmProject(x.Name)).ToList(); + var appSettingsFiles = context.Files + .Where(x => + x.Name.EndsWith(AppSettingsFileName) && + NotTestProject(x.Name) && + NotBlazorWasmProject(x.Name) && + NotMigratorProject(x.Name)) + .ToList(); var content = context.Template.IsPro() ? $"{{{Environment.NewLine} \"AbpLicenseCode\": \"\" {Environment.NewLine}}}" @@ -26,14 +32,19 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps } } - private bool NotTestProject(string fileName) + private static bool NotTestProject(string fileName) { return !fileName.StartsWith("/aspnet-core/test"); } - private bool NotBlazorWasmProject(string fileName) + private static bool NotBlazorWasmProject(string fileName) { return !fileName.Contains("Blazor/wwwroot") && !fileName.Contains("Blazor.Host/wwwroot"); } + + public static bool NotMigratorProject(string fileName) + { + return !fileName.Contains("DbMigrator"); + } } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs index 0bc45f3f34..85ea0e1111 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs @@ -1,6 +1,5 @@ using System.IO; using System.Threading.Tasks; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -32,10 +31,6 @@ namespace MyCompanyName.MyProjectName.DbMigrator public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration(build => - { - build.AddJsonFile("appsettings.secrets.json", optional: true); - }) .ConfigureLogging((context, logging) => logging.ClearProviders()) .ConfigureServices((hostContext, services) => { From 6f0593a191deb8fc25e0ce77963b9ede12c6277b Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Sun, 13 Jun 2021 17:18:26 +0800 Subject: [PATCH 6/6] Improve --- .gitignore | 3 +++ .../Steps/CreateAppSettingsSecretsStep.cs | 24 ++++++++++++------- templates/app/aspnet-core/.gitignore | 3 +-- .../DbMigratorHostedService.cs | 6 ++++- ...ompanyName.MyProjectName.DbMigrator.csproj | 6 ++--- .../Program.cs | 5 ++++ .../ConsoleTestAppHostedService.cs | 13 +++++++++- ...tName.HttpApi.Client.ConsoleTestApp.csproj | 4 +--- .../Program.cs | 5 ++++ templates/module/aspnet-core/.gitignore | 3 +-- .../ConsoleTestAppHostedService.cs | 13 +++++++++- ...tName.HttpApi.Client.ConsoleTestApp.csproj | 1 + .../Program.cs | 5 ++++ 13 files changed, 68 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index f3f48c5963..c0347428f2 100644 --- a/.gitignore +++ b/.gitignore @@ -315,3 +315,6 @@ tempkey.jwk # ABP Analyzing files *.abppkg.analyze.json + +# appsettings.secrets.json +appsettings.secrets.json \ No newline at end of file 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 e8a8be959e..fd600e2c5e 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 @@ -8,15 +8,14 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { private const string FileName = "appsettings.secrets.json"; private const string AppSettingsFileName = "appsettings.json"; + private const string AppSettingsPlaceholder = ""; public override void Execute(ProjectBuildContext context) { var appSettingsFiles = context.Files .Where(x => x.Name.EndsWith(AppSettingsFileName) && - NotTestProject(x.Name) && - NotBlazorWasmProject(x.Name) && - NotMigratorProject(x.Name)) + NotBlazorWasmProject(x.Name)) .ToList(); var content = context.Template.IsPro() @@ -30,11 +29,13 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps content.GetBytes(), false)); } - } - private static bool NotTestProject(string fileName) - { - return !fileName.StartsWith("/aspnet-core/test"); + var projectFiles = context.Files.Where(x => x.Content.Contains(AppSettingsPlaceholder)).ToList(); + + foreach (var projectFile in projectFiles) + { + projectFile.SetContent(ReplaceAppSettingsSecretsPlaceholder(projectFile.Content)); + } } private static bool NotBlazorWasmProject(string fileName) @@ -42,9 +43,14 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps return !fileName.Contains("Blazor/wwwroot") && !fileName.Contains("Blazor.Host/wwwroot"); } - public static bool NotMigratorProject(string fileName) + private static string ReplaceAppSettingsSecretsPlaceholder(string content) { - return !fileName.Contains("DbMigrator"); + var replaceContent = $"{Environment.NewLine}" + + $" {Environment.NewLine}" + + $" PreserveNewest{Environment.NewLine}" + + $" Always{Environment.NewLine}" + + " "; + return content.Replace(AppSettingsPlaceholder, replaceContent); } } } diff --git a/templates/app/aspnet-core/.gitignore b/templates/app/aspnet-core/.gitignore index c412a346fc..726086cb40 100644 --- a/templates/app/aspnet-core/.gitignore +++ b/templates/app/aspnet-core/.gitignore @@ -259,5 +259,4 @@ src/MyCompanyName.MyProjectName.HttpApi.Host/Logs/* 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 \ No newline at end of file +src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Logs/* \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs index 89b12bcc03..08a58a9899 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs @@ -1,5 +1,6 @@ using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.Data; @@ -11,16 +12,19 @@ namespace MyCompanyName.MyProjectName.DbMigrator public class DbMigratorHostedService : IHostedService { private readonly IHostApplicationLifetime _hostApplicationLifetime; + private readonly IConfiguration _configuration; - public DbMigratorHostedService(IHostApplicationLifetime hostApplicationLifetime) + public DbMigratorHostedService(IHostApplicationLifetime hostApplicationLifetime, IConfiguration configuration) { _hostApplicationLifetime = hostApplicationLifetime; + _configuration = configuration; } public async Task StartAsync(CancellationToken cancellationToken) { using (var application = AbpApplicationFactory.Create(options => { + options.Services.ReplaceConfiguration(_configuration); options.UseAutofac(); options.Services.AddLogging(c => c.AddSerilog()); })) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index 471cab6cda..9a0ffd986a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -9,13 +9,11 @@ - - - PreserveNewest Always + @@ -30,7 +28,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs index 85ea0e1111..0bc45f3f34 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -31,6 +32,10 @@ namespace MyCompanyName.MyProjectName.DbMigrator public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureLogging((context, logging) => logging.ClearProviders()) .ConfigureServices((hostContext, services) => { diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs index ae929ced30..d16fb65f9e 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Hosting; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Volo.Abp; @@ -8,9 +9,19 @@ namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp { public class ConsoleTestAppHostedService : IHostedService { + private readonly IConfiguration _configuration; + + public ConsoleTestAppHostedService(IConfiguration configuration) + { + _configuration = configuration; + } + public async Task StartAsync(CancellationToken cancellationToken) { - using (var application = AbpApplicationFactory.Create()) + using (var application = AbpApplicationFactory.Create(options => + { + options.Services.ReplaceConfiguration(_configuration); + })) { application.Initialize(); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj index e78ce77d08..83d96c2429 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj @@ -7,13 +7,11 @@ - - - PreserveNewest Always + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs index 1e24d8a349..e296ed9a11 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -13,6 +14,10 @@ namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureServices((hostContext, services) => { services.AddHostedService(); diff --git a/templates/module/aspnet-core/.gitignore b/templates/module/aspnet-core/.gitignore index 9a86ee0025..aaadbff002 100644 --- a/templates/module/aspnet-core/.gitignore +++ b/templates/module/aspnet-core/.gitignore @@ -256,5 +256,4 @@ host/MyCompanyName.MyProjectName.IdentityServer/Logs/logs.txt 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 \ No newline at end of file +host/MyCompanyName.MyProjectName.Blazor.Server.Host/Logs/logs.txt \ No newline at end of file diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs index 1ea99ce263..68c4daec56 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Hosting; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Volo.Abp; @@ -8,9 +9,19 @@ namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp { public class ConsoleTestAppHostedService : IHostedService { + private readonly IConfiguration _configuration; + + public ConsoleTestAppHostedService(IConfiguration configuration) + { + _configuration = configuration; + } + public async Task StartAsync(CancellationToken cancellationToken) { - using (var application = AbpApplicationFactory.Create()) + using (var application = AbpApplicationFactory.Create(options=> + { + options.Services.ReplaceConfiguration(_configuration); + })) { application.Initialize(); diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj index ab46bde28b..5ebe04513a 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj @@ -17,6 +17,7 @@ PreserveNewest Always + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs index 1e24d8a349..e296ed9a11 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -13,6 +14,10 @@ namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration(build => + { + build.AddJsonFile("appsettings.secrets.json", optional: true); + }) .ConfigureServices((hostContext, services) => { services.AddHostedService();