From bdd63ac993ad8648fd1d65abc724983ee92087d7 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Thu, 18 Mar 2021 15:43:55 +0800
Subject: [PATCH] Improved

---
 .../AbpFeatureManagementBlazorServerModule.cs               | 2 +-
 ...le.cs => AbpFeatureManagementBlazorWebAssemblyModule.cs} | 5 +++--
 .../Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj    | 1 +
 .../AbpIdentityBlazorServerModule.cs                        | 2 ++
 .../Volo.Abp.Identity.Blazor.Server.csproj                  | 1 +
 .../AbpIdentityBlazorWebAssemblyModule.cs                   | 5 ++++-
 .../Volo.Abp.Identity.Blazor.WebAssembly.csproj             | 2 ++
 .../AbpPermissionManagementBlazorWebAssemblyModule.cs       | 3 ++-
 .../Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj | 1 +
 .../AbpSettingManagementBlazorWebAssemblyModule.cs          | 3 ++-
 .../Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj    | 1 +
 .../AbpTenantManagementBlazorServerModule.cs                | 6 ++++--
 .../Volo.Abp.TenantManagement.Blazor.Server.csproj          | 4 ++++
 .../AbpTenantManagementBlazorWebAssemblyModule.cs           | 6 ++++--
 .../Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj     | 6 +++++-
 .../MyProjectNameBlazorModule.cs                            | 1 +
 16 files changed, 38 insertions(+), 11 deletions(-)
 rename modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/{AbpTenantManagementBlazorWebAssemblyModule.cs => AbpFeatureManagementBlazorWebAssemblyModule.cs} (54%)

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs
index 7f996bca12..9ec85033d9 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs
@@ -7,7 +7,7 @@ namespace Volo.Abp.FeatureManagement.Blazor.Server
         typeof(AbpFeatureManagementBlazorModule),
         typeof(AbpAspNetCoreComponentsServerThemingModule)
         )]
-    public class AbpTenantManagementBlazorServerModule : AbpModule
+    public class AbpFeatureManagementBlazorServerModule : AbpModule
     {
 
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpFeatureManagementBlazorWebAssemblyModule.cs
similarity index 54%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpFeatureManagementBlazorWebAssemblyModule.cs
index c4f316aa9e..f091a8d2a4 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpFeatureManagementBlazorWebAssemblyModule.cs
@@ -5,9 +5,10 @@ namespace Volo.Abp.FeatureManagement.Blazor.WebAssembly
 {
     [DependsOn(
         typeof(AbpFeatureManagementBlazorModule),
-        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpFeatureManagementHttpApiClientModule)
     )]
-    public class AbpTenantManagementBlazorWebAssemblyModule : AbpModule
+    public class AbpFeatureManagementBlazorWebAssemblyModule : AbpModule
     {
     }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj
index 1a046fcf86..070323dab4 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj
@@ -9,6 +9,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+        <ProjectReference Include="..\Volo.Abp.FeatureManagement.HttpApi.Client\Volo.Abp.FeatureManagement.HttpApi.Client.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs
index f445dd8798..692551da55 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs
@@ -1,10 +1,12 @@
 using Volo.Abp.AspNetCore.Components.Server.Theming;
 using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.Blazor.Server;
 
 namespace Volo.Abp.Identity.Blazor.Server
 {
     [DependsOn(
         typeof(AbpIdentityBlazorModule),
+        typeof(AbpPermissionManagementBlazorServerModule),
         typeof(AbpAspNetCoreComponentsServerThemingModule)
     )]
     public class AbpIdentityBlazorServerModule : AbpModule
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj
index 916e12572a..301c4cc621 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj
@@ -13,6 +13,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj"/>
+        <ProjectReference Include="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Blazor.Server\Volo.Abp.PermissionManagement.Blazor.Server.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs
index d7d9ed2a44..a0f7f8af9e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs
@@ -1,11 +1,14 @@
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
 using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.Blazor.WebAssembly;
 
 namespace Volo.Abp.Identity.Blazor.WebAssembly
 {
     [DependsOn(
         typeof(AbpIdentityBlazorModule),
-        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
+        typeof(AbpPermissionManagementBlazorWebAssemblyModule),
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpIdentityHttpApiClientModule)
     )]
     public class AbpIdentityBlazorWebAssemblyModule : AbpModule
     {
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj
index b0e65de973..84609f6624 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj
@@ -9,10 +9,12 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+        <ProjectReference Include="..\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj" />
+        <ProjectReference Include="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Blazor.WebAssembly\Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs
index 3561907162..c6a95860bb 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs
@@ -5,7 +5,8 @@ namespace Volo.Abp.PermissionManagement.Blazor.WebAssembly
 {
     [DependsOn(
         typeof(AbpPermissionManagementBlazorModule),
-        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpPermissionManagementHttpApiClientModule)
     )]
     public class AbpPermissionManagementBlazorWebAssemblyModule : AbpModule
     {
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj
index 8329b1659e..d5d11790e7 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj
@@ -9,6 +9,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+        <ProjectReference Include="..\Volo.Abp.PermissionManagement.HttpApi.Client\Volo.Abp.PermissionManagement.HttpApi.Client.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs
index 7cc7a0ff35..a1b1ad08b5 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs
@@ -5,7 +5,8 @@ namespace Volo.Abp.SettingManagement.Blazor.WebAssembly
 {
     [DependsOn(
         typeof(AbpSettingManagementBlazorModule),
-        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpSettingManagementHttpApiClientModule)
     )]
     public class AbpSettingManagementBlazorWebAssemblyModule : AbpModule
     {
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj
index 15154e4dc8..eef535f9b2 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj
@@ -9,6 +9,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+        <ProjectReference Include="..\Volo.Abp.SettingManagement.HttpApi.Client\Volo.Abp.SettingManagement.HttpApi.Client.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs
index 120ac5e345..b2829df926 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs
@@ -1,14 +1,16 @@
 using Volo.Abp.AspNetCore.Components.Server.Theming;
+using Volo.Abp.FeatureManagement.Blazor.Server;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.TenantManagement.Blazor.Server
 {
     [DependsOn(
         typeof(AbpTenantManagementBlazorModule),
+        typeof(AbpFeatureManagementBlazorServerModule),
         typeof(AbpAspNetCoreComponentsServerThemingModule)
         )]
     public class AbpTenantManagementBlazorServerModule : AbpModule
     {
-        
+
     }
-}
\ No newline at end of file
+}
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj
index 9763fa5f65..1589f70c20 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj
@@ -11,6 +11,10 @@
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming\Volo.Abp.AspNetCore.Components.Server.Theming.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Blazor.Server\Volo.Abp.FeatureManagement.Blazor.Server.csproj" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\Volo.Abp.TenantManagement.Blazor\Volo.Abp.TenantManagement.Blazor.csproj" />
     </ItemGroup>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs
index 991682b211..4621fed18f 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs
@@ -1,15 +1,17 @@
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.FeatureManagement.Blazor.WebAssembly;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.TenantManagement.Blazor.WebAssembly
 {
     [DependsOn(
         typeof(AbpTenantManagementBlazorModule),
+        typeof(AbpFeatureManagementBlazorWebAssemblyModule),
         typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
         typeof(AbpTenantManagementHttpApiClientModule)
         )]
     public class AbpTenantManagementBlazorWebAssemblyModule : AbpModule
     {
-        
+
     }
-}
\ No newline at end of file
+}
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj
index 1a8ae8c68c..bda4c7dd15 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj
@@ -11,9 +11,13 @@
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Blazor.WebAssembly\Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\Volo.Abp.TenantManagement.Blazor\Volo.Abp.TenantManagement.Blazor.csproj" />
       <ProjectReference Include="..\Volo.Abp.TenantManagement.HttpApi.Client\Volo.Abp.TenantManagement.HttpApi.Client.csproj" />
     </ItemGroup>
-    
+
 </Project>
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 b7b1460f71..846c7c10d8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -15,6 +15,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
 using Volo.Abp.Identity.Blazor.WebAssembly;
+using Volo.Abp.SettingManagement.Blazor.WebAssembly;
 using Volo.Abp.TenantManagement.Blazor.WebAssembly;
 
 namespace MyCompanyName.MyProjectName.Blazor