Update CLI to support `Blazor Web App`.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@@ -130,7 +130,6 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
 
         if (outputWarning)
         {
-            version = currentCliVersion.ToString();
             Logger.LogWarning(userSpecifiedVersion
                 ? $"The specified template version ({templateVersion}) is different than the CLI version ({currentCliVersion}). This may cause compatibility issues."
                 : $"The latest template version ({templateVersion}) is different than the CLI version ({currentCliVersion}). This may cause compatibility issues.");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFramework.cs

@@ -8,5 +8,6 @@ public enum UiFramework
     Angular = 3,
     Blazor = 4,
     BlazorServer = 5,
-    MauiBlazor = 6
+    MauiBlazor = 6,
+    BlazorWebApp = 7
 }

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

@@ -6,7 +6,6 @@ using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
 using Volo.Abp.Cli.ProjectBuilding.Templates.Maui;
-using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Templates.App;
 
@@ -134,6 +133,10 @@ public abstract class AppTemplateBase : TemplateInfo
                 ConfigureWithBlazorServerUi(context, steps);
                 break;
 
+            case UiFramework.BlazorWebApp:
+                ConfigureWithBlazorWebAppUi(context, steps);
+                break;
+
             case UiFramework.MauiBlazor:
                 ConfigureWithMauiBlazorUi(context, steps);
                 break;
@@ -144,9 +147,10 @@ public abstract class AppTemplateBase : TemplateInfo
                 break;
         }
 
-        if (context.BuildArgs.UiFramework != UiFramework.Blazor && context.BuildArgs.UiFramework != UiFramework.BlazorServer)
+        if (context.BuildArgs.UiFramework != UiFramework.Blazor)
         {
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client"));
         }
 
         if (context.BuildArgs.UiFramework != UiFramework.BlazorServer)
@@ -155,6 +159,14 @@ public abstract class AppTemplateBase : TemplateInfo
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server.Tiered"));
         }
 
+        if (context.BuildArgs.UiFramework != UiFramework.BlazorWebApp)
+        {
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp.Client"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp.Tiered"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client"));
+        }
+
         if (context.BuildArgs.UiFramework != UiFramework.MauiBlazor)
         {
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MauiBlazor"));
@@ -264,7 +276,7 @@ public abstract class AppTemplateBase : TemplateInfo
                 throw new AbpException("Unknown Dbms: " + context.BuildArgs.DatabaseManagementSystem);
         }
     }
-    
+
     private void RemoveThemeLogoFolders(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (context.BuildArgs.Theme != Theme.Lepton && IsPro())
@@ -500,6 +512,38 @@ public abstract class AppTemplateBase : TemplateInfo
         }
     }
 
+    protected void ConfigureWithBlazorWebAppUi(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+    {
+        context.Symbols.Add("ui:blazor-webapp");
+
+        steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor"));
+        steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client"));
+        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"));
+        steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
+
+        if (context.BuildArgs.ExtraProperties.ContainsKey("tiered"))
+        {
+            steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.WebApp.Tiered", "MyCompanyName.MyProjectName.Blazor"));
+            steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client", "MyCompanyName.MyProjectName.Blazor.Client"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp.Client"));
+            steps.Add(new AppTemplateChangeDbMigratorPortSettingsStep("44300"));
+        }
+        else
+        {
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp.Tiered"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client"));
+            steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.WebApp", "MyCompanyName.MyProjectName.Blazor"));
+            steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.WebApp.Client", "MyCompanyName.MyProjectName.Blazor.Client"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
+            steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44313"));
+        }
+    }
+
     protected void ConfigureWithMvcUi(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         context.Symbols.Add("ui:mvc");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs

@@ -62,6 +62,11 @@ public abstract class ModuleTemplateBase : TemplateInfo
             projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host"
         ));
 
+        steps.Add(new RemoveProjectFromSolutionStep(
+            "MyCompanyName.MyProjectName.Blazor.Host.Client",
+            projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client"
+        ));
+
         steps.Add(new RemoveProjectFromSolutionStep(
             "MyCompanyName.MyProjectName.Blazor.Server.Host",
             projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host"

templates/app/aspnet-core/MyCompanyName.MyProjectName.sln

@@ -57,13 +57,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Client", "src\MyCompanyName.MyProjectName.Blazor.Client\MyCompanyName.MyProjectName.Blazor.Client.csproj", "{188A64AD-A1A7-4F95-85D1-C935594611B7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Server.WebApp", "src\MyCompanyName.MyProjectName.Blazor.Server.WebApp\MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj", "{14882ABF-1EEF-430C-8E72-812B3EE810C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp", "src\MyCompanyName.MyProjectName.Blazor.WebApp\MyCompanyName.MyProjectName.Blazor.WebApp.csproj", "{14882ABF-1EEF-430C-8E72-812B3EE810C4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client", "src\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client.csproj", "{648460F4-3ECC-4751-9D87-EE25D0B8B2BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp.Client", "src\MyCompanyName.MyProjectName.Blazor.WebApp.Client\MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj", "{648460F4-3ECC-4751-9D87-EE25D0B8B2BF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered", "src\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.csproj", "{8A3E5E20-F162-4321-8AD5-23DD7B2B0E74}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp.Tiered", "src\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj", "{8A3E5E20-F162-4321-8AD5-23DD7B2B0E74}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client", "src\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.csproj", "{834C6A10-7562-427C-8771-B0588C35873D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client", "src\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj", "{834C6A10-7562-427C-8771-B0588C35873D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/Pages/Index.razor.cs

@@ -1,6 +0,0 @@
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Components.Pages;
-
-public partial class Index
-{
-
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/Pages/Index.razor.cs

@@ -1,6 +0,0 @@
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.Pages;
-
-public partial class Index
-{
-
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/Menus/MyProjectNameMenuContributor.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/Menus/MyProjectNameMenuContributor.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -10,7 +9,7 @@ using Volo.Abp.SettingManagement.Blazor.Menus;
 using Volo.Abp.TenantManagement.Blazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client.Menus;
 
 public class MyProjectNameMenuContributor : IMenuContributor
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/Menus/MyProjectNameMenus.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/Menus/MyProjectNameMenus.cs

@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client.Menus;
 
 public class MyProjectNameMenus
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client.csproj → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj

@@ -6,6 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+    <RootNamespace>MyCompanyName.MyProjectName.Blazor.WebApp.Client</RootNamespace>
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
     <!-- </TEMPLATE-REMOVE> -->

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/MyProjectNameBlazorAutoMapperProfile.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBlazorAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client;
 
 public class MyProjectNameBlazorAutoMapperProfile : Profile
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/MyProjectNameBlazorClientModule.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBlazorClientModule.cs

@@ -2,29 +2,23 @@
 using System.Net.Http;
 using Blazorise.Bootstrap5;
 using Blazorise.Icons.FontAwesome;
-using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client.Menus;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Client.Menus;
-using OpenIddict.Abstractions;
 using Volo.Abp.AspNetCore.Components.Server;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
-using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp;
 using Volo.Abp.Autofac.WebAssembly;
 using Volo.Abp.AutoMapper;
-using Volo.Abp.Http.Client.Authentication;
 using Volo.Abp.Identity.Blazor.WebAssembly;
 using Volo.Abp.Modularity;
-using Volo.Abp.Security.Claims;
 using Volo.Abp.SettingManagement.Blazor.WebAssembly;
 using Volo.Abp.TenantManagement.Blazor.WebAssembly;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client;
 
 [DependsOn(
     typeof(AbpAutofacWebAssemblyModule),

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyProjectNameBrandingProvider.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBrandingProvider.cs

@@ -1,7 +1,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Ui.Branding;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client;
 
 [Dependency(ReplaceServices = true)]
 public class MyProjectNameBrandingProvider : DefaultBrandingProvider

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/MyProjectNameBundleContributor.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBundleContributor.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.Bundling;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client;
 
 /* Add your global styles/scripts here.
  * See https://docs.abp.io/en/abp/latest/UI/Blazor/Global-Scripts-Styles to learn how to use it

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyProjectNameComponentBase.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameComponentBase.cs

@@ -1,7 +1,7 @@
 using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.AspNetCore.Components;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client;
 
 public abstract class MyProjectNameComponentBase : AbpComponentBase
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/Pages/Index.razor.cs

@@ -0,0 +1,6 @@
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client.Pages;
+
+public partial class Index
+{
+
+}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/Program.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/Program.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Client;
 
 public class Program
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/Menus/MyProjectNameMenuContributor.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/Menus/MyProjectNameMenuContributor.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -10,7 +9,7 @@ using Volo.Abp.SettingManagement.Blazor.Menus;
 using Volo.Abp.TenantManagement.Blazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.Menus;
 
 public class MyProjectNameMenuContributor : IMenuContributor
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/Menus/MyProjectNameMenus.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/Menus/MyProjectNameMenus.cs

@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.Menus;
 
 public class MyProjectNameMenus
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.csproj → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj

@@ -6,6 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+    <RootNamespace>MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client</RootNamespace>
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
     <!-- </TEMPLATE-REMOVE> -->

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/MyProjectNameBlazorAutoMapperProfile.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBlazorAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
 
 public class MyProjectNameBlazorAutoMapperProfile : Profile
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/MyProjectNameBlazorClientModule.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBlazorClientModule.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.Menus;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.Menus;
 using Volo.Abp.AspNetCore.Components.Server;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
@@ -18,7 +18,7 @@ using Volo.Abp.SettingManagement.Blazor.WebAssembly;
 using Volo.Abp.TenantManagement.Blazor.WebAssembly;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
 
 [DependsOn(
     typeof(AbpAutofacWebAssemblyModule),

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/MyProjectNameBrandingProvider.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBrandingProvider.cs

@@ -1,7 +1,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Ui.Branding;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
 
 [Dependency(ReplaceServices = true)]
 public class MyProjectNameBrandingProvider : DefaultBrandingProvider

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/MyProjectNameBundleContributor.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBundleContributor.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.Bundling;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
 
 /* Add your global styles/scripts here.
  * See https://docs.abp.io/en/abp/latest/UI/Blazor/Global-Scripts-Styles to learn how to use it

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/MyProjectNameComponentBase.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameComponentBase.cs

@@ -1,7 +1,7 @@
 using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.AspNetCore.Components;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
 
 public abstract class MyProjectNameComponentBase : AbpComponentBase
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/Pages/Index.razor.cs

@@ -0,0 +1,6 @@
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.Pages;
+
+public partial class Index
+{
+
+}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client/Program.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/Program.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
 
 public class Program
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/Components/Toolbar/LoginLink/LoginLinkViewComponent.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Components/Toolbar/LoginLink/LoginLinkViewComponent.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Components.Toolbar.LoginLink;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Components.Toolbar.LoginLink;
 
 public class LoginLinkViewComponent : AbpViewComponent
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/Controllers/AccountController.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Controllers/AccountController.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.AspNetCore.Mvc.Authentication;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Controllers;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Controllers;
 
 public class AccountController : ChallengeAccountController
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/Menus/MyProjectNameMenuContributor.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Menus/MyProjectNameMenuContributor.cs

@@ -10,7 +10,7 @@ using Volo.Abp.SettingManagement.Blazor.Menus;
 using Volo.Abp.TenantManagement.Blazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Menus;
 
 public class MyProjectNameMenuContributor : IMenuContributor
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/Menus/MyProjectNameMenus.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Menus/MyProjectNameMenus.cs

@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Menus;
 
 public class MyProjectNameMenus
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/Menus/MyProjectNameToolbarContributor.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Menus/MyProjectNameToolbarContributor.cs

@@ -1,10 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Components.Toolbar.LoginLink;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Components.Toolbar.LoginLink;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.Users;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Menus;
 
 public class MyProjectNameToolbarContributor : IToolbarContributor
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.csproj → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj

@@ -10,6 +10,7 @@
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
+    <RootNamespace>MyCompanyName.MyProjectName.Blazor.WebApp.Tiered</RootNamespace>
     <UserSecretsId>MyCompanyName.MyProjectName-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
   </PropertyGroup>
 
@@ -36,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.csproj" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.DistributedLocking\Volo.Abp.DistributedLocking.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBlazorModule.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBlazorModule.cs

@@ -11,14 +11,13 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.OpenApi.Models;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Components;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Components;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Menus;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Menus;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using StackExchange.Redis;
@@ -57,7 +56,7 @@ using Volo.Abp.UI.Navigation;
 using Volo.Abp.UI.Navigation.Urls;
 using Volo.Abp.VirtualFileSystem;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered;
 
 [DependsOn(
     typeof(MyProjectNameHttpApiClientModule),
@@ -156,7 +155,7 @@ public class MyProjectNameBlazorModule : AbpModule
                 {
                     bundle.AddFiles("/blazor-global-styles.css");
                     //You can remove the following line if you don't use Blazor CSS isolation for components
-                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.styles.css");
+                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.styles.css");
                 }
             );
         });

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBrandingProvider.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBrandingProvider.cs

@@ -1,7 +1,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Ui.Branding;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered;
 
 [Dependency(ReplaceServices = true)]
 public class MyProjectNameBrandingProvider : DefaultBrandingProvider

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameComponentBase.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameComponentBase.cs

@@ -1,7 +1,7 @@
 using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.AspNetCore.Components;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered;
 
 public abstract class MyProjectNameComponentBase : AbpComponentBase
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/Program.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Program.cs

@@ -6,7 +6,7 @@ using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered;
 
 public class Program
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/Properties/launchSettings.json → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Properties/launchSettings.json

@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered": {
+    "MyCompanyName.MyProjectName.Blazor.WebApp.Tiered": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/_Imports.razor → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/_Imports.razor

@@ -11,4 +11,4 @@
 @using Blazorise.DataGrid
 @using Volo.Abp.BlazoriseUI
 @using Volo.Abp.BlazoriseUI.Components
-@using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client
+@using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/web.config → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/web.config

@@ -5,7 +5,7 @@
       <handlers>
         <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
       </handlers>
-      <aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Blazor.Server.WebApp.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
+      <aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
     </system.webServer>
   </location>
   <system.webServer>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/Components/App.razor → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Components/App.razor

@@ -1,7 +1,6 @@
 @using Volo.Abp.Localization
 @using System.Globalization
 @using Microsoft.Extensions.Hosting
-@using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client
 @using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
 @using Volo.Abp.AspNetCore.Components.Server.Theming.Bundling
 @inject IHostEnvironment Env

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/Menus/MyProjectNameMenuContributor.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Menus/MyProjectNameMenuContributor.cs

@@ -6,7 +6,7 @@ using Volo.Abp.SettingManagement.Blazor.Menus;
 using Volo.Abp.TenantManagement.Blazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Menus;
 
 public class MyProjectNameMenuContributor : IMenuContributor
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/Menus/MyProjectNameMenus.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Menus/MyProjectNameMenus.cs

@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp.Menus;
 
 public class MyProjectNameMenus
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj

@@ -11,6 +11,7 @@
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <UserSecretsId>MyCompanyName.MyProjectName-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
+    <RootNamespace>MyCompanyName.MyProjectName.Blazor.WebApp</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,7 +36,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client.csproj" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Blazor.WebApp.Client\MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyProjectNameBlazorModule.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBlazorModule.cs

@@ -10,9 +10,9 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Client;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Components;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Components;
-using MyCompanyName.MyProjectName.Blazor.Server.WebApp.Menus;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Menus;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -46,7 +46,7 @@ using Volo.Abp.UI.Navigation;
 using Volo.Abp.UI.Navigation.Urls;
 using Volo.Abp.VirtualFileSystem;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp;
 
 [DependsOn(
     typeof(MyProjectNameApplicationModule),
@@ -170,7 +170,7 @@ public class MyProjectNameBlazorModule : AbpModule
                 {
                     bundle.AddFiles("/blazor-global-styles.css");
                     //You can remove the following line if you don't use Blazor CSS isolation for components
-                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Client.styles.css");
+                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.WebApp.Client.styles.css");
                 }
             );
         });

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/MyProjectNameBrandingProvider.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBrandingProvider.cs

@@ -1,7 +1,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Ui.Branding;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp;
 
 [Dependency(ReplaceServices = true)]
 public class MyProjectNameBrandingProvider : DefaultBrandingProvider

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client/MyProjectNameComponentBase.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameComponentBase.cs

@@ -1,7 +1,7 @@
 using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.AspNetCore.Components;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.Client;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp;
 
 public abstract class MyProjectNameComponentBase : AbpComponentBase
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/Program.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Program.cs

@@ -6,7 +6,7 @@ using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
 
-namespace MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered;
+namespace MyCompanyName.MyProjectName.Blazor.WebApp;
 
 public class Program
 {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/Properties/launchSettings.json → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Properties/launchSettings.json

@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "MyCompanyName.MyProjectName.Blazor.Server.WebApp": {
+    "MyCompanyName.MyProjectName.Blazor.WebApp": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/_Imports.razor → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/_Imports.razor

@@ -7,7 +7,7 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.JSInterop
-@using MyCompanyName.MyProjectName.Blazor.Server.WebApp
+@using MyCompanyName.MyProjectName.Blazor.WebApp.Client
 @using Blazorise
 @using Blazorise.DataGrid
 @using Volo.Abp.BlazoriseUI

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/web.config → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/web.config

@@ -5,7 +5,7 @@
       <handlers>
         <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
       </handlers>
-      <aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
+      <aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Blazor.WebApp.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
     </system.webServer>
   </location>
   <system.webServer>