Rename blazor server side basic theme namespace and remove unnecessary dependencies.

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/AbpAspNetCoreComponentsServerBasicThemeModule.cs

@@ -1,12 +1,13 @@
-using Volo.Abp.AspNetCore.Components.Server.Theming;
+using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.Server.Theming;
 using Volo.Abp.AspNetCore.Components.Server.Theming.Bundling;
-using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling;
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Toolbars;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.Modularity;
 
-namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server
+namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme
 {
     [DependsOn(
         typeof(AbpAspNetCoreComponentsWebBasicThemeModule),
@@ -16,11 +17,6 @@ namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpRouterOptions>(options =>
-            {
-                options.AdditionalAssemblies.Add(typeof(AbpAspNetCoreComponentsServerBasicThemeModule).Assembly);
-            });
-
             Configure<AbpToolbarOptions>(options =>
             {
                 options.Contributors.Add(new BasicThemeToolbarContributor());

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/BasicThemeToolbarContributor.cs

@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
-using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Themes.Basic;
-using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic;
+using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Toolbars;
 
-namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server
+namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme
 {
     public class BasicThemeToolbarContributor : IToolbarContributor
     {

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeBundles.cs

@@ -1,4 +1,4 @@
-namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
+namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
 {
     public class BlazorBasicThemeBundles
     {

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeScriptContributor.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
-namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
+namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
 {
     public class BlazorBasicThemeScriptContributor : BundleContributor
     {

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeStyleContributor.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
-namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
+namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
 {
     public class BlazorBasicThemeStyleContributor : BundleContributor
     {

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor

@@ -1,4 +1,4 @@
-@namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Themes.Basic
+@namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic
 @using Volo.Abp.Users
 @using Volo.Abp.MultiTenancy
 @using Microsoft.Extensions.Localization

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 using Volo.Abp.UI.Navigation;
 
-namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Themes.Basic
+namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic
 {
     public partial class LoginDisplay : IDisposable
     {

framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj

@@ -5,12 +5,9 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(MicrosoftPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(MicrosoftPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
   </ItemGroup>
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs

@@ -15,8 +15,8 @@ using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
+using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
 using Volo.Abp.AspNetCore.Components.Server.Theming.Bundling;
-using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml

@@ -1,7 +1,7 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
+@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
 @using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
 @{
     Layout = null;
 }