Merge pull request #18559 from abpframework/auto-merge/rel-8-0/2380

Merge branch dev with rel-8.0

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -431,7 +431,6 @@ public abstract class AppTemplateBase : TemplateInfo
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
-            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
     }
@@ -457,7 +456,6 @@ public abstract class AppTemplateBase : TemplateInfo
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
-            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
 
@@ -551,7 +549,6 @@ public abstract class AppTemplateBase : TemplateInfo
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
-            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
 
@@ -589,7 +586,6 @@ public abstract class AppTemplateBase : TemplateInfo
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
-            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
     }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs

@@ -179,7 +179,6 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
         }
         //</TEMPLATE-REMOVE>
 
-        //<TEMPLATE-REMOVE IF-NOT='HostWithIds'>
         // Swagger Client
         var swaggerClientId = configurationSection["MyProjectName_Swagger:ClientId"];
         if (!swaggerClientId.IsNullOrWhiteSpace())
@@ -198,7 +197,6 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
                 clientUri: swaggerRootUrl
             );
         }
-        //</TEMPLATE-REMOVE>
     }
 
     private async Task CreateApplicationAsync(