Implement MyCompanyName.MyProjectName.HttpApi.HostWithIds for template generation.

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

@@ -0,0 +1,44 @@
+using System;
+using System.Linq;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
+{
+    public class AngularEnvironmentFilePortChangeForSeparatedIdentityServersStep : ProjectBuildPipelineStep
+    {
+        public override void Execute(ProjectBuildContext context)
+        {
+            var fileEntries = context.Files.Where(x =>
+                    !x.IsDirectory &&
+                    (x.Name.EndsWith("angular/src/environments/environment.ts", StringComparison.InvariantCultureIgnoreCase) ||
+                     x.Name.EndsWith("angular/src/environments/environment.hmr.ts", StringComparison.InvariantCultureIgnoreCase) ||
+                     x.Name.EndsWith("angular/src/environments/environment.prod.ts", StringComparison.InvariantCultureIgnoreCase))
+                )
+                .ToList();
+
+            foreach (var fileEntry in fileEntries)
+            {
+                fileEntry.NormalizeLineEndings();
+                var lines = fileEntry.GetLines();
+
+                for (var i = 0; i < lines.Length; i++)
+                {
+                    var line = lines[i];
+
+                    if (line.Contains("issuer") && line.Contains("localhost"))
+                    {
+                        line = line.Replace("44305", "44301");
+                    }
+                    else if (line.Contains("url") && line.Contains("localhost"))
+                    {
+                        line = line.Replace("44305", "44300");
+                    }
+
+                    lines[i] = line;
+                }
+
+                fileEntry.SetLines(lines);
+            }
+        }
+    }
+}

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

@@ -67,6 +67,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
                     steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep());
                 }
+
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
             }
 
             if (context.BuildArgs.UiFramework != UiFramework.Mvc)
@@ -74,6 +76,18 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests"));
+
+                if (context.BuildArgs.ExtraProperties.ContainsKey("separate-identity-server"))
+                {
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
+                    steps.Add(new AngularEnvironmentFilePortChangeForSeparatedIdentityServersStep());
+                }
+                else
+                {
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
+                    steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+                }
             }
 
             if (context.BuildArgs.UiFramework != UiFramework.Angular)
@@ -90,7 +104,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                         "https://localhost:44300",
                         "https://localhost:44301",
                         "https://localhost:44302",
-                        "https://localhost:44303"
+                        "https://localhost:44303",
+                        "https://localhost:44305"
                     }
                 )
             );

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs

@@ -15,7 +15,9 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates
 
         private readonly List<string> _buildInSslUrls;
 
-        public TemplateRandomSslPortStep(List<string> buildInSslSslUrls, int minSslPort = 44300,
+        public TemplateRandomSslPortStep(
+            List<string> buildInSslSslUrls, 
+            int minSslPort = 44300,
             int maxSslPort = 44399)
         {
             _buildInSslUrls = buildInSslSslUrls;