From 809a56a2dd44c491ae0490061a59c6a02ea22cde Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Mon, 7 Jun 2021 23:40:35 +0800
Subject: [PATCH] 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\": \"<LICENSE_CODE/>\" {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) =>
                 {