Merge pull request #15881 from abpframework/auto-merge/rel-7-1/1779

Merge branch dev with rel-7.1

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

@@ -308,7 +308,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
     {
         var projectNames = new[]
         {
-            ".Web", ".HttpApi.Host", ".AuthServer",
+            ".Web", ".HttpApi.Host", ".AuthServer", ".Web.Public", ".Web.Public.Host",
             "" //for app-nolayers-mvc
         };
 
@@ -781,6 +781,8 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             {".Web", "MyProjectNameWebModule"},
             {".HttpApi.Host", "MyProjectNameHttpApiHostModule"},
             {".AuthServer", "MyProjectNameAuthServerModule"},
+            {".Web.Public", "MyProjectNameWebPublicModule"},
+            {".Web.Public.Host", "MyProjectNameWebPublicModule"},
             {"", "MyProjectNameWebModule"}
         };
 

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

@@ -258,6 +258,8 @@ public abstract class AppTemplateBase : TemplateInfo
         {
             "/MyCompanyName.MyProjectName.Web/package.json",
             "/MyCompanyName.MyProjectName.Web.Host/package.json",
+            "/MyCompanyName.MyProjectName.Web.Public/package.json",
+            "/MyCompanyName.MyProjectName.Web.Public.Host/package.json",
             "/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json",
             "/MyCompanyName.MyProjectName.HttpApi.Host/package.json",
             "/MyCompanyName.MyProjectName.AuthServer/package.json",