Fix modules and template for blazor package changes.

modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AspNetCore.Components.UI.Theming;
+using Volo.Abp.AspNetCore.Components.Web.Theming;
-using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -8,7 +8,7 @@ using Volo.Abp.UI.Navigation;
 namespace Volo.Abp.Account.Blazor
 {
     [DependsOn(
-        typeof(AbpAspNetCoreComponentsUiThemingModule),
+        typeof(AbpAspNetCoreComponentsWebThemingModule),
         typeof(AbpAutoMapperModule),
         typeof(AbpAccountApplicationContractsModule)
         )]

modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
   </ItemGroup>
 

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs

@@ -1,11 +1,11 @@
-using Volo.Abp.AspNetCore.Components.UI.Theming;
+using Volo.Abp.AspNetCore.Components.Web.Theming;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.FeatureManagement.Blazor
 {
     [DependsOn(
-        typeof(AbpAspNetCoreComponentsUiThemingModule),
+        typeof(AbpAspNetCoreComponentsWebThemingModule),
         typeof(AbpAutoMapperModule),
         typeof(AbpFeatureManagementApplicationContractsModule)
     )]

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     </ItemGroup>
 

modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.BlazoriseUI;
 using Volo.Abp.Modularity;

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor

@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Volo.Abp.PermissionManagement.Blazor.Components
 @using Volo.Abp.Identity.Localization
-@using Volo.Abp.AspNetCore.Components.UI
+@using Volo.Abp.AspNetCore.Components.Web
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
 @inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -3,7 +3,6 @@
 @using Microsoft.AspNetCore.Authorization
 @using Volo.Abp.PermissionManagement.Blazor.Components
 @using Volo.Abp.Identity.Localization
-@using Volo.Abp.AspNetCore.Components.UI
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
 @inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>

modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor

@@ -1,5 +1,6 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Forms
+@using Volo.Abp.AspNetCore.Components.Web
 @using Volo.Abp.BlazoriseUI
 @using Volo.Abp.BlazoriseUI.Components
 @using Blazorise

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs

@@ -1,11 +1,11 @@
-using Volo.Abp.AspNetCore.Components.UI.Theming;
+using Volo.Abp.AspNetCore.Components.Web.Theming;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.PermissionManagement.Blazor
 {
     [DependsOn(
-        typeof(AbpAspNetCoreComponentsUiThemingModule),
+        typeof(AbpAspNetCoreComponentsWebThemingModule),
         typeof(AbpAutoMapperModule),
         typeof(AbpPermissionManagementApplicationContractsModule)
         )]

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
   </ItemGroup>
 

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor

@@ -1,5 +1,5 @@
 @using Microsoft.AspNetCore.Components.Web
-@using Volo.Abp.AspNetCore.Components.UI
+@using Volo.Abp.AspNetCore.Components.Web
 @using Volo.Abp.BlazoriseUI
 @using Blazorise
 @using Blazorise.DataGrid

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.SettingManagement.Blazor.Menus;
@@ -9,8 +10,9 @@ using Volo.Abp.UI.Navigation;
 namespace Volo.Abp.SettingManagement.Blazor
 {
     [DependsOn(
-        typeof(AbpSettingManagementDomainSharedModule),
         typeof(AbpAutoMapperModule),
+        typeof(AbpAspNetCoreComponentsWebThemingModule),
+        typeof(AbpSettingManagementDomainSharedModule),
         typeof(AbpSettingManagementHttpApiClientModule)
     )]
     public class AbpSettingManagementBlazorModule : AbpModule

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor

@@ -1,6 +1,4 @@
-@using Volo.Abp.Emailing
+@using Volo.Abp.SettingManagement.Localization
-@using Volo.Abp.SettingManagement.Localization
-@using Volo.Abp.AspNetCore.Components.UI
 @inject AbpBlazorMessageLocalizerHelper<AbpSettingManagementResource> LH
 
 @if (EmailSettings != null)

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj

@@ -10,11 +10,11 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
-        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
-        <ProjectReference Include="..\Volo.Abp.SettingManagement.HttpApi.Client\Volo.Abp.SettingManagement.HttpApi.Client.csproj" />
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.SettingManagement.HttpApi.Client\Volo.Abp.SettingManagement.HttpApi.Client.csproj" />
         <ProjectReference Include="..\Volo.Abp.SettingManagement.Domain.Shared\Volo.Abp.SettingManagement.Domain.Shared.csproj" />
     </ItemGroup>
 </Project>

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/_Imports.razor

@@ -1,7 +1,6 @@
 @using Microsoft.AspNetCore.Components.Web
-@using Volo.Abp.AspNetCore.Components.WebAssembly
 @using Volo.Abp.BlazoriseUI
 @using Volo.Abp.BlazoriseUI.Components
-@using Volo.Abp.AspNetCore.Components.UI
+@using Volo.Abp.AspNetCore.Components.Web
 @using Blazorise
 @using Blazorise.DataGrid

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.FeatureManagement.Blazor;
 using Volo.Abp.Modularity;

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor

@@ -4,7 +4,7 @@
 @using Volo.Abp.FeatureManagement.Blazor.Components
 @using Microsoft.AspNetCore.Components.Forms
 @using Volo.Abp.TenantManagement.Localization
-@using Volo.Abp.AspNetCore.Components.UI
+@using Volo.Abp.AspNetCore.Components.Web
 @inject AbpBlazorMessageLocalizerHelper<AbpTenantManagementResource> LH
 @inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
 

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/_Imports.razor

@@ -1,5 +1,6 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Forms
+@using Volo.Abp.AspNetCore.Components.Web
 @using Volo.Abp.BlazoriseUI
 @using Volo.Abp.BlazoriseUI.Components
 @using Blazorise

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

@@ -20,7 +20,7 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.JwtBearer\Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server\Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.IdentityServer\Volo.Abp.Account.Web.IdentityServer.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor\Volo.Abp.TenantManagement.Blazor.csproj" />

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.UI.BasicTheme.Server;
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server;
-using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI;
@@ -51,7 +51,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server
         typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
         typeof(AbpAspNetCoreSerilogModule), 
         typeof(AbpAccountWebIdentityServerModule),
-        typeof(AbpAspNetCoreComponentsUiBasicThemeServerModule),
+        typeof(AbpAspNetCoreComponentsWebBasicThemeServerModule),
         typeof(AbpIdentityBlazorModule),
         typeof(AbpTenantManagementBlazorModule)
        )]

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

@@ -1,6 +1,6 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
-@using Volo.Abp.AspNetCore.Components.UI.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @{
     Layout = null;

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

@@ -7,6 +7,8 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Blazor.Menus;
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.Autofac.WebAssembly;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Identity.Blazor;
@@ -14,8 +16,6 @@ using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement.Blazor;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
-using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic;
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.SettingManagement.Blazor;
 
 namespace MyCompanyName.MyProjectName.Blazor

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

@@ -6,7 +6,7 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
-@using Volo.Abp.AspNetCore.Components.UI.BasicTheme.WebAssembly
+@using Volo.Abp.AspNetCore.Components.Web
 @using MyCompanyName.MyProjectName.Blazor
 @using Blazorise
 @using Blazorise.DataGrid