diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index e3e1ba9027..3a3572138f 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -337,6 +337,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.Cli
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Components.WebAssembly", "src\Volo.Abp.AspNetCore.Components.WebAssembly\Volo.Abp.AspNetCore.Components.WebAssembly.csproj", "{E1A62D10-F2FB-4040-BD60-11A3934058DF}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Blazorise", "src\Volo.Abp.Blazorise\Volo.Abp.Blazorise.csproj", "{D97028EB-A66C-4739-B5C8-1F035F7228E7}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -1003,6 +1005,10 @@ Global
{E1A62D10-F2FB-4040-BD60-11A3934058DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1A62D10-F2FB-4040-BD60-11A3934058DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E1A62D10-F2FB-4040-BD60-11A3934058DF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D97028EB-A66C-4739-B5C8-1F035F7228E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D97028EB-A66C-4739-B5C8-1F035F7228E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D97028EB-A66C-4739-B5C8-1F035F7228E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D97028EB-A66C-4739-B5C8-1F035F7228E7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1173,6 +1179,7 @@ Global
{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
{8A22D962-016E-474A-8BB7-F831F0ABF3AC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
{E1A62D10-F2FB-4040-BD60-11A3934058DF} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+ {D97028EB-A66C-4739-B5C8-1F035F7228E7} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/framework/src/Volo.Abp.Blazorise/FodyWeavers.xml b/framework/src/Volo.Abp.Blazorise/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/framework/src/Volo.Abp.Blazorise/FodyWeavers.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/framework/src/Volo.Abp.Blazorise/FodyWeavers.xsd b/framework/src/Volo.Abp.Blazorise/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.Blazorise/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.
+
+
+
+
+ A comma-separated list of error codes that can be safely ignored in assembly verification.
+
+
+
+
+ 'false' to turn off automatic generation of the XML Schema file.
+
+
+
+
+
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Blazorise/Volo.Abp.Blazorise.csproj b/framework/src/Volo.Abp.Blazorise/Volo.Abp.Blazorise.csproj
new file mode 100644
index 0000000000..f7875a0f4a
--- /dev/null
+++ b/framework/src/Volo.Abp.Blazorise/Volo.Abp.Blazorise.csproj
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ netstandard2.1
+ $(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/src/Volo.Abp.Blazorise/Volo/Abp/BlazoriseLib/AbpBlazoriseModule.cs b/framework/src/Volo.Abp.Blazorise/Volo/Abp/BlazoriseLib/AbpBlazoriseModule.cs
new file mode 100644
index 0000000000..f49d560b01
--- /dev/null
+++ b/framework/src/Volo.Abp.Blazorise/Volo/Abp/BlazoriseLib/AbpBlazoriseModule.cs
@@ -0,0 +1,23 @@
+using Blazorise;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.BlazoriseLib
+{
+ [DependsOn(
+ typeof(AbpAspNetCoreComponentsWebAssemblyModule)
+ )]
+ public class AbpBlazoriseModule : AbpModule
+ {
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ ConfigureBlazorise(context);
+ }
+
+ private void ConfigureBlazorise(ServiceConfigurationContext context)
+ {
+ context.Services
+ .AddBlazorise();
+ }
+ }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
index 7a74bc8673..85695062c6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
@@ -1,12 +1,13 @@
using Volo.Abp.Modularity;
+using Volo.Abp.BlazoriseLib;
namespace Volo.Abp.Identity.Blazor
{
[DependsOn(
- typeof(AbpIdentityHttpApiClientModule)
+ typeof(AbpIdentityHttpApiClientModule),
+ typeof(AbpBlazoriseModule)
)]
public class AbpIdentityBlazorModule : AbpModule
{
-
}
}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
similarity index 100%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/RoleManagement.razor
rename to modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/RoleManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
similarity index 97%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/RoleManagement.razor.cs
rename to modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
index ccece1f699..09c967ceb6 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/RoleManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
@@ -4,11 +4,10 @@ using System.Linq;
using System.Threading.Tasks;
using Blazorise;
using Blazorise.DataGrid;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
+using Volo.Abp.Application.Dtos;
-namespace MyCompanyName.MyProjectName.Blazor.Pages
+namespace Volo.Abp.Identity.Blazor.Pages.Identity
{
public partial class RoleManagement
{
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
index 85bbf1a77c..33f26edc57 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
@@ -1,20 +1,16 @@
-
+
- netstandard2.0
+ netstandard2.1
3.0
-
-
-
-
-
+
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
index 77285129da..1b2fa8ffc4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
@@ -1 +1,5 @@
@using Microsoft.AspNetCore.Components.Web
+@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using Volo.Abp.BlazoriseLib
+@using Blazorise
+@using Blazorise.DataGrid
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
index fd2c6b0047..a5dd40ec10 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -7,7 +7,6 @@
-