Improve

.gitignore

@@ -315,3 +315,6 @@ tempkey.jwk
 
 # ABP Analyzing files
 *.abppkg.analyze.json
+
+# appsettings.secrets.json
+appsettings.secrets.json

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 = "<!--APPSETTINGS-SECRETS-->";
 
         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 = $"<None Remove=\"{FileName}\" />{Environment.NewLine}" +
+                    $"    <Content Include=\"{FileName}\">{Environment.NewLine}" +
+                    $"      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>{Environment.NewLine}" +
+                    $"      <CopyToOutputDirectory>Always</CopyToOutputDirectory>{Environment.NewLine}" +
+                    "    </Content>";
+            return content.Replace(AppSettingsPlaceholder, replaceContent);
         }
     }
 }

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
+src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Logs/*

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<MyProjectNameDbMigratorModule>(options =>
             {
+                options.Services.ReplaceConfiguration(_configuration);
                 options.UseAutofac();
                 options.Services.AddLogging(c => c.AddSerilog());
             }))

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj

@@ -9,13 +9,11 @@
 
   <ItemGroup>
     <None Remove="appsettings.json" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Content Include="appsettings.json">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <!--APPSETTINGS-SECRETS-->
   </ItemGroup>
 
   <ItemGroup>
@@ -30,7 +28,7 @@
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Remove="Logs\**" />
     <Content Remove="Logs\**" />

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) =>
                 {

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<MyProjectNameConsoleApiClientModule>())
+            using (var application = AbpApplicationFactory.Create<MyProjectNameConsoleApiClientModule>(options =>
+            {
+                options.Services.ReplaceConfiguration(_configuration);
+            }))
             {
                 application.Initialize();
 

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj

@@ -7,13 +7,11 @@
 
   <ItemGroup>
     <None Remove="appsettings.json" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Content Include="appsettings.json">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <!--APPSETTINGS-SECRETS-->
   </ItemGroup>
 
   <ItemGroup>

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

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
+host/MyCompanyName.MyProjectName.Blazor.Server.Host/Logs/logs.txt

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<MyProjectNameConsoleApiClientModule>())
+            using (var application = AbpApplicationFactory.Create<MyProjectNameConsoleApiClientModule>(options=>
+            {
+                options.Services.ReplaceConfiguration(_configuration);
+            }))
             {
                 application.Initialize();
 

templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj

@@ -17,6 +17,7 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <!--APPSETTINGS-SECRETS-->
   </ItemGroup>
 
   <ItemGroup>

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