From f59c7c802aa6741b7b9a7f6cf50316f11acf3f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 9 Mar 2021 11:37:49 +0300 Subject: [PATCH] Fix modules and template for blazor package changes. --- .../src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs | 6 +++--- .../Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj | 2 +- .../AbpFeatureManagementBlazorModule.cs | 4 ++-- .../Volo.Abp.FeatureManagement.Blazor.csproj | 2 +- .../src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs | 2 +- .../Pages/Identity/RoleManagement.razor | 2 +- .../Pages/Identity/UserManagement.razor | 1 - .../identity/src/Volo.Abp.Identity.Blazor/_Imports.razor | 1 + .../AbpPermissionManagementBlazorModule.cs | 4 ++-- .../Volo.Abp.PermissionManagement.Blazor.csproj | 2 +- .../src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor | 2 +- .../AbpSettingManagementBlazorModule.cs | 6 ++++-- .../EmailSettingGroup/EmailSettingGroupViewComponent.razor | 4 +--- .../Volo.Abp.SettingManagement.Blazor.csproj | 4 ++-- .../src/Volo.Abp.SettingManagement.Blazor/_Imports.razor | 3 +-- .../AbpTenantManagementBlazorModule.cs | 2 +- .../Pages/TenantManagement/TenantManagement.razor | 2 +- .../src/Volo.Abp.TenantManagement.Blazor/_Imports.razor | 1 + .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 2 +- .../MyProjectNameBlazorServerModule.cs | 6 +++--- .../Pages/_Host.cshtml | 2 +- .../MyProjectNameBlazorModule.cs | 4 ++-- .../src/MyCompanyName.MyProjectName.Blazor/_Imports.razor | 2 +- 23 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs index fb3e08edd5..16da0ed8bc 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs +++ b/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.UI.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.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) )] diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj index 3ffa5f1001..7b4f4ff43f 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj +++ b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj @@ -9,7 +9,7 @@ - + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs index a2b5e9211b..c392516d89 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs +++ b/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) )] diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj index d1127e10cf..a68182a0a9 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs index e973b91749..0a24c813f1 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs +++ b/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; diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index 0cf1ba52b4..dd13319a13 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/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 LH @inherits AbpCrudPageBase diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index e72d74ade4..30c4417238 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/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 LH @inherits AbpCrudPageBase diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor index 2d58420556..300e37310d 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor +++ b/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 diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs index bc8ef9249f..34dcbe72f9 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs +++ b/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) )] diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj index 8461450f59..bf9eb33f5c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor index 599cf99087..43b30f8498 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor +++ b/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 \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs index ebb9531a8a..041cfdbf70 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs +++ b/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 diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor index 860e0fb5ef..c95718fa14 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor +++ b/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.AspNetCore.Components.UI +@using Volo.Abp.SettingManagement.Localization @inject AbpBlazorMessageLocalizerHelper LH @if (EmailSettings != null) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj index 6f1960cbdd..a93b400ecf 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj @@ -10,11 +10,11 @@ - - + + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/_Imports.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/_Imports.razor index 7e18cbd016..2a9d865e48 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/_Imports.razor +++ b/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 \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs index 70ca17e388..d4f75668ce 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs +++ b/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; diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor index 42cd900ca3..7dfa03b7a4 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor +++ b/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 LH @inherits AbpCrudPageBase diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/_Imports.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/_Imports.razor index 2d58420556..300e37310d 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/_Imports.razor +++ b/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 diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 3a6d74d70e..db99105403 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -20,7 +20,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs index a3288a31bb..75aec42259 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs +++ b/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.UI.Theming.Routing; +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; 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) )] diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml index 3148df8b81..bab19f9001 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml +++ b/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; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index 4f94031fd0..5803abb4c9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/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 diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor index 466fa27dcf..7f81929799 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor +++ b/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