diff --git a/.gitignore b/.gitignore
index 1f14485237..5b47e32794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -303,4 +303,4 @@ modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Logs/
 /templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package-lock.json
 /templates/app/angular/package-lock.json
 /modules/client-simulation/demo/Volo.ClientSimulation.Demo/package-lock.json
-
+abp-build-config.json
diff --git a/docs/en/CLI-BuildCommand.md b/docs/en/CLI-BuildCommand.md
new file mode 100644
index 0000000000..d9620aa621
--- /dev/null
+++ b/docs/en/CLI-BuildCommand.md
@@ -0,0 +1,67 @@
+# Build Command
+
+Building a .NET project is hard when the project references a project reference outside of the solution or even from a different GIT repository. This command builds a GIT repository and it's depending repositories or a single .NET solution File. In order ```build``` command to work, its **executing directory** or passed ```--working-directory``` parameter's directory must contain one of;
+
+* A .NET solution file (*.sln)
+* abp-build-config.json
+
+When the executing directory  (or ```--working-directory``` parameter's directory) contains a .NET solution file, ```build``` command builds all the projects in the related solution file and all project references on building project files recursively. 
+
+When the executing directory  (or ```--working-directory``` parameter's directory) contains a ```abp-build-config.json```, ```build``` command builds all changed projects form its last build and all project references on building project files recursively. 
+
+# Build Command Config
+
+```abp-build-config.json``` contains properties below;
+
+* ```Name```: Name of the GIT repository. This can be friendly name of your GIT repository or any other unique string for the repository.
+* ```RootPath```: Root path of the repository which contains ```.git``` folder.
+* ```DependingRepositories```: Depending repository list of a repository. Each depending repository item contains same fields as a repository.
+* ```IgnoredDirectories```: Relative directory paths to ignore while building a GIT repository.
+
+A sample ```abp-build-config.json``` looks like for a Windows OS;
+
+````json
+{
+    "Name": "main-repository",
+    "RootPath": "D:\\GitHub\\main-repository",
+    "DependingRepositories": [{
+        "Name": "module-repository",
+        "RootPath": "D:\\GitHub\\module-repository"
+    }],
+    "IgnoredDirectories": [
+        "utils"
+    ]
+}
+````
+
+# Build Status
+
+ABP CLI stores a build status file for builds using the repository friendly names and current branch names in the;
+
+* ```%USERPROFILE%\.abp\build\``` for Windows.
+* ```$HOME/.abp/build/``` for Linux/macOS.
+
+and uses this file when building same repository next time and only builds affected projects and decreases the total build time. A sample build status file content looks like;
+
+````json
+{
+    "RepositoryName": "main-repository",
+    "BranchName": "dev",
+    "CommitId": "84ecde8ba275aeeb14d24a87ad46a1e941adf8ba",
+    "SucceedProjects": [{
+        "CsProjPath": "D:\\GitHub\\main-repository\\BookStore\\BookStore.Web.csproj",
+        "CommitId": "84ecde8ba275aeeb14d24a87ad46a1e941adf8ba"
+    }],
+    "DependingRepositories": [{
+        "RepositoryName": "module-repository",
+        "BranchName": "dev",
+        "CommitId": "0598b8e45af9507fc9ba8abf304e78fc7d434e04",
+        "SucceedProjects": [{
+            "CsProjPath": "D:\\GitHub\\module-repository\\identity-module\Identity\\Identity.Web.csproj",
+            "CommitId": "0598b8e45af9507fc9ba8abf304e78fc7d434e04"
+        }],
+        "DependingRepositories": []
+    }]
+}
+````
+
diff --git a/docs/en/CLI.md b/docs/en/CLI.md
index 36f3b8e105..dd3287ce12 100644
--- a/docs/en/CLI.md
+++ b/docs/en/CLI.md
@@ -31,6 +31,7 @@ Here, the list of all available commands before explaining their details:
 * **`update`**: Automatically updates all ABP related NuGet and NPM packages in a solution.
 * **`add-package`**: Adds an ABP package to a project.
 * **`add-module`**: Adds a [multi-package application module](https://docs.abp.io/en/abp/latest/Modules/Index) to a solution.
+* **`get-source`**: Downloads the source code of a module.
 * **`generate-proxy`**: Generates client side proxies to use HTTP API endpoints.
 * **`remove-proxy`**: Removes previously generated client side proxies.
 * **`switch-to-preview`**: Switches to the latest preview version of the ABP Framework.
@@ -39,6 +40,7 @@ Here, the list of all available commands before explaining their details:
 * **`translate`**: Simplifies to translate localization files when you have multiple JSON [localization](Localization.md) files in a source control repository.
 * **`login`**: Authenticates on your computer with your [abp.io](https://abp.io/) username and password.
 * **`logout`**: Logouts from your computer if you've authenticated before.
+* **`build`**: Builds a GIT repository and depending repositories or a single .NET solution.
 
 ### help
 
@@ -85,6 +87,8 @@ abp new Acme.BookStore
         * `--tiered`: Creates a tiered solution where Web and Http API layers are physically separated. If not specified, it creates a layered solution which is less complex and suitable for most scenarios.
       * `angular`: Angular. There are some additional options for this template:
         * `--separate-identity-server`: Separates the identity server application from the API host application. If not specified, you will have a single endpoint in the server side.
+      * `blazor`: Blazor. There are some additional options for this template:
+        * `--separate-identity-server`: Separates the identity server application from the API host application. If not specified, you will have a single endpoint in the server side.
       * `none`: Without UI. There are some additional options for this template:
         * `--separate-identity-server`: Separates the identity server application from the API host application. If not specified, you will have a single endpoint in the server side.
     * `--mobile` or `-m`: Specifies the mobile application framework. If not specified, no mobile application will be created. Available options:
@@ -178,6 +182,31 @@ abp add-module Volo.Blogging
 * `-sp` or `--startup-project`: Relative path to the project folder of the startup project. Default value is the current folder.
 * `--with-source-code`: Add source code of the module instead of NuGet/NPM packages.
 
+### get-source
+
+Downloads the source code of a module to your computer.
+
+Usage
+
+````bash
+abp get-source <module-name> [options]
+````
+
+Example:
+
+```bash
+abp get-source Volo.Blogging
+
+abp get-source Volo.Blogging --local-framework-ref --abp-path D:\GitHub\abp
+```
+
+#### Options
+
+* `--output-folder` or `-o`: Specifies the directory that source code will be downloaded in. If not specified, current directory is used.
+* `--version` or `-v`: Specifies the version of the  source code that will be downloaded. If not specified, latest version is used.
+* `--preview`: If no version option is specified, this option specifies if latest [preview version](Previews.md) will be used instead of latest stable version.
+* `-- local-framework-ref --abp-path`: Path of [ABP Framework GitHub repository](https://github.com/abpframework/abp) in your computer. This will be used for converting project references to your local system. If this is not specified, project references will be converted to NuGet references.
+
 ### generate-proxy
 
 Generates Angular service proxies for your HTTP APIs to make easy to consume your services from the client side. Your host (server) application must be up and running before running this command.
@@ -332,3 +361,31 @@ Logs you out by removing the session token from your computer.
 abp logout
 ```
 
+### build
+
+This command builds a GIT repository and it's depending repositories or a single .NET solution File. In order ```build``` command to work, its **executing directory** or passed ```--working-directory``` parameter's directory must contain one of;
+
+* A .NET solution file (*.sln)
+* abp-build-config.json (suggested to add this to .gitignore)
+
+Usage:
+
+````bash
+abp build [options]
+````
+
+Example:
+
+```
+abp build --build-name "prod" --dotnet-build-arguments "\"--no-dependencies\""
+```
+
+#### Options
+
+* ```--working-directory``` or ```-w```: Specifies the working directory. This option is useful when the command is executed outside of a GIT repository or when executing directory doesn't contain a .NET solution file.
+* ```--build-name``` or ```-n```: Specifies a name for the build. This option is useful when same repository is used for more than one different builds. 
+* ```--dotnet-build-arguments``` or ```-a```: Arguments to pass ```dotnet build``` when building project files.  This parameter must be passed like ```"\"{params}\""``` .
+* ```--force``` or ```-f```: Forces to build projects even they are not changed from the last successful build.
+
+For more details, see [build command documentation](CLI-BuildCommand.md).
+
diff --git a/docs/en/Data-Filtering.md b/docs/en/Data-Filtering.md
index 85f094b614..62021452bd 100644
--- a/docs/en/Data-Filtering.md
+++ b/docs/en/Data-Filtering.md
@@ -151,11 +151,21 @@ public class Book : AggregateRoot<Guid>, IIsActive
 
 ABP uses [EF Core's Global Query Filters](https://docs.microsoft.com/en-us/ef/core/querying/filters) system for the [EF Core Integration](Entity-Framework-Core.md). So, it is well integrated to EF Core and works as expected even if you directly work with `DbContext`.
 
-Best way to implement a custom filter is to override `CreateFilterExpression` method for your `DbContext`. Example:
+Best way to implement a custom filter is to override  `ShouldFilterEntity` and `CreateFilterExpression` method for your `DbContext`. Example:
 
 ````csharp
 protected bool IsActiveFilterEnabled => DataFilter?.IsEnabled<IIsActive>() ?? false;
 
+protected override bool ShouldFilterEntity<TEntity>(IMutableEntityType entityType)
+{
+    if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity)))
+    {
+        return true;
+    }
+
+    return base.ShouldFilterEntity<TEntity>(entityType);
+}
+
 protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntity>()
 {
     var expression = base.CreateFilterExpression<TEntity>();
@@ -174,7 +184,7 @@ protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntit
 ````
 
 * Added a `IsActiveFilterEnabled` property to check if `IIsActive` is enabled or not. It internally uses the `IDataFilter` service introduced before.
-* Overrided the `CreateFilterExpression` method, checked if given entity implements the `IIsActive` interface and combines the expressions if necessary.
+* Overrided the `ShouldFilterEntity` and `CreateFilterExpression` methods, checked if given entity implements the `IIsActive` interface and combines the expressions if necessary.
 
 ### MongoDB
 
diff --git a/docs/en/Modules/Identity.md b/docs/en/Modules/Identity.md
index b950658505..ac86b13564 100644
--- a/docs/en/Modules/Identity.md
+++ b/docs/en/Modules/Identity.md
@@ -4,3 +4,26 @@ Identity module is used to manage [organization units](Organization-Units.md), r
 
 See [the source code](https://github.com/abpframework/abp/tree/dev/modules/identity). Documentation will come soon...
 
+
+## Identity Security Log
+
+The security log can record some important operations or changes about your account. You can save the security log if needed.
+
+You can inject and use `IdentitySecurityLogManager` or `ISecurityLogManager` to write security logs. It will create a log object by default and fill in some common values, such as `CreationTime`, `ClientIpAddress`, `BrowserInfo`, `current user/tenant`, etc. Of course, you can override them.
+
+```cs
+await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
+{
+	Identity = "IdentityServer";
+	Action = "ChangePassword";
+});
+```
+
+Configure `AbpSecurityLogOptions` to provide the application name for the log or disable this feature. **Enabled** by default.
+
+```cs
+Configure<AbpSecurityLogOptions>(options =>
+{
+	options.ApplicationName = "AbpSecurityTest";
+});
+```
diff --git a/docs/en/UI/Angular/Service-Proxies.md b/docs/en/UI/Angular/Service-Proxies.md
index 4aaf12d0ca..7dfb2c052c 100644
--- a/docs/en/UI/Angular/Service-Proxies.md
+++ b/docs/en/UI/Angular/Service-Proxies.md
@@ -132,7 +132,7 @@ export class BookComponent implements OnInit {
 <select formControlName="genre">
   <option [ngValue]="null">Select a genre</option>
   <option *ngFor="let genre of genres" [ngValue]="genre.value">
-    {{ genre.key }}
+      {%{{{ genre.key }}}%}
   </option>
 </select>
 ```
diff --git a/docs/zh-Hans/CLI.md b/docs/zh-Hans/CLI.md
index 20afc1b50f..11f9964279 100644
--- a/docs/zh-Hans/CLI.md
+++ b/docs/zh-Hans/CLI.md
@@ -85,6 +85,8 @@ abp new Acme.BookStore
         * `--tiered`: 创建分层解决方案,Web和Http Api层在物理上是分开的.如果未指定会创建一个分层的解决方案,此解决方案没有那么复杂,适合大多数场景.
       * `angular`: Angular. 这个模板还有一些额外的选项:
         * `--separate-identity-server`: 将Identity Server应用程序与API host应用程序分开. 如果未指定,则服务器端将只有一个端点.
+      * `blazor`: Blazor. 这个模板还有一些额外的选项:
+        * `--separate-identity-server`: 将Identity Server应用程序与API host应用程序分开. 如果未指定,则服务器端将只有一个端点.
       * `none`: 无UI. 这个模板还有一些额外的选项:
         * `--separate-identity-server`: 将Identity Server应用程序与API host应用程序分开. 如果未指定,则服务器端将只有一个端点.
     * `--mobile` 或者 `-m`: 指定移动应用程序框架. 如果未指定,则不会创建任何移动应用程序,其他选项:
diff --git a/docs/zh-Hans/Data-Filtering.md b/docs/zh-Hans/Data-Filtering.md
index 548f70c80c..45adcb6b05 100644
--- a/docs/zh-Hans/Data-Filtering.md
+++ b/docs/zh-Hans/Data-Filtering.md
@@ -151,11 +151,21 @@ public class Book : AggregateRoot<Guid>, IIsActive
 
 ABP使用[EF Core的全局过滤](https://docs.microsoft.com/en-us/ef/core/querying/filters)系统用于[EF Core 集成](Entity-Framework-Core.md). 所以它很好的集成到EF Core中,即使你直接使用 `DbContext` 它也可以正常工作.
 
-实现自定义过滤的最佳方法是为重写你的 `DbContext` 的 `CreateFilterExpression` 方法. 示例:
+实现自定义过滤的最佳方法是为重写你的 `DbContext` 的 `ShouldFilterEntity` 和 `CreateFilterExpression` 方法. 示例:
 
 ````csharp
 protected bool IsActiveFilterEnabled => DataFilter?.IsEnabled<IIsActive>() ?? false;
 
+protected override bool ShouldFilterEntity<TEntity>(IMutableEntityType entityType)
+{
+    if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity)))
+    {
+        return true;
+    }
+
+    return base.ShouldFilterEntity<TEntity>(entityType);
+}
+
 protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntity>()
 {
     var expression = base.CreateFilterExpression<TEntity>();
@@ -174,7 +184,7 @@ protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntit
 ````
 
 * 添加 `IsActiveFilterEnabled` 属性用于检查是否启用了 `IIsActive` . 内部使用了之前介绍到的 `IDataFilter` 服务.
-* 重写 `CreateFilterExpression` 方法检查给定实体是否实现 `IIsActive` 接口,在必要时组合表达式.
+* 重写 `ShouldFilterEntity` 和 `CreateFilterExpression` 方法检查给定实体是否实现 `IIsActive` 接口,在必要时组合表达式.
 
 ### MongoDB
 
diff --git a/docs/zh-Hans/Modules/Identity.md b/docs/zh-Hans/Modules/Identity.md
index f396de00c1..5589fb367e 100644
--- a/docs/zh-Hans/Modules/Identity.md
+++ b/docs/zh-Hans/Modules/Identity.md
@@ -1,5 +1,28 @@
 # 身份管理模块
 
-身份模块基于Microsoft Identity 库用于管理[组织单元](Organization-Units.md), 角色, 用户和他们的权限.
+身份模块基于Microsoft Identity库用于管理[组织单元](Organization-Units.md), 角色, 用户和他们的权限.
 
-参阅 [源码](https://github.com/abpframework/abp/tree/dev/modules/identity). 文档很快会被完善.
\ No newline at end of file
+参阅 [源码](https://github.com/abpframework/abp/tree/dev/modules/identity). 文档很快会被完善.
+
+## Identity安全日志
+
+安全日志可以记录账户的一些重要的操作或者改动， 你可以在在一些功能中保存安全日志.
+
+你可以注入和使用 `IdentitySecurityLogManager` 或 `ISecurityLogManager` 来保存安全日志. 默认它会创建一个安全日志对象并填充常用的值. 如 `CreationTime`, `ClientIpAddress`, `BrowserInfo`, `current user/tenant`等等. 当然你可以自定义这些值.
+
+```cs
+await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
+{
+	Identity = "IdentityServer";
+	Action = "ChangePassword";
+});
+```
+
+通过配置 `AbpSecurityLogOptions` 来提供应用程序的名称或者禁用安全日志功能. 默认是**启用**状态.
+
+```cs
+Configure<AbpSecurityLogOptions>(options =>
+{
+	options.ApplicationName = "AbpSecurityTest";
+});
+```
diff --git a/docs/zh-Hans/Virtual-File-System.md b/docs/zh-Hans/Virtual-File-System.md
index 4fcf861000..59c1fcf1f2 100644
--- a/docs/zh-Hans/Virtual-File-System.md
+++ b/docs/zh-Hans/Virtual-File-System.md
@@ -1,6 +1,6 @@
 ## 虚拟文件系统
 
-虚拟文件系统使得管理物理上不存在于文件系统中(磁盘)的文件成为可能. 它主要用于将(js, css, image...)文件嵌入到程序集中, 并在运行时将它们象物理文件一样使用.
+虚拟文件系统使得管理物理上不存在于文件系统中(磁盘)的文件成为可能. 它主要用于将(js, css, image...)文件嵌入到程序集中, 并在运行时将它们像物理文件一样使用.
 
 ## 安装
 
@@ -27,13 +27,20 @@
 
 如果需要添加多个文件, 这样做会很乏味. 作为选择, 你可以直接编辑 **.csproj** 文件:
 
+````C#
+<ItemGroup>
+  <EmbeddedResource Include="MyResources\**\*.*" />
+  <Content Remove="MyResources\**\*.*" />
+</ItemGroup>
+````
+
+此配置以递归方式添加项目的 **MyResources** 文件夹下的所有文件(包括将来新添加的文件).
+
 如果文件名包含一些特殊字符,在项目/程序集中嵌入文件可能会导致问题. 为了克服这个限制;
 
 1. 将[Microsoft.Extensions.FileProviders.Embedded](https://www.nuget.org/packages/Microsoft.Extensions.FileProviders.Embedded) NuGet包添加到包含嵌入式资源的项目中.
 2. 添加 `<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>` 到 `.csproj` 文件的 `<PropertyConfig>...</PropertyConfig>` 部分中.
 
-此配置以递归方式添加项目的 **MyResources** 文件夹下的所有文件(包括将来新添加的文件).
-
 > 尽管这两个步骤是可选的,并且ABP无需这些配置即可工作,但强烈建议你这样做.
 
 ### 配置AbpVirtualFileSystemOptions
@@ -189,4 +196,4 @@ public class MyWebAppModule : AbpModule
 
 ### 物理文件
 
-物理文件总是覆盖虚拟文件. 这意味着如果你把一个文件放在 `/wwwroot/my-folder/my-file.css`,它将覆盖虚拟文件系统相同位置的文件.因此你需要知道在模块中定义的文件路径来覆盖它们.
\ No newline at end of file
+物理文件总是覆盖虚拟文件. 这意味着如果你把一个文件放在 `/wwwroot/my-folder/my-file.css`,它将覆盖虚拟文件系统相同位置的文件.因此你需要知道在模块中定义的文件路径来覆盖它们.
diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index aa0a3f1222..503b42c7e1 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -331,6 +331,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.GlobalFeatures", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.GlobalFeatures.Tests", "test\Volo.Abp.GlobalFeatures.Tests\Volo.Abp.GlobalFeatures.Tests.csproj", "{231F1581-AA21-44C3-BF27-51EB3AD5355C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Client.IdentityModel.WebAssembly", "src\Volo.Abp.Http.Client.IdentityModel.WebAssembly\Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj", "{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.Client.Common", "src\Volo.Abp.AspNetCore.Mvc.Client.Common\Volo.Abp.AspNetCore.Mvc.Client.Common.csproj", "{8A22D962-016E-474A-8BB7-F831F0ABF3AC}"
+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.BlazoriseUI", "src\Volo.Abp.BlazoriseUI\Volo.Abp.BlazoriseUI.csproj", "{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme", "src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj", "{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Components.WebAssembly.Theming", "src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj", "{29CA7471-4E3E-4E75-8B33-001DDF682F01}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Autofac.WebAssembly", "src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj", "{37F89B0B-1C6B-426F-A5EE-676D1956D9E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Authentication.OpenIdConnect", "src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj", "{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -985,6 +1001,38 @@ Global
 		{231F1581-AA21-44C3-BF27-51EB3AD5355C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{231F1581-AA21-44C3-BF27-51EB3AD5355C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{231F1581-AA21-44C3-BF27-51EB3AD5355C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A22D962-016E-474A-8BB7-F831F0ABF3AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A22D962-016E-474A-8BB7-F831F0ABF3AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A22D962-016E-474A-8BB7-F831F0ABF3AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A22D962-016E-474A-8BB7-F831F0ABF3AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1A62D10-F2FB-4040-BD60-11A3934058DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29CA7471-4E3E-4E75-8B33-001DDF682F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29CA7471-4E3E-4E75-8B33-001DDF682F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29CA7471-4E3E-4E75-8B33-001DDF682F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29CA7471-4E3E-4E75-8B33-001DDF682F01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37F89B0B-1C6B-426F-A5EE-676D1956D9E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37F89B0B-1C6B-426F-A5EE-676D1956D9E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37F89B0B-1C6B-426F-A5EE-676D1956D9E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37F89B0B-1C6B-426F-A5EE-676D1956D9E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1152,6 +1200,14 @@ Global
 		{C1D891B0-AE83-42CB-987D-425A2787DE78} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{04F44063-C952-403A-815F-EFB778BDA125} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{231F1581-AA21-44C3-BF27-51EB3AD5355C} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+		{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}
+		{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{29CA7471-4E3E-4E75-8B33-001DDF682F01} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{37F89B0B-1C6B-426F-A5EE-676D1956D9E9} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xml b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xsd b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs
new file mode 100644
index 0000000000..56886f679e
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth.Claims;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using Microsoft.Extensions.Options;
+using Volo.Abp.AspNetCore.MultiTenancy;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class AbpOpenIdConnectExtensions
+    {
+        public static AuthenticationBuilder AddAbpOpenIdConnect(this AuthenticationBuilder builder)
+            => builder.AddAbpOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, _ => { });
+
+        public static AuthenticationBuilder AddAbpOpenIdConnect(this AuthenticationBuilder builder, Action<OpenIdConnectOptions> configureOptions)
+            => builder.AddAbpOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, configureOptions);
+
+        public static AuthenticationBuilder AddAbpOpenIdConnect(this AuthenticationBuilder builder, string authenticationScheme, Action<OpenIdConnectOptions> configureOptions)
+            => builder.AddAbpOpenIdConnect(authenticationScheme, OpenIdConnectDefaults.DisplayName, configureOptions);
+
+        public static AuthenticationBuilder AddAbpOpenIdConnect(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action<OpenIdConnectOptions> configureOptions)
+        {
+            return builder.AddOpenIdConnect(authenticationScheme, displayName, options =>
+            {
+                options.ClaimActions.MapAbpClaimTypes();
+
+                options.Events = new OpenIdConnectEvents
+                {
+                    OnAuthorizationCodeReceived = receivedContext =>
+                    {
+                        var tenantKey = receivedContext.HttpContext.RequestServices
+                            .GetRequiredService<IOptionsSnapshot<AbpAspNetCoreMultiTenancyOptions>>().Value.TenantKey;
+
+                        if (receivedContext.HttpContext.Request != null &&
+                            receivedContext.Request.Cookies.ContainsKey(tenantKey))
+                        {
+                            receivedContext.TokenEndpointRequest.SetParameter(tenantKey,
+                                receivedContext.Request.Cookies[tenantKey]);
+                        }
+
+                        return Task.CompletedTask;
+                    }
+                };
+
+                configureOptions?.Invoke(options);
+            });
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj
new file mode 100644
index 0000000000..30f56491c5
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj" />
+      <ProjectReference Include="..\Volo.Abp.AspNetCore.Authentication.OAuth\Volo.Abp.AspNetCore.Authentication.OAuth.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs
new file mode 100644
index 0000000000..13a8fd5c04
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs
@@ -0,0 +1,14 @@
+using Volo.Abp.AspNetCore.Authentication.OAuth;
+using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.Authentication.OpenIdConnect
+{
+    [DependsOn(
+        typeof(AbpMultiTenancyModule),
+        typeof(AbpAspNetCoreAuthenticationOAuthModule))]
+    public class AbpAspNetCoreAuthenticationOpenIdConnectModule : AbpModule
+    {
+
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
new file mode 100644
index 0000000000..74c81ed72c
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
@@ -0,0 +1,20 @@
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
+{
+    [DependsOn(
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
+        )]
+    public class AbpAspNetCoreComponentsWebAssemblyBasicThemeModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AdditionalAssemblies.Add(typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule).Assembly);
+            });
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/FodyWeavers.xml b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/FodyWeavers.xsd b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Pages/Authentication.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Pages/Authentication.razor
new file mode 100644
index 0000000000..e237cea555
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Pages/Authentication.razor
@@ -0,0 +1,7 @@
+@page "/authentication/{action}"
+@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
+<RemoteAuthenticatorView Action="@Action" />
+
+@code{
+    [Parameter] public string Action { get; set; }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/App.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/App.razor
new file mode 100644
index 0000000000..b6bba50bab
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/App.razor
@@ -0,0 +1,27 @@
+@using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+@using Microsoft.Extensions.Options
+@inject IOptions<AbpRouterOptions> RouterOptions
+<CascadingAuthenticationState>
+    <Router AppAssembly="RouterOptions.Value.AppAssembly"
+            AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">
+        <Found Context="routeData">
+            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
+                <NotAuthorized>
+                    @if (!context.User.Identity.IsAuthenticated)
+                    {
+                        <RedirectToLogin />
+                    }
+                    else
+                    {
+                        <p>You are not authorized to access this resource.</p>
+                    }
+                </NotAuthorized>
+            </AuthorizeRouteView>
+        </Found>
+        <NotFound>
+            <LayoutView Layout="@typeof(MainLayout)">
+                <p>Sorry, there's nothing at this address.</p>
+            </LayoutView>
+        </NotFound>
+    </Router>
+</CascadingAuthenticationState>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
new file mode 100644
index 0000000000..8c7b348f7d
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
@@ -0,0 +1,65 @@
+@using Volo.Abp.Localization
+@using System.Globalization
+@using System.Collections.Immutable
+@inject ILanguageProvider LanguageProvider
+@inject IJSRuntime JsRuntime
+@if (_otherLanguages != null && _otherLanguages.Any())
+{
+    <Dropdown>
+        <DropdownToggle Color="Color.None">
+            @_currentLanguage.DisplayName
+        </DropdownToggle>
+        <DropdownMenu>
+            @foreach (var language in _otherLanguages)
+            {
+                <DropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</DropdownItem>
+            }
+        </DropdownMenu>
+    </Dropdown>
+}
+@code {
+    private IReadOnlyList<LanguageInfo> _otherLanguages;
+    private LanguageInfo _currentLanguage;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var selectedLanguageName = await JsRuntime.InvokeAsync<string>(
+            "localStorage.getItem",
+            "Abp.SelectedLanguage"
+            );
+
+        _otherLanguages = await LanguageProvider.GetLanguagesAsync();
+
+        if (!_otherLanguages.Any())
+        {
+            return;
+        }
+
+        if (!selectedLanguageName.IsNullOrWhiteSpace())
+        {
+            _currentLanguage = _otherLanguages.FirstOrDefault(l => l.UiCultureName == selectedLanguageName);
+        }
+
+        if (_currentLanguage == null)
+        {
+            _currentLanguage = _otherLanguages.FirstOrDefault(l => l.UiCultureName == CultureInfo.CurrentUICulture.Name);
+        }
+
+        if (_currentLanguage == null)
+        {
+            _currentLanguage = _otherLanguages.FirstOrDefault();
+        }
+
+        _otherLanguages = _otherLanguages.Where(l => l != _currentLanguage).ToImmutableList();
+    }
+
+    private async Task ChangeLanguageAsync(LanguageInfo language)
+    {
+        await JsRuntime.InvokeVoidAsync(
+            "localStorage.setItem",
+            "Abp.SelectedLanguage", language.UiCultureName
+            );
+
+        await JsRuntime.InvokeVoidAsync("location.reload");
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
new file mode 100644
index 0000000000..88a005d7bf
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
@@ -0,0 +1,41 @@
+@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
+@using Volo.Abp.Users
+@inject ICurrentUser CurrentUser
+@inject NavigationManager Navigation
+@inject SignOutSessionStateManager SignOutManager
+<AuthorizeView>
+    <Authorized>
+        <Dropdown>
+            <DropdownToggle Color="Color.None">
+                @CurrentUser.UserName
+            </DropdownToggle>
+            <DropdownMenu>
+                @if (Menu != null)
+                {
+                    @foreach (var menuItem in Menu.Items)
+                    {
+                        <DropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</DropdownItem>
+                    }
+                }
+                <Divider />
+                <DropdownItem Clicked="BeginSignOut">Logout</DropdownItem>
+            </DropdownMenu>
+        </Dropdown>
+    </Authorized>
+    <NotAuthorized>
+        <a class="nav-link" href="authentication/login">Log in</a>
+    </NotAuthorized>
+</AuthorizeView>
+@code{
+
+    private void NavigateTo(string uri)
+    {
+        Navigation.NavigateTo(uri);
+    }
+    
+    private async Task BeginSignOut()
+    {
+        await SignOutManager.SetSignOutState();
+        NavigateTo("authentication/logout");
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
new file mode 100644
index 0000000000..e0ad688513
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+{
+    public partial class LoginDisplay
+    {
+        [Inject] protected IMenuManager MenuManager { get; set; }
+
+        protected ApplicationMenu Menu { get; set; }
+
+        protected override async Task OnInitializedAsync()
+        {
+            Menu = await MenuManager.GetAsync(StandardMenus.User);
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
new file mode 100644
index 0000000000..af88212f0a
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
@@ -0,0 +1,29 @@
+@inherits LayoutComponentBase
+@using Volo.Abp.Ui.Branding
+@inject IBrandingProvider BrandingProvider
+<nav class="navbar navbar-expand-md navbar-dark bg-dark shadow-sm flex-column flex-md-row mb-4" id="main-navbar" style="min-height: 4rem;">
+    <div class="container">
+        <a class="navbar-brand" href="/">@BrandingProvider.AppName</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse"
+                data-target="#main-navbar-collapse" aria-controls="main-navbar-collapse"
+                aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="main-navbar-collapse">
+            <ul class="navbar-nav mx-auto">
+                <NavMenu/>
+            </ul>
+            <ul class="navbar-nav">
+                <li class="nav-item">
+                    <LanguageSwitch/>
+                </li>
+                <li class="nav-item">
+                    <LoginDisplay/>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="container">
+    @Body
+</div>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor
new file mode 100644
index 0000000000..e1ede1c0fd
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor
@@ -0,0 +1,7 @@
+@if (Menu != null)
+{
+    foreach (var menuItem in Menu.Items)
+    {
+        <NavMenuItem MenuItem="@menuItem" />
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs
new file mode 100644
index 0000000000..e47603e163
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+{
+    public partial class NavMenu
+    {
+        [Inject] protected IMenuManager MenuManager { get; set; }
+
+        protected ApplicationMenu Menu { get; set; }
+
+        private bool collapseNavMenu = true;
+
+        private string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+
+        protected override async Task OnInitializedAsync()
+        {
+            Menu = await MenuManager.GetAsync(StandardMenus.Main);
+        }
+
+        private void ToggleNavMenu()
+        {
+            collapseNavMenu = !collapseNavMenu;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor
new file mode 100644
index 0000000000..8194896f61
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor
@@ -0,0 +1,52 @@
+@using Volo.Abp.UI.Navigation
+@{
+    var elementId = MenuItem.ElementId ?? "MenuItem_" + MenuItem.Name.Replace(".", "_");
+    var cssClass = string.IsNullOrEmpty(MenuItem.CssClass) ? string.Empty : MenuItem.CssClass;
+    var url = string.IsNullOrEmpty(MenuItem.Url) ? "#" : MenuItem.Url;
+}
+@if (MenuItem.IsLeaf)
+{
+    if (MenuItem.Url != null)
+    {
+        <li class="nav-item @cssClass" disabled="@MenuItem.IsDisabled">
+            <NavLink class="nav-link" href="@url" id="@elementId">
+                @if (MenuItem.Icon != null)
+                {
+                    if (MenuItem.Icon.StartsWith("fa"))
+                    {
+                        <i class="@MenuItem.Icon"></i>
+                    }
+                }
+                @MenuItem.DisplayName
+            </NavLink>
+        </li>
+    }
+}
+else
+{
+    <li class="nav-item">
+        <div class="dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="@elementId" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                @if (MenuItem.Icon != null)
+                {
+                    if (MenuItem.Icon.StartsWith("fa"))
+                    {
+                        <i class="@MenuItem.Icon"></i>
+                    }
+                }
+                @MenuItem.DisplayName
+            </a>
+            <div class="dropdown-menu border-0 shadow-sm" aria-labelledby="@elementId">
+                @foreach (var childMenuItem in MenuItem.Items)
+                {
+                    <NavMenuItem MenuItem="@childMenuItem" />
+                }
+            </div>
+        </div>
+    </li>
+
+}
+@code {
+    [Parameter]
+    public ApplicationMenuItem MenuItem { get; set; }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/RedirectToLogin.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/RedirectToLogin.razor
new file mode 100644
index 0000000000..b535ae4216
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/RedirectToLogin.razor
@@ -0,0 +1,8 @@
+@inject NavigationManager Navigation
+@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
+@code {
+    protected override void OnInitialized()
+    {
+        Navigation.NavigateTo($"authentication/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
new file mode 100644
index 0000000000..f1ebc76453
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
@@ -0,0 +1,10 @@
+@using System.Net.Http
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.WebAssembly.Http
+@using Microsoft.JSInterop
+@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using Blazorise
+@using Blazorise.DataGrid
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj
new file mode 100644
index 0000000000..783af0b202
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <RazorLangVersion>3.0</RazorLangVersion>
+        <PackageId>Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme</PackageId>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/theme.css b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/theme.css
new file mode 100644
index 0000000000..fc47596044
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/theme.css
@@ -0,0 +1,105 @@
+
+#main-navbar-tools a.dropdown-toggle {
+    text-decoration: none;
+    color: #fff;
+}
+
+.navbar .dropdown-submenu {
+    position: relative;
+}
+.navbar .dropdown-menu {
+    margin: 0;
+    padding: 0;
+}
+    .navbar .dropdown-menu a {
+        font-size: .9em;
+        padding: 10px 15px;
+        display: block;
+        min-width: 210px;
+        text-align: left;
+        border-radius: 0.25rem;
+        min-height: 44px;
+    }
+.navbar .dropdown-submenu a::after {
+    transform: rotate(-90deg);
+    position: absolute;
+    right: 16px;
+    top: 18px;
+}
+.navbar .dropdown-submenu .dropdown-menu {
+    top: 0;
+    left: 100%;
+}
+
+.card-header .btn {
+    padding: 2px 6px;
+}
+.card-header h5 {
+    margin: 0;
+}
+.container > .card {
+    box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+}
+
+@media screen and (min-width: 768px) {
+    .navbar .dropdown:hover > .dropdown-menu {
+        display: block;
+    }
+
+    .navbar .dropdown-submenu:hover > .dropdown-menu {
+        display: block;
+    }
+}
+.input-validation-error {
+    border-color: #dc3545;
+}
+.field-validation-error {
+    font-size: 0.8em;
+}
+
+.dataTables_scrollBody {
+    min-height: 248px;
+}
+
+div.dataTables_wrapper div.dataTables_info {
+    padding-top: 11px;
+    white-space: nowrap;
+}
+
+div.dataTables_wrapper div.dataTables_length label {
+    padding-top: 10px;
+    margin-bottom: 0;
+}
+
+.rtl .dropdown-menu-right {
+    right: auto;
+    left: 0;
+}
+
+    .rtl .dropdown-menu-right a {
+        text-align: right;
+    }
+
+.rtl .navbar .dropdown-menu a {
+    text-align: right;
+}
+.rtl .navbar .dropdown-submenu .dropdown-menu {
+    top: 0;
+    left: auto;
+    right: 100%;
+}
+
+/* TEMP */
+
+.navbar-dark .navbar-nav .nav-link {
+    color: #000 !important;
+}
+
+.navbar-nav > .nav-item > .nav-link,
+.navbar-nav > .nav-item > .dropdown > .nav-link {
+    color: #fff !important;
+}
+
+.navbar-nav>.nav-item>div>button{
+    color:#fff;
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/theme.js b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/theme.js
new file mode 100644
index 0000000000..8a5b94c7c6
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/theme.js
@@ -0,0 +1,16 @@
+$(function () {
+    $('.dropdown-menu a.dropdown-toggle').on('click', function (e) {
+        if (!$(this).next().hasClass('show')) {
+            $(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
+        }
+
+        var $subMenu = $(this).next(".dropdown-menu");
+        $subMenu.toggleClass('show');
+
+        $(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function (e) {
+            $('.dropdown-submenu .show').removeClass("show");
+        });
+
+        return false;
+    });
+});
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/AbpAspNetCoreComponentsWebAssemblyThemingModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/AbpAspNetCoreComponentsWebAssemblyThemingModule.cs
new file mode 100644
index 0000000000..867e01467f
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/AbpAspNetCoreComponentsWebAssemblyThemingModule.cs
@@ -0,0 +1,17 @@
+using Volo.Abp.BlazoriseUI;
+using Volo.Abp.Http.Client.IdentityModel.WebAssembly;
+using Volo.Abp.Modularity;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
+{
+    [DependsOn(
+        typeof(AbpBlazoriseUIModule),
+        typeof(AbpHttpClientIdentityModelWebAssemblyModule),
+        typeof(AbpUiNavigationModule)
+    )]
+    public class AbpAspNetCoreComponentsWebAssemblyThemingModule : AbpModule
+    {
+
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xml b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xsd b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs
new file mode 100644
index 0000000000..107fc9b078
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs
@@ -0,0 +1,16 @@
+using System.Reflection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+{
+    public class AbpRouterOptions
+    {
+        public Assembly AppAssembly { get; set; }
+
+        public RouterAssemblyList AdditionalAssemblies { get; }
+
+        public AbpRouterOptions()
+        {
+            AdditionalAssemblies = new RouterAssemblyList();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs
new file mode 100644
index 0000000000..e7a4a49343
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+{
+    public class RouterAssemblyList : List<Assembly>
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj
new file mode 100644
index 0000000000..86902f7038
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <RazorLangVersion>3.0</RazorLangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.BlazoriseUI\Volo.Abp.BlazoriseUI.csproj" />
+        <ProjectReference Include="..\Volo.Abp.Http.Client.IdentityModel.WebAssembly\Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj" />
+        <ProjectReference Include="..\Volo.Abp.UI.Navigation\Volo.Abp.UI.Navigation.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xml b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xsd b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs
new file mode 100644
index 0000000000..865a6f0edc
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.AspNetCore.Mvc.Client;
+using Volo.Abp.Modularity;
+
+namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
+{
+    public static class AbpWebAssemblyHostBuilderExtensions
+    {
+        public static IAbpApplicationWithExternalServiceProvider AddApplication<TStartupModule>(
+            [NotNull] this WebAssemblyHostBuilder builder,
+            Action<AbpWebAssemblyApplicationCreationOptions> options)
+            where TStartupModule : IAbpModule
+        {
+            Check.NotNull(builder, nameof(builder));
+
+            builder.Services.AddSingleton<IConfiguration>(builder.Configuration);
+            builder.Services.AddSingleton(builder);
+
+            var application = builder.Services.AddApplication<TStartupModule>(opts =>
+            {
+                options?.Invoke(new AbpWebAssemblyApplicationCreationOptions(builder, opts));
+            });
+
+            return application;
+        }
+
+        public static async Task InitializeAsync(
+            [NotNull] this IAbpApplicationWithExternalServiceProvider application,
+            [NotNull] IServiceProvider serviceProvider)
+        {
+            Check.NotNull(application, nameof(application));
+            Check.NotNull(serviceProvider, nameof(serviceProvider));
+
+            application.Initialize(serviceProvider);
+
+            using (var scope = serviceProvider.CreateScope())
+            {
+                await scope.ServiceProvider
+                    .GetRequiredService<ICachedApplicationConfigurationClient>()
+                    .InitializeAsync();
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj
new file mode 100644
index 0000000000..89f2d08b49
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <AssemblyName>Volo.Abp.AspNetCore.Components.WebAssembly</AssemblyName>
+        <PackageId>Volo.Abp.AspNetCore.Components.WebAssembly</PackageId>
+        <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.Client.Common\Volo.Abp.AspNetCore.Mvc.Client.Common.csproj" />
+      <ProjectReference Include="..\Volo.Abp.UI\Volo.Abp.UI.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.6" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs
new file mode 100644
index 0000000000..db6109e55a
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs
@@ -0,0 +1,26 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Mvc.Client;
+using Volo.Abp.Http.Client;
+using Volo.Abp.Modularity;
+using Volo.Abp.UI;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    [DependsOn(
+        typeof(AbpAspNetCoreMvcClientCommonModule),
+        typeof(AbpUiModule)
+        )]
+    public class AbpAspNetCoreComponentsWebAssemblyModule : AbpModule
+    {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            PreConfigure<AbpHttpClientBuilderOptions>(options =>
+            {
+                options.ProxyClientBuildActions.Add((_, builder) =>
+                {
+                    builder.AddHttpMessageHandler<AbpBlazorClientHttpMessageHandler>();
+                });
+            });
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs
new file mode 100644
index 0000000000..7d59042806
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.JSInterop;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    public class AbpBlazorClientHttpMessageHandler : DelegatingHandler, ITransientDependency
+    {
+        private readonly IJSRuntime _jsRuntime;
+
+        public AbpBlazorClientHttpMessageHandler(IJSRuntime jsRuntime)
+        {
+            _jsRuntime = jsRuntime;
+        }
+
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            await SetLanguageAsync(request, cancellationToken);
+
+            return await base.SendAsync(request, cancellationToken);
+        }
+
+        private async Task SetLanguageAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var selectedLanguage = await _jsRuntime.InvokeAsync<string>(
+                "localStorage.getItem",
+                cancellationToken,
+                "Abp.SelectedLanguage"
+            );
+
+            if (!selectedLanguage.IsNullOrWhiteSpace())
+            {
+                request.Headers.AcceptLanguage.Clear();
+                request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(selectedLanguage));
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpWebAssemblyApplicationCreationOptions.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpWebAssemblyApplicationCreationOptions.cs
new file mode 100644
index 0000000000..54fdf7edb4
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpWebAssemblyApplicationCreationOptions.cs
@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    public class AbpWebAssemblyApplicationCreationOptions
+    {
+        public WebAssemblyHostBuilder HostBuilder { get; }
+
+        public AbpApplicationCreationOptions ApplicationCreationOptions { get; }
+
+        public AbpWebAssemblyApplicationCreationOptions(
+            WebAssemblyHostBuilder hostBuilder,
+            AbpApplicationCreationOptions applicationCreationOptions)
+        {
+            HostBuilder = hostBuilder;
+            ApplicationCreationOptions = applicationCreationOptions;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ApplicationConfigurationCache.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ApplicationConfigurationCache.cs
new file mode 100644
index 0000000000..df41c996b6
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ApplicationConfigurationCache.cs
@@ -0,0 +1,20 @@
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    public class ApplicationConfigurationCache : ISingletonDependency
+    {
+        protected ApplicationConfigurationDto Configuration { get; set; }
+
+        public virtual ApplicationConfigurationDto Get()
+        {
+            return Configuration;
+        }
+
+        internal void Set(ApplicationConfigurationDto configuration)
+        {
+            Configuration = configuration;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageService.cs
new file mode 100644
index 0000000000..2c834ddc87
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageService.cs
@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    public interface IUiMessageService
+    {
+        Task InfoAsync(string message, string title = null);
+        
+        Task SuccessAsync(string message, string title = null);
+        
+        Task WarnAsync(string message, string title = null);
+        
+        Task ErrorAsync(string message, string title = null);
+        
+        Task<bool> ConfirmAsync(string message, string title = null);
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageService.cs
new file mode 100644
index 0000000000..16fe041de4
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageService.cs
@@ -0,0 +1,42 @@
+using System.Threading.Tasks;
+using Microsoft.JSInterop;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    //TODO: Implement with sweetalert in a new package
+    public class UiMessageService : IUiMessageService, ITransientDependency
+    {
+        protected IJSRuntime JsRuntime { get; }
+
+        public UiMessageService(IJSRuntime jsRuntime)
+        {
+            JsRuntime = jsRuntime;
+        }
+
+        public async Task InfoAsync(string message, string title = null)
+        {
+            await JsRuntime.InvokeVoidAsync("alert", message);
+        }
+
+        public async Task SuccessAsync(string message, string title = null)
+        {
+            await JsRuntime.InvokeVoidAsync("alert", message);
+        }
+
+        public async Task WarnAsync(string message, string title = null)
+        {
+            await JsRuntime.InvokeVoidAsync("alert", message);
+        }
+        
+        public async Task ErrorAsync(string message, string title = null)
+        {
+            await JsRuntime.InvokeVoidAsync("alert", message);
+        }
+        
+        public async Task<bool> ConfirmAsync(string message, string title = null)
+        {
+            return await JsRuntime.InvokeAsync<bool>("confirm", message);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCachedApplicationConfigurationClient.cs
new file mode 100644
index 0000000000..e403a8cfe9
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCachedApplicationConfigurationClient.cs
@@ -0,0 +1,50 @@
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
+using Volo.Abp.AspNetCore.Mvc.Client;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.DynamicProxying;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    public class WebAssemblyCachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
+    {
+        protected IHttpClientProxy<IAbpApplicationConfigurationAppService> Proxy { get; }
+
+        protected ApplicationConfigurationCache Cache { get; }
+
+        public WebAssemblyCachedApplicationConfigurationClient(
+            IHttpClientProxy<IAbpApplicationConfigurationAppService> proxy,
+            ApplicationConfigurationCache cache)
+        {
+            Proxy = proxy;
+            Cache = cache;
+        }
+
+        public virtual async Task InitializeAsync()
+        {
+            Cache.Set(await Proxy.Service.GetAsync());
+        }
+
+        public virtual Task<ApplicationConfigurationDto> GetAsync()
+        {
+            return Task.FromResult(GetConfigurationByChecking());
+        }
+
+        public virtual ApplicationConfigurationDto Get()
+        {
+            return GetConfigurationByChecking();
+        }
+
+        private ApplicationConfigurationDto GetConfigurationByChecking()
+        {
+            var configuration = Cache.Get();
+            if (configuration == null)
+            {
+                throw new AbpException(
+                    $"{nameof(WebAssemblyCachedApplicationConfigurationClient)} should be initialized before using it.");
+            }
+
+            return configuration;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs
new file mode 100644
index 0000000000..3c252ebe5e
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using Volo.Abp.AspNetCore.Mvc.Client;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Security.Claims;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    public class WebAssemblyCurrentPrincipalAccessor : CurrentPrincipalAccessorBase, ITransientDependency
+    {
+        protected ICachedApplicationConfigurationClient ConfigurationClient { get; }
+
+        public WebAssemblyCurrentPrincipalAccessor(
+            ICachedApplicationConfigurationClient configurationClient)
+        {
+            ConfigurationClient = configurationClient;
+        }
+
+        protected override ClaimsPrincipal GetClaimsPrincipal()
+        {
+            var configuration = ConfigurationClient.Get();
+
+            var claims = new List<Claim>();
+
+            if (!configuration.CurrentUser.UserName.IsNullOrWhiteSpace())
+            {
+                claims.Add(new Claim(AbpClaimTypes.UserName,configuration.CurrentUser.UserName));
+            }
+
+            if (!configuration.CurrentUser.Email.IsNullOrWhiteSpace())
+            {
+                claims.Add(new Claim(AbpClaimTypes.Email,configuration.CurrentUser.Email));
+            }
+
+            if (configuration.CurrentUser.Id != null)
+            {
+                claims.Add(new Claim(AbpClaimTypes.UserId,configuration.CurrentUser.Id.ToString()));
+            }
+
+            if (configuration.CurrentUser.TenantId != null)
+            {
+                claims.Add(new Claim(AbpClaimTypes.TenantId,configuration.CurrentUser.TenantId.ToString()));
+            }
+            else if (configuration.CurrentTenant.Id != null)
+            {
+                claims.Add(new Claim(AbpClaimTypes.TenantId,configuration.CurrentTenant.Id.ToString()));
+            }
+
+            foreach (var role in configuration.CurrentUser.Roles)
+            {
+                claims.Add(new Claim(AbpClaimTypes.Role, role));
+            }
+
+            return new ClaimsPrincipal(new ClaimsIdentity(claims));
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyRemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyRemoteTenantStore.cs
new file mode 100644
index 0000000000..ebe170cfa8
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyRemoteTenantStore.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Mvc.MultiTenancy;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.DynamicProxying;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    public class WebAssemblyRemoteTenantStore : ITenantStore, ITransientDependency
+    {
+        protected IHttpClientProxy<IAbpTenantAppService> Proxy { get; }
+
+        public WebAssemblyRemoteTenantStore(
+            IHttpClientProxy<IAbpTenantAppService> proxy)
+        {
+            Proxy = proxy;
+        }
+
+        public async Task<TenantConfiguration> FindAsync(string name)
+        {
+            //TODO: Cache
+
+            return CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name));
+        }
+
+        public async Task<TenantConfiguration> FindAsync(Guid id)
+        {
+            //TODO: Cache
+
+            return CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id));
+        }
+
+        public TenantConfiguration Find(string name)
+        {
+            //TODO: Cache
+
+            return AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name)));
+        }
+
+        public TenantConfiguration Find(Guid id)
+        {
+            //TODO: Cache
+
+            return AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id)));
+        }
+
+        protected virtual TenantConfiguration CreateTenantConfiguration(FindTenantResultDto tenantResultDto)
+        {
+            if (!tenantResultDto.Success || tenantResultDto.TenantId == null)
+            {
+                return null;
+            }
+
+            return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name);
+        }
+
+        protected virtual string CreateCacheKey(string tenantName)
+        {
+            return $"RemoteTenantStore_Name_{tenantName}";
+        }
+
+        protected virtual string CreateCacheKey(Guid tenantId)
+        {
+            return $"RemoteTenantStore_Id_{tenantId:N}";
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs
index d757b2f5f8..1d0268556f 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs
@@ -5,7 +5,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     [DependsOn(
-        typeof(AbpMultiTenancyModule), 
+        typeof(AbpMultiTenancyModule),
         typeof(AbpAspNetCoreModule)
         )]
     public class AbpAspNetCoreMultiTenancyModule : AbpModule
@@ -15,6 +15,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
             Configure<AbpTenantResolveOptions>(options =>
             {
                 options.TenantResolvers.Add(new QueryStringTenantResolveContributor());
+                options.TenantResolvers.Add(new FormTenantResolveContributor());
                 options.TenantResolvers.Add(new RouteTenantResolveContributor());
                 options.TenantResolvers.Add(new HeaderTenantResolveContributor());
                 options.TenantResolvers.Add(new CookieTenantResolveContributor());
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/FormTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/FormTenantResolveContributor.cs
new file mode 100644
index 0000000000..5e70559f0c
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/FormTenantResolveContributor.cs
@@ -0,0 +1,23 @@
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public class FormTenantResolveContributor : HttpTenantResolveContributorBase
+    {
+        public const string ContributorName = "Form";
+
+        public override string Name => ContributorName;
+
+        protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext)
+        {
+            if (httpContext.Request == null || !httpContext.Request.Form.Any())
+            {
+                return null;
+            }
+
+            return httpContext.Request.Form[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey];
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/FodyWeavers.xml b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/FodyWeavers.xsd b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj
new file mode 100644
index 0000000000..dc672d842f
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <AssemblyName>Volo.Abp.AspNetCore.Mvc.Client.Common</AssemblyName>
+        <PackageId>Volo.Abp.AspNetCore.Mvc.Client.Common</PackageId>
+        <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.Contracts\Volo.Abp.AspNetCore.Mvc.Contracts.csproj" />
+        <ProjectReference Include="..\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
+        <ProjectReference Include="..\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
+        <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientCommonModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientCommonModule.cs
new file mode 100644
index 0000000000..de5e80ff64
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientCommonModule.cs
@@ -0,0 +1,33 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Caching;
+using Volo.Abp.Http.Client;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    [DependsOn(
+        typeof(AbpHttpClientModule),
+        typeof(AbpAspNetCoreMvcContractsModule),
+        typeof(AbpCachingModule),
+        typeof(AbpLocalizationModule)
+    )]
+    public class AbpAspNetCoreMvcClientCommonModule : AbpModule
+    {
+        public const string RemoteServiceName = "AbpMvcClient";
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddHttpClientProxies(
+                typeof(AbpAspNetCoreMvcContractsModule).Assembly,
+                RemoteServiceName,
+                asDefaultServices: false
+            );
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.GlobalContributors.Add<RemoteLocalizationContributor>();
+            });
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
similarity index 76%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
index 71d9d8cddf..d08ca7013e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
@@ -5,6 +5,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
 {
     public interface ICachedApplicationConfigurationClient
     {
+        Task InitializeAsync();
+
         Task<ApplicationConfigurationDto> GetAsync();
+
+        ApplicationConfigurationDto Get();
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
similarity index 100%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLanguageProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLanguageProvider.cs
similarity index 100%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLanguageProvider.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLanguageProvider.cs
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
similarity index 94%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
index d60256a501..f8502fce78 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
@@ -4,7 +4,6 @@ using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Localization;
-using Volo.Abp.Threading;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client
 {
@@ -55,7 +54,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
 
         private Dictionary<string, string> GetResourceOrNull()
         {
-            var applicationConfigurationDto = AsyncHelper.RunSync(() => _applicationConfigurationClient.GetAsync());
+            var applicationConfigurationDto = _applicationConfigurationClient.Get();
 
             var resource = applicationConfigurationDto
                 .Localization.Values
@@ -69,4 +68,4 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             return resource;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemotePermissionChecker.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemotePermissionChecker.cs
similarity index 100%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemotePermissionChecker.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemotePermissionChecker.cs
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs
similarity index 100%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
index 87641365b2..aa11e602a1 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
@@ -17,10 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.Contracts\Volo.Abp.AspNetCore.Mvc.Contracts.csproj" />
-    <ProjectReference Include="..\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
-    <ProjectReference Include="..\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
-    <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
+    <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.Client.Common\Volo.Abp.AspNetCore.Mvc.Client.Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
index 6c306073c5..1186b48ae7 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
@@ -1,33 +1,11 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Caching;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Localization;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client
 {
     [DependsOn(
-        typeof(AbpHttpClientModule),
-        typeof(AbpAspNetCoreMvcContractsModule),
-        typeof(AbpCachingModule),
-        typeof(AbpLocalizationModule)
+        typeof(AbpAspNetCoreMvcClientCommonModule)
         )]
     public class AbpAspNetCoreMvcClientModule : AbpModule
     {
-        public const string RemoteServiceName = "AbpMvcClient";
-
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            context.Services.AddHttpClientProxies(
-                typeof(AbpAspNetCoreMvcContractsModule).Assembly,
-                RemoteServiceName,
-                asDefaultServices: false
-            );
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.GlobalContributors.Add<RemoteLocalizationContributor>();
-            });
-        }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs
similarity index 76%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs
index 1fbb72bb3e..a357d959b2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs
@@ -12,14 +12,14 @@ using Volo.Abp.Users;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client
 {
-    public class CachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
+    public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
     {
         protected IHttpContextAccessor HttpContextAccessor { get; }
         protected IHttpClientProxy<IAbpApplicationConfigurationAppService> Proxy { get; }
         protected ICurrentUser CurrentUser { get; }
         protected IDistributedCache<ApplicationConfigurationDto> Cache { get; }
 
-        public CachedApplicationConfigurationClient(
+        public MvcCachedApplicationConfigurationClient(
             IDistributedCache<ApplicationConfigurationDto> cache,
             IHttpClientProxy<IAbpApplicationConfigurationAppService> proxy,
             ICurrentUser currentUser,
@@ -31,6 +31,11 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             Cache = cache;
         }
 
+        public async Task InitializeAsync()
+        {
+            await GetAsync();
+        }
+
         public async Task<ApplicationConfigurationDto> GetAsync()
         {
             var cacheKey = CreateCacheKey();
@@ -58,9 +63,22 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             return configuration;
         }
 
+        public ApplicationConfigurationDto Get()
+        {
+            var cacheKey = CreateCacheKey();
+            var httpContext = HttpContextAccessor?.HttpContext;
+
+            if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
+            {
+                return configuration;
+            }
+
+            return AsyncHelper.RunSync(GetAsync);
+        }
+
         protected virtual string CreateCacheKey()
         {
             return $"ApplicationConfiguration_{CurrentUser.Id?.ToString("N") ?? "Anonymous"}_{CultureInfo.CurrentUICulture.Name}";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs
similarity index 97%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs
index 236387823c..2b6a272d64 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs
@@ -11,13 +11,13 @@ using Volo.Abp.Threading;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client
 {
-    public class RemoteTenantStore : ITenantStore, ITransientDependency
+    public class MvcRemoteTenantStore : ITenantStore, ITransientDependency
     {
         protected IHttpClientProxy<IAbpTenantAppService> Proxy { get; }
         protected IHttpContextAccessor HttpContextAccessor { get; }
         protected IDistributedCache<TenantConfiguration> Cache { get; }
 
-        public RemoteTenantStore(
+        public MvcRemoteTenantStore(
             IHttpClientProxy<IAbpTenantAppService> proxy,
             IHttpContextAccessor httpContextAccessor,
             IDistributedCache<TenantConfiguration> cache)
@@ -120,7 +120,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             {
                 return tenantConfiguration;
             }
-            
+
             tenantConfiguration = Cache.GetOrAdd(
                 cacheKey,
                 () => AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id))),
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj
index a979cfa637..04b2e7ec59 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj
@@ -4,7 +4,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.Contracts</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.Contracts</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs
index 2599c317cf..4e1bdd133f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.AlertsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class AlertsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/AlertsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs
index bdc47336cd..727b613926 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.BadgesDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class BadgesDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BadgesDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs
index 2ba33feb54..b288653010 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.BordersDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class BordersDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BordersDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs
index e700acb667..0853f2b195 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.BreadcrumbsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class BreadcrumbsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs
index ff5b917d40..cb134673ac 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ButtonGroupsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class ButtonGroupsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs
index 9d7a2dd3f9..5cb6cf0779 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ButtonsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class ButtonsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ButtonsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs
index f192285f80..0dafa65c70 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.CardsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class CardsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CardsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs
index 8ef48c1da5..e57b840269 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.CarouselDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class CarouselDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CarouselDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs
index 28ccbcb447..44df03d3c4 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.CollapseDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class CollapseDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CollapseDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs
index 136ad70481..1eb9be8cf5 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.DropdownsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class DropdownsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DropdownsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs
index 3681eda627..e768536a9f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.DynamicFormsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class DynamicFormsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs
index 01c477ecb1..22bcde1e52 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.FormElementsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class FormElementsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/FormElementsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs
index 99f99186cd..e5e031afc0 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.GridsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class GridsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/GridsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs
index 9e0f89e325..3c48462650 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ListGroupsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class ListGroupsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ListGroupsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs
index 272ea4a480..e4c2ce2c5e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ModalsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class ModalsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ModalsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs
index e282f1b923..470857a845 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.NavbarsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class NavbarsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/NavbarsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs
index 5bc0363193..7149894f46 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.NavsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class NavsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/NavsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PaginatorDemo/PaginatorDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PaginatorDemo/PaginatorDemoViewComponent.cs
index 46b8cb2db1..92a0b19ead 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PaginatorDemo/PaginatorDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PaginatorDemo/PaginatorDemoViewComponent.cs
@@ -1,10 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.PaginatorDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class PaginatorDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/PaginatorDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs
index 6114918165..408676f63d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.PopoversDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class PopoversDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/PopoversDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs
index acaf9b4135..33f1e09e15 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ProgressBarsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class ProgressBarsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs
index e40ecae321..181a58f07f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.TablesDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class TablesDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TablesDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs
index 00f3b5c2c4..e001b5157d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.TabsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class TabsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TabsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs
index a23fede627..7d30f09a79 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs
@@ -1,9 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.TooltipsDemo
 {
-    [Widget]
+    [Widget(
+        StyleTypes = new []{ typeof(PrismjsStyleBundleContributor) },
+        ScriptTypes = new[]{ typeof(PrismjsScriptBundleContributor) }
+    )]
     public class TooltipsDemoViewComponent : AbpViewComponent
     {
         public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TooltipsDemo/Default.cshtml";
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
index 1f1f71b066..27fc4c4d13 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
@@ -78,7 +78,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             
             output.PostContent.AppendHtml($"<div class=\"tab-pane fade show active\" id=\"tag-helper-{tagHelperCodeBlockId}\" role=\"tabpanel\" aria-labelledby=\"tag-helper-tab-{tagHelperCodeBlockId}\">");
             output.PostContent.AppendHtml("<pre class=\"p-4\">");
-            output.PostContent.AppendHtml("<code>");
+            output.PostContent.AppendHtml("<code class=\"language-html\">");
             output.PostContent.Append(GetRawDemoSource());
             output.PostContent.AppendHtml("</code>");
             output.PostContent.AppendHtml("</pre>");
@@ -86,7 +86,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             
             output.PostContent.AppendHtml($"<div class=\"tab-pane fade\" id=\"bootstrap-{bootstrapCodeBlockId}\" role=\"tabpanel\" aria-labelledby=\"bootstrap-tab-{bootstrapCodeBlockId}\">");
             output.PostContent.AppendHtml("<pre class=\"p-4\">");
-            output.PostContent.AppendHtml("<code>");
+            output.PostContent.AppendHtml("<code class=\"language-html\">");
             output.PostContent.Append(content.GetContent());
             output.PostContent.AppendHtml("</code>");
             output.PostContent.AppendHtml("</pre>");
diff --git a/framework/src/Volo.Abp.Autofac.WebAssembly/FodyWeavers.xml b/framework/src/Volo.Abp.Autofac.WebAssembly/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/framework/src/Volo.Abp.Autofac.WebAssembly/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/framework/src/Volo.Abp.Autofac.WebAssembly/FodyWeavers.xsd b/framework/src/Volo.Abp.Autofac.WebAssembly/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.Autofac.WebAssembly/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Autofac.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyApplicationCreationOptionsAutofacExtensions.cs b/framework/src/Volo.Abp.Autofac.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyApplicationCreationOptionsAutofacExtensions.cs
new file mode 100644
index 0000000000..427ae3ddf6
--- /dev/null
+++ b/framework/src/Volo.Abp.Autofac.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyApplicationCreationOptionsAutofacExtensions.cs
@@ -0,0 +1,23 @@
+using System;
+using Autofac;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+
+namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
+{
+    public static class AbpWebAssemblyApplicationCreationOptionsAutofacExtensions
+    {
+        public static void UseAutofac(
+            [NotNull] this AbpWebAssemblyApplicationCreationOptions options,
+            [CanBeNull] Action<ContainerBuilder> configure = null)
+        {
+            options.HostBuilder.Services.AddAutofacServiceProviderFactory();
+            options.HostBuilder.ConfigureContainer(
+                options.HostBuilder.Services.GetSingletonInstance<IServiceProviderFactory<ContainerBuilder>>(),
+                configure
+            );
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj b/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj
new file mode 100644
index 0000000000..6d03439a85
--- /dev/null
+++ b/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Volo.Abp.AspNetCore.Components.WebAssembly\Volo.Abp.AspNetCore.Components.WebAssembly.csproj" />
+      <ProjectReference Include="..\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.Autofac.WebAssembly/Volo/Abp/Autofac/WebAssembly/AbpAutofacWebAssemblyModule.cs b/framework/src/Volo.Abp.Autofac.WebAssembly/Volo/Abp/Autofac/WebAssembly/AbpAutofacWebAssemblyModule.cs
new file mode 100644
index 0000000000..361d3daf85
--- /dev/null
+++ b/framework/src/Volo.Abp.Autofac.WebAssembly/Volo/Abp/Autofac/WebAssembly/AbpAutofacWebAssemblyModule.cs
@@ -0,0 +1,14 @@
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Autofac.WebAssembly
+{
+    [DependsOn(
+        typeof(AbpAutofacModule),
+        typeof(AbpAspNetCoreComponentsWebAssemblyModule)
+        )]
+    public class AbpAutofacWebAssemblyModule : AbpModule
+    {
+        
+    }
+}
diff --git a/framework/src/Volo.Abp.Autofac/Volo/Abp/AbpAutofacAbpApplicationCreationOptionsExtensions.cs b/framework/src/Volo.Abp.Autofac/Volo/Abp/AbpAutofacAbpApplicationCreationOptionsExtensions.cs
index f632c11495..56b91dea2d 100644
--- a/framework/src/Volo.Abp.Autofac/Volo/Abp/AbpAutofacAbpApplicationCreationOptionsExtensions.cs
+++ b/framework/src/Volo.Abp.Autofac/Volo/Abp/AbpAutofacAbpApplicationCreationOptionsExtensions.cs
@@ -8,9 +8,22 @@ namespace Volo.Abp
     {
         public static void UseAutofac(this AbpApplicationCreationOptions options)
         {
-            var builder = new ContainerBuilder();
-            options.Services.AddObjectAccessor(builder);
-            options.Services.AddSingleton((IServiceProviderFactory<ContainerBuilder>) new AbpAutofacServiceProviderFactory(builder));
+            options.Services.AddAutofacServiceProviderFactory();
+        }
+
+        public static AbpAutofacServiceProviderFactory AddAutofacServiceProviderFactory(this IServiceCollection services)
+        {
+            return services.AddAutofacServiceProviderFactory(new ContainerBuilder());
+        }
+
+        public static AbpAutofacServiceProviderFactory AddAutofacServiceProviderFactory(this IServiceCollection services, ContainerBuilder containerBuilder)
+        {
+            var factory = new AbpAutofacServiceProviderFactory(containerBuilder);
+
+            services.AddObjectAccessor(containerBuilder);
+            services.AddSingleton((IServiceProviderFactory<ContainerBuilder>) factory);
+
+            return factory;
         }
     }
 }
diff --git a/framework/src/Volo.Abp.BlazoriseUI/FodyWeavers.xml b/framework/src/Volo.Abp.BlazoriseUI/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/framework/src/Volo.Abp.BlazoriseUI/FodyWeavers.xsd b/framework/src/Volo.Abp.BlazoriseUI/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
new file mode 100644
index 0000000000..f7875a0f4a
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.AspNetCore.Components.WebAssembly\Volo.Abp.AspNetCore.Components.WebAssembly.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Blazorise" Version="0.9.1.2" />
+        <PackageReference Include="Blazorise.DataGrid" Version="0.9.1.2" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/AbpBlazoriseModule.cs b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/AbpBlazoriseModule.cs
new file mode 100644
index 0000000000..716f36b1ea
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/AbpBlazoriseModule.cs
@@ -0,0 +1,23 @@
+using Blazorise;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.BlazoriseUI
+{
+    [DependsOn(
+        typeof(AbpAspNetCoreComponentsWebAssemblyModule)
+        )]
+    public class AbpBlazoriseUIModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            ConfigureBlazorise(context);
+        }
+
+        private void ConfigureBlazorise(ServiceConfigurationContext context)
+        {
+            context.Services
+                .AddBlazorise();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
new file mode 100644
index 0000000000..5889737745
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
@@ -0,0 +1,235 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Blazorise;
+using Blazorise.DataGrid;
+using Localization.Resources.AbpUi;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.ObjectMapping;
+
+namespace Volo.Abp.BlazoriseUI
+{
+    public abstract class BlazoriseCrudPageBase<TAppService, TEntityDto, TKey>
+        : BlazoriseCrudPageBase<TAppService, TEntityDto, TKey, PagedAndSortedResultRequestDto>
+        where TAppService : ICrudAppService<TEntityDto, TKey>
+        where TEntityDto : IEntityDto<TKey>, new()
+    {
+
+    }
+
+    public abstract class BlazoriseCrudPageBase<TAppService, TEntityDto, TKey, TGetListInput>
+        : BlazoriseCrudPageBase<TAppService, TEntityDto, TKey, TGetListInput, TEntityDto>
+        where TAppService : ICrudAppService<TEntityDto, TKey, TGetListInput>
+        where TEntityDto : IEntityDto<TKey>, new()
+        where TGetListInput : new()
+    {
+
+    }
+
+    public abstract class BlazoriseCrudPageBase<TAppService, TEntityDto, TKey, TGetListInput, TCreateInput>
+        : BlazoriseCrudPageBase<TAppService, TEntityDto, TKey, TGetListInput, TCreateInput, TCreateInput>
+        where TAppService : ICrudAppService<TEntityDto, TKey, TGetListInput, TCreateInput>
+        where TEntityDto : IEntityDto<TKey>
+        where TCreateInput : new()
+        where TGetListInput : new()
+    {
+
+    }
+
+    public abstract class BlazoriseCrudPageBase<TAppService, TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        : BlazoriseCrudPageBase<TAppService, TEntityDto, TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        where TAppService : ICrudAppService<TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        where TEntityDto : IEntityDto<TKey>
+        where TCreateInput : new()
+        where TUpdateInput : new()
+        where TGetListInput : new()
+    {
+
+    }
+
+    public abstract class BlazoriseCrudPageBase<TAppService, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        : OwningComponentBase
+        where TAppService : ICrudAppService<TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        where TGetOutputDto : IEntityDto<TKey>
+        where TGetListOutputDto : IEntityDto<TKey>
+        where TCreateInput : new()
+        where TUpdateInput : new()
+        where TGetListInput : new()
+    {
+        [Inject] protected TAppService AppService { get; set; }
+        [Inject] protected IUiMessageService UiMessageService { get; set; }
+        [Inject] protected IStringLocalizer<AbpUiResource> UiLocalizer { get; set; }
+
+        protected virtual int PageSize { get; } = LimitedResultRequestDto.DefaultMaxResultCount;
+
+        protected int CurrentPage;
+        protected string CurrentSorting;
+        protected int? TotalCount;
+        protected IReadOnlyList<TGetListOutputDto> Entities = Array.Empty<TGetListOutputDto>();
+        protected TCreateInput NewEntity;
+        protected TKey EditingEntityId;
+        protected TUpdateInput EditingEntity;
+        protected Modal CreateModal;
+        protected Modal EditModal;
+
+        protected Type ObjectMapperContext { get; set; }
+
+        protected IObjectMapper ObjectMapper
+        {
+            get
+            {
+                if (_objectMapper != null)
+                {
+                    return _objectMapper;
+                }
+
+                if (ObjectMapperContext == null)
+                {
+                    return LazyGetRequiredService(ref _objectMapper);
+                }
+
+                return LazyGetRequiredService(
+                    typeof(IObjectMapper<>).MakeGenericType(ObjectMapperContext),
+                    ref _objectMapper
+                );
+            }
+        }
+
+        private IObjectMapper _objectMapper;
+
+        protected TService LazyGetRequiredService<TService>(ref TService reference)
+            => LazyGetRequiredService(typeof(TService), ref reference);
+
+        protected TRef LazyGetRequiredService<TRef>(Type serviceType, ref TRef reference)
+        {
+            if (reference == null)
+            {
+                reference = (TRef) ScopedServices.GetRequiredService(serviceType);
+            }
+
+            return reference;
+        }
+
+        protected BlazoriseCrudPageBase()
+        {
+            NewEntity = new TCreateInput();
+            EditingEntity = new TUpdateInput();
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await GetEntitiesAsync();
+        }
+
+        protected virtual async Task GetEntitiesAsync()
+        {
+            var input = await CreateGetListInputAsync();
+            var result = await AppService.GetListAsync(input);
+            Entities = result.Items;
+            TotalCount = (int?) result.TotalCount;
+        }
+
+        protected virtual Task<TGetListInput> CreateGetListInputAsync()
+        {
+            var input = new TGetListInput();
+
+            if (input is ISortedResultRequest sortedResultRequestInput)
+            {
+                sortedResultRequestInput.Sorting = CurrentSorting;
+            }
+
+            if (input is IPagedResultRequest pagedResultRequestInput)
+            {
+                pagedResultRequestInput.SkipCount = CurrentPage * PageSize;
+            }
+
+            if (input is ILimitedResultRequest limitedResultRequestInput)
+            {
+                limitedResultRequestInput.MaxResultCount = PageSize;
+            }
+
+            return Task.FromResult(input);
+        }
+
+        protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs<TGetListOutputDto> e)
+        {
+            CurrentSorting = e.Columns
+                .Where(c => c.Direction != SortDirection.None)
+                .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
+                .JoinAsString(",");
+            CurrentPage = e.Page - 1;
+
+            await GetEntitiesAsync();
+
+            StateHasChanged();
+        }
+
+        protected virtual Task OpenCreateModalAsync()
+        {
+            NewEntity = new TCreateInput();
+            CreateModal.Show();
+            return Task.CompletedTask;
+        }
+
+        protected virtual Task CloseCreateModalAsync()
+        {
+            CreateModal.Hide();
+            return Task.CompletedTask;
+        }
+
+        protected virtual async Task OpenEditModalAsync(TKey id)
+        {
+            var entityDto = await AppService.GetAsync(id);
+            EditingEntityId = id;
+            EditingEntity = MapToEditingEntity(entityDto);
+            EditModal.Show();
+        }
+
+        protected virtual TUpdateInput MapToEditingEntity(TGetOutputDto entityDto)
+        {
+            return ObjectMapper.Map<TGetOutputDto, TUpdateInput>(entityDto);
+        }
+
+        protected virtual Task CloseEditModalAsync()
+        {
+            EditModal.Hide();
+            return Task.CompletedTask;
+        }
+
+        protected virtual async Task CreateEntityAsync()
+        {
+            await AppService.CreateAsync(NewEntity);
+            await GetEntitiesAsync();
+            CreateModal.Hide();
+        }
+
+        protected virtual async Task UpdateEntityAsync()
+        {
+            await AppService.UpdateAsync(EditingEntityId, EditingEntity);
+            await GetEntitiesAsync();
+            EditModal.Hide();
+        }
+
+        protected virtual async Task DeleteEntityAsync(TGetListOutputDto entity)
+        {
+            if (!await UiMessageService.ConfirmAsync(GetDeleteConfirmationMessage(entity)))
+            {
+                return;
+            }
+
+            await AppService.DeleteAsync(entity.Id);
+            await GetEntitiesAsync();
+        }
+
+        protected virtual string GetDeleteConfirmationMessage(TGetListOutputDto entity)
+        {
+            return UiLocalizer["ItemWillBeDeletedMessage"];
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs
index b456d7abb6..cf8ff42973 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs
@@ -1,46 +1,51 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.BlobStoring.Aliyun
 {
     public class AliyunBlobNamingNormalizer : IBlobNamingNormalizer, ITransientDependency
     {
         /// <summary>
-        /// Container names can contain only letters, numbers, and the dash (-) character 
-        /// they can't start or end with the dash (-) character 
+        /// Container names can contain only letters, numbers, and the dash (-) character
+        /// they can't start or end with the dash (-) character
         /// Container names must be from 3 through 63 characters long
         /// </summary>
         public virtual string NormalizeContainerName(string containerName)
         {
-            // All letters in a container name must be lowercase.
-            containerName = containerName.ToLower();
+            using (CultureHelper.Use(CultureInfo.InvariantCulture))
+            {
+                // All letters in a container name must be lowercase.
+                containerName = containerName.ToLower();
 
-            // Container names can contain only letters, numbers, and the dash (-) character.
-            containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+                // Container names can contain only letters, numbers, and the dash (-) character.
+                containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
 
-            // Every dash (-) character must be immediately preceded and followed by a letter or number;
-            // consecutive dashes are not permitted in container names.
-            // Container names must start or end with a letter or number
-            containerName = Regex.Replace(containerName, "-{2,}", "-");
-            containerName = Regex.Replace(containerName, "^-", string.Empty);
-            containerName = Regex.Replace(containerName, "-$", string.Empty);
+                // Every dash (-) character must be immediately preceded and followed by a letter or number;
+                // consecutive dashes are not permitted in container names.
+                // Container names must start or end with a letter or number
+                containerName = Regex.Replace(containerName, "-{2,}", "-");
+                containerName = Regex.Replace(containerName, "^-", string.Empty);
+                containerName = Regex.Replace(containerName, "-$", string.Empty);
 
-            // Container names must be from 3 through 63 characters long.
-            if (containerName.Length < 3)
-            {
-                var length = containerName.Length;
-                for (var i = 0; i < 3 - length; i++)
+                // Container names must be from 3 through 63 characters long.
+                if (containerName.Length < 3)
                 {
-                    containerName += "0";
+                    var length = containerName.Length;
+                    for (var i = 0; i < 3 - length; i++)
+                    {
+                        containerName += "0";
+                    }
                 }
-            }
 
-            if (containerName.Length > 63)
-            {
-                containerName = containerName.Substring(0, 63);
-            }
+                if (containerName.Length > 63)
+                {
+                    containerName = containerName.Substring(0, 63);
+                }
 
-            return containerName;
+                return containerName;
+            }
         }
 
         public virtual string NormalizeBlobName(string blobName)
diff --git a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs
index cd8eca021e..3779f9ff70 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs
@@ -1,5 +1,7 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.BlobStoring.Aws
 {
@@ -10,35 +12,38 @@ namespace Volo.Abp.BlobStoring.Aws
         /// </summary>
         public virtual string NormalizeContainerName(string containerName)
         {
-            // All letters in a container name must be lowercase.
-            containerName = containerName.ToLower();
+            using (CultureHelper.Use(CultureInfo.InvariantCulture))
+            {
+                // All letters in a container name must be lowercase.
+                containerName = containerName.ToLower();
 
-            // Container names can contain only letters, numbers, and the dash (-) character.
-            containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+                // Container names can contain only letters, numbers, and the dash (-) character.
+                containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
 
-            // Every dash (-) character must be immediately preceded and followed by a letter or number;
-            // consecutive dashes are not permitted in container names.
-            // Container names must start or end with a letter or number
-            containerName = Regex.Replace(containerName, "-{2,}", "-");
-            containerName = Regex.Replace(containerName, "^-", string.Empty);
-            containerName = Regex.Replace(containerName, "-$", string.Empty);
+                // Every dash (-) character must be immediately preceded and followed by a letter or number;
+                // consecutive dashes are not permitted in container names.
+                // Container names must start or end with a letter or number
+                containerName = Regex.Replace(containerName, "-{2,}", "-");
+                containerName = Regex.Replace(containerName, "^-", string.Empty);
+                containerName = Regex.Replace(containerName, "-$", string.Empty);
 
-            // Container names must be from 3 through 63 characters long.
-            if (containerName.Length < 3)
-            {
-                var length = containerName.Length;
-                for (var i = 0; i < 3 - length; i++)
+                // Container names must be from 3 through 63 characters long.
+                if (containerName.Length < 3)
                 {
-                    containerName += "0";
+                    var length = containerName.Length;
+                    for (var i = 0; i < 3 - length; i++)
+                    {
+                        containerName += "0";
+                    }
                 }
-            }
 
-            if (containerName.Length > 63)
-            {
-                containerName = containerName.Substring(0, 63);
-            }
+                if (containerName.Length > 63)
+                {
+                    containerName = containerName.Substring(0, 63);
+                }
 
-            return containerName;
+                return containerName;
+            }
         }
 
         /// <summary>
diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs
index 43b479e08e..767a7b6fea 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs
@@ -1,5 +1,7 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.BlobStoring.Azure
 {
@@ -10,35 +12,38 @@ namespace Volo.Abp.BlobStoring.Azure
         /// </summary>
         public virtual string NormalizeContainerName(string containerName)
         {
-            // All letters in a container name must be lowercase.
-            containerName = containerName.ToLower();
+            using (CultureHelper.Use(CultureInfo.InvariantCulture))
+            {
+                // All letters in a container name must be lowercase.
+                containerName = containerName.ToLower();
 
-            // Container names can contain only letters, numbers, and the dash (-) character.
-            containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+                // Container names can contain only letters, numbers, and the dash (-) character.
+                containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
 
-            // Every dash (-) character must be immediately preceded and followed by a letter or number;
-            // consecutive dashes are not permitted in container names.
-            // Container names must start or end with a letter or number
-            containerName = Regex.Replace(containerName, "-{2,}", "-");
-            containerName = Regex.Replace(containerName, "^-", string.Empty);
-            containerName = Regex.Replace(containerName, "-$", string.Empty);
+                // Every dash (-) character must be immediately preceded and followed by a letter or number;
+                // consecutive dashes are not permitted in container names.
+                // Container names must start or end with a letter or number
+                containerName = Regex.Replace(containerName, "-{2,}", "-");
+                containerName = Regex.Replace(containerName, "^-", string.Empty);
+                containerName = Regex.Replace(containerName, "-$", string.Empty);
 
-            // Container names must be from 3 through 63 characters long.
-            if (containerName.Length < 3)
-            {
-                var length = containerName.Length;
-                for (var i = 0; i < 3 - length; i++)
+                // Container names must be from 3 through 63 characters long.
+                if (containerName.Length < 3)
                 {
-                    containerName += "0";
+                    var length = containerName.Length;
+                    for (var i = 0; i < 3 - length; i++)
+                    {
+                        containerName += "0";
+                    }
                 }
-            }
 
-            if (containerName.Length > 63)
-            {
-                containerName = containerName.Substring(0, 63);
-            }
+                if (containerName.Length > 63)
+                {
+                    containerName = containerName.Substring(0, 63);
+                }
 
-            return containerName;
+                return containerName;
+            }
         }
 
         /// <summary>
diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs
index f7d273dca7..94c19b07f8 100644
--- a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs
@@ -1,8 +1,10 @@
 using System;
+using System.Globalization;
 using System.Runtime;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.BlobStoring.FileSystem
 {
@@ -27,15 +29,18 @@ namespace Volo.Abp.BlobStoring.FileSystem
 
         protected virtual string Normalize(string fileName)
         {
-            var os = _iosPlatformProvider.GetCurrentOSPlatform();
-            if (os == OSPlatform.Windows)
+            using (CultureHelper.Use(CultureInfo.InvariantCulture))
             {
-                // A filename cannot contain any of the following characters: \ / : * ? " < > |
-                // In order to support the directory included in the blob name, remove / and \
-                fileName = Regex.Replace(fileName, "[:\\*\\?\"<>\\|]", string.Empty);
-            }
+                var os = _iosPlatformProvider.GetCurrentOSPlatform();
+                if (os == OSPlatform.Windows)
+                {
+                    // A filename cannot contain any of the following characters: \ / : * ? " < > |
+                    // In order to support the directory included in the blob name, remove / and \
+                    fileName = Regex.Replace(fileName, "[:\\*\\?\"<>\\|]", string.Empty);
+                }
 
-            return fileName;
+                return fileName;
+            }
         }
     }
 }
diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs
index d350910105..c4df24f91a 100644
--- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs
@@ -1,5 +1,7 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.BlobStoring.Minio
 {
@@ -10,35 +12,38 @@ namespace Volo.Abp.BlobStoring.Minio
         /// </summary>
         public virtual string NormalizeContainerName(string containerName)
         {
-            // All letters in a container name must be lowercase.
-            containerName = containerName.ToLower();
+            using (CultureHelper.Use(CultureInfo.InvariantCulture))
+            {
+                // All letters in a container name must be lowercase.
+                containerName = containerName.ToLower();
 
-            // Container names can contain only letters, numbers, and the dash (-) character.
-            containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+                // Container names can contain only letters, numbers, and the dash (-) character.
+                containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
 
-            // Every dash (-) character must be immediately preceded and followed by a letter or number;
-            // consecutive dashes are not permitted in container names.
-            // Container names must start or end with a letter or number
-            containerName = Regex.Replace(containerName, "-{2,}", "-");
-            containerName = Regex.Replace(containerName, "^-", string.Empty);
-            containerName = Regex.Replace(containerName, "-$", string.Empty);
+                // Every dash (-) character must be immediately preceded and followed by a letter or number;
+                // consecutive dashes are not permitted in container names.
+                // Container names must start or end with a letter or number
+                containerName = Regex.Replace(containerName, "-{2,}", "-");
+                containerName = Regex.Replace(containerName, "^-", string.Empty);
+                containerName = Regex.Replace(containerName, "-$", string.Empty);
 
-            // Container names must be from 3 through 63 characters long.
-            if (containerName.Length < 3)
-            {
-                var length = containerName.Length;
-                for (var i = 0; i < 3 - length; i++)
+                // Container names must be from 3 through 63 characters long.
+                if (containerName.Length < 3)
                 {
-                    containerName += "0";
+                    var length = containerName.Length;
+                    for (var i = 0; i < 3 - length; i++)
+                    {
+                        containerName += "0";
+                    }
                 }
-            }
 
-            if (containerName.Length > 63)
-            {
-                containerName = containerName.Substring(0, 63);
-            }
+                if (containerName.Length > 63)
+                {
+                    containerName = containerName.Substring(0, 63);
+                }
 
-            return containerName;
+                return containerName;
+            }
         }
 
         /// <summary>
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
index 40eecfd06a..2dfd66f4ab 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
+++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
@@ -22,6 +22,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
     <PackageReference Include="Polly" Version="7.2.1" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
+    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
index a79b52b4f2..29238a3e35 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
@@ -36,6 +36,7 @@ namespace Volo.Abp.Cli
                 options.Commands["switch-to-stable"] = typeof(SwitchToStableCommand);
                 options.Commands["switch-to-nightly"] = typeof(SwitchToNightlyCommand);
                 options.Commands["translate"] = typeof(TranslateCommand);
+                options.Commands["build"] = typeof(BuildCommand);
             });
         }
     }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildProjectListSorter.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildProjectListSorter.cs
new file mode 100644
index 0000000000..6df892b472
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildProjectListSorter.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class DefaultBuildProjectListSorter : IBuildProjectListSorter, ITransientDependency
+    {
+        public List<DotNetProjectInfo> SortByDependencies(
+            List<DotNetProjectInfo> source,
+            IEqualityComparer<DotNetProjectInfo> comparer = null)
+        {
+            /* See: http://www.codeproject.com/Articles/869059/Topological-sorting-in-Csharp
+             *      http://en.wikipedia.org/wiki/Topological_sorting
+             */
+
+            var sorted = new List<DotNetProjectInfo>();
+            var visited = new Dictionary<DotNetProjectInfo, bool>(comparer);
+
+            foreach (var item in source)
+            {
+                SortByDependenciesVisit(source, item, sorted, visited);
+            }
+
+            return sorted;
+        }
+
+        private void SortByDependenciesVisit(
+            List<DotNetProjectInfo> source,
+            DotNetProjectInfo item,
+            List<DotNetProjectInfo> sorted,
+            Dictionary<DotNetProjectInfo, bool> visited)
+        {
+            bool inProcess;
+            var alreadyVisited = visited.TryGetValue(item, out inProcess);
+
+            if (alreadyVisited)
+            {
+                if (inProcess)
+                {
+                    throw new ArgumentException("Cyclic dependency found! Item: " + item);
+                }
+            }
+            else
+            {
+                visited[item] = true;
+
+                var dependencies = item.Dependencies;
+                if (dependencies != null)
+                {
+                    foreach (var dependency in dependencies)
+                    {
+                        var dependencyItem = source.FirstOrDefault(e => e.CsProjPath == dependency.CsProjPath);
+                        if (dependencyItem != null)
+                        {
+                            SortByDependenciesVisit(source, dependencyItem, sorted, visited);
+                        }
+                    }
+                }
+
+                visited[item] = false;
+                sorted.Add(item);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildStatusGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildStatusGenerator.cs
new file mode 100644
index 0000000000..e57c6837c0
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildStatusGenerator.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using LibGit2Sharp;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class DefaultBuildStatusGenerator : IBuildStatusGenerator, ITransientDependency
+    {
+        private readonly IGitRepositoryHelper _gitRepositoryHelper;
+
+        public DefaultBuildStatusGenerator(IGitRepositoryHelper gitRepositoryHelper)
+        {
+            _gitRepositoryHelper = gitRepositoryHelper;
+        }
+
+        public GitRepositoryBuildStatus Generate(
+            DotNetProjectBuildConfig buildConfig,
+            List<DotNetProjectInfo> changedProjects,
+            List<string> buildSucceededProjects)
+        {
+            var lastCommitId = _gitRepositoryHelper.GetLastCommitId(buildConfig.GitRepository);
+            var repoFriendlyName = _gitRepositoryHelper.GetFriendlyName(buildConfig.GitRepository);
+
+            var status = new GitRepositoryBuildStatus(
+                buildConfig.GitRepository.Name,
+                repoFriendlyName
+            );
+
+            if (ShouldUpdateRepositoryCommitId(buildConfig, changedProjects, buildSucceededProjects))
+            {
+                status.CommitId = lastCommitId;
+            }
+
+            status.SucceedProjects = changedProjects.Where(p =>
+                    p.RepositoryName == buildConfig.GitRepository.Name &&
+                    buildSucceededProjects.Contains(p.CsProjPath)
+                )
+                .Select(e => new DotNetProjectBuildStatus
+                {
+                    CsProjPath = e.CsProjPath,
+                    CommitId = lastCommitId
+                }).ToList();
+
+            foreach (var dependingRepository in buildConfig.GitRepository.DependingRepositories)
+            {
+                GenerateBuildStatusInternal(
+                    buildConfig,
+                    dependingRepository,
+                    changedProjects,
+                    buildSucceededProjects,
+                    status
+                );
+            }
+
+            return status;
+        }
+
+        private bool ShouldUpdateRepositoryCommitId(
+            DotNetProjectBuildConfig buildConfig,
+            List<DotNetProjectInfo> changedProjects,
+            List<string> buildSucceededProjects)
+        {
+            if (!buildConfig.SlFilePath.IsNullOrEmpty())
+            {
+                return false;
+            }
+            
+            if (changedProjects.Count == 0 || buildSucceededProjects.Count == 0)
+            {
+                return false;
+            }
+            
+            return changedProjects.Count == buildSucceededProjects.Count;
+        }
+
+        private void GenerateBuildStatusInternal(
+            DotNetProjectBuildConfig buildConfig,
+            GitRepository gitRepository,
+            List<DotNetProjectInfo> changedProjects,
+            List<string> buildSucceededProjects,
+            GitRepositoryBuildStatus status)
+        {
+            var lastCommitId = _gitRepositoryHelper.GetLastCommitId(gitRepository);
+            var repoFriendlyName = _gitRepositoryHelper.GetFriendlyName(gitRepository);
+
+            var dependingRepositoryStatus = new GitRepositoryBuildStatus(
+                gitRepository.Name,
+                repoFriendlyName
+            );
+            
+            if (ShouldUpdateRepositoryCommitId(buildConfig, changedProjects, buildSucceededProjects))
+            {
+                dependingRepositoryStatus.CommitId = lastCommitId;
+            }
+
+            dependingRepositoryStatus.SucceedProjects = changedProjects.Where(p =>
+                    p.RepositoryName == gitRepository.Name &&
+                    buildSucceededProjects.Contains(p.CsProjPath)
+                )
+                .Select(e => new DotNetProjectBuildStatus()
+                {
+                    CsProjPath = e.CsProjPath,
+                    CommitId = lastCommitId
+                }).ToList();
+
+            foreach (var dependingRepository in gitRepository.DependingRepositories)
+            {
+                GenerateBuildStatusInternal(
+                    buildConfig,
+                    dependingRepository,
+                    changedProjects,
+                    buildSucceededProjects,
+                    dependingRepositoryStatus
+                );
+            }
+
+            status.DependingRepositories.Add(dependingRepositoryStatus);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs
new file mode 100644
index 0000000000..e866c425b5
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs
@@ -0,0 +1,352 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using LibGit2Sharp;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class DefaultChangedProjectFinder : IChangedProjectFinder, ITransientDependency
+    {
+        private readonly IRepositoryBuildStatusStore _repositoryBuildStatusStore;
+        private readonly IGitRepositoryHelper _gitRepositoryHelper;
+
+        private readonly IDotNetProjectDependencyFiller _dotNetProjectDependencyFiller;
+        private readonly IBuildProjectListSorter _buildProjectListSorter;
+
+        private readonly List<string> _changeDetectionFileExtensions = new List<string>
+        {
+            ".cs",
+            ".csproj",
+            ".cshtml"
+        };
+
+        public DefaultChangedProjectFinder(
+            IRepositoryBuildStatusStore repositoryBuildStatusStore,
+            IGitRepositoryHelper gitRepositoryHelper,
+            IDotNetProjectDependencyFiller dotNetProjectDependencyFiller,
+            IBuildProjectListSorter buildProjectListSorter)
+        {
+            _repositoryBuildStatusStore = repositoryBuildStatusStore;
+            _gitRepositoryHelper = gitRepositoryHelper;
+            _dotNetProjectDependencyFiller = dotNetProjectDependencyFiller;
+            _buildProjectListSorter = buildProjectListSorter;
+        }
+
+        public List<DotNetProjectInfo> Find(DotNetProjectBuildConfig buildConfig)
+        {
+            if (!buildConfig.SlFilePath.IsNullOrEmpty())
+            {
+                return FindBySlnFile(buildConfig);
+            }
+
+            return FindByRepository(buildConfig);
+        }
+
+        /// <summary>
+        /// Returns list of projects in a repository and its depending repositories sorted by dependencies
+        /// </summary>
+        /// <param name="buildConfig"></param>
+        /// <returns></returns>
+        private List<DotNetProjectInfo> FindAllProjects(DotNetProjectBuildConfig buildConfig)
+        {
+            var projects = new List<DotNetProjectInfo>();
+
+            AddProjectsOfRepository(buildConfig.GitRepository, projects);
+            
+            _dotNetProjectDependencyFiller.Fill(projects);
+            
+            var allSortedProjectList = _buildProjectListSorter.SortByDependencies(
+                projects,
+                new DotNetProjectInfoEqualityComparer()
+            );
+            
+            FilterIgnoredDirectories(allSortedProjectList, buildConfig.GitRepository);
+
+            return allSortedProjectList;
+        }
+
+        private void FilterIgnoredDirectories(List<DotNetProjectInfo> projects, GitRepository gitRepository)
+        {
+            foreach (var ignoredDirectory in gitRepository.IgnoredDirectories)
+            {
+                projects = projects.Where(e =>
+                        !e.CsProjPath.StartsWith(Path.Combine(gitRepository.RootPath, ignoredDirectory)))
+                    .ToList();
+            }
+
+            foreach (var dependingRepository in gitRepository.DependingRepositories)
+            {
+                FilterIgnoredDirectories(projects, dependingRepository);
+            }
+        }
+
+        private void AddProjectsOfRepository(GitRepository gitRepository, List<DotNetProjectInfo> projects)
+        {
+            var allCsProjFiles = Directory.GetFiles(
+                gitRepository.RootPath,
+                "*.csproj",
+                SearchOption.AllDirectories
+            ).ToList();
+
+            projects.AddRange(
+                allCsProjFiles.Select(csProjPath => new DotNetProjectInfo(gitRepository.Name, csProjPath, false))
+            );
+
+            foreach (var dependingRepository in gitRepository.DependingRepositories)
+            {
+                AddProjectsOfRepository(dependingRepository, projects);
+            }
+        }
+
+        private List<DotNetProjectInfo> FindByRepository(DotNetProjectBuildConfig buildConfig)
+        {
+            var gitRepositoryBuildStatus = _repositoryBuildStatusStore.Get(
+                buildConfig.BuildName,
+                buildConfig.GitRepository
+            );
+            
+            var allSortedProjectList = FindAllProjects(buildConfig);
+            
+            MarkProjectsForBuild(
+                buildConfig.GitRepository,
+                gitRepositoryBuildStatus,
+                buildConfig.ForceBuild,
+                allSortedProjectList
+            );
+
+            return allSortedProjectList.Where(e => e.ShouldBuild).ToList();
+        }
+
+        private void MarkProjectsForBuild(
+            GitRepository repository,
+            GitRepositoryBuildStatus repositoryBuildStatus,
+            bool forceBuild,
+            List<DotNetProjectInfo> allProjectList)
+        {
+            if (forceBuild || repositoryBuildStatus == null || repositoryBuildStatus.CommitId.IsNullOrEmpty())
+            {
+                // Mark all projects for build
+                allProjectList.ForEach(e => e.ShouldBuild = true);
+            }
+            else
+            {
+                MarkChangedProjectsForBuild(
+                    repository,
+                    repositoryBuildStatus,
+                    allProjectList
+                );
+            }
+
+            if (!repository.DependingRepositories.Any())
+            {
+                return;
+            }
+
+            foreach (var dependingRepository in repository.DependingRepositories)
+            {
+                var dependingRepositoryBuildStatus = repositoryBuildStatus?.GetChild(dependingRepository.Name);
+                MarkProjectsForBuild(
+                    dependingRepository,
+                    dependingRepositoryBuildStatus,
+                    forceBuild,
+                    allProjectList
+                );
+            }
+        }
+
+        private void MarkChangedProjectsForBuild(
+            GitRepository repository,
+            GitRepositoryBuildStatus status,
+            List<DotNetProjectInfo> allProjectList)
+        {
+            using (var repo = new Repository(string.Concat(repository.RootPath, @"\.git")))
+            {
+                var firstCommit = status.CommitId.IsNullOrEmpty()
+                    ? null
+                    : repo.Lookup<Commit>(status.CommitId);
+
+                var repoDifferences = repo.Diff.Compare<Patch>(firstCommit?.Tree, repo.Head.Tip.Tree);
+
+                var fileExtensionPredicate = PredicateBuilder.New<PatchEntryChanges>(true);
+
+                foreach (var changeDetectionFileExtension in _changeDetectionFileExtensions)
+                {
+                    fileExtensionPredicate = fileExtensionPredicate.Or(
+                        e => e.Path.EndsWith(changeDetectionFileExtension)
+                    );
+                }
+
+                var files = repoDifferences
+                    .Where(fileExtensionPredicate)
+                    .Where(e => e.Status != ChangeKind.Deleted)
+                    .Select(e => e)
+                    .ToList();
+
+                var affectedCsProjFiles = FindAffectedCsProjFiles(repository.RootPath, files);
+                var lastCommitId = _gitRepositoryHelper.GetLastCommitId(repository);
+
+                foreach (var file in affectedCsProjFiles)
+                {
+                    var csProjPath = Path.Combine(repository.RootPath, file);
+                    if (status.SucceedProjects.Any(p => p.CsProjPath == csProjPath && p.CommitId == lastCommitId))
+                    {
+                        continue;
+                    }
+
+                    // Filter ignored directories
+                    var isIgnored = repository.IgnoredDirectories.Any(ignoredDirectory =>
+                        csProjPath.StartsWith(Path.Combine(repository.RootPath, ignoredDirectory)));
+                    if (isIgnored)
+                    {
+                        continue;
+                    }
+
+                    allProjectList.MarkForBuild(repository.Name, csProjPath);
+                    AddDependingProjectsToList(repository.Name, csProjPath, allProjectList);
+                }
+            }
+        }
+
+        private List<DotNetProjectInfo> FindBySlnFile(DotNetProjectBuildConfig buildConfig)
+        {
+            var allProjectList = FindAllProjects(buildConfig);
+
+            var slFine = new FileInfo(buildConfig.SlFilePath);
+            var csProjFiles = slFine.Directory.GetFiles(
+                    "*.csproj",
+                    SearchOption.AllDirectories
+                ).Select(e => e.FullName)
+                .ToList();
+
+            foreach (var csProjFile in csProjFiles)
+            {
+                MarkDependantProjectsForBuild(buildConfig.GitRepository, csProjFile, allProjectList);
+            }
+
+            return _buildProjectListSorter.SortByDependencies(
+                allProjectList,
+                new DotNetProjectInfoEqualityComparer()
+            ).Where(e => e.ShouldBuild).ToList();
+        }
+
+        private void MarkDependantProjectsForBuild(
+            GitRepository gitRepository,
+            string csProjFilePath,
+            List<DotNetProjectInfo> allProjectList)
+        {
+            var repositoryName = gitRepository.FindRepositoryOf(csProjFilePath);
+            var project = new DotNetProjectInfo(repositoryName, csProjFilePath, true);
+
+            if (allProjectList.IsMarkedForBuild(repositoryName, csProjFilePath))
+            {
+                return;
+            }
+
+            allProjectList.MarkForBuild(project);
+            AddProjectDependencies(gitRepository, project, allProjectList);
+        }
+
+        private void AddProjectDependencies(
+            GitRepository gitRepository,
+            DotNetProjectInfo project,
+            List<DotNetProjectInfo> allProjectList)
+        {
+            var projectInfo = allProjectList.FirstOrDefault(e => e.CsProjPath == project.CsProjPath);
+            if (projectInfo == null)
+            {
+                return;
+            }
+
+            var dependencies = projectInfo.Dependencies;
+
+            foreach (var dependency in dependencies)
+            {
+                if (allProjectList.IsMarkedForBuild(dependency.RepositoryName, dependency.CsProjPath))
+                {
+                    continue;
+                }
+
+                allProjectList.MarkForBuild(dependency.RepositoryName, dependency.CsProjPath);
+
+                AddProjectDependencies(gitRepository, dependency, allProjectList);
+            }
+        }
+
+        private void AddDependingProjectsToList(
+            string repositoryName,
+            string csProjPath,
+            List<DotNetProjectInfo> allProjectList)
+        {
+            var dependingProjects = allProjectList.Where(
+                e => e.Dependencies.Any(d => d.RepositoryName == repositoryName && d.CsProjPath == csProjPath)
+            ).Select(e => new DotNetProjectInfo(e.RepositoryName, e.CsProjPath, true)).ToList();
+
+            if (!dependingProjects.Any())
+            {
+                return;
+            }
+
+            foreach (var dependingProject in dependingProjects)
+            {
+                if (allProjectList.IsMarkedForBuild(dependingProject))
+                {
+                    continue;
+                }
+
+                allProjectList.MarkForBuild(dependingProject);
+                AddDependingProjectsToList(dependingProject.RepositoryName, dependingProject.CsProjPath,
+                    allProjectList);
+            }
+        }
+
+        private List<string> FindAffectedCsProjFiles(string repositoryPath, List<PatchEntryChanges> files)
+        {
+            var affectedProjectFiles = new List<string>();
+            foreach (var file in files)
+            {
+                var filePath = Path.Combine(repositoryPath, file.Path);
+                if (filePath.EndsWith(".csproj"))
+                {
+                    affectedProjectFiles.Add(filePath);
+                }
+
+                if (!filePath.EndsWith(".cs"))
+                {
+                    continue;
+                }
+
+                var classFile = new FileInfo(filePath);
+                var csProjPath = FindBelongingProjectPathOfClass(classFile.Directory?.FullName);
+                if (csProjPath.IsNullOrEmpty() || affectedProjectFiles.Contains(csProjPath))
+                {
+                    continue;
+                }
+
+                affectedProjectFiles.Add(csProjPath);
+            }
+
+            return affectedProjectFiles;
+        }
+
+        private string FindBelongingProjectPathOfClass(string directoryPath)
+        {
+            var files = Directory.GetFiles(directoryPath, "*.csproj", SearchOption.TopDirectoryOnly);
+            if (files.Length == 1)
+            {
+                return files.First();
+            }
+
+            var directoryInfo = new DirectoryInfo(directoryPath);
+
+            if (directoryInfo.Parent == null)
+            {
+                return null;
+            }
+
+            return FindBelongingProjectPathOfClass(directoryInfo.Parent.FullName);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultDotNetProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultDotNetProjectBuilder.cs
new file mode 100644
index 0000000000..65749fd45c
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultDotNetProjectBuilder.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using Volo.Abp.Cli.Utils;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class DefaultDotNetProjectBuilder : IDotNetProjectBuilder, ITransientDependency
+    {
+        public List<string> Build(List<DotNetProjectInfo> projects, string arguments)
+        {
+            var builtProjects = new ConcurrentBag<string>();
+            var totalProjectCountToBuild = projects.Count;
+            var buildingProjectIndex = 0;
+
+            try
+            {
+                foreach (var project in projects)
+                {
+                    if (builtProjects.Contains(project.CsProjPath))
+                    {
+                        continue;
+                    }
+
+                    buildingProjectIndex++;
+
+                    Console.WriteLine(
+                        "Building....: " + " (" + buildingProjectIndex + "/" +
+                        totalProjectCountToBuild + ")" + project.CsProjPath
+                    );
+
+                    BuildInternal(project, arguments, builtProjects);
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+
+            return builtProjects.ToList();
+        }
+
+        private void BuildInternal(DotNetProjectInfo project, string arguments, ConcurrentBag<string> builtProjects)
+        {
+            var buildArguments = arguments.TrimStart('"').TrimEnd('"');
+            Console.WriteLine("Executing...: dotnet build " + project.CsProjPath + " " + buildArguments);
+
+            var output = CmdHelper.RunCmdAndGetOutput(
+                "dotnet build " + project.CsProjPath + " " + buildArguments,
+                out int buildStatus
+            );
+
+            if (buildStatus == 0)
+            {
+                builtProjects.Add(project.CsProjPath);
+                WriteOutput(output, ConsoleColor.Green);
+            }
+            else
+            {
+                WriteOutput(output, ConsoleColor.Red);
+                Console.WriteLine("Build failed for :" + project.CsProjPath);
+                throw new Exception("Build failed!");
+            }
+        }
+
+        private void WriteOutput(string text, ConsoleColor color)
+        {
+            var currentConsoleColor = Console.ForegroundColor;
+            Console.ForegroundColor = color;
+            Console.WriteLine(text);
+            Console.ForegroundColor = currentConsoleColor;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectBuildConfig.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectBuildConfig.cs
new file mode 100644
index 0000000000..9a9da0766a
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectBuildConfig.cs
@@ -0,0 +1,13 @@
+namespace Volo.Abp.Cli.Build
+{
+    public class DotNetProjectBuildConfig
+    {
+        public string BuildName { get; set; }
+        
+        public string SlFilePath { get; set; }
+        
+        public GitRepository GitRepository { get; set; }
+        
+        public bool ForceBuild { get; set; }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectBuildStatus.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectBuildStatus.cs
new file mode 100644
index 0000000000..10092777c2
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectBuildStatus.cs
@@ -0,0 +1,9 @@
+namespace Volo.Abp.Cli.Build
+{
+    public class DotNetProjectBuildStatus
+    {
+        public string CsProjPath { get; set; }
+
+        public string CommitId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectDependencyFiller.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectDependencyFiller.cs
new file mode 100644
index 0000000000..b9c883a45d
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectDependencyFiller.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class DotNetProjectDependencyFiller : IDotNetProjectDependencyFiller, ITransientDependency
+    {
+        public void Fill(List<DotNetProjectInfo> projects)
+        {
+            foreach (var project in projects)
+            {
+                FillProjectDependencies(project);
+            }
+        }
+
+        private void FillProjectDependencies(DotNetProjectInfo project)
+        {
+            var projectNode = XElement.Load(project.CsProjPath);
+            var referenceNodes = projectNode.Descendants("ItemGroup").Descendants("ProjectReference");
+
+            foreach (var referenceNode in referenceNodes)
+            {
+                if (referenceNode.Attribute("Include") == null)
+                {
+                    continue;
+                }
+
+                var relativePath = referenceNode.Attribute("Include").Value;
+                var file = new FileInfo(project.CsProjPath);
+                var referenceProjectInfo = new FileInfo(Path.Combine(file.Directory.FullName, relativePath));
+
+                var referenceProject = new DotNetProjectInfo(project.RepositoryName, referenceProjectInfo.FullName, false);
+                project.Dependencies.Add(referenceProject);
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfo.cs
new file mode 100644
index 0000000000..3a8fe825ca
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfo.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    [Serializable]
+    public class DotNetProjectInfo
+    {
+        public string RepositoryName { get; set; }
+
+        public string CsProjPath { get; set; }
+        
+        public bool ShouldBuild { get; set; }
+
+        public List<DotNetProjectInfo> Dependencies { get; set; }
+
+        public DotNetProjectInfo(string repositoryName, string csProjPath, bool shouldBuild)
+        {
+            RepositoryName = repositoryName;
+            CsProjPath = csProjPath;
+            ShouldBuild = shouldBuild;
+            Dependencies = new List<DotNetProjectInfo>();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoEqualityComparer.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoEqualityComparer.cs
new file mode 100644
index 0000000000..c6f8e5dd53
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoEqualityComparer.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class DotNetProjectInfoEqualityComparer : EqualityComparer<DotNetProjectInfo>
+    {
+        public override bool Equals(DotNetProjectInfo x, DotNetProjectInfo y)
+        {
+            return (x == null && y == null) || (x != null && y != null && x.CsProjPath == y.CsProjPath);
+        }
+
+        public override int GetHashCode(DotNetProjectInfo obj)
+        {
+            return obj == null ? 0 : obj.CsProjPath.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoExtensions.cs
new file mode 100644
index 0000000000..ace85e5257
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoExtensions.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Volo.Abp.Cli.Build
+{
+    public static class DotNetProjectInfoExtensions
+    {
+        public static void MarkForBuild(this List<DotNetProjectInfo> projects, string repositoryName, string csProjPath)
+        {
+            var project = projects.FirstOrDefault(e =>
+                e.RepositoryName == repositoryName && e.CsProjPath == csProjPath
+            );
+
+            if (project == null)
+            {
+                return;
+            }
+
+            project.ShouldBuild = true;
+        }
+
+        public static void MarkForBuild(this List<DotNetProjectInfo> projects, DotNetProjectInfo project)
+        {
+            projects.MarkForBuild(project.RepositoryName, project.CsProjPath);
+        }
+
+        public static bool IsMarkedForBuild(this List<DotNetProjectInfo> projects, string repositoryName,
+            string csProjPath)
+        {
+            var project = projects.FirstOrDefault(e =>
+                e.RepositoryName == repositoryName && e.CsProjPath == csProjPath
+            );
+
+            if (project == null)
+            {
+                return false;
+            }
+
+            return project.ShouldBuild;
+        }
+        
+        public static bool IsMarkedForBuild(this List<DotNetProjectInfo> projects, DotNetProjectInfo project)
+        {
+            return projects.IsMarkedForBuild(project.RepositoryName, project.CsProjPath);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemDotNetProjectBuildConfigReader.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemDotNetProjectBuildConfigReader.cs
new file mode 100644
index 0000000000..5aed3d0941
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemDotNetProjectBuildConfigReader.cs
@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+using System.Linq;
+using LibGit2Sharp;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Json;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class FileSystemDotNetProjectBuildConfigReader : IDotNetProjectBuildConfigReader, ITransientDependency
+    {
+        private readonly IJsonSerializer _jsonSerializer;
+        private string _buildConfigName = "abp-build-config.json";
+
+        public FileSystemDotNetProjectBuildConfigReader(IJsonSerializer jsonSerializer)
+        {
+            _jsonSerializer = jsonSerializer;
+        }
+
+        public DotNetProjectBuildConfig Read(string directoryPath)
+        {
+            var buildConfig = new DotNetProjectBuildConfig();
+            var solutionFiles = Directory.GetFiles(directoryPath, "*.sln", SearchOption.TopDirectoryOnly);
+            if (solutionFiles.Length == 1)
+            {
+                buildConfig.SlFilePath = solutionFiles.First();
+                var configFile = GetClosestFile(directoryPath, _buildConfigName);
+                var configFileContent = File.ReadAllText(configFile);
+                buildConfig.GitRepository = _jsonSerializer.Deserialize<GitRepository>(configFileContent);
+
+                SetBranchNames(buildConfig.GitRepository);
+
+                return buildConfig;
+            }
+
+            var configFiles = Directory.GetFiles(directoryPath, _buildConfigName, SearchOption.TopDirectoryOnly);
+            if (configFiles.Length == 1)
+            {
+                var configFile = configFiles.First();
+                var configFileContent = File.ReadAllText(configFile);
+                buildConfig.GitRepository = _jsonSerializer.Deserialize<GitRepository>(configFileContent);
+
+                SetBranchNames(buildConfig.GitRepository);
+
+                return buildConfig;
+            }
+
+            Console.WriteLine(
+                "There are more than 1 config (abp-build-config.json) file in the directory!"
+            );
+
+            throw new Exception("There is no solution file (*.sln) or " + _buildConfigName + " in the working directory !");
+        }
+
+        private void SetBranchNames(GitRepository gitRepository)
+        {
+            using (var repo = new Repository(string.Concat(gitRepository.RootPath, @"\.git")))
+            {
+                gitRepository.BranchName = repo.Head.FriendlyName;
+            }
+
+            foreach (var dependingRepository in gitRepository.DependingRepositories)
+            {
+                SetBranchNames(dependingRepository);
+            }
+        }
+
+        private string GetClosestFile(string directoryPath, string fileName)
+        {
+            var directory = new DirectoryInfo(directoryPath);
+            var files = directory.GetFiles(fileName, SearchOption.TopDirectoryOnly);
+            if (files.Any() && files.Length == 1)
+            {
+                return files.First().FullName;
+            }
+
+            do
+            {
+                directory = directory.Parent;
+                if (directory == null)
+                {
+                    return string.Empty;
+                }
+
+                files = directory.GetFiles(fileName, SearchOption.TopDirectoryOnly);
+                if (files.Any() && files.Length == 1)
+                {
+                    return files.First().FullName;
+                }
+            } while (true);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemRepositoryBuildStatusStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemRepositoryBuildStatusStore.cs
new file mode 100644
index 0000000000..0f6b2f19a7
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/FileSystemRepositoryBuildStatusStore.cs
@@ -0,0 +1,61 @@
+using System.IO;
+using Newtonsoft.Json;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.IO;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class FileSystemRepositoryBuildStatusStore : IRepositoryBuildStatusStore, ITransientDependency
+    {
+        public GitRepositoryBuildStatus Get(string buildNamePrefix, GitRepository repository)
+        {
+            if (!Directory.Exists(CliPaths.Build))
+            {
+                Directory.CreateDirectory(CliPaths.Build);
+            }
+
+            var buildStatusFile = Path.Combine(CliPaths.Build, repository.GetUniqueName(buildNamePrefix)) +
+                                  ".json";
+
+            if (!File.Exists(buildStatusFile))
+            {
+                return null;
+            }
+
+            var buildStatusText = File.ReadAllText(buildStatusFile);
+            return JsonConvert.DeserializeObject<GitRepositoryBuildStatus>(buildStatusText);
+        }
+
+        public void Set(string buildNamePrefix, GitRepository repository, GitRepositoryBuildStatus status)
+        {
+            var existingRepositoryStatus = Get(buildNamePrefix, repository);
+
+            var buildStatusFile = Path.Combine(
+                CliPaths.Build,
+                status.GetUniqueName(buildNamePrefix)
+            ) + ".json";
+
+            if (File.Exists(buildStatusFile))
+            {
+                FileHelper.DeleteIfExists(buildStatusFile);
+            }
+
+            if (existingRepositoryStatus != null)
+            {
+                existingRepositoryStatus.MergeWith(status);
+
+                using (var file = File.CreateText(buildStatusFile))
+                {
+                    new JsonSerializer {Formatting = Formatting.Indented}.Serialize(file, existingRepositoryStatus);
+                }
+            }
+            else
+            {
+                using (var file = File.CreateText(buildStatusFile))
+                {
+                    new JsonSerializer {Formatting = Formatting.Indented}.Serialize(file, status);
+                }
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepository.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepository.cs
new file mode 100644
index 0000000000..eb1acafd82
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepository.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    /// <summary>
+    /// Represents a source code repository
+    /// </summary>
+    public class GitRepository
+    {
+        /// <summary>
+        /// Name of the repository
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Branch of the repository
+        /// </summary>
+        public string BranchName { get; set; }
+
+        /// <summary>
+        /// Root path of the repository which contains .git folder
+        /// </summary>
+        public string RootPath { get; set; }
+
+        public List<GitRepository> DependingRepositories { get; set; }
+        
+        public List<string> IgnoredDirectories { get; set; }
+
+        public GitRepository(string name, string branchName, string rootPath)
+        {
+            Name = name;
+            BranchName = branchName;
+            RootPath = rootPath;
+            DependingRepositories = new List<GitRepository>();
+            IgnoredDirectories = new List<string>();
+        }
+
+        public string GetUniqueName(string prefix)
+        {
+            var name = Name + "_" + BranchName;
+            foreach (var dependingRepository in DependingRepositories)
+            {
+                AddToUniqueName(dependingRepository, name);
+            }
+
+            return (prefix.IsNullOrEmpty() ? "" : prefix + "_") + name.ToMd5();
+        }
+
+        private void AddToUniqueName(GitRepository gitRepository, string name)
+        {
+            name += "_" + gitRepository.Name + "_" + gitRepository.BranchName;
+
+            foreach (var dependingRepository in gitRepository.DependingRepositories)
+            {
+                AddToUniqueName(dependingRepository, name);
+            }
+        }
+
+        public string FindRepositoryOf(string csProjFilePath)
+        {
+            if (csProjFilePath.StartsWith(RootPath))
+            {
+                return Name;
+            }
+
+            foreach (var dependingRepository in DependingRepositories)
+            {
+                var name = FindRepositoryOfInternal(dependingRepository, csProjFilePath);
+                if (!string.IsNullOrEmpty(name))
+                {
+                    return name;
+                }
+            }
+
+            return null;
+        }
+
+        private string FindRepositoryOfInternal(GitRepository repository, string csProjFilePath)
+        {
+            if (csProjFilePath.StartsWith(repository.RootPath))
+            {
+                return repository.Name;
+            }
+
+            foreach (var dependingRepository in repository.DependingRepositories)
+            {
+                return FindRepositoryOfInternal(dependingRepository, csProjFilePath);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryBuildStatus.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryBuildStatus.cs
new file mode 100644
index 0000000000..1a60a04068
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryBuildStatus.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class GitRepositoryBuildStatus
+    {
+        /// <summary>
+        /// Name of the repository
+        /// </summary>
+        public string RepositoryName { get; set; }
+
+        /// <summary>
+        /// Branch of the repository
+        /// </summary>
+        public string BranchName { get; set; }
+
+        /// <summary>
+        /// Last succeeded commitId of the repository
+        /// </summary>
+        public string CommitId { get; set; }
+
+        /// <summary>
+        /// Build succeeded projects of this repository
+        /// </summary>
+        public List<DotNetProjectBuildStatus> SucceedProjects { get; set; }
+
+        /// <summary>
+        /// Build status of depending repositories
+        /// </summary>
+        public List<GitRepositoryBuildStatus> DependingRepositories { get; set; }
+
+        public GitRepositoryBuildStatus(string repositoryName, string branchName)
+        {
+            RepositoryName = repositoryName;
+            BranchName = branchName;
+            SucceedProjects = new List<DotNetProjectBuildStatus>();
+            DependingRepositories = new List<GitRepositoryBuildStatus>();
+        }
+
+        public GitRepositoryBuildStatus GetSelfOrChild(string repositoryName)
+        {
+            if (RepositoryName == repositoryName)
+            {
+                return this;
+            }
+
+            return GetChild(repositoryName);
+        }
+
+        public GitRepositoryBuildStatus GetChild(string repositoryName)
+        {
+            foreach (var dependingRepository in DependingRepositories)
+            {
+                var child = GetChildInternal(dependingRepository, repositoryName);
+                if (child != null)
+                {
+                    return child;
+                }
+            }
+
+            return null;
+        }
+
+        public string GetUniqueName(string prefix)
+        {
+            var name = RepositoryName + "_" + BranchName;
+            foreach (var dependingRepository in DependingRepositories)
+            {
+                AddToUniqueName(dependingRepository, name);
+            }
+
+            return (prefix.IsNullOrEmpty() ? "" : prefix + "_") + name.ToMd5();
+        }
+
+        public void AddOrUpdateProjectStatus(DotNetProjectBuildStatus status)
+        {
+            var existingProjectStatus = SucceedProjects.FirstOrDefault(p => p.CsProjPath == status.CsProjPath);
+            if (existingProjectStatus != null)
+            {
+                existingProjectStatus.CommitId = status.CommitId;
+            }
+            else
+            {
+                SucceedProjects.Add(status);
+            }
+        }
+
+        public void MergeWith(GitRepositoryBuildStatus newBuildStatus)
+        {
+            if (!newBuildStatus.CommitId.IsNullOrEmpty())
+            {
+                CommitId = newBuildStatus.CommitId;
+            }
+
+            foreach (var succeedProject in newBuildStatus.SucceedProjects)
+            {
+                AddOrUpdateProjectStatus(succeedProject);
+            }
+
+            foreach (var dependingRepositoryBuildStatus in newBuildStatus.DependingRepositories)
+            {
+                var existingDependingRepositoryBuildStatus = GetChild(dependingRepositoryBuildStatus.RepositoryName);
+                var newDependingRepositoryBuildStatus = newBuildStatus.GetChild(
+                    dependingRepositoryBuildStatus.RepositoryName
+                );
+
+                existingDependingRepositoryBuildStatus.MergeWith(newDependingRepositoryBuildStatus);
+            }
+        }
+
+        private GitRepositoryBuildStatus GetChildInternal(GitRepositoryBuildStatus repositoryBuildStatus,
+            string repositoryName)
+        {
+            if (repositoryBuildStatus.RepositoryName == repositoryName)
+            {
+                return repositoryBuildStatus;
+            }
+
+            foreach (var dependingRepository in repositoryBuildStatus.DependingRepositories)
+            {
+                var child = GetChildInternal(dependingRepository, repositoryName);
+                if (child != null)
+                {
+                    return child;
+                }
+            }
+
+            return null;
+        }
+
+        private void AddToUniqueName(GitRepositoryBuildStatus gitRepository, string name)
+        {
+            name += "_" + gitRepository.RepositoryName + "_" + gitRepository.BranchName;
+
+            foreach (var dependingRepository in gitRepository.DependingRepositories)
+            {
+                AddToUniqueName(dependingRepository, name);
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryHelper.cs
new file mode 100644
index 0000000000..51c84f0f61
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryHelper.cs
@@ -0,0 +1,24 @@
+using LibGit2Sharp;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class GitRepositoryHelper : IGitRepositoryHelper, ITransientDependency
+    {
+        public string GetLastCommitId(GitRepository repository)
+        {
+            using (var repo = new Repository(string.Concat(repository.RootPath, @"\.git")))
+            {
+                return repo.Head.Tip.Id.ToString();
+            }
+        }
+
+        public string GetFriendlyName(GitRepository repository)
+        {
+            using (var repo = new Repository(string.Concat(repository.RootPath, @"\.git")))
+            {
+                return repo.Head.FriendlyName;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IBuildProjectListSorter.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IBuildProjectListSorter.cs
new file mode 100644
index 0000000000..ed97ca27c8
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IBuildProjectListSorter.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    public interface IBuildProjectListSorter
+    {
+        List<DotNetProjectInfo> SortByDependencies(
+            List<DotNetProjectInfo> source,
+            IEqualityComparer<DotNetProjectInfo> comparer = null);
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IBuildStatusGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IBuildStatusGenerator.cs
new file mode 100644
index 0000000000..f9cf0b8254
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IBuildStatusGenerator.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    public interface IBuildStatusGenerator
+    {
+        GitRepositoryBuildStatus Generate(
+            DotNetProjectBuildConfig buildConfig,
+            List<DotNetProjectInfo> changedProjects,
+            List<string> buildSucceededProjects
+        );
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IChangedProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IChangedProjectFinder.cs
new file mode 100644
index 0000000000..b381a073b4
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IChangedProjectFinder.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    public interface IChangedProjectFinder
+    {
+        List<DotNetProjectInfo> Find(DotNetProjectBuildConfig buildConfig);
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuildConfigReader.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuildConfigReader.cs
new file mode 100644
index 0000000000..54dd2bd5ac
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuildConfigReader.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.Cli.Build
+{
+    public interface IDotNetProjectBuildConfigReader
+    {
+        DotNetProjectBuildConfig Read(string directoryPath);
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuilder.cs
new file mode 100644
index 0000000000..02f753c325
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuilder.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    public interface IDotNetProjectBuilder
+    {
+        List<string> Build(List<DotNetProjectInfo> projects, string arguments);
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectDependencyFiller.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectDependencyFiller.cs
new file mode 100644
index 0000000000..cc1ba65bc7
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectDependencyFiller.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.Build
+{
+    public interface IDotNetProjectDependencyFiller
+    {
+        void Fill(List<DotNetProjectInfo> projects);
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IGitRepositoryHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IGitRepositoryHelper.cs
new file mode 100644
index 0000000000..a1402c7dda
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IGitRepositoryHelper.cs
@@ -0,0 +1,9 @@
+namespace Volo.Abp.Cli.Build
+{
+    public interface IGitRepositoryHelper
+    {
+        string GetLastCommitId(GitRepository repository);
+
+        string GetFriendlyName(GitRepository repository);
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IRepositoryBuildStatusStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IRepositoryBuildStatusStore.cs
new file mode 100644
index 0000000000..99be400ec8
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IRepositoryBuildStatusStore.cs
@@ -0,0 +1,9 @@
+namespace Volo.Abp.Cli.Build
+{
+    public interface IRepositoryBuildStatusStore
+    {
+        GitRepositoryBuildStatus Get(string buildNamePrefix, GitRepository repository);
+
+        void Set(string buildNamePrefix, GitRepository repository, GitRepositoryBuildStatus status);
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs
index eb6339b9da..2b422446ca 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs
@@ -9,7 +9,8 @@ namespace Volo.Abp.Cli
         public static string Log => Path.Combine(AbpRootPath, "cli", "logs");
         public static string Root => Path.Combine(AbpRootPath, "cli");
         public static string AccessToken => Path.Combine(AbpRootPath, "cli", "access-token.bin");
-
+        public static string Build => Path.Combine(AbpRootPath, "build");
+        
         private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp");
     }
 }   
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs
new file mode 100644
index 0000000000..6d28b39fad
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Build;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Commands
+{
+    public class BuildCommand : IConsoleCommand, ITransientDependency
+    {
+        public IDotNetProjectDependencyFiller DotNetProjectDependencyFiller { get; set; }
+
+        public IChangedProjectFinder ChangedProjectFinder { get; set; }
+
+        public IDotNetProjectBuilder DotNetProjectBuilder { get; set; }
+
+        public IRepositoryBuildStatusStore RepositoryBuildStatusStore { get; set; }
+
+        public IDotNetProjectBuildConfigReader DotNetProjectBuildConfigReader { get; set; }
+
+        public IBuildStatusGenerator BuildStatusGenerator { get; set; }
+
+        public IBuildProjectListSorter BuildProjectListSorter { get; set; }
+
+        public Task ExecuteAsync(CommandLineArgs commandLineArgs)
+        {
+            var sw = new Stopwatch();
+            sw.Start();
+
+            var workingDirectory = commandLineArgs.Options.GetOrNull(
+                Options.WorkingDirectory.Short,
+                Options.WorkingDirectory.Long
+            );
+
+            var dotnetBuildArguments = commandLineArgs.Options.GetOrNull(
+                Options.DotnetBuildArguments.Short,
+                Options.DotnetBuildArguments.Long
+            );
+
+            var buildName = commandLineArgs.Options.GetOrNull(
+                Options.BuildName.Short,
+                Options.BuildName.Long
+            );
+
+            var forceBuild = commandLineArgs.Options.ContainsKey(Options.ForceBuild.Short) ||
+                             commandLineArgs.Options.ContainsKey(Options.ForceBuild.Long);
+
+            var buildConfig = DotNetProjectBuildConfigReader.Read(workingDirectory ?? Directory.GetCurrentDirectory());
+            buildConfig.BuildName = buildName;
+            buildConfig.ForceBuild = forceBuild;
+
+            Console.WriteLine("Finding changed projects...");
+
+            var changedProjectFiles = ChangedProjectFinder.Find(buildConfig);
+
+            var buildSucceededProjects = DotNetProjectBuilder.Build(
+                changedProjectFiles,
+                dotnetBuildArguments ?? ""
+            );
+
+            var buildStatus = BuildStatusGenerator.Generate(
+                buildConfig,
+                changedProjectFiles,
+                buildSucceededProjects
+            );
+
+            RepositoryBuildStatusStore.Set(buildName, buildConfig.GitRepository, buildStatus);
+
+            sw.Stop();
+            Console.WriteLine("Build operation is completed in " + sw.ElapsedMilliseconds + " (ms)");
+
+            return Task.CompletedTask;
+        }
+
+        public string GetUsageInfo()
+        {
+            var sb = new StringBuilder();
+
+            sb.AppendLine("");
+            sb.AppendLine("Usage:");
+            sb.AppendLine("");
+            sb.AppendLine("  abp build [options]");
+            sb.AppendLine("");
+            sb.AppendLine("Options:");
+            sb.AppendLine("");
+            sb.AppendLine("-wd|--working-directory <directory-path>                (default: empty)");
+            sb.AppendLine("-m |--max-parallel-builds <parallel-build-count>        (default: 1)");
+            sb.AppendLine("-a |--dotnet-build-arguments <arguments>                (default: empty)");
+            sb.AppendLine("-n |--build-name <name>                                 (default: empty)");
+            sb.AppendLine("-f | --force                                            (default: false)");
+            sb.AppendLine("");
+            sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+
+            return sb.ToString();
+        }
+
+        public string GetShortDescription()
+        {
+            return "Builds a dotnet repository and dependent repositories or a solution.";
+        }
+
+        public static class Options
+        {
+            public static class WorkingDirectory
+            {
+                public const string Short = "wd";
+                public const string Long = "working-directory";
+            }
+
+            public static class DotnetBuildArguments
+            {
+                public const string Short = "a";
+                public const string Long = "dotnet-build-arguments";
+            }
+
+            public static class BuildName
+            {
+                public const string Short = "n";
+                public const string Long = "build-name";
+            }
+
+            public static class ForceBuild
+            {
+                public const string Short = "f";
+                public const string Long = "force";
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
index d5ece4361f..39ecdb8183 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -286,6 +286,8 @@ namespace Volo.Abp.Cli.Commands
                     return UiFramework.Mvc;
                 case "angular":
                     return UiFramework.Angular;
+                case "blazor":
+                    return UiFramework.Blazor;
                 default:
                     return UiFramework.NotSpecified;
             }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
index 46d2b77f95..ad5da58a8e 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
@@ -19,13 +19,14 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
             pipeline.Steps.Add(new TemplateCodeDeleteStep());
             pipeline.Steps.Add(new SolutionRenameStep());
 
-            if (context.Template.Name == AppProTemplate.TemplateName || 
+            if (context.Template.Name == AppProTemplate.TemplateName ||
                 context.Template.Name == ModuleProTemplate.TemplateName)
             {
                 pipeline.Steps.Add(new LicenseCodeReplaceStep());
             }
 
-            if (context.BuildArgs.UiFramework == UiFramework.Mvc && context.BuildArgs.MobileApp == MobileApp.None)
+            if ((context.BuildArgs.UiFramework == UiFramework.Mvc || context.BuildArgs.UiFramework == UiFramework.Blazor)
+                && context.BuildArgs.MobileApp == MobileApp.None)
             {
                 pipeline.Steps.Add(new RemoveRootFolderStep());
             }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFramework.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFramework.cs
index 1ea2760b1c..17e33dc22d 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFramework.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFramework.cs
@@ -5,6 +5,7 @@
         NotSpecified = 0,
         None = 1,
         Mvc = 2,
-        Angular = 3
+        Angular = 3,
+        Blazor = 4
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFrameworkExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFrameworkExtensions.cs
index 9161c9c63e..b247a8f424 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFrameworkExtensions.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFrameworkExtensions.cs
@@ -9,9 +9,10 @@
                 case UiFramework.None: return "none";
                 case UiFramework.Mvc: return "mvc";
                 case UiFramework.Angular: return "angular";
+                case UiFramework.Blazor: return "blazor";
                 case UiFramework.NotSpecified: return "NotSpecified";
                 default: return "NotSpecified";
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index 417c004f36..d309d4858a 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -65,12 +65,22 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                     ConfigureWithAngularUi(context, steps);
                     break;
 
+
+                case UiFramework.Blazor:
+                    ConfigureWithBlazorUi(context, steps);
+                    break;
+
                 case UiFramework.Mvc:
                 case UiFramework.NotSpecified:
                     ConfigureWithMvcUi(context, steps);
                     break;
             }
 
+            if (context.BuildArgs.UiFramework != UiFramework.Blazor)
+            {
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor"));
+            }
+
             if (context.BuildArgs.UiFramework != UiFramework.Angular)
             {
                 steps.Add(new RemoveFolderStep("/angular"));
@@ -101,6 +111,26 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
             }
         }
 
+        private static void ConfigureWithBlazorUi(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host"));
+            steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests"));
+
+            if (context.BuildArgs.ExtraProperties.ContainsKey("separate-identity-server"))
+            {
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
+                steps.Add(new BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep());
+            }
+            else
+            {
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
+                steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+                steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
+            }
+        }
+
         private static void ConfigureWithMvcUi(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
         {
             if (context.BuildArgs.ExtraProperties.ContainsKey("tiered"))
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs
new file mode 100644
index 0000000000..e83a630343
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Linq;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
+{
+    public class BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep : ProjectBuildPipelineStep
+    {
+        public override void Execute(ProjectBuildContext context)
+        {
+            var appsettingsFile = context.Files.FirstOrDefault(x =>
+                !x.IsDirectory &&
+                x.Name.EndsWith("aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json",
+                    StringComparison.InvariantCultureIgnoreCase)
+            );
+
+            appsettingsFile.NormalizeLineEndings();
+            var lines = appsettingsFile.GetLines();
+
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i];
+
+                if (line.Contains("Authority") && line.Contains("localhost"))
+                {
+                    line = line.Replace("44305", "44301");
+                }
+                else if (line.Contains("BaseUrl") && line.Contains("localhost"))
+                {
+                    line = line.Replace("44305", "44300");
+                }
+
+                lines[i] = line;
+            }
+
+            appsettingsFile.SetLines(lines);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs
index ac71649793..23fed34f3c 100644
--- a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs
+++ b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs
@@ -188,18 +188,22 @@ namespace System.Collections.Generic
         /// <typeparam name="T">The type of the members of values.</typeparam>
         /// <param name="source">A list of objects to sort</param>
         /// <param name="getDependencies">Function to resolve the dependencies</param>
+        /// <param name="comparer">Equality comparer for dependencies </param>
         /// <returns>
         /// Returns a new list ordered by dependencies.
         /// If A depends on B, then B will come before than A in the resulting list.
         /// </returns>
-        public static List<T> SortByDependencies<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> getDependencies)
+        public static List<T> SortByDependencies<T>(
+            this IEnumerable<T> source, 
+            Func<T, IEnumerable<T>> getDependencies,
+            IEqualityComparer<T> comparer = null)
         {
             /* See: http://www.codeproject.com/Articles/869059/Topological-sorting-in-Csharp
              *      http://en.wikipedia.org/wiki/Topological_sorting
              */
 
             var sorted = new List<T>();
-            var visited = new Dictionary<T, bool>();
+            var visited = new Dictionary<T, bool>(comparer);
 
             foreach (var item in source)
             {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs
index 1c522a438a..8968fdf918 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs
@@ -7,4 +7,4 @@ namespace Volo.Abp
     {
         void Initialize([NotNull] IServiceProvider serviceProvider);
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs
index 45f02e08c8..46b4174bef 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs
@@ -1,6 +1,4 @@
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.Modularity
+namespace Volo.Abp.Modularity
 {
     public interface IAbpModule
     {
diff --git a/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Services/ICrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Services/ICrudAppService.cs
index 10f88db22a..75cbfb8e96 100644
--- a/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Services/ICrudAppService.cs
+++ b/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Services/ICrudAppService.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.Application.Services
     }
 
     public interface ICrudAppService<TEntityDto, in TKey, in TGetListInput>
-        : ICrudAppService<TEntityDto, TKey, TGetListInput, TEntityDto, TEntityDto>
+        : ICrudAppService<TEntityDto, TKey, TGetListInput, TEntityDto>
     {
 
     }
diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs
index db66881fb7..bf2be8e8f0 100644
--- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs
@@ -21,7 +21,7 @@ namespace Volo.Abp.Application.Services
     }
 
     public abstract class CrudAppService<TEntity, TEntityDto, TKey, TGetListInput>
-        : CrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TEntityDto, TEntityDto>
+        : CrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TEntityDto>
         where TEntity : class, IEntity<TKey>
         where TEntityDto : IEntityDto<TKey>
     {
diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/FodyWeavers.xml b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/FodyWeavers.xsd b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj
new file mode 100644
index 0000000000..36838f5149
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <AssemblyName>Volo.Abp.Http.Client.IdentityModel.WebAssembly</AssemblyName>
+        <PackageId>Volo.Abp.Http.Client.IdentityModel.WebAssembly</PackageId>
+        <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
+    </ItemGroup>
+    
+    <ItemGroup>
+      <ProjectReference Include="..\Volo.Abp.Http.Client.IdentityModel\Volo.Abp.Http.Client.IdentityModel.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AbpHttpClientIdentityModelWebAssemblyModule.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AbpHttpClientIdentityModelWebAssemblyModule.cs
new file mode 100644
index 0000000000..3110c36e26
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AbpHttpClientIdentityModelWebAssemblyModule.cs
@@ -0,0 +1,13 @@
+using System;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Http.Client.IdentityModel.WebAssembly
+{
+    [DependsOn(
+        typeof(AbpHttpClientIdentityModelModule)
+    )]
+    public class AbpHttpClientIdentityModelWebAssemblyModule : AbpModule
+    {
+
+    }
+}
diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AccessTokenProviderIdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AccessTokenProviderIdentityModelRemoteServiceHttpClientAuthenticator.cs
new file mode 100644
index 0000000000..c86fc095c7
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AccessTokenProviderIdentityModelRemoteServiceHttpClientAuthenticator.cs
@@ -0,0 +1,50 @@
+using System.Threading.Tasks;
+using IdentityModel.Client;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.Authentication;
+using Volo.Abp.IdentityModel;
+
+namespace Volo.Abp.Http.Client.IdentityModel.WebAssembly
+{
+    [Dependency(ReplaceServices = true)]
+    public class AccessTokenProviderIdentityModelRemoteServiceHttpClientAuthenticator : IdentityModelRemoteServiceHttpClientAuthenticator
+    {
+        protected IAccessTokenProvider AccessTokenProvider { get; }
+
+        public AccessTokenProviderIdentityModelRemoteServiceHttpClientAuthenticator(
+            IIdentityModelAuthenticationService identityModelAuthenticationService,
+            IAccessTokenProvider accessTokenProvider)
+            : base(identityModelAuthenticationService)
+        {
+            AccessTokenProvider = accessTokenProvider;
+        }
+
+        public override async Task Authenticate(RemoteServiceHttpClientAuthenticateContext context)
+        {
+            if (context.RemoteService.GetUseCurrentAccessToken() != false)
+            {
+                var accessToken = await GetAccessTokenFromAccessTokenProviderOrNullAsync();
+                if (accessToken != null)
+                {
+                    context.Request.SetBearerToken(accessToken);
+                    return;
+                }
+            }
+
+            await base.Authenticate(context);
+        }
+
+        protected virtual async Task<string> GetAccessTokenFromAccessTokenProviderOrNullAsync()
+        {
+            var result = await AccessTokenProvider.RequestAccessToken();
+            if (result.Status != AccessTokenResultStatus.Success)
+            {
+                return null;
+            }
+
+            result.TryGetToken(out var token);
+            return token.Value;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs b/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs
index e20b60bf54..4d79779dd1 100644
--- a/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs
+++ b/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using System.Reflection;
 using Castle.DynamicProxy;
 using JetBrains.Annotations;
-using Polly;
 using Volo.Abp;
 using Volo.Abp.Castle.DynamicProxy;
 using Volo.Abp.Http.Client;
@@ -30,23 +29,15 @@ namespace Microsoft.Extensions.DependencyInjection
         /// <param name="asDefaultServices">
         /// True, to register the HTTP client proxy as the default implementation for the services.
         /// </param>
-        /// <param name="configureHttpClientBuilder">
-        /// A delegate that is used to configure an <see cref="T:Microsoft.Extensions.DependencyInjection.IHttpClientBuilder" />.
-        /// </param>
         public static IServiceCollection AddHttpClientProxies(
             [NotNull] this IServiceCollection services,
             [NotNull] Assembly assembly,
             [NotNull] string remoteServiceConfigurationName = RemoteServiceConfigurationDictionary.DefaultName,
-            bool asDefaultServices = true,
-            Action<IHttpClientBuilder> configureHttpClientBuilder = null)
+            bool asDefaultServices = true)
         {
             Check.NotNull(services, nameof(assembly));
 
-            AddHttpClientFactoryAndPolicy(services, remoteServiceConfigurationName, configureHttpClientBuilder);
-
-            //TODO: Make a configuration option and add remoteServiceName inside it!
-
-            var serviceTypes = assembly.GetTypes().Where(IsSuitableForDynamicClientProxying);
+            var serviceTypes = assembly.GetTypes().Where(IsSuitableForDynamicClientProxying).ToArray();
 
             foreach (var serviceType in serviceTypes)
             {
@@ -72,17 +63,11 @@ namespace Microsoft.Extensions.DependencyInjection
         /// <param name="asDefaultService">
         /// True, to register the HTTP client proxy as the default implementation for the service <typeparamref name="T"/>.
         /// </param>
-        /// <param name="configureHttpClientBuilder">
-        /// A delegate that is used to configure an <see cref="T:Microsoft.Extensions.DependencyInjection.IHttpClientBuilder" />.
-        /// </param>
         public static IServiceCollection AddHttpClientProxy<T>(
             [NotNull] this IServiceCollection services,
             [NotNull] string remoteServiceConfigurationName = RemoteServiceConfigurationDictionary.DefaultName,
-            bool asDefaultService = true,
-            Action<IHttpClientBuilder> configureHttpClientBuilder = null)
+            bool asDefaultService = true)
         {
-            AddHttpClientFactoryAndPolicy(services, remoteServiceConfigurationName, configureHttpClientBuilder);
-
             return services.AddHttpClientProxy(
                 typeof(T),
                 remoteServiceConfigurationName,
@@ -90,37 +75,6 @@ namespace Microsoft.Extensions.DependencyInjection
             );
         }
 
-        /// <summary>
-        /// Use IHttpClientFactory and polly
-        /// </summary>
-        /// <param name="services">Service collection</param>
-        /// <param name="remoteServiceConfigurationName">
-        /// The name of the remote service configuration to be used by the HTTP Client proxies.
-        /// See <see cref="AbpRemoteServiceOptions"/>.
-        /// </param>
-        /// <param name="configureHttpClientBuilder">
-        /// A delegate that is used to configure an <see cref="T:Microsoft.Extensions.DependencyInjection.IHttpClientBuilder" />.
-        /// </param>
-        public static IServiceCollection AddHttpClientFactoryAndPolicy(
-            [NotNull] this IServiceCollection services,
-            [NotNull] string remoteServiceConfigurationName = RemoteServiceConfigurationDictionary.DefaultName,
-            Action<IHttpClientBuilder> configureHttpClientBuilder = null)
-        {
-            var httpClientBuilder = services.AddHttpClient(remoteServiceConfigurationName);
-            if (configureHttpClientBuilder == null)
-            {
-                httpClientBuilder.AddTransientHttpErrorPolicy(builder =>
-                    // retry 3 times
-                    builder.WaitAndRetryAsync(3, i => TimeSpan.FromSeconds(Math.Pow(2, i))));
-            }
-            else
-            {
-                configureHttpClientBuilder.Invoke(httpClientBuilder);
-            }
-
-            return services;
-        }
-
         /// <summary>
         /// Registers HTTP Client Proxy for given service <paramref name="type"/>.
         /// </summary>
@@ -143,6 +97,8 @@ namespace Microsoft.Extensions.DependencyInjection
             Check.NotNull(type, nameof(type));
             Check.NotNullOrWhiteSpace(remoteServiceConfigurationName, nameof(remoteServiceConfigurationName));
 
+            AddHttpClientFactoryAndPolicy(services, remoteServiceConfigurationName);
+
             services.Configure<AbpHttpClientOptions>(options =>
             {
                 options.HttpClientProxies[type] = new DynamicHttpClientProxyConfig(type, remoteServiceConfigurationName);
@@ -189,13 +145,36 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
+        private static IServiceCollection AddHttpClientFactoryAndPolicy(
+            [NotNull] this IServiceCollection services,
+            [NotNull] string remoteServiceConfigurationName = RemoteServiceConfigurationDictionary.DefaultName)
+        {
+            var preOptions = services.ExecutePreConfiguredActions<AbpHttpClientBuilderOptions>();
+
+            if (preOptions.ConfiguredProxyClients.Contains(remoteServiceConfigurationName))
+            {
+                return services;
+            }
+
+            var clientBuilder = services.AddHttpClient(remoteServiceConfigurationName);
+
+            foreach (var clientBuildAction in preOptions.ProxyClientBuildActions)
+            {
+                clientBuildAction(remoteServiceConfigurationName, clientBuilder);
+            }
+
+            preOptions.ConfiguredProxyClients.Add(remoteServiceConfigurationName);
+
+            return services;
+        }
+
         /// <summary>
         /// Checks wether the type is suitable to use with the dynamic proxying.
         /// Currently the type is checked statically against some fixed conditions.
         /// </summary>
         /// <param name="type">Type to check</param>
         /// <returns>True, if the type is suitable for dynamic proxying. Otherwise false.</returns>
-        static bool IsSuitableForDynamicClientProxying(Type type)
+        private static bool IsSuitableForDynamicClientProxying(Type type)
         {
             //TODO: Add option to change type filter
 
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientBuilderOptions.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientBuilderOptions.cs
new file mode 100644
index 0000000000..7f11a6be12
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientBuilderOptions.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Volo.Abp.Http.Client
+{
+    public class AbpHttpClientBuilderOptions
+    {
+        public List<Action<string, IHttpClientBuilder>> ProxyClientBuildActions { get; }
+
+        internal HashSet<string> ConfiguredProxyClients { get; }
+
+        public AbpHttpClientBuilderOptions()
+        {
+            ProxyClientBuildActions = new List<Action<string, IHttpClientBuilder>>();
+            ConfiguredProxyClients = new HashSet<string>();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
index e2e5b7b9fe..e4e4f3e802 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
@@ -1,11 +1,11 @@
-using System.Linq;
+using System;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Http;
 using Volo.Abp.Castle;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Threading;
 using Volo.Abp.Validation;
+using Polly;
 
 namespace Volo.Abp.Http.Client
 {
@@ -18,29 +18,26 @@ namespace Volo.Abp.Http.Client
         )]
     public class AbpHttpClientModule : AbpModule
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            var configuration = context.Services.GetConfiguration();
-            Configure<AbpRemoteServiceOptions>(configuration);
-        }
-
-        public override void PostConfigureServices(ServiceConfigurationContext context)
+        public override void PreConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpHttpClientOptions>(options =>
+            PreConfigure<AbpHttpClientBuilderOptions>(options =>
             {
-                if (options.HttpClientActions.Any())
+                options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) =>
                 {
-                    var httpClientNames = options.HttpClientProxies.Select(x => x.Value.RemoteServiceName);
-                    foreach (var httpClientName in httpClientNames)
-                    {
-                        foreach (var httpClientAction in options.HttpClientActions)
-                        {
-                            context.Services.Configure<HttpClientFactoryOptions>(httpClientName,
-                                x => x.HttpClientActions.Add(httpClientAction.Invoke(httpClientName)));
-                        }
-                    }
-                }
+                    clientBuilder.AddTransientHttpErrorPolicy(policyBuilder =>
+                        policyBuilder.WaitAndRetryAsync(
+                            3,
+                            i => TimeSpan.FromSeconds(Math.Pow(2, i))
+                        )
+                    );
+                });
             });
         }
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            var configuration = context.Services.GetConfiguration();
+            Configure<AbpRemoteServiceOptions>(configuration);
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientOptions.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientOptions.cs
index 54cc4eb624..2e6cd3798d 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientOptions.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientOptions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using Volo.Abp.Http.Client.DynamicProxying;
 
 namespace Volo.Abp.Http.Client
@@ -9,12 +8,9 @@ namespace Volo.Abp.Http.Client
     {
         public Dictionary<Type, DynamicHttpClientProxyConfig> HttpClientProxies { get; set; }
 
-        public List<Func<string, Action<HttpClient>>> HttpClientActions { get; }
-
         public AbpHttpClientOptions()
         {
             HttpClientProxies = new Dictionary<Type, DynamicHttpClientProxyConfig>();
-            HttpClientActions = new List<Func<string, Action<HttpClient>>>();
         }
     }
 }
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
index af9eb59b7f..5313457ba7 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -25,7 +25,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
     public class DynamicHttpProxyInterceptor<TService> : AbpInterceptor, ITransientDependency
     {
         // ReSharper disable once StaticMemberInGenericType
-        protected static MethodInfo GenericInterceptAsyncMethod { get; }
+        protected static MethodInfo MakeRequestAndGetResultAsyncMethod { get; }
 
         protected ICancellationTokenProvider CancellationTokenProvider { get; }
         protected ICorrelationIdProvider CorrelationIdProvider { get; }
@@ -42,7 +42,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
 
         static DynamicHttpProxyInterceptor()
         {
-            GenericInterceptAsyncMethod = typeof(DynamicHttpProxyInterceptor<TService>)
+            MakeRequestAndGetResultAsyncMethod = typeof(DynamicHttpProxyInterceptor<TService>)
                 .GetMethods(BindingFlags.NonPublic | BindingFlags.Instance)
                 .First(m => m.Name == nameof(MakeRequestAndGetResultAsync) && m.IsGenericMethodDefinition);
         }
@@ -81,7 +81,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             }
             else
             {
-                var result = (Task)GenericInterceptAsyncMethod
+                var result = (Task)MakeRequestAndGetResultAsyncMethod
                     .MakeGenericMethod(invocation.Method.ReturnType.GenericTypeArguments[0])
                     .Invoke(this, new object[] { invocation });
 
@@ -90,7 +90,6 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                     invocation.Method.ReturnType.GetGenericArguments()[0]
                 );
             }
-
         }
 
         private async Task<object> GetResultAsync(Task task, Type resultType)
diff --git a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj
index 2b9e46f43d..e2f589b399 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj
+++ b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.10.4" />
+    <PackageReference Include="MongoDB.Driver" Version="2.11.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
index 8676ac0f34..02dd0e5de7 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
@@ -29,6 +29,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
 
         public virtual IMongoDatabase Database => DbContext.Database;
 
+        public virtual IClientSessionHandle SessionHandle => DbContext.SessionHandle;
+
         public virtual TMongoDbContext DbContext => DbContextProvider.GetDbContext();
 
         protected IMongoDbContextProvider<TMongoDbContext> DbContextProvider { get; }
@@ -60,10 +62,21 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
         {
             await ApplyAbpConceptsForAddedEntityAsync(entity);
 
-            await Collection.InsertOneAsync(
-                entity,
-                cancellationToken: GetCancellationToken(cancellationToken)
-            );
+            if (SessionHandle != null)
+            {
+                await Collection.InsertOneAsync(
+                    SessionHandle,
+                    entity,
+                    cancellationToken: GetCancellationToken(cancellationToken)
+                );
+            }
+            else
+            {
+                await Collection.InsertOneAsync(
+                    entity,
+                    cancellationToken: GetCancellationToken(cancellationToken)
+                );
+            }
 
             return entity;
         }
@@ -88,12 +101,27 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             await TriggerDomainEventsAsync(entity);
 
             var oldConcurrencyStamp = SetNewConcurrencyStamp(entity);
+            ReplaceOneResult result;
+
+            if (SessionHandle != null)
+            {
+                result = await Collection.ReplaceOneAsync(
+                    SessionHandle,
+                    CreateEntityFilter(entity, true, oldConcurrencyStamp),
+                    entity,
+                    cancellationToken: GetCancellationToken(cancellationToken)
+                );
 
-            var result = await Collection.ReplaceOneAsync(
-                CreateEntityFilter(entity, true, oldConcurrencyStamp),
-                entity,
-                cancellationToken: GetCancellationToken(cancellationToken)
-            );
+
+            }
+            else
+            {
+                result = await Collection.ReplaceOneAsync(
+                    CreateEntityFilter(entity, true, oldConcurrencyStamp),
+                    entity,
+                    cancellationToken: GetCancellationToken(cancellationToken)
+                );
+            }
 
             if (result.MatchedCount <= 0)
             {
@@ -114,11 +142,25 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             if (entity is ISoftDelete softDeleteEntity && !IsHardDeleted(entity))
             {
                 softDeleteEntity.IsDeleted = true;
-                var result = await Collection.ReplaceOneAsync(
-                    CreateEntityFilter(entity, true, oldConcurrencyStamp),
-                    entity,
-                    cancellationToken: GetCancellationToken(cancellationToken)
-                );
+                ReplaceOneResult result;
+
+                if (SessionHandle != null)
+                {
+                    result = await Collection.ReplaceOneAsync(
+                        SessionHandle,
+                        CreateEntityFilter(entity, true, oldConcurrencyStamp),
+                        entity,
+                        cancellationToken: GetCancellationToken(cancellationToken)
+                    );
+                }
+                else
+                {
+                    result = await Collection.ReplaceOneAsync(
+                        CreateEntityFilter(entity, true, oldConcurrencyStamp),
+                        entity,
+                        cancellationToken: GetCancellationToken(cancellationToken)
+                    );
+                }
 
                 if (result.MatchedCount <= 0)
                 {
@@ -127,10 +169,23 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             }
             else
             {
-                var result = await Collection.DeleteOneAsync(
-                    CreateEntityFilter(entity, true, oldConcurrencyStamp),
-                    GetCancellationToken(cancellationToken)
-                );
+                DeleteResult result;
+
+                if (SessionHandle != null)
+                {
+                    result = await Collection.DeleteOneAsync(
+                        SessionHandle,
+                        CreateEntityFilter(entity, true, oldConcurrencyStamp),
+                        cancellationToken: GetCancellationToken(cancellationToken)
+                    );
+                }
+                else
+                {
+                    result = await Collection.DeleteOneAsync(
+                        CreateEntityFilter(entity, true, oldConcurrencyStamp),
+                        GetCancellationToken(cancellationToken)
+                    );
+                }
 
                 if (result.DeletedCount <= 0)
                 {
@@ -195,9 +250,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
 
         public virtual IMongoQueryable<TEntity> GetMongoQueryable()
         {
-            return ApplyDataFilters(
-                Collection.AsQueryable()
-            );
+            return ApplyDataFilters(SessionHandle != null ? Collection.AsQueryable(SessionHandle) : Collection.AsQueryable());
         }
         protected virtual bool IsHardDeleted(TEntity entity)
         {
@@ -404,6 +457,13 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
         {
+            if (SessionHandle != null)
+            {
+                return await Collection
+                    .Find(SessionHandle, RepositoryFilterer.CreateEntityFilter(id, true))
+                    .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
+            }
+
             return await Collection
                 .Find(RepositoryFilterer.CreateEntityFilter(id, true))
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs
index bfa4b87da1..e961fdf256 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using MongoDB.Bson;
 using MongoDB.Driver;
 using Volo.Abp.DependencyInjection;
 
@@ -10,14 +11,17 @@ namespace Volo.Abp.MongoDB
 
         public IMongoDatabase Database { get; private set; }
 
+        public IClientSessionHandle SessionHandle { get; private set; }
+
         protected internal virtual void CreateModel(IMongoModelBuilder modelBuilder)
         {
 
         }
 
-        public virtual void InitializeDatabase(IMongoDatabase database)
+        public virtual void InitializeDatabase(IMongoDatabase database, IClientSessionHandle sessionHandle)
         {
             Database = database;
+            SessionHandle = sessionHandle;
         }
 
         public virtual IMongoCollection<T> Collection<T>()
@@ -25,6 +29,12 @@ namespace Volo.Abp.MongoDB
             return Database.GetCollection<T>(GetCollectionName<T>());
         }
 
+        public virtual void InitializeCollections(IMongoDatabase database)
+        {
+            Database = database;
+            ModelSource.GetModel(this);
+        }
+
         protected virtual string GetCollectionName<T>()
         {
             return GetEntityModel<T>().CollectionName;
@@ -42,4 +52,4 @@ namespace Volo.Abp.MongoDB
             return model;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs
index e36e972954..d32f015a33 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs
@@ -1,7 +1,9 @@
-using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Repositories.MongoDB;
 using Volo.Abp.Modularity;
+using Volo.Abp.MongoDB.DependencyInjection;
 using Volo.Abp.Uow.MongoDB;
 
 namespace Volo.Abp.MongoDB
@@ -9,18 +11,23 @@ namespace Volo.Abp.MongoDB
     [DependsOn(typeof(AbpDddDomainModule))]
     public class AbpMongoDbModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddConventionalRegistrar(new AbpMongoDbConventionalRegistrar());
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.TryAddTransient(
                 typeof(IMongoDbContextProvider<>),
                 typeof(UnitOfWorkMongoDbContextProvider<>)
             );
-            
+
             context.Services.TryAddTransient(
                 typeof(IMongoDbRepositoryFilterer<>),
                 typeof(MongoDbRepositoryFilterer<>)
             );
-            
+
             context.Services.TryAddTransient(
                 typeof(IMongoDbRepositoryFilterer<,>),
                 typeof(MongoDbRepositoryFilterer<,>)
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/AbpMongoDbConventionalRegistrar.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/AbpMongoDbConventionalRegistrar.cs
new file mode 100644
index 0000000000..cb1ed7ea54
--- /dev/null
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/AbpMongoDbConventionalRegistrar.cs
@@ -0,0 +1,27 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.MongoDB.DependencyInjection
+{
+    public class AbpMongoDbConventionalRegistrar : DefaultConventionalRegistrar
+    {
+        public override void AddType(IServiceCollection services, Type type)
+        {
+            if (!typeof(IAbpMongoDbContext).IsAssignableFrom(type) || type == typeof(AbpMongoDbContext))
+            {
+                return;
+            }
+
+            var dependencyAttribute = GetDependencyAttributeOrNull(type);
+            var lifeTime = GetLifeTimeOrNull(type, dependencyAttribute);
+
+            if (lifeTime == null)
+            {
+                return;
+            }
+
+            services.Add(ServiceDescriptor.Describe(typeof(IAbpMongoDbContext), type, ServiceLifetime.Transient));
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/IAbpMongoDbContext.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/IAbpMongoDbContext.cs
index a2f48fd323..c4049e1389 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/IAbpMongoDbContext.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/IAbpMongoDbContext.cs
@@ -7,5 +7,7 @@ namespace Volo.Abp.MongoDB
         IMongoDatabase Database { get; }
 
         IMongoCollection<T> Collection<T>();
+
+        IClientSessionHandle SessionHandle { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs
index 43ffbabf4a..6d8706d7ee 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs
@@ -3,6 +3,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using MongoDB.Bson;
+using MongoDB.Driver;
 using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.MongoDB
@@ -18,7 +20,7 @@ namespace Volo.Abp.MongoDB
             _entityModelBuilders = new Dictionary<Type, object>();
         }
 
-        public MongoDbContextModel Build()
+        public MongoDbContextModel Build(AbpMongoDbContext dbContext)
         {
             lock (SyncObj)
             {
@@ -38,6 +40,8 @@ namespace Volo.Abp.MongoDB
                     }
 
                     baseClasses.AddRange(entityModel.EntityType.GetBaseClasses(includeObject: false));
+
+                    CreateCollectionIfNotExists(dbContext, entityModel.CollectionName);
                 }
 
                 baseClasses = baseClasses.Distinct().ToList();
@@ -84,5 +88,16 @@ namespace Volo.Abp.MongoDB
         {
             return _entityModelBuilders.Values.Cast<IMongoEntityModel>().ToImmutableList();
         }
+
+        protected virtual void CreateCollectionIfNotExists(AbpMongoDbContext dbContext, string collectionName)
+        {
+            var filter = new BsonDocument("name", collectionName);
+            var options = new ListCollectionNamesOptions { Filter = filter };
+
+            if (!dbContext.Database.ListCollectionNames(options).Any())
+            {
+                dbContext.Database.CreateCollection(collectionName);
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs
index c5cb0da1c8..295cb8b84f 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.MongoDB
     public class MongoModelSource : IMongoModelSource, ISingletonDependency
     {
         protected readonly ConcurrentDictionary<Type, MongoDbContextModel> ModelCache = new ConcurrentDictionary<Type, MongoDbContextModel>();
-        
+
         public virtual MongoDbContextModel GetModel(AbpMongoDbContext dbContext)
         {
             return ModelCache.GetOrAdd(
@@ -26,7 +26,7 @@ namespace Volo.Abp.MongoDB
             var modelBuilder = CreateModelBuilder();
             BuildModelFromDbContextType(modelBuilder, dbContext.GetType());
             BuildModelFromDbContextInstance(modelBuilder, dbContext);
-            return modelBuilder.Build();
+            return modelBuilder.Build(dbContext);
         }
 
         protected virtual MongoModelBuilder CreateModelBuilder()
@@ -65,4 +65,4 @@ namespace Volo.Abp.MongoDB
             dbContext.CreateModel(modelBuilder);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbTransactionApi.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbTransactionApi.cs
new file mode 100644
index 0000000000..6c3ab76ee5
--- /dev/null
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbTransactionApi.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MongoDB.Driver;
+
+namespace Volo.Abp.Uow.MongoDB
+{
+    public class MongoDbTransactionApi : ITransactionApi, ISupportsRollback
+    {
+        public IClientSessionHandle SessionHandle { get; }
+
+        public MongoDbTransactionApi(IClientSessionHandle sessionHandle)
+        {
+            SessionHandle = sessionHandle;
+        }
+
+        public async Task CommitAsync()
+        {
+            await SessionHandle.CommitTransactionAsync();
+        }
+
+        protected void Commit()
+        {
+            SessionHandle.CommitTransaction();
+        }
+
+        public void Dispose()
+        {
+            SessionHandle.Dispose();
+        }
+
+        public void Rollback()
+        {
+            SessionHandle.AbortTransaction();
+        }
+
+        public async Task RollbackAsync(CancellationToken cancellationToken)
+        {
+            await SessionHandle.AbortTransactionAsync(cancellationToken);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs
index 0d527efc4c..0d9969ee51 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using MongoDB.Bson;
 using MongoDB.Driver;
 using Volo.Abp.Data;
 using Volo.Abp.MongoDB;
@@ -25,7 +26,8 @@ namespace Volo.Abp.Uow.MongoDB
             var unitOfWork = _unitOfWorkManager.Current;
             if (unitOfWork == null)
             {
-                throw new AbpException($"A {nameof(IMongoDatabase)} instance can only be created inside a unit of work!");
+                throw new AbpException(
+                    $"A {nameof(IMongoDatabase)} instance can only be created inside a unit of work!");
             }
 
             var connectionString = _connectionStringResolver.Resolve<TMongoDbContext>();
@@ -41,18 +43,61 @@ namespace Volo.Abp.Uow.MongoDB
             //TODO: Create only single MongoDbClient per connection string in an application (extract MongoClientCache for example).
             var databaseApi = unitOfWork.GetOrAddDatabaseApi(
                 dbContextKey,
-                () =>
+                () => new MongoDbDatabaseApi<TMongoDbContext>(CreateDbContext(unitOfWork, mongoUrl, databaseName)));
+
+            return ((MongoDbDatabaseApi<TMongoDbContext>) databaseApi).DbContext;
+        }
+
+        private TMongoDbContext CreateDbContext(IUnitOfWork unitOfWork, MongoUrl mongoUrl, string databaseName)
+        {
+            var client = new MongoClient(mongoUrl);
+            var database = client.GetDatabase(databaseName);
+
+            if (unitOfWork.Options.IsTransactional)
+            {
+                return CreateDbContextWithTransaction(unitOfWork, mongoUrl, client, database);
+            }
+
+            var dbContext = unitOfWork.ServiceProvider.GetRequiredService<TMongoDbContext>();
+            dbContext.ToAbpMongoDbContext().InitializeDatabase(database, null);
+
+            return dbContext;
+        }
+
+        public TMongoDbContext CreateDbContextWithTransaction(
+            IUnitOfWork unitOfWork,
+            MongoUrl url,
+            MongoClient client,
+            IMongoDatabase database)
+        {
+            var transactionApiKey = $"MongoDb_{url}";
+            var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as MongoDbTransactionApi;
+            var dbContext = unitOfWork.ServiceProvider.GetRequiredService<TMongoDbContext>();
+
+            if (activeTransaction?.SessionHandle == null)
+            {
+                var session = client.StartSession();
+
+                if (unitOfWork.Options.Timeout.HasValue)
                 {
-                    var database = new MongoClient(mongoUrl).GetDatabase(databaseName);
+                    session.AdvanceOperationTime(new BsonTimestamp(unitOfWork.Options.Timeout.Value));
+                }
 
-                    var dbContext = unitOfWork.ServiceProvider.GetRequiredService<TMongoDbContext>();
+                session.StartTransaction();
 
-                    dbContext.ToAbpMongoDbContext().InitializeDatabase(database);
+                unitOfWork.AddTransactionApi(
+                    transactionApiKey,
+                    new MongoDbTransactionApi(session)
+                );
 
-                    return new MongoDbDatabaseApi<TMongoDbContext>(dbContext);
-                });
+                dbContext.ToAbpMongoDbContext().InitializeDatabase(database, session);
+            }
+            else
+            {
+                dbContext.ToAbpMongoDbContext().InitializeDatabase(database, activeTransaction.SessionHandle);
+            }
 
-            return ((MongoDbDatabaseApi<TMongoDbContext>)databaseApi).DbContext;
+            return dbContext;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/CurrentPrincipalAccessorBase.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/CurrentPrincipalAccessorBase.cs
new file mode 100644
index 0000000000..0ebedc8d44
--- /dev/null
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/CurrentPrincipalAccessorBase.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Security.Claims;
+using System.Threading;
+
+namespace Volo.Abp.Security.Claims
+{
+    public abstract class CurrentPrincipalAccessorBase : ICurrentPrincipalAccessor
+    {
+        public ClaimsPrincipal Principal => _currentPrincipal.Value ?? GetClaimsPrincipal();
+        
+        private readonly AsyncLocal<ClaimsPrincipal> _currentPrincipal = new AsyncLocal<ClaimsPrincipal>();
+        
+        protected abstract ClaimsPrincipal GetClaimsPrincipal();
+
+        public virtual IDisposable Change(ClaimsPrincipal principal)
+        {
+            return SetCurrent(principal);
+        }
+
+        private IDisposable SetCurrent(ClaimsPrincipal principal)
+        {
+            var parent = Principal;
+            _currentPrincipal.Value = principal;
+            return new DisposeAction(() =>
+            {
+                _currentPrincipal.Value = parent;
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
index ad496ba916..ea7ed7106f 100644
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
@@ -1,34 +1,14 @@
-using System;
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Threading;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Security.Claims
 {
-    public class ThreadCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency
+    public class ThreadCurrentPrincipalAccessor : CurrentPrincipalAccessorBase, ISingletonDependency
     {
-        public ClaimsPrincipal Principal => _currentPrincipal.Value ?? GetClaimsPrincipal();
-
-        private readonly AsyncLocal<ClaimsPrincipal> _currentPrincipal = new AsyncLocal<ClaimsPrincipal>();
-
-        protected virtual ClaimsPrincipal GetClaimsPrincipal()
+        protected override ClaimsPrincipal GetClaimsPrincipal()
         {
             return Thread.CurrentPrincipal as ClaimsPrincipal;
         }
-
-        public virtual IDisposable Change(ClaimsPrincipal principal)
-        {
-            return SetCurrent(principal);
-        }
-
-        private IDisposable SetCurrent(ClaimsPrincipal principal)
-        {
-            var parent = Principal;
-            _currentPrincipal.Value = principal;
-            return new DisposeAction(() =>
-            {
-                _currentPrincipal.Value = parent;
-            });
-        }
     }
 }
diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
index ffa31e66a2..912621c424 100644
--- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
+++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
@@ -87,13 +87,16 @@ namespace Volo.Abp.UI.Navigation.Urls
                 tenantNamePlaceHolder = TenantNamePlaceHolder + '.';
             }
 
-            if (CurrentTenant.Id.HasValue)
+            if (url.Contains(tenantNamePlaceHolder))
             {
-                url = url.Replace(tenantNamePlaceHolder, await GetCurrentTenantNameAsync());
-            }
-            else
-            {
-                url = url.Replace(tenantNamePlaceHolder, "");
+                if (CurrentTenant.Id.HasValue)
+                {
+                    url = url.Replace(tenantNamePlaceHolder, await GetCurrentTenantNameAsync());
+                }
+                else
+                {
+                    url = url.Replace(tenantNamePlaceHolder, "");
+                }
             }
 
             return url;
@@ -110,4 +113,4 @@ namespace Volo.Abp.UI.Navigation.Urls
             return CurrentTenant.Name;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
index d6f24833a9..e0cdee07af 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
@@ -62,6 +62,8 @@
     "500Message": "Internal Server Error",
     "GoHomePage": "Go to the homepage",
     "GoBack": "Go back",
-    "Search": "Search"
+    "Search": "Search",
+    "ItemWillBeDeletedMessageWithFormat": "{0} will be deleted!",
+    "ItemWillBeDeletedMessage": "This item will be deleted!"
   }
 }
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
index f4fffd3f7f..db803e01e2 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
@@ -62,6 +62,8 @@
     "500Message": "Sunucu tarafında hata",
     "GoHomePage": "Ana sayfaya git",
     "GoBack": "Geri dön",
-    "Search": "Arama"
+    "Search": "Arama",
+    "ItemWillBeDeletedMessageWithFormat": "{0} silinecektir!",
+    "ItemWillBeDeletedMessage": "Bu nesne silinecektir!"
   }
 }
diff --git a/framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/DefaultBrandingProvider.cs b/framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/DefaultBrandingProvider.cs
new file mode 100644
index 0000000000..d6a09e1c19
--- /dev/null
+++ b/framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/DefaultBrandingProvider.cs
@@ -0,0 +1,13 @@
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Ui.Branding
+{
+    public class DefaultBrandingProvider : IBrandingProvider, ITransientDependency
+    {
+        public virtual string AppName => "MyApplication";
+
+        public virtual string LogoUrl => null;
+
+        public virtual string LogoReverseUrl => null;
+    }
+}
diff --git a/framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/IBrandingProvider.cs b/framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/IBrandingProvider.cs
new file mode 100644
index 0000000000..93e7fd957b
--- /dev/null
+++ b/framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/IBrandingProvider.cs
@@ -0,0 +1,17 @@
+namespace Volo.Abp.Ui.Branding
+{
+    public interface IBrandingProvider
+    {
+        string AppName { get; }
+
+        /// <summary>
+        /// Logo on white background
+        /// </summary>
+        string LogoUrl { get; }
+
+        /// <summary>
+        /// Logo on dark background
+        /// </summary>
+        string LogoReverseUrl { get; }
+    }
+}
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
index b23c825d93..a37af33e79 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
@@ -3,7 +3,7 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^3.1.1",
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^3.1.2",
     "highlight.js": "^9.13.1"
   },
   "devDependencies": {}
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
index 6d1c971b0e..5d59728037 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
@@ -2,30 +2,30 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.shared@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.shared@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -34,144 +34,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
index ad5f9eb185..9e281c4b1f 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
@@ -3,7 +3,7 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   },
   "devDependencies": {}
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
index 7897247f0d..5f63f5733b 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/BuildProjectListSorter_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/BuildProjectListSorter_Tests.cs
new file mode 100644
index 0000000000..1fde954ce2
--- /dev/null
+++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/BuildProjectListSorter_Tests.cs
@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class BuildProjectListSorter_Tests : AbpCliTestBase
+    {
+        private IBuildProjectListSorter _buildProjectListSorter;
+
+        public BuildProjectListSorter_Tests()
+        {
+            _buildProjectListSorter = GetRequiredService<IBuildProjectListSorter>();
+        }
+
+        [Fact]
+        public void SortByDependencies_Test()
+        {
+            // A -> B, C
+            // B -> D
+            // D -> F
+            // F -> C
+            // C -> G
+            // Final build order must be: G, 
+
+            var repositoryName = "volo";
+            var source = new List<DotNetProjectInfo>
+            {
+                new DotNetProjectInfo(repositoryName, "A", true)
+                {
+                    Dependencies = new List<DotNetProjectInfo>()
+                    {
+                        new DotNetProjectInfo(repositoryName, "B", true),
+                        new DotNetProjectInfo(repositoryName, "C", true)
+                    }
+                },
+                new DotNetProjectInfo(repositoryName, "B", true)
+                {
+                    Dependencies = new List<DotNetProjectInfo>()
+                    {
+                        new DotNetProjectInfo(repositoryName, "D", true)
+                    }
+                },
+                new DotNetProjectInfo(repositoryName, "D", true)
+                {
+                    Dependencies = new List<DotNetProjectInfo>()
+                    {
+                        new DotNetProjectInfo(repositoryName, "F", true)
+                    }
+                },
+                new DotNetProjectInfo(repositoryName, "F", true)
+                {
+                    Dependencies = new List<DotNetProjectInfo>()
+                    {
+                        new DotNetProjectInfo(repositoryName, "C", true)
+                    }
+                },
+                new DotNetProjectInfo(repositoryName, "C", true)
+                {
+                    Dependencies = new List<DotNetProjectInfo>()
+                    {
+                        new DotNetProjectInfo(repositoryName, "G", true)
+                    }
+                },
+                new DotNetProjectInfo(repositoryName, "G", true)
+            };
+
+            var sortedDependencies =
+                _buildProjectListSorter.SortByDependencies(source, new DotNetProjectInfoEqualityComparer());
+            sortedDependencies.Count.ShouldBe(6);
+            sortedDependencies[0].CsProjPath.ShouldBe("G");
+            sortedDependencies[1].CsProjPath.ShouldBe("C");
+            sortedDependencies[2].CsProjPath.ShouldBe("F");
+            sortedDependencies[3].CsProjPath.ShouldBe("D");
+            sortedDependencies[4].CsProjPath.ShouldBe("B");
+            sortedDependencies[5].CsProjPath.ShouldBe("A");
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/BuildStatusGenerator_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/BuildStatusGenerator_Tests.cs
new file mode 100644
index 0000000000..24790a8a03
--- /dev/null
+++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/BuildStatusGenerator_Tests.cs
@@ -0,0 +1,123 @@
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class BuildStatusGenerator_Tests : AbpCliTestBase
+    {
+        private readonly IBuildStatusGenerator _buildStatusGenerator;
+        private IGitRepositoryHelper _gitRepositoryHelper;
+
+        public BuildStatusGenerator_Tests()
+        {
+            _buildStatusGenerator = GetRequiredService<IBuildStatusGenerator>();
+        }
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            _gitRepositoryHelper = Substitute.For<IGitRepositoryHelper>();
+            services.AddTransient(provider => _gitRepositoryHelper);
+        }
+
+        [Fact]
+        public void Should_Set_Repository_CommitId_When_All_Projects_Built()
+        {
+            var buildConfig = new DotNetProjectBuildConfig
+            {
+                GitRepository = new GitRepository("volo", "dev", "")
+                {
+                    DependingRepositories = new List<GitRepository>()
+                    {
+                        new GitRepository("abp", "dev", "")
+                    }
+                }
+            };
+
+            var changedProjects = new List<DotNetProjectInfo>()
+            {
+                new DotNetProjectInfo("volo", "project1.csproj", true)
+            };
+
+            var builtProjects = new List<string>()
+            {
+                "project1.csproj"
+            };
+
+            var lastCommitId = "1";
+            _gitRepositoryHelper.GetLastCommitId(buildConfig.GitRepository).Returns(lastCommitId);
+            _gitRepositoryHelper.GetFriendlyName(buildConfig.GitRepository).Returns("volo");
+
+            var status = _buildStatusGenerator.Generate(buildConfig, changedProjects, builtProjects);
+            status.CommitId.ShouldBe(lastCommitId);
+        }
+
+
+        [Fact]
+        public void Should_Set_Repository_CommitId_When_All_Projects_Built_For_Child_Repository()
+        {
+            var buildConfig = new DotNetProjectBuildConfig
+            {
+                GitRepository = new GitRepository("volo", "dev", "")
+                {
+                    DependingRepositories = new List<GitRepository>()
+                    {
+                        new GitRepository("abp", "dev", "")
+                    }
+                }
+            };
+
+            var changedProjects = new List<DotNetProjectInfo>()
+            {
+                new DotNetProjectInfo("abp", "project1.csproj", true)
+            };
+
+            var builtProjects = new List<string>()
+            {
+                "project1.csproj"
+            };
+
+            var lastCommitId = "1";
+            _gitRepositoryHelper.GetLastCommitId(buildConfig.GitRepository).Returns(lastCommitId);
+            _gitRepositoryHelper.GetFriendlyName(buildConfig.GitRepository).Returns("abp");
+
+            var status = _buildStatusGenerator.Generate(buildConfig, changedProjects, builtProjects);
+            status.CommitId.ShouldBe(lastCommitId);
+        }
+
+        [Fact]
+        public void Should_Not_Set_Repository_CommitId_When_Building_Single_Solution()
+        {
+            var buildConfig = new DotNetProjectBuildConfig
+            {
+                GitRepository = new GitRepository("volo", "dev", "")
+                {
+                    DependingRepositories = new List<GitRepository>()
+                    {
+                        new GitRepository("abp", "dev", "")
+                    }
+                },
+                SlFilePath = "test.sln"
+            };
+
+            var changedProjects = new List<DotNetProjectInfo>()
+            {
+                new DotNetProjectInfo("volo", "project1.csproj", true)
+            };
+
+            var builtProjects = new List<string>()
+            {
+                "project1.csproj"
+            };
+
+            var lastCommitId = "1";
+            _gitRepositoryHelper.GetLastCommitId(buildConfig.GitRepository).Returns(lastCommitId);
+            _gitRepositoryHelper.GetFriendlyName(buildConfig.GitRepository).Returns("volo");
+
+            var status = _buildStatusGenerator.Generate(buildConfig, changedProjects, builtProjects);
+            status.CommitId.ShouldBeNull();
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepositoryBuildStatus_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepositoryBuildStatus_Tests.cs
new file mode 100644
index 0000000000..387b30da7c
--- /dev/null
+++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepositoryBuildStatus_Tests.cs
@@ -0,0 +1,318 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class GitRepositoryBuildStatus_Tests : AbpCliTestBase
+    {
+        private IGitRepositoryHelper _gitRepositoryHelper;
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            _gitRepositoryHelper = Substitute.For<IGitRepositoryHelper>();
+            services.AddTransient(provider => _gitRepositoryHelper);
+        }
+
+        [Fact]
+        public void Add_New_Build_Status_Test()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("volo", "dev")
+            {
+                SucceedProjects = new List<DotNetProjectBuildStatus>
+                {
+                    new DotNetProjectBuildStatus
+                    {
+                        CsProjPath = "project1.csproj",
+                        CommitId = "1"
+                    }
+                }
+            };
+
+            var newBuildStatus = new GitRepositoryBuildStatus(
+                existingBuildStatus.RepositoryName,
+                existingBuildStatus.BranchName
+            )
+            {
+                SucceedProjects = new List<DotNetProjectBuildStatus>
+                {
+                    new DotNetProjectBuildStatus
+                    {
+                        CsProjPath = "project2.csproj",
+                        CommitId = "2"
+                    }
+                }
+            };
+
+            existingBuildStatus.MergeWith(newBuildStatus);
+
+            existingBuildStatus.SucceedProjects.Count.ShouldBe(2);
+        }
+
+        [Fact]
+        public void Update_Existing_Build_Status_Test()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("volo", "dev")
+            {
+                SucceedProjects = new List<DotNetProjectBuildStatus>
+                {
+                    new DotNetProjectBuildStatus
+                    {
+                        CsProjPath = "project1.csproj",
+                        CommitId = "1"
+                    }
+                }
+            };
+
+            var newBuildStatus = new GitRepositoryBuildStatus(
+                existingBuildStatus.RepositoryName,
+                existingBuildStatus.BranchName
+            )
+            {
+                SucceedProjects = new List<DotNetProjectBuildStatus>
+                {
+                    new DotNetProjectBuildStatus
+                    {
+                        CsProjPath = "project1.csproj",
+                        CommitId = "2"
+                    },
+                    new DotNetProjectBuildStatus
+                    {
+                        CsProjPath = "project2.csproj",
+                        CommitId = "2"
+                    }
+                }
+            };
+
+            existingBuildStatus.MergeWith(newBuildStatus);
+            existingBuildStatus.SucceedProjects.Count.ShouldBe(2);
+            existingBuildStatus.GetSelfOrChild("volo").SucceedProjects.First(p => p.CsProjPath == "project1.csproj")
+                .CommitId.ShouldBe("2");
+            existingBuildStatus.GetSelfOrChild("volo").SucceedProjects.First(p => p.CsProjPath == "project2.csproj")
+                .CommitId.ShouldBe("2");
+        }
+
+        [Fact]
+        public void Add_New_Build_Status_For_Child_Repository_Test()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("volo", "dev")
+            {
+                DependingRepositories = new List<GitRepositoryBuildStatus>()
+                {
+                    new GitRepositoryBuildStatus("abp", "dev")
+                    {
+                        SucceedProjects = new List<DotNetProjectBuildStatus>
+                        {
+                            new DotNetProjectBuildStatus
+                            {
+                                CsProjPath = "project1.csproj",
+                                CommitId = "1"
+                            }
+                        }
+                    }
+                }
+            };
+
+            var newBuildStatus = new GitRepositoryBuildStatus(
+                existingBuildStatus.RepositoryName,
+                existingBuildStatus.BranchName
+            )
+            {
+                DependingRepositories = new List<GitRepositoryBuildStatus>()
+                {
+                    new GitRepositoryBuildStatus("abp", "dev")
+                    {
+                        SucceedProjects = new List<DotNetProjectBuildStatus>
+                        {
+                            new DotNetProjectBuildStatus
+                            {
+                                CsProjPath = "project2.csproj",
+                                CommitId = "2"
+                            }
+                        }
+                    }
+                }
+            };
+
+            existingBuildStatus.MergeWith(newBuildStatus);
+            existingBuildStatus.GetChild("abp").SucceedProjects.Count.ShouldBe(2);
+        }
+
+        [Fact]
+        public void Should_Update_Repository_CommitId_When_New_CommitId_Is_Not_Empty()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("volo", "dev");
+
+            var newBuildStatus = new GitRepositoryBuildStatus(
+                existingBuildStatus.RepositoryName,
+                existingBuildStatus.BranchName
+            )
+            {
+                CommitId = "42"
+            };
+
+            existingBuildStatus.MergeWith(newBuildStatus);
+
+            existingBuildStatus.CommitId.ShouldBe("42");
+        }
+
+        [Fact]
+        public void Should_Not_Update_Repository_CommitId_When_New_CommitId_Is_Empty()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("volo", "dev")
+            {
+                CommitId = "21"
+            };
+
+            var newBuildStatus = new GitRepositoryBuildStatus(
+                existingBuildStatus.RepositoryName,
+                existingBuildStatus.BranchName
+            )
+            {
+                CommitId = ""
+            };
+
+            existingBuildStatus.MergeWith(newBuildStatus);
+
+            existingBuildStatus.CommitId.ShouldBe("21");
+        }
+
+        [Fact]
+        public void GetChild_Test()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("repo-1", "dev")
+            {
+                DependingRepositories = new List<GitRepositoryBuildStatus>()
+                {
+                    new GitRepositoryBuildStatus("repo-2", "dev")
+                    {
+                        DependingRepositories = new List<GitRepositoryBuildStatus>()
+                        {
+                            new GitRepositoryBuildStatus("repo-3", "dev")
+                        }
+                    },
+                    new GitRepositoryBuildStatus("repo-4", "dev")
+                }
+            };
+
+            existingBuildStatus.GetChild("repo-3").RepositoryName.ShouldBe("repo-3");
+            existingBuildStatus.GetChild("repo-4").RepositoryName.ShouldBe("repo-4");
+        }
+
+        [Fact]
+        public void GetUniqueName_Test()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("repo-1", "dev")
+            {
+                DependingRepositories = new List<GitRepositoryBuildStatus>()
+                {
+                    new GitRepositoryBuildStatus("repo-2", "dev")
+                    {
+                        DependingRepositories = new List<GitRepositoryBuildStatus>()
+                        {
+                            new GitRepositoryBuildStatus("repo-3", "dev")
+                        }
+                    },
+                    new GitRepositoryBuildStatus("repo-4", "dev")
+                }
+            };
+
+            existingBuildStatus.GetUniqueName("").ShouldBe("B25C935F97D7B3375530A96B392B7644");
+            existingBuildStatus.GetUniqueName("production").ShouldBe("production_B25C935F97D7B3375530A96B392B7644");
+        }
+
+        [Fact]
+        public void GetSelfOrChild_Test()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("repo-1", "dev")
+            {
+                DependingRepositories = new List<GitRepositoryBuildStatus>()
+                {
+                    new GitRepositoryBuildStatus("repo-2", "dev")
+                    {
+                        DependingRepositories = new List<GitRepositoryBuildStatus>()
+                        {
+                            new GitRepositoryBuildStatus("repo-3", "dev")
+                        }
+                    },
+                    new GitRepositoryBuildStatus("repo-4", "dev")
+                }
+            };
+
+            existingBuildStatus.GetSelfOrChild("repo-1").RepositoryName.ShouldBe("repo-1");
+            existingBuildStatus.GetSelfOrChild("repo-2").RepositoryName.ShouldBe("repo-2");
+            existingBuildStatus.GetSelfOrChild("repo-3").RepositoryName.ShouldBe("repo-3");
+            existingBuildStatus.GetSelfOrChild("repo-4").RepositoryName.ShouldBe("repo-4");
+        }
+
+        [Fact]
+        public void AddOrUpdateProjectStatus_Test()
+        {
+            var existingBuildStatus = new GitRepositoryBuildStatus("repo-1", "dev")
+            {
+                DependingRepositories = new List<GitRepositoryBuildStatus>()
+                {
+                    new GitRepositoryBuildStatus("repo-2", "dev")
+                    {
+                        SucceedProjects = new List<DotNetProjectBuildStatus>
+                        {
+                            new DotNetProjectBuildStatus
+                            {
+                                CsProjPath = "A.csproj",
+                                CommitId = "42"
+                            }
+                        },
+                        DependingRepositories = new List<GitRepositoryBuildStatus>
+                        {
+                            new GitRepositoryBuildStatus("repo-3", "dev")
+                            {
+                                SucceedProjects = new List<DotNetProjectBuildStatus>
+                                {
+                                    new DotNetProjectBuildStatus
+                                    {
+                                        CsProjPath = "B.csproj",
+                                        CommitId = "42"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    new GitRepositoryBuildStatus("repo-4", "dev")
+                    {
+                        SucceedProjects = new List<DotNetProjectBuildStatus>()
+                        {
+                            new DotNetProjectBuildStatus
+                            {
+                                CsProjPath = "C.csproj",
+                                CommitId = "42"
+                            }
+                        }
+                    }
+                }
+            };
+
+            var repo2 = existingBuildStatus.GetChild("repo-2");
+            repo2.AddOrUpdateProjectStatus(new DotNetProjectBuildStatus
+            {
+                CommitId = "21",
+                CsProjPath = "A.csproj"
+            });
+            
+            var repo3 = existingBuildStatus.GetChild("repo-3");
+            repo3.AddOrUpdateProjectStatus(new DotNetProjectBuildStatus
+            {
+                CommitId = "21",
+                CsProjPath = "X.csproj"
+            });
+            
+            repo2.SucceedProjects.Count.ShouldBe(1);
+            repo2.SucceedProjects.ShouldContain(e=> e.CsProjPath == "A.csproj" && e.CommitId == "21");
+            
+            repo3.SucceedProjects.Count.ShouldBe(2);
+            repo3.SucceedProjects.ShouldContain(e=> e.CsProjPath == "X.csproj" && e.CommitId == "21");
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepository_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepository_Tests.cs
new file mode 100644
index 0000000000..17cc8b9dc4
--- /dev/null
+++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepository_Tests.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.Cli.Build
+{
+    public class GitRepository_Tests : AbpCliTestBase
+    {
+        [Fact]
+        public void GetUniqueName_Test()
+        {
+            var gitRepository = new GitRepository("repo-1", "dev", "")
+            {
+                DependingRepositories = new List<GitRepository>
+                {
+                    new GitRepository("repo-2", "dev", ""),
+                    new GitRepository("repo-3", "dev", "")
+                    {
+                        DependingRepositories = new List<GitRepository>()
+                        {
+                            new GitRepository("repo-4", "dev", "")
+                        }
+                    }
+                }
+            };
+            
+            gitRepository.GetUniqueName("").ShouldBe("B25C935F97D7B3375530A96B392B7644");
+            gitRepository.GetUniqueName("production").ShouldBe("production_B25C935F97D7B3375530A96B392B7644");
+        }
+
+        [Fact]
+        public void FindRepositoryOf_Test()
+        {
+            var gitRepository = new GitRepository("repo-1", "dev", "/repo-1/dev/")
+            {
+                DependingRepositories = new List<GitRepository>
+                {
+                    new GitRepository("repo-2", "dev", "/repo-2/dev/"),
+                    new GitRepository("repo-3", "dev", "/repo-3/dev/")
+                    {
+                        DependingRepositories = new List<GitRepository>()
+                        {
+                            new GitRepository("repo-4", "dev", "/repo-4/dev/")
+                        }
+                    }
+                }
+            };
+
+            gitRepository.FindRepositoryOf("/repo-4/dev/A.csproj").ShouldBe("repo-4");
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs
index cfa7b033b7..8ec0b026cd 100644
--- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs
+++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs
@@ -1,10 +1,15 @@
 using System;
+using System.Linq;
+using System.Threading;
 using Microsoft.Extensions.DependencyInjection;
+using MongoDB.Driver;
+using MongoDB.Driver.Core.Servers;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
 using Volo.Abp.TestApp;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.TestApp.MongoDB;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.MongoDB
 {
@@ -16,7 +21,7 @@ namespace Volo.Abp.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
                                    Guid.NewGuid().ToString("N");
 
@@ -30,6 +35,11 @@ namespace Volo.Abp.MongoDB
                 options.AddDefaultRepositories<ITestAppMongoDbContext>();
                 options.AddRepository<City, CityRepository>();
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
 }
diff --git a/modules/account/Volo.Abp.Account.sln b/modules/account/Volo.Abp.Account.sln
index c2b195f05b..b96627aac9 100644
--- a/modules/account/Volo.Abp.Account.sln
+++ b/modules/account/Volo.Abp.Account.sln
@@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{12FAE513-7
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Account.Application.Tests", "test\Volo.Abp.Account.Application.Tests\Volo.Abp.Account.Application.Tests.csproj", "{356EAC51-5D55-4852-A8A5-2F90EAC8DAE3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Account.Blazor", "src\Volo.Abp.Account.Blazor\Volo.Abp.Account.Blazor.csproj", "{EE8858B3-A638-481B-8EB9-74F5E7D43D80}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +57,10 @@ Global
 		{356EAC51-5D55-4852-A8A5-2F90EAC8DAE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{356EAC51-5D55-4852-A8A5-2F90EAC8DAE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{356EAC51-5D55-4852-A8A5-2F90EAC8DAE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE8858B3-A638-481B-8EB9-74F5E7D43D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE8858B3-A638-481B-8EB9-74F5E7D43D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE8858B3-A638-481B-8EB9-74F5E7D43D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE8858B3-A638-481B-8EB9-74F5E7D43D80}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +73,7 @@ Global
 		{EBF0C2B3-14CB-4DFC-9753-ECBF959CBA2E} = {B5881429-EFF7-4F30-8C0B-0AC41E36B74E}
 		{7BCA5955-B3F6-41E8-9D5D-D115195C6098} = {B5881429-EFF7-4F30-8C0B-0AC41E36B74E}
 		{356EAC51-5D55-4852-A8A5-2F90EAC8DAE3} = {12FAE513-7575-4235-89DF-277BA1A3B098}
+		{EE8858B3-A638-481B-8EB9-74F5E7D43D80} = {B5881429-EFF7-4F30-8C0B-0AC41E36B74E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2B054393-D2B2-4EA8-8A15-D60CBCF3E7A9}
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorAutoMapperProfile.cs b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorAutoMapperProfile.cs
new file mode 100644
index 0000000000..f5c4cdc01d
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorAutoMapperProfile.cs
@@ -0,0 +1,20 @@
+using AutoMapper;
+using Volo.Abp.Account.Blazor.Pages.Account;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Identity;
+
+namespace Volo.Abp.Account.Blazor
+{
+    public class AbpAccountBlazorAutoMapperProfile : Profile
+    {
+        public AbpAccountBlazorAutoMapperProfile()
+        {
+            CreateMap<ProfileDto, PersonalInfoModel>()
+                .Ignore(x => x.PhoneNumberConfirmed)
+                .Ignore(x => x.EmailConfirmed);
+
+            CreateMap<PersonalInfoModel, UpdateProfileDto>()
+                .Ignore(x => x.ExtraProperties);
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs
new file mode 100644
index 0000000000..c0917dd8f7
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs
@@ -0,0 +1,37 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Modularity;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.Account.Blazor
+{
+    [DependsOn(
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpAutoMapperModule),
+        typeof(AbpAccountHttpApiClientModule)
+        )]
+    public class AbpAccountBlazorModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddAutoMapperObjectMapper<AbpAccountBlazorModule>();
+
+            Configure<AbpAutoMapperOptions>(options =>
+            {
+                options.AddProfile<AbpAccountBlazorAutoMapperProfile>(validate: true);
+            });
+
+            Configure<AbpNavigationOptions>(options =>
+            {
+                options.MenuContributors.Add(new AbpAccountBlazorUserMenuContributor());
+            });
+
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AdditionalAssemblies.Add(typeof(AbpAccountBlazorModule).Assembly);
+            });
+        }
+    }
+}
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorUserMenuContributor.cs b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorUserMenuContributor.cs
new file mode 100644
index 0000000000..3ceab0f735
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorUserMenuContributor.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Volo.Abp.Account.Localization;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.Account.Blazor
+{
+    public class AbpAccountBlazorUserMenuContributor : IMenuContributor
+    {
+        public Task ConfigureMenuAsync(MenuConfigurationContext context)
+        {
+            if (context.Menu.Name != StandardMenus.User)
+            {
+                return Task.CompletedTask;
+            }
+
+            var accountResource = context.GetLocalizer<AccountResource>();
+
+            context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountResource["ManageYourProfile"], url: "account/manage-profile", icon: "fa fa-cog"));
+            
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/FodyWeavers.xml b/modules/account/src/Volo.Abp.Account.Blazor/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/FodyWeavers.xsd b/modules/account/src/Volo.Abp.Account.Blazor/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor
new file mode 100644
index 0000000000..d8c9d063b8
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor
@@ -0,0 +1,64 @@
+@page "/account/manage-profile"
+@inherits AccountManageBase
+<Row>
+    <Column ColumnSize="ColumnSize.Is12">
+        <Tabs @bind-SelectedTab="@SelectedTab" TabPosition="TabPosition.Left" Pills="true">
+            <Items>
+                <Tab Name="Password">@L["ProfileTab:Password"]</Tab>
+                <Tab Name="PersonalInfo">@L["ProfileTab:PersonalInfo"]</Tab>
+            </Items>
+            <Content>
+                @if (ChangePasswordModel != null)
+                {
+                    <TabPanel Name="Password">
+                        <Field>
+                            <FieldLabel>@L["DisplayName:CurrentPassword"]</FieldLabel>
+                            <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.CurrentPassword" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:NewPassword"]</FieldLabel>
+                            <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPassword" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:NewPasswordConfirm"]</FieldLabel>
+                            <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPasswordConfirm" />
+                        </Field>
+                        <Field>
+                            <Button Color="Color.Primary" Clicked="@ChangePasswordAsync">@L["Save"]</Button>
+                        </Field>
+                    </TabPanel>
+                }
+                @if (PersonalInfoModel != null)
+                {
+                    <TabPanel Name="PersonalInfo">
+                        <Field>
+                            <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                            <TextEdit @bind-text="@PersonalInfoModel.UserName" />
+                        </Field>
+                        <Fields>
+                            <Field ColumnSize="ColumnSize.Is6">
+                                <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                                <TextEdit @bind-text="@PersonalInfoModel.Name" />
+                            </Field>
+                            <Field ColumnSize="ColumnSize.Is6">
+                                <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                                <TextEdit @bind-text="@PersonalInfoModel.Surname" />
+                            </Field>
+                        </Fields>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                            <TextEdit @bind-text="@PersonalInfoModel.Email" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                            <TextEdit @bind-text="@PersonalInfoModel.PhoneNumber" />
+                        </Field>
+                        <Field>
+                            <Button Color="Color.Primary" Clicked="@UpdatePersonalInfoAsync">@L["Save"]</Button>
+                        </Field>
+                    </TabPanel>
+                }
+            </Content>
+        </Tabs>
+    </Column>
+</Row>
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs
new file mode 100644
index 0000000000..77cf43327c
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs
@@ -0,0 +1,117 @@
+using System.Threading.Tasks;
+using Localization.Resources.AbpUi;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.Account.Localization;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.Identity;
+using Volo.Abp.ObjectMapping;
+
+namespace Volo.Abp.Account.Blazor.Pages.Account
+{
+    public class AccountManageBase : OwningComponentBase
+    {
+        [Inject] protected IAccountAppService AccountAppService { get; set; }
+        [Inject] protected IProfileAppService ProfileAppService { get; set; }
+        
+        [Inject] protected IObjectMapper<AbpAccountBlazorModule> ObjectMapper { get; set; }
+        
+        [Inject] protected IUiMessageService UiMessageService { get; set; }
+
+        [Inject] protected IStringLocalizer<AbpUiResource> UiLocalizer { get; set; }
+        
+        [Inject] protected IStringLocalizer<AccountResource> L { get; set; }
+
+        protected string SelectedTab = "Password";
+
+        protected ChangePasswordModel ChangePasswordModel;
+
+        protected PersonalInfoModel PersonalInfoModel;
+        
+        protected override async Task OnInitializedAsync()
+        {
+            await GetUserInformations();
+        }
+
+        protected async Task GetUserInformations()
+        {
+            var user = await ProfileAppService.GetAsync();
+
+            ChangePasswordModel = new ChangePasswordModel
+            {
+                HideOldPasswordInput = !user.HasPassword
+            };
+            
+            PersonalInfoModel = ObjectMapper.Map<ProfileDto, PersonalInfoModel>(user);
+        }
+
+        protected async Task ChangePasswordAsync()
+        {
+            if (string.IsNullOrWhiteSpace(ChangePasswordModel.CurrentPassword))
+            {
+                return;
+            }
+            
+            if (ChangePasswordModel.NewPassword != ChangePasswordModel.NewPasswordConfirm)
+            {
+                await UiMessageService.WarnAsync(L["NewPasswordConfirmFailed"]);
+                return;
+            }
+            
+            if (!await UiMessageService.ConfirmAsync(UiLocalizer["AreYouSure"]))
+            {
+                return;
+            }
+
+            await ProfileAppService.ChangePasswordAsync(new ChangePasswordInput
+            {
+                CurrentPassword = ChangePasswordModel.CurrentPassword,
+                NewPassword = ChangePasswordModel.NewPassword
+            });
+            
+            await UiMessageService.SuccessAsync(L["PasswordChanged"]);
+        }
+
+        protected async Task UpdatePersonalInfoAsync()
+        {
+            if (!await UiMessageService.ConfirmAsync(UiLocalizer["AreYouSure"]))
+            {
+                return;
+            }
+            
+            await ProfileAppService.UpdateAsync(
+                ObjectMapper.Map<PersonalInfoModel, UpdateProfileDto>(PersonalInfoModel)
+                );
+            
+            await UiMessageService.SuccessAsync(L["PersonalSettingsSaved"]);
+        }
+    }
+
+    public class ChangePasswordModel
+    {
+        public string CurrentPassword { get; set; }
+
+        public string NewPassword { get; set; }
+
+        public string NewPasswordConfirm { get; set; }
+
+        public bool HideOldPasswordInput { get; set; }
+    }
+    
+    public class PersonalInfoModel
+    {
+        public string UserName { get; set; }
+
+        public string Email { get; set; }
+
+        public string Name { get; set; }
+
+        public string Surname { get; set; }
+
+        public string PhoneNumber { get; set; }
+
+        public bool PhoneNumberConfirmed { get; set; }
+
+        public bool EmailConfirmed { get; set; }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..5707bc86a4
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <Import Project="..\..\..\..\configureawait.props" />
+  <Import Project="..\..\..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <RootNamespace>Volo.Abp.Account.Blazor</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.Account.HttpApi.Client\Volo.Abp.Account.HttpApi.Client.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="Pages\Account\Manage.razor">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+    </Content>
+  </ItemGroup>
+
+</Project>
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor b/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor
new file mode 100644
index 0000000000..4685ac9893
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor
@@ -0,0 +1,5 @@
+@using Microsoft.AspNetCore.Components.Web
+@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using Volo.Abp.BlazoriseUI
+@using Blazorise
+@using Blazorise.DataGrid
\ No newline at end of file
diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
index 5cac32faae..a8d213a81f 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.AuditLogging.MongoDB
 {
@@ -12,14 +13,19 @@ namespace Volo.Abp.AuditLogging.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
index 07be76b792..a7ec1ad65f 100644
--- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.BackgroundJobs.MongoDB
 {
@@ -12,14 +13,19 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs
index 03eb96f6d3..12cb8b0de3 100644
--- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs
+++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs
@@ -1,25 +1,31 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
     [DependsOn(
         typeof(BlobStoringDatabaseTestBaseModule),
         typeof(BlobStoringDatabaseMongoDbModule)
-        )]
+    )]
     public class BlobStoringDatabaseMongoDbTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json
index 02ac6e7d83..bf5ad9c093 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/package.json
+++ b/modules/blogging/app/Volo.BloggingTestApp/package.json
@@ -3,7 +3,7 @@
   "name": "volo.blogtestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1",
-    "@abp/blogging": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2",
+    "@abp/blogging": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
index 376601e5c1..2064046256 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
+++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,213 +41,213 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/blogging@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-3.1.1.tgz#3e1048430a0614dd31c68f462fd14eb4731928a9"
-  integrity sha512-mAonKax2yC1Wra86kejAcRICOD7yzNJPlv23sUCa52vfifZijww8ClSpAlxiHMtIMNNuGJcjA+MpZnNuMqXWTw==
+"@abp/blogging@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-3.1.2.tgz#7adde6ee9cccfcc3b7c0715491d4856daaff02db"
+  integrity sha512-4QKq5uvGxXAJlu5Vb6D5Njap0Llb4VhqqV1LFvgR14ARb8n5BguqL66Pt+Ke5nPXxaZJz5VbyUl1P3Gp+iqS8w==
   dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-    "@abp/owl.carousel" "~3.1.1"
-    "@abp/prismjs" "~3.1.1"
-    "@abp/tui-editor" "~3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+    "@abp/owl.carousel" "~3.1.2"
+    "@abp/prismjs" "~3.1.2"
+    "@abp/tui-editor" "~3.1.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/clipboard@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.1.1.tgz#f01186c7e5d08a17cc206280eab5512daad583e8"
-  integrity sha512-opCCnIqa5Fx3Z0qH4TEsfY8Msj8BeffhkFoXeZlvZGrZg/jRz8nwzZi2oEcPYcr6Hzbb0bj4dunDbmU7yKxukQ==
+"@abp/clipboard@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.1.2.tgz#ee561db080c6b0836fd77628543cc3c31cd687c8"
+  integrity sha512-ybx3E1eLsfrPhPDb8f/KQJrH8G9+E5+WNsmYopKkQP2v3Un/9QGme7CslT7oytExJ7P++Y3LZ2ZhfBwQLicxxQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     clipboard "^2.0.6"
 
-"@abp/codemirror@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-3.1.1.tgz#fc6bef9801815f7eaf3ca661567bb29d0600c6eb"
-  integrity sha512-WKS924PrxmseYVyly7MH6J/jAK9wBdvKM1qYGsQ9DHiH13zb1L72ck3CcGHPP7jkKkFqqgvenm7Uuhbq0zTkgA==
+"@abp/codemirror@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-3.1.2.tgz#63701fd6eb30bd45d4251cca2d5bbd75b8491f6b"
+  integrity sha512-BxW3y/Ps7iiczlmctyvn3gjTnpGJnDfQtKVfeZ0TYKRbbs4B5z3ZHPhYAxH+t6eULJcyzIWBxl3UgrgjTaadgA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     codemirror "^5.54.0"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/highlight.js@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-3.1.1.tgz#691d3fcaad44c6a7178df91de793bb8ee8f3c8e8"
-  integrity sha512-YIiPW0YlwEfBNHiUPCSk9VM6GYk6EBMCuKMTa86ltx1EMW9E0GK0WiVJI+y0qhVEWb722zTcw7O6t0rE1i4dVg==
+"@abp/highlight.js@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-3.1.2.tgz#24f22bbd762532d82af8f3dcbbbc48bd05d0c716"
+  integrity sha512-GAEKizLly5U8XlKJ+pogiNLRnLo8hocpMpUNr61FR+y1crROS0g2pSCe0Iuq+BNuBX+npJKpUpv1GIQwY3cQqQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/markdown-it@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-3.1.1.tgz#0cf0eca9fadfea607ba56d9067ba2ec5b95062da"
-  integrity sha512-7ggun7Q4dAkugct7qKy1IvYP0dSlJQuCfVBLiiuTvyx0oBk4VX67INH4OnkBtjGdSKplzQhndlwWweEQlq2xFA==
+"@abp/markdown-it@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-3.1.2.tgz#8437038687cabb9679ab81c2e995d4ff3823f22f"
+  integrity sha512-hoxIO05mf3WNiT2l5iQNjvJQO3p8F6nkVyW9b4ZOHcZoGFQb8DWPp3ONBJk/ZRVYpYfo+/n3sB4ADsUi2oin3w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     markdown-it "^11.0.0"
 
-"@abp/owl.carousel@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-3.1.1.tgz#b74cc97630006fef07a07606c187370c6b30242e"
-  integrity sha512-HcP7p5kR1fYnxddj+cGZ+nBQkI0JhyI2xYApHAcusLLgMFK3vyhpOTQmZt1Ut/a1hlIWgZ50jyofEcIOQfPMWg==
+"@abp/owl.carousel@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-3.1.2.tgz#86e272d3f88d34a201cdea2220f6eb415a4ed85f"
+  integrity sha512-/zIB15W6HFq9ssq9YWHWrikV/fH6gID4X2gkJWeuz89MUg/dtJlPWLMfiN8zAKgG6Uf7rbBmJ4C2/ilI5IoEgA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     owl.carousel "^2.3.4"
 
-"@abp/prismjs@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.1.1.tgz#e118c12d09cdb93f6d7e8ac7b7b0e100ee661f2e"
-  integrity sha512-sWPNNyY3n8OSEkJ4AGVH98AerbqNtbc4dOKPjnymbojgMKxj0SN/+HascySMNfsR7QAOBugjJKvrIzMS+P3BZQ==
+"@abp/prismjs@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.1.2.tgz#884011843c44d85a80d4fd85648bc94ef119bbd6"
+  integrity sha512-UQAOc/FgISgvTi1irPQjehJ42pLEaA1m5K1JileFTCWwUji/t5Vb8RSQe4cjIKPwRpb6p7CEJLI9SFxCtUEF8g==
   dependencies:
-    "@abp/clipboard" "~3.1.1"
-    "@abp/core" "~3.1.1"
+    "@abp/clipboard" "~3.1.2"
+    "@abp/core" "~3.1.2"
     prismjs "^1.20.0"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/tui-editor@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-3.1.1.tgz#0226f43771b573884ced8480e72f7e14ce81e5d3"
-  integrity sha512-kOjFbwceyPO1jYyp1F1CqUMdD3fQmGoJaeaigUDBZ8WHRL/uUhKEwU3Mnmw9Jg1EvmEYBqqN6GkQPXXFMh7FtA==
+"@abp/tui-editor@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-3.1.2.tgz#8796a2518d7d43babf19018ae4deaf347046a93b"
+  integrity sha512-CH1yixb6C+3tRcKu6lrXOToj+jxca5IvVMO0Hfa8xeoGt+FZdS9ATMEiBB09TVhNL/jxAAb7qT4YaXNzk1BOtg==
   dependencies:
-    "@abp/codemirror" "~3.1.1"
-    "@abp/highlight.js" "~3.1.1"
-    "@abp/jquery" "~3.1.1"
-    "@abp/markdown-it" "~3.1.1"
+    "@abp/codemirror" "~3.1.2"
+    "@abp/highlight.js" "~3.1.2"
+    "@abp/jquery" "~3.1.2"
+    "@abp/markdown-it" "~3.1.2"
     tui-editor "^1.4.10"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs
index 1e68cebf21..f66922cfcd 100644
--- a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs
+++ b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Blogging.MongoDB
 {
@@ -12,14 +13,19 @@ namespace Volo.Blogging.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
index 20ef49ec03..9305044f86 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
@@ -3,6 +3,6 @@
   "name": "client-simulation-web",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
index 5d4fc68da5..be010610b3 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json
index 6f0e167a03..01bac82422 100644
--- a/modules/cms-kit/angular/package.json
+++ b/modules/cms-kit/angular/package.json
@@ -15,11 +15,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.1.1",
-    "@abp/ng.identity": "~3.1.1",
-    "@abp/ng.setting-management": "~3.1.1",
-    "@abp/ng.tenant-management": "~3.1.1",
-    "@abp/ng.theme.basic": "~3.1.1",
+    "@abp/ng.account": "~3.1.2",
+    "@abp/ng.identity": "~3.1.2",
+    "@abp/ng.setting-management": "~3.1.2",
+    "@abp/ng.tenant-management": "~3.1.2",
+    "@abp/ng.theme.basic": "~3.1.2",
     "@angular/animations": "~10.0.0",
     "@angular/common": "~10.0.0",
     "@angular/compiler": "~10.0.0",
diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json
index cbf3371b19..e527f269d4 100644
--- a/modules/cms-kit/angular/projects/cms-kit/package.json
+++ b/modules/cms-kit/angular/projects/cms-kit/package.json
@@ -4,8 +4,8 @@
   "peerDependencies": {
     "@angular/common": "^9.1.11",
     "@angular/core": "^9.1.11",
-    "@abp/ng.core": ">=3.1.1",
-    "@abp/ng.theme.shared": ">=3.1.1"
+    "@abp/ng.core": ">=3.1.2",
+    "@abp/ng.theme.shared": ">=3.1.2"
   },
   "dependencies": {
     "tslib": "^2.0.0"
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
index c2703b4d59..526fb222ef 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
index c04f0b3aee..2e73b4cb6f 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
index 0216c44b06..aa8511a4d3 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
index dd76d1712a..ecbaee6414 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
index 0216c44b06..aa8511a4d3 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock
index 362d519a4a..7473b4ed5f 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs
index 3872861ef7..9bf0e0b881 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs
@@ -60,14 +60,14 @@ namespace Volo.CmsKit.Reactions
             await _reactionPublicAppService.CreateAsync(
                 _cmsKitTestData.EntityType2,
                 _cmsKitTestData.EntityId2,
-                StandardReactions.Hooray
+                StandardReactions.Eyes
             );
 
             UsingDbContext(context =>
             {
                 var reaction = context.Set<UserReaction>().FirstOrDefault(x =>
                     x.CreatorId == _cmsKitTestData.User1Id &&
-                    x.ReactionName == StandardReactions.Hooray &&
+                    x.ReactionName == StandardReactions.Eyes &&
                     x.EntityId == _cmsKitTestData.EntityId2 &&
                     x.EntityType == _cmsKitTestData.EntityType2);
 
diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs
index 125ec8dbd4..521b93cc8c 100644
--- a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs
@@ -1,25 +1,31 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.CmsKit.MongoDB
 {
     [DependsOn(
         typeof(CmsKitTestBaseModule),
         typeof(CmsKitMongoDbModule)
-        )]
+    )]
     public class CmsKitMongoDbTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json
index 9689d194c1..6d35d0ecfd 100644
--- a/modules/docs/app/VoloDocs.Web/package.json
+++ b/modules/docs/app/VoloDocs.Web/package.json
@@ -3,7 +3,7 @@
   "name": "volo.docstestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1",
-    "@abp/docs": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2",
+    "@abp/docs": "^3.1.2"
   }
 }
diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock
index d43a68f38a..388d48a35f 100644
--- a/modules/docs/app/VoloDocs.Web/yarn.lock
+++ b/modules/docs/app/VoloDocs.Web/yarn.lock
@@ -2,45 +2,45 @@
 # yarn lockfile v1
 
 
-"@abp/anchor-js@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-3.1.1.tgz#165955055ae85646f359994dbf12fd016535e62a"
-  integrity sha512-PGsebx7yL+YZS5tJhc3D9cKfJB4YrMEEhqr9lXn6MnqIHFo141+RUuvPnjQVQWb0PsSXVuxBCFEHU9uCcgd4Yg==
+"@abp/anchor-js@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-3.1.2.tgz#eb1f5043fad84622b7f3567963d5d94b5f8c60b3"
+  integrity sha512-cELNHIZA3mePvATpvQ/yVbu4gk36dESNxWkCB31nigRXo5mnjOv1YcDpyJzp8PjSk+oXJlwz5inFbiYMtQfaFQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     anchor-js "^4.2.2"
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -49,180 +49,180 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/clipboard@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.1.1.tgz#f01186c7e5d08a17cc206280eab5512daad583e8"
-  integrity sha512-opCCnIqa5Fx3Z0qH4TEsfY8Msj8BeffhkFoXeZlvZGrZg/jRz8nwzZi2oEcPYcr6Hzbb0bj4dunDbmU7yKxukQ==
+"@abp/clipboard@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.1.2.tgz#ee561db080c6b0836fd77628543cc3c31cd687c8"
+  integrity sha512-ybx3E1eLsfrPhPDb8f/KQJrH8G9+E5+WNsmYopKkQP2v3Un/9QGme7CslT7oytExJ7P++Y3LZ2ZhfBwQLicxxQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     clipboard "^2.0.6"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/docs@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-3.1.1.tgz#b7e86c30287bd6ba2d2b381c6b24335c79101c24"
-  integrity sha512-9JX4E2sr9hRbmI36sIwU+8dwJC9LjIPa1rjDUFJzRKezgCw+TLGb3EIhoqfjH6SBM0b3zrS09X4xh83B/MfHow==
+"@abp/docs@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-3.1.2.tgz#6c4e283c80cc502cf6e04ac3448265a8f02bad35"
+  integrity sha512-YnC+IiMLQuZsp8Lc/MC6uB4xAWSG5CVdCsxJdGOBtmPS2SlaE2+2nAM0TtBK7i7190zoCHda4PZRRjjAwtbvAQ==
   dependencies:
-    "@abp/anchor-js" "~3.1.1"
-    "@abp/clipboard" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/popper.js" "~3.1.1"
-    "@abp/prismjs" "~3.1.1"
+    "@abp/anchor-js" "~3.1.2"
+    "@abp/clipboard" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/popper.js" "~3.1.2"
+    "@abp/prismjs" "~3.1.2"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/popper.js@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-3.1.1.tgz#56ff7ad3f0baea0bd5a524895e927bf4e4d9ffb3"
-  integrity sha512-evl/r2/Cgb/e6zS08l1AclOfm/AEWbCbn/HDB7BI7KcN/BKkKP8beVJ2G7yxZN6nSLfP06gJlbjRtrTLo8ZBcg==
+"@abp/popper.js@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-3.1.2.tgz#e611547c2981d3d12fa0da119403131fb07495f8"
+  integrity sha512-OtjNi1B44HUZ9vn5W9LZrrXNmGWLL+Ds96vVJ0GHo7DAi+xAMtalCqlhUyR0NT7uTOrKucE48rZvnJ/SxOiuOw==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     popper.js "^1.16.0"
 
-"@abp/prismjs@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.1.1.tgz#e118c12d09cdb93f6d7e8ac7b7b0e100ee661f2e"
-  integrity sha512-sWPNNyY3n8OSEkJ4AGVH98AerbqNtbc4dOKPjnymbojgMKxj0SN/+HascySMNfsR7QAOBugjJKvrIzMS+P3BZQ==
+"@abp/prismjs@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.1.2.tgz#884011843c44d85a80d4fd85648bc94ef119bbd6"
+  integrity sha512-UQAOc/FgISgvTi1irPQjehJ42pLEaA1m5K1JileFTCWwUji/t5Vb8RSQe4cjIKPwRpb6p7CEJLI9SFxCtUEF8g==
   dependencies:
-    "@abp/clipboard" "~3.1.1"
-    "@abp/core" "~3.1.1"
+    "@abp/clipboard" "~3.1.2"
+    "@abp/core" "~3.1.2"
     prismjs "^1.20.0"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs
index b31f9b5acd..d00f25b533 100644
--- a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs
+++ b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Docs.MongoDB
 {
@@ -12,14 +13,19 @@ namespace Volo.Docs.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
 }
diff --git a/modules/feature-management/Volo.Abp.FeatureManagement.sln b/modules/feature-management/Volo.Abp.FeatureManagement.sln
index 34f0c84aa5..7f1c6ae1e0 100644
--- a/modules/feature-management/Volo.Abp.FeatureManagement.sln
+++ b/modules/feature-management/Volo.Abp.FeatureManagement.sln
@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FeatureManagement.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FeatureManagement.Application.Tests", "test\Volo.Abp.FeatureManagement.Application.Tests\Volo.Abp.FeatureManagement.Application.Tests.csproj", "{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FeatureManagement.Blazor", "src\Volo.Abp.FeatureManagement.Blazor\Volo.Abp.FeatureManagement.Blazor.csproj", "{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +99,10 @@ Global
 		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +122,7 @@ Global
 		{E5906DE1-B2F5-472E-BE1B-1D96A68B834D} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
 		{AA783A34-86E4-41A5-AE21-5D9FBD98D858} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
 		{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
new file mode 100644
index 0000000000..497d7553da
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
@@ -0,0 +1,16 @@
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.FeatureManagement.Blazor
+{
+    [DependsOn(
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpAutoMapperModule),
+        typeof(AbpFeatureManagementHttpApiClientModule)
+    )]
+    public class AbpFeatureManagementBlazorModule : AbpModule
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
new file mode 100644
index 0000000000..f59eea6d57
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
@@ -0,0 +1,85 @@
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.FeatureManagement.Localization
+@using Volo.Abp.Validation.StringValues
+@inject IStringLocalizer<AbpFeatureManagementResource> L
+
+<Modal @ref="_modal">
+    <ModalBackdrop />
+    <ModalContent Size="ModalSize.Large" IsCentered="true">
+        <ModalHeader>
+            <ModalTitle>@L["Features"]</ModalTitle>
+            <CloseButton Clicked="CloseModal" />
+        </ModalHeader>
+        <ModalBody MaxHeight="50">
+            @if (_groups == null)
+            {
+                <span>@L["NoFeatureFoundMessage"]</span>
+            }
+            else
+            {
+                <Tabs TabPosition="TabPosition.Left" Pills="true" SelectedTab="@GetNormalizedGroupName(_groups.First().Name)">
+                    <Items>
+                        @foreach (var group in _groups)
+                        {
+                            <Tab Name="@GetNormalizedGroupName(group.Name)">
+                                <span>@group.DisplayName</span>
+                            </Tab>
+                        }
+                    </Items>
+                    <Content>
+                        @foreach (var group in _groups)
+                        {
+                            <TabPanel Name="@GetNormalizedGroupName(group.Name)">
+                                <h4>@group.DisplayName</h4>
+                                
+                                @foreach (var feature in group.Features)
+                                {
+                                    var disabled = IsDisabled(feature.Provider.Name);
+                                    
+                                    if (feature.ValueType is FreeTextStringValueType)
+                                    {
+                                        <Field>
+                                            <FieldLabel>@feature.DisplayName</FieldLabel>
+                                            <TextEdit Disabled="@disabled" @bind-text="@feature.Value" />
+                                            @if (feature.Description != null)
+                                            {
+                                                <span>@feature.Description</span>
+                                            }
+                                        </Field>
+                                    }
+
+                                    if (feature.ValueType is SelectionStringValueType)
+                                    {
+                                        var items = ((SelectionStringValueType) feature.ValueType).ItemSource.Items;
+                                        
+                                        <Field>
+                                            <FieldLabel>@feature.DisplayName</FieldLabel>
+                                            <Select TValue="string" SelectedValue="feature.Value">
+                                                @foreach (var item in items)
+                                                {
+                                                    <SelectItem Value="@item.Value">@item.DisplayText</SelectItem>
+                                                }
+                                            </Select>
+                                        </Field>
+                                    }
+
+                                    if (feature.ValueType is ToggleStringValueType)
+                                    {
+                                        <Field>
+                                            <Check TValue="bool" @bind-checked="@ToggleValues[feature.Name]">@feature.DisplayName</Check>
+                                        </Field>
+                                    }
+                                }
+                                
+                            </TabPanel>
+                        }
+                    </Content>
+                </Tabs>
+            }
+        </ModalBody>
+        <ModalFooter>
+            <Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button>
+            <Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
+        </ModalFooter>
+    </ModalContent>
+</Modal>
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
new file mode 100644
index 0000000000..40aba610eb
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Blazorise;
+using Microsoft.AspNetCore.Components;
+using Volo.Abp.Features;
+using Volo.Abp.Validation.StringValues;
+
+namespace Volo.Abp.FeatureManagement.Blazor.Components
+{
+    public partial class FeatureManagementModal
+    {
+        [Inject] private IFeatureAppService FeatureAppService { get; set; }
+
+        private Modal _modal;
+        
+        private string _providerName;
+        private string _providerKey;
+        
+        private List<FeatureGroupDto> _groups { get; set; }
+
+        private Dictionary<string, bool> ToggleValues;
+        
+        public async Task OpenAsync(string providerName, string providerKey)
+        {
+            _providerName = providerName;
+            _providerKey = providerKey;
+
+            _groups = (await FeatureAppService.GetAsync(_providerName, _providerKey)).Groups;
+
+            ToggleValues = _groups
+                .SelectMany(x => x.Features)
+                .Where(x => x.ValueType is ToggleStringValueType)
+                .ToDictionary(x => x.Name, x => bool.Parse(x.Value));
+            
+            _modal.Show();
+        }
+        
+        private void CloseModal()
+        {
+            _modal.Hide();
+        }
+        
+        private async Task SaveAsync()
+        {
+            var features = new UpdateFeaturesDto
+            {
+                Features = _groups.SelectMany(g => g.Features).Select(f => new UpdateFeatureDto
+                {
+                    Name = f.Name,
+                    Value = f.ValueType is ToggleStringValueType ? ToggleValues[f.Name].ToString() : f.Value
+                }).ToList()
+            };
+            
+            await FeatureAppService.UpdateAsync(_providerName, _providerKey, features);
+            
+            _modal.Hide();
+        }
+        
+        public string GetNormalizedGroupName(string name)
+        {
+            return "FeatureGroup_" + name.Replace(".", "_");
+        }
+        
+        public virtual bool IsDisabled(string providerName)
+        {
+            return providerName != _providerName && providerName != DefaultValueFeatureValueProvider.ProviderName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/FodyWeavers.xml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/FodyWeavers.xsd b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
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
new file mode 100644
index 0000000000..8769a86e79
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <RazorLangVersion>3.0</RazorLangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.FeatureManagement.HttpApi.Client\Volo.Abp.FeatureManagement.HttpApi.Client.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Content Update="_Imports.razor">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      </Content>
+      <Content Update="Components\FeatureManagementModal.razor">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      </Content>
+    </ItemGroup>
+
+</Project>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/_Imports.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/_Imports.razor
new file mode 100644
index 0000000000..b52766daad
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/_Imports.razor
@@ -0,0 +1,5 @@
+@using Microsoft.AspNetCore.Components.Web
+@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using Volo.Abp.BlazoriseUI
+@using Blazorise
+@using Blazorise.DataGrid
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
index 0c9a2e0f26..04edbfbbc2 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
@@ -1,5 +1,6 @@
 using Volo.Abp.FeatureManagement.Localization;
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Modularity;
 using Volo.Abp.Validation;
 using Volo.Abp.Validation.Localization;
@@ -27,6 +28,11 @@ namespace Volo.Abp.FeatureManagement
                         typeof(AbpValidationResource)
                     ).AddVirtualJson("Volo/Abp/FeatureManagement/Localization/Domain");
             });
+
+            Configure<AbpExceptionLocalizationOptions>(options =>
+            {
+                options.MapCodeNamespace("Volo.Abp.FeatureManagement", typeof(AbpFeatureManagementResource));
+            });
         }
     }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs
index 010c64efbb..9bcfd3290e 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs
@@ -1,7 +1,9 @@
-namespace Volo.Abp.FeatureManagement
+using System;
+
+namespace Volo.Abp.FeatureManagement
 {
     public static class FeatureManagementDomainErrorCodes
     {
-        
+        public const string FeatureValueInvalid = "Volo.Abp.FeatureManagement:InvalidFeatureValue";
     }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureValueInvalidException.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureValueInvalidException.cs
new file mode 100644
index 0000000000..d003295239
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureValueInvalidException.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Volo.Abp.FeatureManagement
+{
+    [Serializable]
+    public class FeatureValueInvalidException : BusinessException
+    {
+        public FeatureValueInvalidException(string name) :
+            base(FeatureManagementDomainErrorCodes.FeatureValueInvalid)
+        {
+            WithData("0", name);
+        }
+    }
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json
index fcc347b9e3..cc5fae2dff 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json
@@ -2,6 +2,7 @@
   "culture": "ar",
   "texts": {
     "Features": "المميزات",
-    "NoFeatureFoundMessage": "لا توجد أي ميزة متاحة."
+    "NoFeatureFoundMessage": "لا توجد أي ميزة متاحة.",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0} قيمة الميزة غير صالحة!"
   }
-}
\ No newline at end of file
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de.json
index 12a4e1aef0..c6d4bb1d07 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de.json
@@ -2,6 +2,7 @@
   "culture": "de",
   "texts": {
     "Features": "Funktionen",
-    "NoFeatureFoundMessage": "Es ist keine Funktion verfügbar."
+    "NoFeatureFoundMessage": "Es ist keine Funktion verfügbar.",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "Der {0} -Feature-Wert ist ungültig!"
   }
-}
\ No newline at end of file
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json
index 26f5dc736b..c5194de6c7 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json
@@ -4,6 +4,7 @@
     "Features": "Features",
     "NoFeatureFoundMessage": "There isn't any available feature.",
     "Permission:FeatureManagement": "Feature management",
-    "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features"
+    "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0} feature value is not valid!"
   }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json
index 3945762269..d232c20060 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json
@@ -2,6 +2,7 @@
   "culture": "ru",
   "texts": {
     "Features": "Функциональные возможности",
-    "NoFeatureFoundMessage": "Нет доступных функциональных возможностей."
+    "NoFeatureFoundMessage": "Нет доступных функциональных возможностей.",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "Недопустимое значение функции {0}!"
   }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json
index 8233674933..b69674a620 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json
@@ -4,6 +4,7 @@
     "Features": "Özellikler",
     "NoFeatureFoundMessage": "Hiç özellik yok.",
     "Permission:FeatureManagement": "Özellik yönetimi",
-    "Permission:FeatureManagement.ManageHostFeatures": "Host özelliklerini düzenle"
+    "Permission:FeatureManagement.ManageHostFeatures": "Host özelliklerini düzenle",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0} özellik değeri geçerli değil!"
   }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
index 9737a9a59c..473f581b34 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
@@ -4,6 +4,7 @@
 		"Features": "功能",
 		"NoFeatureFoundMessage": "没有可用的功能.",
 		"Permission:FeatureManagement": "特性管理",
-		"Permission:FeatureManagement.ManageHostFeatures": "管理Host特性"
+		"Permission:FeatureManagement.ManageHostFeatures": "管理Host特性",
+		"Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值无效!"
 	}
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json
index 7d68fd5bc2..dc84e7c104 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json
@@ -4,6 +4,7 @@
 		"Features": "功能",
 		"NoFeatureFoundMessage": "沒有可用的功能.",
 		"Permission:FeatureManagement": "功能管理",
-		"Permission:FeatureManagement.ManageHostFeatures": "管理Host功能"
+		"Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
+		"Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值無效!"
 	}
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs
index 454ade5476..38c61cc743 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Features;
@@ -14,15 +15,18 @@ namespace Volo.Abp.FeatureManagement
         protected IFeatureDefinitionManager FeatureDefinitionManager { get; }
         protected List<IFeatureManagementProvider> Providers => _lazyProviders.Value;
         protected FeatureManagementOptions Options { get; }
+        protected IStringLocalizerFactory StringLocalizerFactory { get; }
 
         private readonly Lazy<List<IFeatureManagementProvider>> _lazyProviders;
 
         public FeatureManager(
             IOptions<FeatureManagementOptions> options,
             IServiceProvider serviceProvider,
-            IFeatureDefinitionManager featureDefinitionManager)
+            IFeatureDefinitionManager featureDefinitionManager,
+            IStringLocalizerFactory stringLocalizerFactory)
         {
             FeatureDefinitionManager = featureDefinitionManager;
+            StringLocalizerFactory = stringLocalizerFactory;
             Options = options.Value;
 
             //TODO: Instead, use IHybridServiceScopeFactory and create a scope..?
@@ -57,7 +61,8 @@ namespace Volo.Abp.FeatureManagement
                 .Select(x => new FeatureNameValue(x.Name, x.Value)).ToList();
         }
 
-        public async Task<FeatureNameValueWithGrantedProvider> GetOrNullWithProviderAsync(string name, string providerName, string providerKey, bool fallback = true)
+        public async Task<FeatureNameValueWithGrantedProvider> GetOrNullWithProviderAsync(string name,
+            string providerName, string providerKey, bool fallback = true)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(providerName, nameof(providerName));
@@ -65,7 +70,8 @@ namespace Volo.Abp.FeatureManagement
             return await GetOrNullInternalAsync(name, providerName, providerKey, fallback);
         }
 
-        public async Task<List<FeatureNameValueWithGrantedProvider>> GetAllWithProviderAsync(string providerName, string providerKey, bool fallback = true)
+        public async Task<List<FeatureNameValueWithGrantedProvider>> GetAllWithProviderAsync(string providerName,
+            string providerKey, bool fallback = true)
         {
             Check.NotNull(providerName, nameof(providerName));
 
@@ -128,6 +134,11 @@ namespace Volo.Abp.FeatureManagement
 
             var feature = FeatureDefinitionManager.Get(name);
 
+            if (!feature.ValueType.Validator.IsValid(value))
+            {
+                throw new FeatureValueInvalidException(feature.DisplayName.Localize(StringLocalizerFactory));
+            }
+
             var providers = Enumerable
                 .Reverse(Providers)
                 .SkipWhile(p => p.Name != providerName)
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
index 601926b193..a5592c2f28 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -1,68 +1,103 @@
-@page
+@page
 @using Microsoft.AspNetCore.Mvc.Localization
+@using Microsoft.Extensions.Options
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
 @using Volo.Abp.FeatureManagement.Localization
 @using Volo.Abp.Validation.StringValues
 @using Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement
+@using Volo.Abp.Localization
 @model FeatureManagementModal
 @inject IHtmlLocalizer<AbpFeatureManagementResource> L
+@inject IHtmlLocalizerFactory HtmlLocalizerFactory
+@inject IOptions<AbpLocalizationOptions> LocalizationOptions
 @{
     Layout = null;
+
+    IHtmlLocalizer CreateHtmlLocalizer(string resourceName)
+    {
+        var resource = LocalizationOptions.Value.Resources.Values.FirstOrDefault(x => x.ResourceName == resourceName);
+        return HtmlLocalizerFactory.Create(resource != null ? resource.ResourceType : LocalizationOptions.Value.DefaultResourceType);
+    }
 }
 <form method="post" asp-page="/FeatureManagement/FeatureManagementModal" data-script-class="abp.modals.FeatureManagement">
     <abp-modal size="Large">
         <abp-modal-header title="@(L["Features"].Value)"></abp-modal-header>
         @if (Model.FeatureListResultDto != null && Model.FeatureListResultDto.Groups.Any())
         {
+            var featureGroups = Model.FeatureListResultDto.Groups;
+
             <abp-modal-body class="ml-4">
                 <input asp-for="@Model.ProviderKey"/>
                 <input asp-for="@Model.ProviderName"/>
                 <abp-tabs name="FeaturesTabs" tab-style="PillVertical" vertical-header-size="_4" class="custom-scroll-container">
-                    @for (var i = 0; i < Model.FeatureListResultDto.Groups.Count; i++)
+                    @for (var i = 0; i < featureGroups.Count; i++)
                     {
-                        <abp-tab title="@Model.FeatureListResultDto.Groups[i].DisplayName" name="v-pills-tab-@Model.FeatureListResultDto.Groups[i].GetNormalizedGroupName()">
-                            <h4>@Model.FeatureListResultDto.Groups[i].DisplayName</h4>
+                        <abp-tab title="@featureGroups[i].DisplayName" name="v-pills-tab-@featureGroups[i].GetNormalizedGroupName()">
+                            <h4>@featureGroups[i].DisplayName</h4>
                             <hr class="mt-2 mb-3"/>
                             <div class="custom-scroll-content">
                                 <div class="pl-1 pt-1">
-                                    @for (var j = 0; j < Model.FeatureListResultDto.Groups[i].Features.Count; j++)
+                                    @for (var j = 0; j < featureGroups[i].Features.Count; j++)
                                     {
-                                        var feature = Model.FeatureListResultDto.Groups[i].Features[j];
+                                        var feature = featureGroups[i].Features[j];
                                         var disabled = Model.IsDisabled(feature.Provider.Name);
-                                        <div class="mt-2" style="padding-left: @(feature.Depth * 20)px">
-
-                                            <spam class="mr-2">@feature.DisplayName @(disabled ? $"({feature.Provider.Name})" : "")</spam>
+                                        <div class="mt-2">
 
                                             <input type="text" name="FeatureGroups[@i].Features[@j].ProviderName" value="@feature.Provider.Name" hidden/>
                                             <input type="text" name="FeatureGroups[@i].Features[@j].Type" value="@feature.ValueType?.Name" hidden/>
+
+                                            @if (feature.ValueType is ToggleStringValueType)
+                                            {
+                                                <abp-input asp-for="@featureGroups[i].Features[j].Value"
+                                                           type="checkbox"
+                                                           name="FeatureGroups[@i].Features[@j].BoolValue"
+                                                           label="@feature.DisplayName"
+                                                           disabled="@disabled"
+                                                           group-data-feature-name="@feature.Name"
+                                                           group-data-parent-name="@(feature.ParentName ?? "")"
+                                                           group-style="margin-left: @(feature.Depth * 20)px"/>
+
+                                            }
+
                                             @if (feature.ValueType is FreeTextStringValueType)
                                             {
-                                                <input type="text" name="FeatureGroups[@i].Features[@j].Name" value="@feature.Name" hidden/>
-                                                <input disabled="@disabled" type="text" name="FeatureGroups[@i].Features[@j].Value" value="@feature.Value"/>
+                                                var type = "text";
+                                                if(feature.ValueType.Validator is NumericValueValidator)
+                                                {
+                                                    type = "number";
+                                                }
+
+                                                <abp-input asp-for="@featureGroups[i].Features[j].Value"
+                                                           label="@feature.DisplayName"
+                                                           disabled="@disabled"
+                                                           type="@type"
+                                                           group-data-feature-name="@feature.Name"
+                                                           group-data-parent-name="@(feature.ParentName ?? "")"
+                                                           group-style="margin-left: @(feature.Depth * 25)px"/>
                                             }
-                                            @if (feature.ValueType is SelectionStringValueType)
+
+                                            @if (feature.ValueType is SelectionStringValueType selectType)
                                             {
-                                                <input type="text" name="FeatureGroups[@i].Features[@j].Name" value="@feature.Name" hidden/>
-                                                <select disabled="@disabled" name="FeatureGroups[@i].Features[@j].Value">
-                                                    @foreach (var item in (feature.ValueType as SelectionStringValueType).ItemSource.Items)
-                                                    {
-                                                        if (item.Value == feature.Value)
-                                                        {
-                                                            <option value="@item.Value" selected="selected"> @L.GetString(item.DisplayText.Name) </option>
-                                                        }
-                                                        else
+                                                <div data-feature-name="@feature.Name" data-parent-name="@(feature.ParentName ?? "")" style="margin-left: @(feature.Depth * 25)px" class="form-group">
+                                                    <label for="@feature.Name">@feature.DisplayName</label>
+
+                                                    <select id="@feature.Name" name="FeatureGroups[@i].Features[@j].Value" class="custom-select form-control">
+                                                        @foreach (var item in selectType.ItemSource.Items)
                                                         {
-                                                            <option value="@item.Value"> @L.GetString(item.DisplayText.Name) </option>
+                                                            if (item.Value == feature.Value)
+                                                            {
+                                                                <option value="@item.Value" selected="selected"> @CreateHtmlLocalizer(item.DisplayText.ResourceName).GetString(item.DisplayText.Name) </option>
+                                                            }
+                                                            else
+                                                            {
+                                                                <option value="@item.Value"> @CreateHtmlLocalizer(item.DisplayText.ResourceName).GetString(item.DisplayText.Name) </option>
+                                                            }
                                                         }
-                                                    }
-                                                </select>
-                                            }
-                                            @if (feature.ValueType is ToggleStringValueType)
-                                            {
-                                                <input type="text" name="FeatureGroups[@i].Features[@j].Name" value="@feature.Name" hidden/>
-                                                <input disabled="@disabled" type="checkbox" class="FeatureValueCheckbox" name="FeatureGroups[@i].Features[@j].BoolValue" value="@feature.Value"
-                                                       @Html.Raw(feature.Value == "True" ? "checked" : "")/>
+                                                    </select>
+                                                </div>
                                             }
+
+                                            <input value="@feature.Name" name="FeatureGroups[@i].Features[@j].Name" hidden=""/>
                                         </div>
                                     }
                                 </div>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js
index 7e4960999c..f9ec7e11fa 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js
@@ -3,12 +3,75 @@
     abp.modals = abp.modals || {};
 
     abp.modals.FeatureManagement = function () {
-        $('.FeatureValueCheckbox').change(function () {
-            if (this.checked) {
-                $(this).val('true');
-            } else {
-                $(this).val('false');
+        function checkParents($tab, $element, className) {
+            var parentName = $element
+                .closest(className)
+                .attr('data-parent-name');
+
+            if (!parentName) {
+                return;
+            }
+
+            $tab.find('.custom-checkbox')
+                .filter('[data-feature-name="' + parentName + '"]')
+                .find('input[type="checkbox"]')
+                .each(function () {
+                    var $parent = $(this);
+                    $parent.prop('checked', true);
+                    checkParents($tab, $parent, className);
+                });
+        }
+
+        function uncheckChildren($tab, $checkBox) {
+            var featureName = $checkBox
+                .closest('.custom-checkbox')
+                .attr('data-feature-name');
+            if (!featureName) {
+                return;
             }
-        });
+
+            $tab.find('.custom-checkbox')
+                .filter('[data-parent-name="' + featureName + '"]')
+                .find('input[type="checkbox"]')
+                .each(function () {
+                    var $child = $(this);
+                    $child.prop('checked', false);
+                    uncheckChildren($tab, $child);
+                });
+        }
+
+        this.initDom = function ($el) {
+            $el.find('.tab-pane').each(function () {
+                var $tab = $(this);
+                $tab.find('input[type="checkbox"]')
+                    .each(function () {
+                        var $checkBox = $(this);
+                        $checkBox.change(function () {
+                            if ($checkBox.is(':checked')) {
+                                checkParents($tab, $checkBox, '.custom-checkbox')
+                            } else {
+                                uncheckChildren($tab, $checkBox);
+                            }
+                        });
+                    });
+
+                $tab.find('.form-control')
+                    .each(function () {
+                        var $element = $(this);
+                        $element.change(function () {
+                            checkParents($tab, $element, '.form-group')
+                        });
+                    });
+            });
+
+            $(function () {
+                $('.custom-scroll-content').mCustomScrollbar({
+                    theme: 'minimal-dark',
+                });
+                $('.custom-scroll-container > .col-4').mCustomScrollbar({
+                    theme: 'minimal-dark',
+                });
+            });
+        };
     };
 })(jQuery);
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
index 04d4ac916f..fdafebef51 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.FeatureManagement.MongoDB
 {
@@ -12,14 +13,19 @@ namespace Volo.Abp.FeatureManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/identity/.gitignore b/modules/identity/.gitignore
new file mode 100644
index 0000000000..dcd876a3c7
--- /dev/null
+++ b/modules/identity/.gitignore
@@ -0,0 +1,4 @@
+src/Volo.Abp.Identity.HttpApi/Properties/launchSettings.json
+src/Volo.Abp.Identity.Web/Properties/launchSettings.json
+test/Volo.Abp.Identity.AspNetCore.Tests/Properties/launchSettings.json
+src/Volo.Abp.Identity.AspNetCore/Properties/launchSettings.json
diff --git a/modules/identity/Volo.Abp.Identity.sln b/modules/identity/Volo.Abp.Identity.sln
index 388cd0c555..23336bdc02 100644
--- a/modules/identity/Volo.Abp.Identity.sln
+++ b/modules/identity/Volo.Abp.Identity.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AADC5A0A-F100-4511-87DE-B74E55F5B69B}"
 EndProject
@@ -37,9 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Domain.Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.AspNetCore", "src\Volo.Abp.Identity.AspNetCore\Volo.Abp.Identity.AspNetCore.csproj", "{D5EFC912-75A0-4856-9B8D-DFDD4CD66BAB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Domain.Identity", "src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj", "{736F91E7-8A70-441B-89DE-0E29A348E718}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.Domain.Identity", "src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj", "{736F91E7-8A70-441B-89DE-0E29A348E718}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.AspNetCore.Tests", "test\Volo.Abp.Identity.AspNetCore.Tests\Volo.Abp.Identity.AspNetCore.Tests.csproj", "{89C094EB-D80A-4976-9C10-7CE3EBEEE877}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.AspNetCore.Tests", "test\Volo.Abp.Identity.AspNetCore.Tests\Volo.Abp.Identity.AspNetCore.Tests.csproj", "{89C094EB-D80A-4976-9C10-7CE3EBEEE877}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor", "src\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj", "{3F7BB653-3F3A-4889-B73C-E463F239099A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -115,6 +117,10 @@ Global
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -137,6 +143,7 @@ Global
 		{D5EFC912-75A0-4856-9B8D-DFDD4CD66BAB} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B}
 		{736F91E7-8A70-441B-89DE-0E29A348E718} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B}
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877} = {9FACAF96-A681-4B36-A938-A37DCA0B7EC1}
+		{3F7BB653-3F3A-4889-B73C-E463F239099A} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {05740D37-83CF-4041-9C2A-D89F1B3DB5A4}
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityRoleAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityRoleAppService.cs
index 36f483d0e6..24969c1ed5 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityRoleAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityRoleAppService.cs
@@ -5,18 +5,14 @@ using Volo.Abp.Application.Services;
 
 namespace Volo.Abp.Identity
 {
-    public interface IIdentityRoleAppService : IApplicationService
+    public interface IIdentityRoleAppService
+        : ICrudAppService<
+            IdentityRoleDto,
+            Guid,
+            PagedAndSortedResultRequestDto,
+            IdentityRoleCreateDto,
+            IdentityRoleUpdateDto>
     {
         Task<ListResultDto<IdentityRoleDto>> GetAllListAsync();
-        
-        Task<PagedResultDto<IdentityRoleDto>> GetListAsync(PagedAndSortedResultRequestDto input);
-
-        Task<IdentityRoleDto> CreateAsync(IdentityRoleCreateDto input);
-
-        Task<IdentityRoleDto> GetAsync(Guid id);
-
-        Task<IdentityRoleDto> UpdateAsync(Guid id, IdentityRoleUpdateDto input);
-
-        Task DeleteAsync(Guid id);
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs
index a184226117..97f443f3b6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs
@@ -5,7 +5,13 @@ using Volo.Abp.Application.Services;
 
 namespace Volo.Abp.Identity
 {
-    public interface IIdentityUserAppService : ICrudAppService<IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
+    public interface IIdentityUserAppService 
+        : ICrudAppService<
+            IdentityUserDto, 
+            Guid, 
+            GetIdentityUsersInput, 
+            IdentityUserCreateDto, 
+            IdentityUserUpdateDto>
     {
         Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id);
 
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs
new file mode 100644
index 0000000000..bbe57e91fd
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs
@@ -0,0 +1,24 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+
+namespace Volo.Abp.Identity.Blazor
+{
+    public class AbpIdentityBlazorAutoMapperProfile : Profile
+    {
+        public AbpIdentityBlazorAutoMapperProfile()
+        {
+            CreateMap<IdentityUserDto, IdentityUserUpdateDto>()
+                .MapExtraProperties()
+                .Ignore(x => x.Password)
+                .Ignore(x => x.RoleNames);
+            
+            CreateMap<IdentityRoleDto, IdentityRoleUpdateDto>()
+                .MapExtraProperties();
+
+            CreateMap<IdentityUserDto, IdentityUserUpdateDto>()
+                .Ignore(x => x.Password)
+                .Ignore(x => x.RoleNames)
+                .MapExtraProperties();
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
new file mode 100644
index 0000000000..cebde068c3
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
@@ -0,0 +1,37 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.Blazor;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.Identity.Blazor
+{
+    [DependsOn(
+        typeof(AbpIdentityHttpApiClientModule),
+        typeof(AbpAutoMapperModule),
+        typeof(AbpPermissionManagementBlazorModule)
+        )]
+    public class AbpIdentityBlazorModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddAutoMapperObjectMapper<AbpIdentityBlazorModule>();
+
+            Configure<AbpAutoMapperOptions>(options =>
+            {
+                options.AddProfile<AbpIdentityBlazorAutoMapperProfile>(validate: true);
+            });
+
+            Configure<AbpNavigationOptions>(options =>
+            {
+                options.MenuContributors.Add(new AbpIdentityWebMainMenuContributor());
+            });
+
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AdditionalAssemblies.Add(typeof(AbpIdentityBlazorModule).Assembly);
+            });
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
new file mode 100644
index 0000000000..17c956f0c7
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
@@ -0,0 +1,40 @@
+using System.Threading.Tasks;
+using Volo.Abp.Identity.Localization;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.Identity.Blazor
+{
+    public class AbpIdentityWebMainMenuContributor : IMenuContributor
+    {
+        public virtual async Task ConfigureMenuAsync(MenuConfigurationContext context)
+        {
+            if (context.Menu.Name != StandardMenus.Main)
+            {
+                return;
+            }
+
+            var hasRolePermission = await context.IsGrantedAsync(IdentityPermissions.Roles.Default);
+            var hasUserPermission = await context.IsGrantedAsync(IdentityPermissions.Users.Default);
+
+            if (hasRolePermission || hasUserPermission)
+            {
+                var administrationMenu = context.Menu.GetAdministration();
+
+                var l = context.GetLocalizer<IdentityResource>();
+
+                var identityMenuItem = new ApplicationMenuItem(IdentityMenuNames.GroupName, l["Menu:IdentityManagement"], icon: "fa fa-id-card-o");
+                administrationMenu.AddItem(identityMenuItem);
+
+                if (hasRolePermission)
+                {
+                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Roles, l["Roles"], url: "/identity/roles"));
+                }
+
+                if (hasUserPermission)
+                {
+                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "/identity/users"));
+                }
+            }
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xml b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xsd b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/IdentityMenuNames.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/IdentityMenuNames.cs
new file mode 100644
index 0000000000..9cd5b1dc37
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/IdentityMenuNames.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.Identity.Blazor
+{
+    public class IdentityMenuNames
+    {
+        public const string GroupName = "AbpIdentity";
+
+        public const string Roles = GroupName + ".Roles";
+        public const string Users = GroupName + ".Users";
+    }
+}
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
new file mode 100644
index 0000000000..fca4cf1913
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -0,0 +1,112 @@
+@page "/identity/roles"
+@attribute [Authorize]
+@using Volo.Abp.Identity
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.Identity.Localization
+@using Volo.Abp.PermissionManagement.Blazor.Components
+@inherits RoleManagementBase
+@inject IStringLocalizer<IdentityResource> L
+@* ************************* PAGE HEADER ************************* *@
+<Row>
+    <Column ColumnSize="ColumnSize.Is6">
+        <h1>@L["Roles"]</h1>
+    </Column>
+    <Column ColumnSize="ColumnSize.Is6">
+        <Paragraph Alignment="TextAlignment.Right">
+            <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewRole"]</Button>
+        </Paragraph>
+    </Column>
+</Row>
+
+@* ************************* DATA GRID ************************* *@
+<DataGrid TItem="IdentityRoleDto"
+          Data="Entities"
+          ReadData="OnDataGridReadAsync"
+          TotalItems="TotalCount"
+          ShowPager="true"
+          PageSize="PageSize">
+    <DataGridColumns>
+        <DataGridColumn Width="150px" TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Sortable="false" Caption="@L["Actions"].Value">
+            <DisplayTemplate>
+                <Dropdown>
+                    <DropdownToggle Color="Color.Primary">
+                        @L["Actions"]
+                    </DropdownToggle>
+                    <DropdownMenu>
+                        <DropdownItem Clicked="() => OpenEditModalAsync(context.As<IdentityRoleDto>().Id)">@L["Edit"]</DropdownItem>
+                        <DropdownItem Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName,context.As<IdentityRoleDto>().Name)">@L["Permissions"]</DropdownItem>
+                        <DropdownDivider/>
+                        <DropdownItem Clicked="() => DeleteEntityAsync(context.As<IdentityRoleDto>())">@L["Delete"]</DropdownItem>
+                    </DropdownMenu>
+                </Dropdown>
+            </DisplayTemplate>
+        </DataGridColumn>
+        <DataGridColumn TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Caption="@L["RoleName"].Value">
+            <DisplayTemplate>
+                @(context.As<IdentityRoleDto>().Name)
+                @if (context.As<IdentityRoleDto>().IsDefault)
+                {
+                    <Badge Color="Color.Primary">@L["DisplayName:IsDefault"]</Badge>
+                }
+                @if (context.As<IdentityRoleDto>().IsPublic)
+                {
+                    <Badge Color="Color.Light">@L["DisplayName:IsPublic"]</Badge>
+                }
+            </DisplayTemplate>
+        </DataGridColumn>
+    </DataGridColumns>
+</DataGrid>
+
+@* ************************* CREATE MODAL ************************* *@
+<Modal @ref="CreateModal">
+    <ModalBackdrop />
+    <ModalContent IsCentered="true">
+        <ModalHeader>
+            <ModalTitle>@L["NewRole"]</ModalTitle>
+            <CloseButton Clicked="CloseCreateModalAsync" />
+        </ModalHeader>
+        <ModalBody>
+            <Field>
+                <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
+                <TextEdit @bind-text="NewEntity.Name" />
+            </Field>
+            <Field>
+                <Check TValue="bool" @bind-checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
+                <Check TValue="bool" @bind-checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
+            </Field>
+        </ModalBody>
+        <ModalFooter>
+            <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
+            <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
+        </ModalFooter>
+    </ModalContent>
+</Modal>
+
+@* ************************* EDIT MODAL ************************* *@
+<Modal @ref="EditModal">
+    <ModalBackdrop />
+    <ModalContent IsCentered="true">
+        <ModalHeader>
+            <ModalTitle>Edit role</ModalTitle>
+            <CloseButton Clicked="CloseEditModalAsync" />
+        </ModalHeader>
+        <ModalBody>
+            <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
+            <Field>
+                <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
+                <TextEdit @bind-text="EditingEntity.Name" />
+            </Field>
+            <Field>
+                <Check TValue="bool" @bind-checked="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
+                <Check TValue="bool" @bind-checked="@EditingEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
+            </Field>
+        </ModalBody>
+        <ModalFooter>
+            <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
+            <Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
+        </ModalFooter>
+    </ModalContent>
+</Modal>
+
+<PermissionManagementModal @ref="PermissionManagementModal"/>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
new file mode 100644
index 0000000000..ddbf9164b8
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
@@ -0,0 +1,19 @@
+using System;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.BlazoriseUI;
+using Volo.Abp.PermissionManagement.Blazor.Components;
+
+namespace Volo.Abp.Identity.Blazor.Pages.Identity
+{
+    public class RoleManagementBase : BlazoriseCrudPageBase<IIdentityRoleAppService,IdentityRoleDto, Guid, PagedAndSortedResultRequestDto, IdentityRoleCreateDto, IdentityRoleUpdateDto>
+    {
+        protected const string PermissionProviderName = "R";
+
+        protected PermissionManagementModal PermissionManagementModal;
+
+        public RoleManagementBase()
+        {
+            ObjectMapperContext = typeof(AbpIdentityBlazorModule);
+        }
+    }
+}
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
new file mode 100644
index 0000000000..ca813229c3
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -0,0 +1,204 @@
+@page "/identity/users"
+@attribute [Authorize]
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.Application.Dtos
+@using Volo.Abp.Identity.Localization
+@using Volo.Abp.PermissionManagement.Blazor.Components
+@inherits UserManagementBase
+@inject IStringLocalizer<IdentityResource> L
+
+@* ************************* PAGE HEADER ************************* *@
+<Row>
+    <Column ColumnSize="ColumnSize.Is6">
+        <h1>@L["Users"]</h1>
+    </Column>
+    <Column ColumnSize="ColumnSize.Is6">
+        <Paragraph Alignment="TextAlignment.Right">
+            <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewUser"]</Button>
+        </Paragraph>
+    </Column>
+</Row>
+
+@* ************************* DATA GRID ************************* *@
+<DataGrid TItem="IdentityUserDto"
+          Data="Entities"
+          ReadData="OnDataGridReadAsync"
+          TotalItems="TotalCount"
+          ShowPager="true"
+          PageSize="PageSize">
+    <DataGridColumns>
+        <DataGridColumn Width="150px" TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Sortable="false" Caption="@L["Actions"].Value">
+            <DisplayTemplate>
+                <Dropdown>
+                    <DropdownToggle Color="Color.Primary">
+                        @L["Actions"]
+                    </DropdownToggle>
+                    <DropdownMenu>
+                        <DropdownItem Clicked="() => OpenEditModalAsync(context.As<IdentityUserDto>().Id)">@L["Edit"]</DropdownItem>
+                        <DropdownItem Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName,context.As<IdentityUserDto>().Id.ToString())">@L["Permissions"]</DropdownItem>
+                        <DropdownDivider/>
+                        <DropdownItem Clicked="() => DeleteEntityAsync(context.As<IdentityUserDto>())">@L["Delete"]</DropdownItem>
+                    </DropdownMenu>
+                </Dropdown>
+            </DisplayTemplate>
+        </DataGridColumn>
+        <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Caption="@L["UserName"].Value">
+            <DisplayTemplate>
+                @(context.As<IdentityUserDto>().UserName)
+            </DisplayTemplate>
+        </DataGridColumn>
+        <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.Email)" Caption="@L["Email"].Value">
+            <DisplayTemplate>
+                @(context.As<IdentityUserDto>().Email)
+            </DisplayTemplate>
+        </DataGridColumn>
+        <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.PhoneNumber)" Caption="@L["PhoneNumber"].Value">
+            <DisplayTemplate>
+                @(context.As<IdentityUserDto>().PhoneNumber)
+            </DisplayTemplate>
+        </DataGridColumn>
+    </DataGridColumns>
+</DataGrid>
+
+@* ************************* CREATE MODAL ************************* *@
+<Modal @ref="CreateModal">
+    <ModalBackdrop />
+    <ModalContent IsCentered="true">
+        <ModalHeader>
+            <ModalTitle>@L["NewUser"]</ModalTitle>
+            <CloseButton Clicked="CloseCreateModalAsync" />
+        </ModalHeader>
+        <ModalBody>
+            <Tabs @bind-SelectedTab="@_createModalSelectedTab">
+                <Items>
+                    <Tab Name="UserInformations">@L["UserInformations"]</Tab>
+                    <Tab Name="Roles">@L["Roles"]</Tab>
+                </Items>
+                <Content>
+                    <TabPanel Name="UserInformations">
+                        <Field>
+                            <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                            <TextEdit @bind-text="NewEntity.UserName" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                            <TextEdit @bind-text="NewEntity.Name" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                            <TextEdit @bind-text="NewEntity.Surname" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
+                            <TextEdit Role="TextRole.Password" @bind-text="NewEntity.Password" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                            <TextEdit @bind-text="NewEntity.Email" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                            <TextEdit @bind-text="NewEntity.PhoneNumber" />
+                        </Field>
+                        <Field>
+                            <Check TValue="bool" @bind-checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                        </Field>
+                        <Field>
+                            <Check TValue="bool" @bind-checked="@NewEntity.TwoFactorEnabled">@L["DisplayName:TwoFactorEnabled"]</Check>
+                        </Field>
+                    </TabPanel>
+                    <TabPanel Name="Roles">
+                        @if (NewUserRoles != null)
+                        {
+                            @foreach (var role in NewUserRoles)
+                            {
+                                <Field>
+                                    <input type="hidden" @bind-value="@role.Name" />
+                                    <Check TValue="bool" @bind-checked="@role.IsAssigned">@role.Name</Check>
+                                </Field>
+                            }
+                        }
+                    </TabPanel>
+                </Content>
+            </Tabs>
+        </ModalBody>
+        <ModalFooter>
+            <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
+            <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
+        </ModalFooter>
+    </ModalContent>
+</Modal>
+
+@* ************************* EDIT MODAL ************************* *@
+<Modal @ref="EditModal">
+    <ModalBackdrop />
+    <ModalContent IsCentered="true">
+        <ModalHeader>
+            <ModalTitle>role</ModalTitle>
+            <CloseButton Clicked="CloseEditModalAsync" />
+        </ModalHeader>
+        <ModalBody>
+            <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
+
+            <Tabs @bind-SelectedTab="@_editModalSelectedTab">
+                <Items>
+                    <Tab Name="UserInformations">@L["UserInformations"]</Tab>
+                    <Tab Name="Roles">@L["Roles"]</Tab>
+                </Items>
+                <Content>
+                    <TabPanel Name="UserInformations">
+                        <Field>
+                            <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                            <TextEdit @bind-text="EditingEntity.UserName" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                            <TextEdit @bind-text="EditingEntity.Name" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                            <TextEdit @bind-text="EditingEntity.Surname" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
+                            <TextEdit Role="TextRole.Password" @bind-text="EditingEntity.Password" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                            <TextEdit @bind-text="EditingEntity.Email" />
+                        </Field>
+                        <Field>
+                            <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                            <TextEdit @bind-text="EditingEntity.PhoneNumber" />
+                        </Field>
+                        <Field>
+                            <Check TValue="bool" @bind-checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                        </Field>
+                        <Field>
+                            <Check TValue="bool" @bind-checked="EditingEntity.TwoFactorEnabled">@L["DisplayName:TwoFactorEnabled"]</Check>
+                        </Field>
+                    </TabPanel>
+                    <TabPanel Name="Roles">
+                        @if (EditUserRoles != null)
+                        {
+                            @foreach (var role in EditUserRoles)
+                            {
+                                <Field>
+                                    <input type="hidden" @bind-value="@role.Name" />
+                                    <Check TValue="bool" @bind-checked="@role.IsAssigned">@role.Name</Check>
+                                </Field>
+                            }
+                        }
+                    </TabPanel>
+                </Content>
+            </Tabs>
+        </ModalBody>
+        <ModalFooter>
+            <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
+            <Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
+        </ModalFooter>
+    </ModalContent>
+</Modal>
+
+<PermissionManagementModal @ref="PermissionManagementModal"/>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
new file mode 100644
index 0000000000..e39c9fe567
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.BlazoriseUI;
+using Volo.Abp.PermissionManagement.Blazor.Components;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.Identity.Blazor.Pages.Identity
+{
+    public class UserManagementBase : BlazoriseCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
+    {
+        protected const string PermissionProviderName = "U";
+
+        protected const string DefaultSelectedTab = "UserInformations";
+        
+        protected PermissionManagementModal PermissionManagementModal;
+
+        protected IReadOnlyList<IdentityRoleDto> Roles;
+
+        protected AssignedRoleViewModel[] NewUserRoles;
+
+        protected AssignedRoleViewModel[] EditUserRoles;
+        
+        protected string _createModalSelectedTab = DefaultSelectedTab;
+        
+        protected string _editModalSelectedTab = DefaultSelectedTab;
+        
+        public UserManagementBase()
+        {
+            ObjectMapperContext = typeof(AbpIdentityBlazorModule);
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await base.OnInitializedAsync();
+
+            Roles = (await AppService.GetAssignableRolesAsync()).Items;
+        }
+
+        protected override Task OpenCreateModalAsync()
+        {
+            _createModalSelectedTab = DefaultSelectedTab;
+            
+            NewUserRoles = Roles.Select(x => new AssignedRoleViewModel
+                            {
+                                Name = x.Name,
+                                IsAssigned = x.IsDefault
+                            }).ToArray();
+
+            return base.OpenCreateModalAsync();
+        }
+
+        protected override Task CreateEntityAsync()
+        {
+            NewEntity.RoleNames = NewUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray();
+
+            return base.CreateEntityAsync();
+        }
+
+        protected override async Task OpenEditModalAsync(Guid id)
+        {
+            _editModalSelectedTab = DefaultSelectedTab;
+            
+            var userRoleNames = (await AppService.GetRolesAsync(id)).Items.Select(r => r.Name).ToList();
+
+            EditUserRoles = Roles.Select(x => new AssignedRoleViewModel
+                                {
+                                    Name = x.Name,
+                                    IsAssigned = userRoleNames.Contains(x.Name)
+                                }).ToArray();
+
+            await base.OpenEditModalAsync(id);
+        }
+
+        protected override Task UpdateEntityAsync()
+        {
+            EditingEntity.RoleNames = EditUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray();
+
+            return base.UpdateEntityAsync();
+        }
+    }
+
+    public class AssignedRoleViewModel
+    {
+        public string Name { get; set; }
+
+        public bool IsAssigned { get; set; }
+    }
+}
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
new file mode 100644
index 0000000000..19bfb3831c
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <Import Project="..\..\..\..\configureawait.props" />
+  <Import Project="..\..\..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Blazor\Volo.Abp.PermissionManagement.Blazor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
new file mode 100644
index 0000000000..4685ac9893
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
@@ -0,0 +1,5 @@
+@using Microsoft.AspNetCore.Components.Web
+@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using Volo.Abp.BlazoriseUI
+@using Blazorise
+@using Blazorise.DataGrid
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj
index 06cef29fc3..e1df61cbce 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj
@@ -23,6 +23,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\users\src\Volo.Abp.Users.Domain.Shared\Volo.Abp.Users.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Validation\Volo.Abp.Validation.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Features\Volo.Abp.Features.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
index 4bff33d58a..e14ce5e3f4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
@@ -1,4 +1,5 @@
-using Volo.Abp.Identity.Localization;
+using Volo.Abp.Features;
+using Volo.Abp.Identity.Localization;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Modularity;
@@ -11,7 +12,8 @@ namespace Volo.Abp.Identity
 {
     [DependsOn(
         typeof(AbpUsersDomainSharedModule),
-        typeof(AbpValidationModule)
+        typeof(AbpValidationModule),
+        typeof(AbpFeaturesModule)
         )]
     public class AbpIdentityDomainSharedModule : AbpModule
     {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeature.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeature.cs
new file mode 100644
index 0000000000..a51a3c11f7
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeature.cs
@@ -0,0 +1,9 @@
+namespace Volo.Abp.Identity.Features
+{
+    public class IdentityFeature
+    {
+        public const string GroupName = "Identity";
+
+        public const string TwoFactor = GroupName + ".TwoFactor";
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeatureDefinitionProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeatureDefinitionProvider.cs
new file mode 100644
index 0000000000..d26cc17b92
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeatureDefinitionProvider.cs
@@ -0,0 +1,51 @@
+using System;
+using Volo.Abp.Features;
+using Volo.Abp.Identity.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.Validation.StringValues;
+
+namespace Volo.Abp.Identity.Features
+{
+    public class IdentityFeatureDefinitionProvider : FeatureDefinitionProvider
+    {
+        public override void Define(IFeatureDefinitionContext context)
+        {
+            var group = context.AddGroup(IdentityFeature.GroupName, L("Feature:IdentityGroup"));
+
+            group.AddFeature(IdentityFeature.TwoFactor,
+                IdentityTwoFactorBehaviour.Optional.ToString(),
+                L("Feature:TwoFactor"),
+                L("Feature:TwoFactorDescription"),
+                new SelectionStringValueType
+                {
+                    ItemSource = new StaticSelectionStringValueItemSource(
+                        new LocalizableSelectionStringValueItem
+                        {
+                            Value = IdentityTwoFactorBehaviour.Optional.ToString(),
+                            DisplayText = GetTwoFactorBehaviourLocalizableStringInfo("Feature:TwoFactor.Optional")
+                        },
+                        new LocalizableSelectionStringValueItem
+                        {
+                            Value = IdentityTwoFactorBehaviour.Disabled.ToString(),
+                            DisplayText = GetTwoFactorBehaviourLocalizableStringInfo("Feature:TwoFactor.Disabled")
+                        },
+                        new LocalizableSelectionStringValueItem
+                        {
+                            Value = IdentityTwoFactorBehaviour.Forced.ToString(),
+                            DisplayText = GetTwoFactorBehaviourLocalizableStringInfo("Feature:TwoFactor.Forced")
+                        }
+                    )
+                });
+        }
+
+        private static LocalizableString L(string name)
+        {
+            return LocalizableString.Create<IdentityResource>(name);
+        }
+
+        private static LocalizableStringInfo GetTwoFactorBehaviourLocalizableStringInfo(string key)
+        {
+            return new LocalizableStringInfo(LocalizationResourceNameAttribute.GetName(typeof(IdentityResource)), key);
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviour.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviour.cs
new file mode 100644
index 0000000000..4e415a7cfb
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviour.cs
@@ -0,0 +1,11 @@
+namespace Volo.Abp.Identity.Features
+{
+    public enum IdentityTwoFactorBehaviour
+    {
+        Optional,
+
+        Disabled,
+
+        Forced
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviourFeatureHelper.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviourFeatureHelper.cs
new file mode 100644
index 0000000000..6d8d9f33a7
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviourFeatureHelper.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Volo.Abp.Features;
+
+namespace Volo.Abp.Identity.Features
+{
+    public static class IdentityTwoFactorBehaviourFeatureHelper
+    {
+        public static async Task<IdentityTwoFactorBehaviour> Get([NotNull] IFeatureChecker featureChecker)
+        {
+            Check.NotNull(featureChecker, nameof(featureChecker));
+
+            var value = await featureChecker.GetOrNullAsync(IdentityFeature.TwoFactor);
+            if (value.IsNullOrWhiteSpace() || !Enum.TryParse<IdentityTwoFactorBehaviour>(value, out var behaviour))
+            {
+                throw new AbpException($"{IdentityFeature.TwoFactor} feature value is invalid");
+            }
+
+            return behaviour;
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
index 9fe464ae96..166433c5eb 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
@@ -76,6 +76,12 @@
     "Permission:ChangePermissions": "Change permissions",
     "Permission:UserManagement": "User management",
     "Permission:UserLookup": "User lookup",
+    "Feature:IdentityGroup": "Identity",
+    "Feature:TwoFactor": "Two Factor",
+    "Feature:TwoFactorDescription": "Two Factor",
+    "Feature:TwoFactor.Optional": "Optional",
+    "Feature:TwoFactor.Disabled": "Disabled",
+    "Feature:TwoFactor.Forced": "Forced",
     "DisplayName:Abp.Identity.Password.RequiredLength": "Required length",
     "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "Required unique characters number",
     "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "Required non-alphanumeric character",
@@ -103,6 +109,10 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "Whether the phoneNumber can be confirmed by the user.",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Whether a confirmed telephone number is required to sign in.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Whether the username can be updated by the user.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Whether the email can be updated by the user."
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Whether the email can be updated by the user.",
+    "DisplayName:Abp.Identity.TwoFactorBehaviour": "Two Factor behaviour",
+    "Description:Abp.Identity.TwoFactorBehaviour": "Two Factor behaviour",
+    "DisplayName:Abp.Identity.UsersCanChange": "Allow users to change their Two Factor.",
+    "Description:Abp.Identity.UsersCanChange": "Allow users to change their Two Factor."
   }
-}
+}
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
index 2ad19c80f4..9bdecca7b2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
@@ -76,6 +76,12 @@
     "Permission:ChangePermissions": "İzinleri değiştirme",
     "Permission:UserManagement": "Kullanıcı yönetimi",
     "Permission:UserLookup": "Kullanıcı sorgulama",
+    "Feature:IdentityGroup": "Kimlik",
+    "Feature:TwoFactor": "İki faktörlü kimlik doğrulama",
+    "Feature:TwoFactorDescription": "İki faktörlü kimlik doğrulama",
+    "Feature:TwoFactor.Optional": "İsteğe bağlı",
+    "Feature:TwoFactor.Disabled": "Devre dışı",
+    "Feature:TwoFactor.Forced": "Zorunlu",
     "DisplayName:Abp.Identity.Password.RequiredLength": "Uzunluk gerekli",
     "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "Tekil karakter gerekli",
     "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "Alfasayısal olmayan karakter gerekli",
@@ -103,6 +109,10 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "Oturum açmak için telefon numarası gerekli",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Oturum açmak için onaylanmış bir telefon numarasının gerekli olup olmadığı.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Kullanıcı adının, kullanıcının kendisi tarafından güncellenebilirliği.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "E-posta alanının, kullanıcının kendisi tarafından güncellenebilirliği"
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "E-posta alanının, kullanıcının kendisi tarafından güncellenebilirliği",
+    "DisplayName:Abp.Identity.TwoFactorBehaviour": "İki faktörlü kimlik doğrulama davranışı",
+    "Description:Abp.Identity.TwoFactorBehaviour": "İki faktörlü kimlik doğrulama davranışı",
+    "DisplayName:Abp.Identity.UsersCanChange": "Kullanıcıların iki faktörlü kimlik doğrulama davranışını değiştirmelerine izin verin.",
+    "Description:Abp.Identity.UsersCanChange": "Kullanıcıların iki faktörlü kimlik doğrulama davranışını değiştirmelerine izin verin"
   }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
index 5494581c6a..8e8c8cbccf 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
@@ -73,6 +73,12 @@
     "Permission:ChangePermissions": "更改权限",
     "Permission:UserManagement": "用户管理",
     "Permission:UserLookup": "用户查询",
+    "Feature:IdentityGroup": "身份标识",
+    "Feature:TwoFactor": "双因素身份验证",
+    "Feature:TwoFactorDescription": "双因素身份验证",
+    "Feature:TwoFactor.Optional": "可选",
+    "Feature:TwoFactor.Disabled": "禁用",
+    "Feature:TwoFactor.Forced": "强制启用",
     "DisplayName:Abp.Identity.Password.RequiredLength": "要求长度",
     "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "要求唯一字符数量",
     "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "要求非字母数字",
@@ -98,6 +104,10 @@
     "Description:Abp.Identity.SignIn.RequireConfirmedEmail": "登录时是否需要验证的电子邮箱.",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "登录时是否需要验证的手机号码.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "是否允许用户更新用户名.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "是否允许用户更新电子邮箱."
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "是否允许用户更新电子邮箱.",
+    "DisplayName:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为",
+    "Description:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为",
+    "DisplayName:Abp.Identity.UsersCanChange": "允许用户更改其因素身份验证.",
+    "Description:Abp.Identity.UsersCanChange": "允许用户更改其因素身份验证."
   }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
index edd21e10fe..2881bd886a 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
@@ -19,7 +19,7 @@
     "RoleDeletionConfirmationMessage": "角色 '{0}' 將被刪除. 你確定嗎?",
     "DisplayName:RoleName": "角色名稱",
     "DisplayName:UserName": "使用者名稱",
-    "DisplayName:Name": "名子",
+    "DisplayName:Name": "名",
     "DisplayName:Surname": "姓",
     "DisplayName:Password": "密碼",
     "DisplayName:Email": "電子信箱地址",
@@ -61,11 +61,13 @@
     "Volo.Abp.Identity:UserNameNotFound": "使用者 {0} 不存在.",
     "Volo.Abp.Identity:UserNotInRole": "使用者不具有 '{0}' 角色.",
     "Volo.Abp.Identity:PasswordConfirmationFailed": "密碼或確認密碼不一致.",
+    "Volo.Abp.Identity:010001": "您無法刪除自己的帳號!",
+    "Volo.Abp.Identity:010002": "一個使用者不能設定超過 {MaxUserMembershipCount} 個組織單位",
+    "Volo.Abp.Identity:010003": "外部登入的使用者不能改變密碼!",
+    "Volo.Abp.Identity:010004": "組織內單位內已包含名稱 {0}.同一層級組織，兩個單位不能有相同名稱",
     "Volo.Abp.Identity:010005": "無法重命名靜態角色.",
     "Volo.Abp.Identity:010006": "無法刪除靜態角色.",
-    "Volo.Abp.Identity:010004": "組織內單位內已包含名稱 {0}.同一層級組織，兩個單位不能有相同名稱",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "允許一個使用者至多可隸屬在幾個組織單位",
-    "Volo.Abp.Identity:010001": "您無法刪除自己的帳號!",
     "Permission:IdentityManagement": "身份識別管理",
     "Permission:RoleManagement": "角色管理",
     "Permission:Create": "建立",
@@ -73,6 +75,34 @@
     "Permission:Delete": "刪除",
     "Permission:ChangePermissions": "更改權限",
     "Permission:UserManagement": "使用者管理",
-    "Permission:UserLookup": "使用者查詢"
+    "Permission:UserLookup": "使用者查詢",
+    "DisplayName:Abp.Identity.Password.RequiredLength": "長度需符合",
+    "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "需最小特殊字元數",
+    "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "需包含非數字字母",
+    "DisplayName:Abp.Identity.Password.RequireLowercase": "需小寫字元",
+    "DisplayName:Abp.Identity.Password.RequireUppercase": "需大寫字元",
+    "DisplayName:Abp.Identity.Password.RequireDigit": "需要數字",
+    "DisplayName:Abp.Identity.Lockout.AllowedForNewUsers": "允許新的使用者",
+    "DisplayName:Abp.Identity.Lockout.LockoutDuration": "被鎖定期間(秒)",
+    "DisplayName:Abp.Identity.Lockout.MaxFailedAccessAttempts": "最大登入次數嘗試",
+    "DisplayName:Abp.Identity.SignIn.RequireConfirmedEmail": "信箱需被確認",
+    "DisplayName:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "允許使用者確認電話號碼",
+    "DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "電話號碼需認證",
+    "DisplayName:Abp.Identity.User.IsUserNameUpdateEnabled": "允許使用者更新帳號名稱",
+    "DisplayName:Abp.Identity.User.IsEmailUpdateEnabled": "允許使用者更新信箱",
+    "Description:Abp.Identity.Password.RequiredLength": "密碼須符合最小長度.",
+    "Description:Abp.Identity.Password.RequiredUniqueChars": "密碼至少要包含特殊字元個數.",
+    "Description:Abp.Identity.Password.RequireNonAlphanumeric": "密碼須包含特殊字元.",
+    "Description:Abp.Identity.Password.RequireLowercase": "須包含小寫字母.",
+    "Description:Abp.Identity.Password.RequireUppercase": "須包含大寫字母.",
+    "Description:Abp.Identity.Password.RequireDigit": "密碼必須包含數字.",
+    "Description:Abp.Identity.Lockout.AllowedForNewUsers": "使用者是否會被鎖定.",
+    "Description:Abp.Identity.Lockout.LockoutDuration": "使用者被鎖定後的時間.",
+    "Description:Abp.Identity.Lockout.MaxFailedAccessAttempts": "當啟用鎖定功能，設定最大嘗試輸入次數，超過後就被鎖定.",
+    "Description:Abp.Identity.SignIn.RequireConfirmedEmail": "決定使用者是否需信箱驗證後才能登入.",
+    "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "是否啟用電話認證.",
+    "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "決定使用者是否需電話認證後才能登入.",
+    "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "決定使用者是否能更新帳號.",
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "決定使用者是否能更新信箱."
   }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentitySettingNames.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentitySettingNames.cs
index eb7a88407f..879c3ffd4c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentitySettingNames.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentitySettingNames.cs
@@ -48,5 +48,14 @@
 
             public const string MaxUserMembershipCount = OrganizationUnitPrefix + ".MaxUserMembershipCount";
         }
+
+        public static class TwoFactor
+        {
+            private const string TwoFactorPrefix = Prefix + ".TwoFactor";
+
+            public const string Behaviour = TwoFactorPrefix + ".Behaviour";
+
+            public const string UsersCanChange = TwoFactorPrefix + ".UsersCanChange";
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentityTwoFactorBehaviourSettingHelper.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentityTwoFactorBehaviourSettingHelper.cs
new file mode 100644
index 0000000000..46d7d414a6
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentityTwoFactorBehaviourSettingHelper.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Volo.Abp.Identity.Features;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.Identity.Settings
+{
+    public static class IdentityTwoFactorBehaviourSettingHelper
+    {
+        public static async Task<IdentityTwoFactorBehaviour> Get([NotNull] ISettingProvider settingProvider)
+        {
+            Check.NotNull(settingProvider, nameof(settingProvider));
+
+            var value = await settingProvider.GetOrNullAsync(IdentitySettingNames.TwoFactor.Behaviour);
+            if (value.IsNullOrWhiteSpace() || !Enum.TryParse<IdentityTwoFactorBehaviour>(value, out var behaviour))
+            {
+                throw new AbpException($"{IdentitySettingNames.TwoFactor.Behaviour} setting value is invalid");
+            }
+
+            return behaviour;
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs
index 1fdd2dd451..cff38810c9 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs
@@ -1,4 +1,5 @@
-using Volo.Abp.Identity.Localization;
+using Volo.Abp.Identity.Features;
+using Volo.Abp.Identity.Localization;
 using Volo.Abp.Identity.Settings;
 using Volo.Abp.Localization;
 using Volo.Abp.Settings;
@@ -33,85 +34,97 @@ namespace Volo.Abp.Identity
 
                 new SettingDefinition(
                     IdentitySettingNames.Password.RequireLowercase,
-                    true.ToString(), 
+                    true.ToString(),
                     L("DisplayName:Abp.Identity.Password.RequireLowercase"),
                     L("Description:Abp.Identity.Password.RequireLowercase"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.Password.RequireUppercase,
-                    true.ToString(), 
+                    true.ToString(),
                     L("DisplayName:Abp.Identity.Password.RequireUppercase"),
                     L("Description:Abp.Identity.Password.RequireUppercase"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.Password.RequireDigit,
-                    true.ToString(), 
+                    true.ToString(),
                     L("DisplayName:Abp.Identity.Password.RequireDigit"),
                     L("Description:Abp.Identity.Password.RequireDigit"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.Lockout.AllowedForNewUsers,
-                    true.ToString(), 
+                    true.ToString(),
                     L("DisplayName:Abp.Identity.Lockout.AllowedForNewUsers"),
                     L("Description:Abp.Identity.Lockout.AllowedForNewUsers"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.Lockout.LockoutDuration,
-                    (5 * 60).ToString(), 
+                    (5 * 60).ToString(),
                     L("DisplayName:Abp.Identity.Lockout.LockoutDuration"),
                     L("Description:Abp.Identity.Lockout.LockoutDuration"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.Lockout.MaxFailedAccessAttempts,
-                    5.ToString(), 
+                    5.ToString(),
                     L("DisplayName:Abp.Identity.Lockout.MaxFailedAccessAttempts"),
                     L("Description:Abp.Identity.Lockout.MaxFailedAccessAttempts"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.SignIn.RequireConfirmedEmail,
-                    false.ToString(), 
+                    false.ToString(),
                     L("DisplayName:Abp.Identity.SignIn.RequireConfirmedEmail"),
                     L("Description:Abp.Identity.SignIn.RequireConfirmedEmail"),
                     true),
                 new SettingDefinition(
-                    IdentitySettingNames.SignIn.EnablePhoneNumberConfirmation, 
-                    true.ToString(), 
-                    L("DisplayName:Abp.Identity.SignIn.EnablePhoneNumberConfirmation"), 
-                    L("Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation"), 
+                    IdentitySettingNames.SignIn.EnablePhoneNumberConfirmation,
+                    true.ToString(),
+                    L("DisplayName:Abp.Identity.SignIn.EnablePhoneNumberConfirmation"),
+                    L("Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation"),
                     true),
                 new SettingDefinition(
-                    IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, 
-                    false.ToString(), 
-                    L("DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"), 
-                    L("Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"), 
+                    IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber,
+                    false.ToString(),
+                    L("DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"),
+                    L("Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.User.IsUserNameUpdateEnabled,
-                    true.ToString(), 
+                    true.ToString(),
                     L("DisplayName:Abp.Identity.User.IsUserNameUpdateEnabled"),
                     L("Description:Abp.Identity.User.IsUserNameUpdateEnabled"),
                     true),
 
                 new SettingDefinition(
                     IdentitySettingNames.User.IsEmailUpdateEnabled,
-                    true.ToString(), 
+                    true.ToString(),
                     L("DisplayName:Abp.Identity.User.IsEmailUpdateEnabled"),
                     L("Description:Abp.Identity.User.IsEmailUpdateEnabled"),
                     true),
 
-                 new SettingDefinition(
+                new SettingDefinition(
                     IdentitySettingNames.OrganizationUnit.MaxUserMembershipCount,
-                    int.MaxValue.ToString(), 
+                    int.MaxValue.ToString(),
                     L("Identity.OrganizationUnit.MaxUserMembershipCount"),
                     L("Identity.OrganizationUnit.MaxUserMembershipCount"),
-                    true)
+                    true),
+
+                new SettingDefinition(IdentitySettingNames.TwoFactor.Behaviour,
+                    IdentityTwoFactorBehaviour.Optional.ToString(),
+                    L("DisplayName:Abp.Identity.TwoFactorBehaviour"),
+                    L("Description:Abp.Identity.TwoFactorBehaviour"),
+                    isVisibleToClients: true),
+
+                new SettingDefinition(IdentitySettingNames.TwoFactor.UsersCanChange,
+                    true.ToString(),
+                    L("DisplayName:Abp.Identity.UsersCanChange"),
+                    L("Description:Abp.Identity.UsersCanChange"),
+                    isVisibleToClients: true)
             );
         }
 
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTwoFactorManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTwoFactorManager.cs
new file mode 100644
index 0000000000..75e74afa3c
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTwoFactorManager.cs
@@ -0,0 +1,70 @@
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Services;
+using Volo.Abp.Features;
+using Volo.Abp.Identity.Features;
+using Volo.Abp.Identity.Settings;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.Identity
+{
+    public class IdentityTwoFactorManager : IDomainService
+    {
+        protected IFeatureChecker FeatureChecker { get; }
+
+        protected ISettingProvider SettingProvider { get; }
+
+        public IdentityTwoFactorManager(IFeatureChecker featureChecker, ISettingProvider settingProvider)
+        {
+            FeatureChecker = featureChecker;
+            SettingProvider = settingProvider;
+        }
+
+        public virtual async Task<bool> IsOptionalAsync()
+        {
+            var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
+            if (feature == IdentityTwoFactorBehaviour.Optional)
+            {
+                var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
+                if (setting == IdentityTwoFactorBehaviour.Optional)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public virtual async Task<bool> IsForcedEnableAsync()
+        {
+            var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
+            if (feature == IdentityTwoFactorBehaviour.Forced)
+            {
+                return true;
+            }
+
+            var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
+            if (setting == IdentityTwoFactorBehaviour.Forced)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public virtual async Task<bool> IsForcedDisableAsync()
+        {
+            var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
+            if (feature == IdentityTwoFactorBehaviour.Disabled)
+            {
+                return true;
+            }
+
+            var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
+            if (setting == IdentityTwoFactorBehaviour.Disabled)
+            {
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
index 17a0fbd39d..ccc3e055f5 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
@@ -11,7 +11,11 @@ using Microsoft.Extensions.Logging;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Features;
 using Volo.Abp.Guids;
+using Volo.Abp.Identity.Features;
+using Volo.Abp.Identity.Settings;
+using Volo.Abp.Settings;
 
 namespace Volo.Abp.Identity
 {
@@ -56,12 +60,17 @@ namespace Volo.Abp.Identity
         protected ILookupNormalizer LookupNormalizer { get; }
         protected IIdentityUserRepository UserRepository { get; }
 
+        protected IFeatureChecker FeatureChecker { get; }
+        protected ISettingProvider SettingProvider { get; }
+
         public IdentityUserStore(
             IIdentityUserRepository userRepository,
             IIdentityRoleRepository roleRepository,
             IGuidGenerator guidGenerator,
             ILogger<IdentityRoleStore> logger,
             ILookupNormalizer lookupNormalizer,
+            IFeatureChecker featureChecker,
+            ISettingProvider settingProvider,
             IdentityErrorDescriber describer = null)
         {
             UserRepository = userRepository;
@@ -69,6 +78,8 @@ namespace Volo.Abp.Identity
             GuidGenerator = guidGenerator;
             Logger = logger;
             LookupNormalizer = lookupNormalizer;
+            FeatureChecker = featureChecker;
+            SettingProvider = settingProvider;
 
             ErrorDescriber = describer ?? new IdentityErrorDescriber();
         }
@@ -931,13 +942,33 @@ namespace Volo.Abp.Identity
         /// The <see cref="Task"/> that represents the asynchronous operation, containing a flag indicating whether the specified
         /// <paramref name="user"/> has two factor authentication enabled or not.
         /// </returns>
-        public virtual Task<bool> GetTwoFactorEnabledAsync([NotNull] IdentityUser user, CancellationToken cancellationToken = default)
+        public virtual async Task<bool> GetTwoFactorEnabledAsync([NotNull] IdentityUser user, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             Check.NotNull(user, nameof(user));
 
-            return Task.FromResult(user.TwoFactorEnabled);
+            var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
+            if (feature == IdentityTwoFactorBehaviour.Disabled)
+            {
+                return false;
+            }
+            if (feature == IdentityTwoFactorBehaviour.Forced)
+            {
+                return true;
+            }
+
+            var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
+            if (setting == IdentityTwoFactorBehaviour.Disabled)
+            {
+                return false;
+            }
+            if (setting == IdentityTwoFactorBehaviour.Forced)
+            {
+                return true;
+            }
+
+            return user.TwoFactorEnabled;
         }
 
         /// <summary>
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
index 23a4529502..5362969011 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Identity.Localization;
@@ -16,7 +15,6 @@ using Volo.Abp.VirtualFileSystem;
 namespace Volo.Abp.Identity.Web
 {
     [DependsOn(typeof(AbpIdentityHttpApiModule))]
-    [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))]
     [DependsOn(typeof(AbpAutoMapperModule))]
     [DependsOn(typeof(AbpPermissionManagementWebModule))]
     [DependsOn(typeof(AbpAspNetCoreMvcUiThemeSharedModule))]
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
index 89bb07688a..8a0b8ebd5c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
@@ -38,7 +38,6 @@
 
     <ProjectReference Include="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Web\Volo.Abp.PermissionManagement.Web.csproj" />
 
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
   </ItemGroup>
diff --git a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs
index f730e5f445..101f4836a5 100644
--- a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs
+++ b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 using Volo.Abp.PermissionManagement.MongoDB;
 
 namespace Volo.Abp.Identity.MongoDB
@@ -9,19 +10,24 @@ namespace Volo.Abp.Identity.MongoDB
         typeof(AbpIdentityTestBaseModule),
         typeof(AbpPermissionManagementMongoDbModule),
         typeof(AbpIdentityMongoDbModule)
-        )]
+    )]
     public class AbpIdentityMongoDbTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
 }
diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs
index d1721c720f..ae32aa2d4a 100644
--- a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs
+++ b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs
@@ -3,6 +3,7 @@ using Volo.Abp.Data;
 using Volo.Abp.Identity.MongoDB;
 using Volo.Abp.IdentityServer.MongoDB;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.IdentityServer
 {
@@ -16,7 +17,7 @@ namespace Volo.Abp.IdentityServer
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
                                    Guid.NewGuid().ToString("N");
 
@@ -24,6 +25,11 @@ namespace Volo.Abp.IdentityServer
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });   
         }
     }
 }
diff --git a/modules/permission-management/Volo.Abp.PermissionManagement.sln b/modules/permission-management/Volo.Abp.PermissionManagement.sln
index 7206382e8e..535a31fb2f 100644
--- a/modules/permission-management/Volo.Abp.PermissionManagement.sln
+++ b/modules/permission-management/Volo.Abp.PermissionManagement.sln
@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManageme
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.Application.Tests", "test\Volo.Abp.PermissionManagement.Application.Tests\Volo.Abp.PermissionManagement.Application.Tests.csproj", "{A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Blazor", "src\Volo.Abp.PermissionManagement.Blazor\Volo.Abp.PermissionManagement.Blazor.csproj", "{6F899C50-83BB-43C4-983A-DCCD8FBBF066}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +99,10 @@ Global
 		{A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F899C50-83BB-43C4-983A-DCCD8FBBF066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F899C50-83BB-43C4-983A-DCCD8FBBF066}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F899C50-83BB-43C4-983A-DCCD8FBBF066}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F899C50-83BB-43C4-983A-DCCD8FBBF066}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +122,7 @@ Global
 		{9E0B517E-F02E-436F-9695-7CF12795D34C} = {B559B878-38F7-49CC-BC06-43A32D68C1A7}
 		{1CD80519-9431-48DB-B0EA-291A73FF9F49} = {B559B878-38F7-49CC-BC06-43A32D68C1A7}
 		{A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1} = {63DA4A89-5908-4F37-B7E6-525AEEF20C77}
+		{6F899C50-83BB-43C4-983A-DCCD8FBBF066} = {B559B878-38F7-49CC-BC06-43A32D68C1A7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8FC7DF78-5E2D-489F-9D43-147D2ABAA112}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs
new file mode 100644
index 0000000000..26381615f3
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs
@@ -0,0 +1,16 @@
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.PermissionManagement.Blazor
+{
+    [DependsOn(
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpAutoMapperModule),
+        typeof(AbpPermissionManagementHttpApiClientModule)
+        )]
+    public class AbpPermissionManagementBlazorModule : AbpModule
+    {
+
+    }
+}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
new file mode 100644
index 0000000000..e94319c9ff
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
@@ -0,0 +1,79 @@
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.PermissionManagement.Localization
+@inject IStringLocalizer<AbpPermissionManagementResource> L
+<Modal @ref="_modal">
+    <ModalBackdrop />
+    <ModalContent Size="ModalSize.Large" IsCentered="true">
+        <ModalHeader>
+            <ModalTitle>@L["Permissions"] - @_entityDisplayName</ModalTitle>
+            <CloseButton Clicked="CloseModal" />
+        </ModalHeader>
+        <ModalBody MaxHeight="50">
+            
+            <Field>
+                <Check Cursor="Cursor.Pointer" Checked="@GrantAll" CheckedChanged="@GrantAllChanged" TValue="bool">@L["SelectAllInAllTabs"]</Check>
+            </Field>
+            
+            <Divider />
+            
+            @if (_groups != null)
+            {
+                <Tabs TabPosition="TabPosition.Left" Pills="true" @bind-SelectedTab="@_selectedTabName">
+                    <Items>
+                        @foreach (var group in _groups)
+                        {
+                            <Tab Name="@GetNormalizedGroupName(group.Name)">
+                                @if (group.Permissions.Any(x => x.IsGranted))
+                                {
+                                    <span>
+                                        <b>@group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )</b>
+                                    </span>
+                                }
+                                else
+                                {
+                                    <span>
+                                        @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )
+                                    </span>
+                                }
+                            </Tab>
+                        }
+                    </Items>
+                    <Content>
+                        @foreach (var group in _groups)
+                        {
+                            <TabPanel Name="@GetNormalizedGroupName(group.Name)">
+                                <h4>@group.DisplayName</h4>
+                                
+                                <Divider />
+                                
+                                <Field>
+                                    <Check Checked="@(group.Permissions.All(x => x.IsGranted))" Cursor="Cursor.Pointer" CheckedChanged="@(b => GroupGrantAllChanged(b, group.Name))" TValue="bool">@L["SelectAllInThisTab"]</Check>
+                                </Field>
+
+                                <Divider />
+                                
+                                @foreach (var permission in group.Permissions)
+                                {
+                                    <Field Margin="permission.ParentName != null ? Blazorise.Margin.Is3.OnAll : Blazorise.Margin.Is0.OnAll">
+                                        <Check
+                                            Disabled="@(IsDisabledPermission(permission))"
+                                            Cursor="Cursor.Pointer"
+                                            @bind-checked="@permission.IsGranted"
+                                            TValue="bool">
+                                            @permission.DisplayName
+                                        </Check>
+                                    </Field>
+                                }
+                                
+                            </TabPanel>
+                        }
+                    </Content>
+                </Tabs>
+            }
+        </ModalBody>
+        <ModalFooter>
+            <Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button>
+            <Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
+        </ModalFooter>
+    </ModalContent>
+</Modal>
\ No newline at end of file
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
new file mode 100644
index 0000000000..40333fdc80
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
@@ -0,0 +1,119 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Blazorise;
+using Microsoft.AspNetCore.Components;
+
+namespace Volo.Abp.PermissionManagement.Blazor.Components
+{
+    public partial class PermissionManagementModal
+    {
+        [Inject] private IPermissionAppService PermissionAppService { get; set; }
+
+        private Modal _modal;
+        
+        private string _providerName;
+        private string _providerKey;
+
+        private string _entityDisplayName;
+        private List<PermissionGroupDto> _groups;
+
+        private List<PermissionGrantInfoDto> _disabledPermissions;
+
+        private string _selectedTabName;
+        
+        private bool GrantAll
+        {
+            get
+            {
+                return _groups != null && _groups.All(x => x.Permissions.All(y => y.IsGranted));
+            }
+            set
+            {
+                if (_groups == null)
+                {
+                    return;
+                }
+                
+                foreach (var permissionGroupDto in _groups)
+                {
+                    foreach (var permission in permissionGroupDto.Permissions)
+                    {
+                        if (!IsDisabledPermission(permission))
+                        {
+                            permission.IsGranted = value;
+                        }
+                    }
+                }
+            }
+        }
+        
+        public async Task OpenAsync(string providerName, string providerKey)
+        {
+            _providerName = providerName;
+            _providerKey = providerKey;
+
+            var result = await PermissionAppService.GetAsync(_providerName, _providerKey);
+
+            _entityDisplayName = result.EntityDisplayName;
+            _groups = result.Groups;
+
+            _disabledPermissions = 
+                _groups.SelectMany(x => x.Permissions)
+                        .Where(
+                            x => x.IsGranted &&
+                            x.GrantedProviders.All(y => y.ProviderName != _providerName)
+                            ).ToList();
+
+            _selectedTabName = GetNormalizedGroupName(_groups.First().Name);
+            
+            _modal.Show();
+        }
+
+        private void CloseModal()
+        {
+            _modal.Hide();
+        }
+
+        private async Task SaveAsync()
+        {
+            var updateDto = new UpdatePermissionsDto
+            {
+                Permissions = _groups
+                    .SelectMany(g => g.Permissions)
+                    .Select(p => new UpdatePermissionDto {IsGranted = p.IsGranted, Name = p.Name})
+                    .ToArray()
+            };
+
+            await PermissionAppService.UpdateAsync(_providerName, _providerKey, updateDto);
+
+            _modal.Hide();
+        }
+
+        private string GetNormalizedGroupName(string name)
+        {
+            return "PermissionGroup_" + name.Replace(".", "_");
+        }
+
+        private void GrantAllChanged(bool value)
+        {
+            GrantAll = value;
+        }
+
+        private void GroupGrantAllChanged(bool value, string groupName)
+        {
+            foreach (var permission in _groups.First(x => x.Name == groupName).Permissions)
+            {
+                if (!IsDisabledPermission(permission))
+                {
+                    permission.IsGranted = value;
+                }
+            }
+        }
+
+        private bool IsDisabledPermission(PermissionGrantInfoDto permissionGrantInfo)
+        {
+            return _disabledPermissions.Any(x => x == permissionGrantInfo);
+        }
+    }
+}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/FodyWeavers.xml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/FodyWeavers.xsd b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
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
new file mode 100644
index 0000000000..0663ca49a5
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <Import Project="..\..\..\..\configureawait.props" />
+  <Import Project="..\..\..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.PermissionManagement.HttpApi.Client\Volo.Abp.PermissionManagement.HttpApi.Client.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor
new file mode 100644
index 0000000000..4685ac9893
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/_Imports.razor
@@ -0,0 +1,5 @@
+@using Microsoft.AspNetCore.Components.Web
+@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using Volo.Abp.BlazoriseUI
+@using Blazorise
+@using Blazorise.DataGrid
\ No newline at end of file
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Properties/launchSettings.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Properties/launchSettings.json
new file mode 100644
index 0000000000..5e8bf1d171
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:62454/",
+      "sslPort": 44344
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.PermissionManagement.Web": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs
index 8e3c7b2c22..d896cf01dc 100644
--- a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs
+++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.PermissionManagement.MongoDB
 {
@@ -11,14 +12,19 @@ namespace Volo.Abp.PermissionManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
-                                    "Db_" +									
-                                    Guid.NewGuid().ToString("N");
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
+                                   "Db_" +
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
 }
diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs
index ec221eba15..0e456a2df8 100644
--- a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs
+++ b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.SettingManagement.MongoDB
 {
@@ -12,14 +13,19 @@ namespace Volo.Abp.SettingManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
 }
diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs
index 9584ec2d44..3bdcf0ad9c 100644
--- a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs
+++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.TenantManagement.MongoDB
 {
@@ -12,14 +13,19 @@ namespace Volo.Abp.TenantManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
 }
diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs
index 1b3777f6a8..689f273178 100644
--- a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs
+++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.TenantManagement.MongoDB
 {
diff --git a/npm/lerna.json b/npm/lerna.json
index 0f8ac6305a..75b0730cfd 100644
--- a/npm/lerna.json
+++ b/npm/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "packages": [
     "packs/*"
   ],
diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
index e338675552..f16ba9b898 100644
--- a/npm/ng-packs/apps/dev-app/src/environments/environment.ts
+++ b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
@@ -22,5 +22,9 @@ export const environment = {
       url: 'https://localhost:44305',
       rootNamespace: 'MyCompanyName.MyProjectName',
     },
+    AbpFeatureManagement: {
+      url: 'https://localhost:44305',
+      rootNamespace: 'Volo.Abp',
+    },
   },
 } as Config.Environment;
diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json
index fcf5437bc3..3162795864 100644
--- a/npm/ng-packs/lerna.version.json
+++ b/npm/ng-packs/lerna.version.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "packages": [
     "packages/*"
   ],
diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 6fa44824c1..b3f6321b92 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -25,20 +25,21 @@
     "postinstall": "npm run compile:ivy"
   },
   "devDependencies": {
-    "@abp/ng.account": "~3.1.1",
-    "@abp/ng.core": "~3.1.1",
-    "@abp/ng.feature-management": "~3.1.1",
-    "@abp/ng.identity": "~3.1.1",
-    "@abp/ng.permission-management": "~3.1.1",
-    "@abp/ng.schematics": "~3.1.1",
-    "@abp/ng.setting-management": "~3.1.1",
-    "@abp/ng.tenant-management": "~3.1.1",
-    "@abp/ng.theme.basic": "~3.1.1",
-    "@abp/ng.theme.shared": "~3.1.1",
-    "@abp/utils": "^3.1.1",
+    "@abp/ng.account": "~3.1.2",
+    "@abp/ng.core": "~3.1.2",
+    "@abp/ng.feature-management": "~3.1.2",
+    "@abp/ng.identity": "~3.1.2",
+    "@abp/ng.permission-management": "~3.1.2",
+    "@abp/ng.schematics": "~3.1.2",
+    "@abp/ng.setting-management": "~3.1.2",
+    "@abp/ng.tenant-management": "~3.1.2",
+    "@abp/ng.theme.basic": "~3.1.2",
+    "@abp/ng.theme.shared": "~3.1.2",
+    "@abp/utils": "^3.1.2",
     "@angular-builders/jest": "^10.0.0",
     "@angular-devkit/build-angular": "~0.1000.6",
     "@angular-devkit/build-ng-packagr": "~0.1000.6",
+    "@angular-devkit/schematics-cli": "^0.1001.1",
     "@angular/animations": "~10.0.10",
     "@angular/cli": "~10.0.6",
     "@angular/common": "~10.0.10",
diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json
index 37d27ce9e9..6e3f4e8eaf 100644
--- a/npm/ng-packs/packages/account/package.json
+++ b/npm/ng-packs/packages/account/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.account",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.1",
+    "@abp/ng.theme.shared": "~3.1.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json
index ae054658a2..b59862afb5 100644
--- a/npm/ng-packs/packages/components/package.json
+++ b/npm/ng-packs/packages/components/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.components",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "peerDependencies": {
-    "@abp/ng.core": ">=3.1.1",
+    "@abp/ng.core": ">=3.1.2",
     "@ng-bootstrap/ng-bootstrap": ">=6.0.0"
   },
   "dependencies": {
diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
index b7c777a449..b98aa7e4ff 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
@@ -7,6 +7,7 @@
   [nzData]="nodes"
   [nzTreeTemplate]="treeTemplate"
   [nzExpandedKeys]="expandedKeys"
+  [nzExpandedIcon]="expandedIconTemplate?.template"
   (nzExpandChange)="onExpandedKeysChange($event)"
   (nzCheckBoxChange)="onCheckboxChange($event)"
   (nzOnDrop)="onDrop($event)"
@@ -18,7 +19,16 @@
     [title]="node.title"
     (click)="onSelectedNodeChange(node)"
   >
-    <span>{{ node.title }}</span>
+    <ng-container
+      *ngTemplateOutlet="
+        customNodeTemplate?.template || defaultNodeTemplate;
+        context: { $implicit: node }
+      "
+    ></ng-container>
+
+    <ng-template #defaultNodeTemplate>
+      <span>{{ node.title }}</span>
+    </ng-template>
 
     <div *ngIf="menu" class="ellipsis" ngbDropdown placement="bottom" container="body">
       <i class="fas fa-ellipsis-h" ngbDropdownToggle [class.dropdown-toggle]="false"></i>
diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
index ac7a709048..7ba6280c0b 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
@@ -9,6 +9,8 @@ import {
 } from '@angular/core';
 import { NzFormatEmitEvent, NzFormatBeforeDropEvent } from 'ng-zorro-antd/tree';
 import { of } from 'rxjs';
+import { TreeNodeTemplateDirective } from '../templates/tree-node-template.directive';
+import { ExpandedIconTemplateDirective } from '../templates/expanded-icon-template.directive';
 
 export type DropEvent = NzFormatEmitEvent & { pos: number };
 
@@ -25,6 +27,8 @@ export class TreeComponent {
   dropPosition: number;
 
   @ContentChild('menu') menu: TemplateRef<any>;
+  @ContentChild(TreeNodeTemplateDirective) customNodeTemplate: TreeNodeTemplateDirective;
+  @ContentChild(ExpandedIconTemplateDirective) expandedIconTemplate: ExpandedIconTemplateDirective;
   @Output() readonly checkedKeysChange = new EventEmitter();
   @Output() readonly expandedKeysChange = new EventEmitter<string[]>();
   @Output() readonly selectedNodeChange = new EventEmitter();
diff --git a/npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts b/npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts
new file mode 100644
index 0000000000..35706bd25f
--- /dev/null
+++ b/npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts
@@ -0,0 +1,8 @@
+import { Directive, TemplateRef } from '@angular/core';
+
+@Directive({
+  selector: '[abpTreeExpandedIconTemplate],[abp-tree-expanded-icon-template]',
+})
+export class ExpandedIconTemplateDirective {
+  constructor(public template: TemplateRef<any>) {}
+}
diff --git a/npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts b/npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts
new file mode 100644
index 0000000000..56c66af04b
--- /dev/null
+++ b/npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts
@@ -0,0 +1,8 @@
+import { Directive, TemplateRef } from '@angular/core';
+
+@Directive({
+  selector: '[abpTreeNodeTemplate],[abp-tree-node-template]',
+})
+export class TreeNodeTemplateDirective {
+  constructor(public template: TemplateRef<any>) {}
+}
diff --git a/npm/ng-packs/packages/components/tree/src/lib/tree.module.ts b/npm/ng-packs/packages/components/tree/src/lib/tree.module.ts
index f16ed0dd55..b645a69925 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/tree.module.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/tree.module.ts
@@ -1,12 +1,18 @@
+import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { NzTreeModule } from 'ng-zorro-antd/tree';
 import { TreeComponent } from './components/tree.component';
-import { CommonModule } from '@angular/common';
+import { TreeNodeTemplateDirective } from './templates/tree-node-template.directive';
+import { ExpandedIconTemplateDirective } from './templates/expanded-icon-template.directive';
+
+const templates = [TreeNodeTemplateDirective, ExpandedIconTemplateDirective];
+
+const exported = [...templates, TreeComponent];
 
 @NgModule({
   imports: [CommonModule, NzTreeModule, NgbDropdownModule],
-  exports: [TreeComponent],
-  declarations: [TreeComponent],
+  exports: [...exported],
+  declarations: [...exported],
 })
 export class TreeModule {}
diff --git a/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts b/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts
index 5d042602e2..d5d32f0146 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts
@@ -41,17 +41,33 @@ export class TreeAdapter<T extends BaseNode = BaseNode> {
     return this.tree;
   }
 
-  handleDrop(node: TreeNode<T>) {
-    const { key, parentNode } = node;
+  handleDrop({ key, parentNode }: TreeNode<T>) {
     const index = this.list.findIndex(({ id }) => id === key);
     this.list[index].parentId = parentNode ? parentNode.key : null;
     this.tree = createTreeFromList(this.list);
   }
 
-  handleRemove(node: TreeNode<T>) {
-    const { key, parentNode } = node;
-    this.list = this.list.filter(({ id, parentId }) => id !== key && parentId !== key);
-    this.tree = createTreeFromList(this.list);
+  handleRemove({ key }: TreeNode<T>) {
+    this.updateTreeFromList(this.list.filter(item => item.id !== key));
+  }
+
+  handleUpdate({ key, children }: { key: string; children: T[] }) {
+    /**
+     * When we need to update a node with new children, first we need to remove any descendant nodes.
+     * If we remove immediate children and create a new tree, any other descendant nodes will be removed
+     * and we won't need to recursively remove sub children.
+     * Then, you simply add back the new children and create a new tree.
+     */
+    const listWithDescendantNodesRemoved = this.updateTreeFromList(
+      this.list.filter(item => item.parentId !== key),
+    );
+    this.updateTreeFromList(listWithDescendantNodesRemoved.concat(children));
+  }
+
+  updateTreeFromList(list: T[]) {
+    this.tree = createTreeFromList(list);
+    this.list = createListFromTree(this.tree);
+    return this.list;
   }
 }
 
@@ -66,6 +82,7 @@ function createTreeFromList<T extends BaseNode>(list: T[]): TreeNode<T>[] {
     const node = map.get(row.id);
     if (parentId) {
       const parent = map.get(parentId);
+      if (!parent) return;
       parent.children.push(node);
       parent.isLeaf = false;
     } else {
diff --git a/npm/ng-packs/packages/components/tree/src/public-api.ts b/npm/ng-packs/packages/components/tree/src/public-api.ts
index df82ac0f93..1f3dd48e00 100644
--- a/npm/ng-packs/packages/components/tree/src/public-api.ts
+++ b/npm/ng-packs/packages/components/tree/src/public-api.ts
@@ -1,3 +1,5 @@
 export * from './lib/tree.module';
 export * from './lib/components/tree.component';
 export * from './lib/utils/nz-tree-adapter';
+export * from './lib/templates/tree-node-template.directive';
+export * from './lib/templates/expanded-icon-template.directive';
diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json
index 5ad3468108..a4a22ec710 100644
--- a/npm/ng-packs/packages/core/package.json
+++ b/npm/ng-packs/packages/core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.core",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/utils": "^3.1.1",
+    "@abp/utils": "^3.1.2",
     "@angular/localize": "~10.0.10",
     "@ngxs/router-plugin": "^3.7.0",
     "@ngxs/storage-plugin": "^3.7.0",
diff --git a/npm/ng-packs/packages/core/src/lib/models/rest.ts b/npm/ng-packs/packages/core/src/lib/models/rest.ts
index 2f0e175002..03d70161bc 100644
--- a/npm/ng-packs/packages/core/src/lib/models/rest.ts
+++ b/npm/ng-packs/packages/core/src/lib/models/rest.ts
@@ -34,7 +34,7 @@ export namespace Rest {
           [param: string]: any;
         };
     reportProgress?: boolean;
-    responseType?: ResponseType;
+    responseType?: 'arraybuffer' | 'blob' | 'json' | 'text';
     url: string;
     withCredentials?: boolean;
   }
diff --git a/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts b/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts
index 027c284f52..dd7abf929e 100644
--- a/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts
@@ -49,6 +49,10 @@ export class ConfigStateService {
     return this.store.selectSnapshot(ConfigState.getLocalization(...args));
   }
 
+  getLocalizationResource(...args: Parameters<typeof ConfigState.getLocalizationResource>) {
+    return this.store.selectSnapshot(ConfigState.getLocalizationResource(...args));
+  }
+
   dispatchGetAppConfiguration() {
     return this.store.dispatch(new GetAppConfiguration());
   }
diff --git a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
index 5b98afe0c3..dd64bd27ec 100644
--- a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
@@ -70,6 +70,10 @@ export class LocalizationService {
     return this.store.select(ConfigState.getLocalization(key, ...interpolateParams));
   }
 
+  getResource(resourceName: string) {
+    return this.store.select(ConfigState.getLocalizationResource(resourceName));
+  }
+
   /**
    * Returns localized text with the given interpolation parameters in current language.
    * @param key Localization key to replace with localized text
diff --git a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
index 16fc4c238b..c19628760c 100644
--- a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
@@ -51,9 +51,16 @@ export abstract class AbstractTreeService<T extends object> {
   }
 
   private filterWith(setOrMap: Set<string> | Map<string, T>): T[] {
-    return this._flat$.value.filter(
-      item => !setOrMap.has(item[this.id]) && !setOrMap.has(item[this.parentId]),
-    );
+    return this._flat$.value.filter(item => !setOrMap.has(item[this.id]));
+  }
+
+  private findItemsToRemove(set: Set<string>): Set<string> {
+    return this._flat$.value.reduce((acc, item) => {
+      if (!acc.has(item[this.parentId])) return acc;
+      const childSet = new Set([item[this.id]]);
+      const children = this.findItemsToRemove(childSet);
+      return new Set([...acc, ...children]);
+    }, set);
   }
 
   private publish(flatItems: T[], visibleItems: T[]): T[] {
@@ -104,7 +111,8 @@ export abstract class AbstractTreeService<T extends object> {
     const set = new Set<string>();
     identifiers.forEach(id => set.add(id));
 
-    const flatItems = this.filterWith(set);
+    const setToRemove = this.findItemsToRemove(set);
+    const flatItems = this.filterWith(setToRemove);
     const visibleItems = flatItems.filter(item => !this.hide(item));
 
     return this.publish(flatItems, visibleItems);
diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
index ec9ccd6749..8639981456 100644
--- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts
+++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
@@ -128,6 +128,16 @@ export class ConfigState {
     return selector;
   }
 
+  static getLocalizationResource(resourceName: string) {
+    const selector = createSelector([ConfigState], (state: Config.State): {
+      [key: string]: string;
+    } => {
+      return state.localization.values[resourceName];
+    });
+
+    return selector;
+  }
+
   static getLocalization(
     key: string | Config.LocalizationWithDefault,
     ...interpolateParams: string[]
diff --git a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts
index aa5e51cb17..6b7ae3f50a 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts
@@ -10,6 +10,7 @@ describe('Routes Service', () => {
     { path: '/foo', name: 'foo' },
     { path: '/foo/bar', name: 'bar', parentName: 'foo', invisible: true, order: 2 },
     { path: '/foo/bar/baz', name: 'baz', parentName: 'bar', order: 1 },
+    { path: '/foo/bar/baz/qux', name: 'qux', parentName: 'baz', order: 1 },
     { path: '/foo/x', name: 'x', parentName: 'foo', order: 1 },
   ];
 
@@ -32,11 +33,12 @@ describe('Routes Service', () => {
       const tree = await service.tree$.pipe(take(1)).toPromise();
       const visible = await service.visible$.pipe(take(1)).toPromise();
 
-      expect(flat.length).toBe(4);
-      expect(flat[3].name).toBe('foo');
+      expect(flat.length).toBe(5);
       expect(flat[0].name).toBe('baz');
-      expect(flat[1].name).toBe('x');
-      expect(flat[2].name).toBe('bar');
+      expect(flat[1].name).toBe('qux');
+      expect(flat[2].name).toBe('x');
+      expect(flat[3].name).toBe('bar');
+      expect(flat[4].name).toBe('foo');
 
       expect(tree.length).toBe(1);
       expect(tree[0].name).toBe('foo');
@@ -44,6 +46,7 @@ describe('Routes Service', () => {
       expect(tree[0].children[0].name).toBe('x');
       expect(tree[0].children[1].name).toBe('bar');
       expect(tree[0].children[1].children[0].name).toBe('baz');
+      expect(tree[0].children[1].children[0].children[0].name).toBe('qux');
 
       expect(visible.length).toBe(1);
       expect(visible[0].name).toBe('foo');
@@ -74,7 +77,8 @@ describe('Routes Service', () => {
 
       expect(service.hasChildren('foo')).toBe(true);
       expect(service.hasChildren('bar')).toBe(true);
-      expect(service.hasChildren('baz')).toBe(false);
+      expect(service.hasChildren('baz')).toBe(true);
+      expect(service.hasChildren('qux')).toBe(false);
     });
   });
 
@@ -123,11 +127,12 @@ describe('Routes Service', () => {
       const tree = service.tree;
       const visible = service.visible;
 
-      expect(flat.length).toBe(4);
-      expect(flat[3].name).toBe('foo');
+      expect(flat.length).toBe(5);
       expect(flat[0].name).toBe('baz');
-      expect(flat[1].name).toBe('x');
-      expect(flat[2].name).toBe('bar');
+      expect(flat[1].name).toBe('qux');
+      expect(flat[2].name).toBe('x');
+      expect(flat[3].name).toBe('bar');
+      expect(flat[4].name).toBe('foo');
 
       expect(tree.length).toBe(1);
       expect(tree[0].name).toBe('foo');
@@ -135,6 +140,7 @@ describe('Routes Service', () => {
       expect(tree[0].children[0].name).toBe('x');
       expect(tree[0].children[1].name).toBe('bar');
       expect(tree[0].children[1].children[0].name).toBe('baz');
+      expect(tree[0].children[1].children[0].children[0].name).toBe('qux');
 
       expect(visible.length).toBe(1);
       expect(visible[0].name).toBe('foo');
diff --git a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
index d4c0ba0ab3..ba6e3a5b90 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
@@ -1,7 +1,7 @@
 export class BaseTreeNode<T extends object> {
   children: TreeNode<T>[] = [];
   isLeaf = true;
-  parent: TreeNode<T>;
+  parent?: TreeNode<T>;
 
   constructor(props: T) {
     Object.assign(this, props);
@@ -14,7 +14,7 @@ export class BaseTreeNode<T extends object> {
 
 export function createTreeFromList<T extends object, R extends unknown>(
   list: T[],
-  keySelector: (item: T) => number | string | symbol,
+  keySelector: (item: T) => NodeKey,
   parentKeySelector: typeof keySelector,
   valueMapper: (item: T) => R,
 ) {
@@ -26,6 +26,8 @@ export function createTreeFromList<T extends object, R extends unknown>(
     const parentId = parentKeySelector(row);
     const node = map.get(id);
 
+    if (!node) return;
+
     if (parentId) {
       const parent = map.get(parentId);
       if (!parent) return;
@@ -42,7 +44,7 @@ export function createTreeFromList<T extends object, R extends unknown>(
 
 export function createMapFromList<T extends object, R extends unknown>(
   list: T[],
-  keySelector: (item: T) => number | string | symbol,
+  keySelector: (item: T) => NodeKey,
   valueMapper: (item: T) => R,
 ) {
   type Key = ReturnType<typeof keySelector>;
@@ -60,6 +62,8 @@ export type TreeNode<T extends object> = {
   parent?: TreeNode<T>;
 };
 
+type NodeKey = number | string | symbol | undefined | null;
+
 type NodeValue<T extends object, F extends (...args: any) => any> = F extends undefined
   ? TreeNode<T>
   : ReturnType<F>;
diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json
index aca41b2927..cc1727b9c7 100644
--- a/npm/ng-packs/packages/feature-management/package.json
+++ b/npm/ng-packs/packages/feature-management/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.feature-management",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.1",
+    "@abp/ng.theme.shared": "~3.1.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts b/npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts
index dee5da664a..65791be948 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts
@@ -1,10 +1,16 @@
 import { FeatureManagement } from '../models';
 
+/**
+ * @deprecated To be deleted in v4.0.
+ */
 export class GetFeatures {
   static readonly type = '[FeatureManagement] Get Features';
   constructor(public payload: FeatureManagement.Provider) {}
 }
 
+/**
+ * @deprecated To be deleted in v4.0.
+ */
 export class UpdateFeatures {
   static readonly type = '[FeatureManagement] Update Features';
   constructor(public payload: FeatureManagement.Provider & FeatureManagement.Features) {}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index 6ee1766db7..f857487e1e 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -1,35 +1,110 @@
-<abp-modal size="md" [(visible)]="visible" [busy]="modalBusy">
+<abp-modal size="lg" [(visible)]="visible" [busy]="modalBusy">
   <ng-template #abpHeader>
     <h3>{{ 'AbpFeatureManagement::Features' | abpLocalization }}</h3>
   </ng-template>
 
   <ng-template #abpBody>
-    <form *ngIf="form" (ngSubmit)="save()" [formGroup]="form" validateOnSubmit>
-      <div
-        class="row my-3"
-        *ngFor="let feature of features$ | async; let i = index"
-        [ngSwitch]="feature.valueType.name"
-      >
-        <div class="mr-2">{{ feature.displayName }}</div>
-        <div *ngSwitchCase="'ToggleStringValueType'">
-          <input type="checkbox" name="feature.name" [formControlName]="i" />
-        </div>
-        <div *ngSwitchCase="'FreeTextStringValueType'">
-          <input type="text" name="feature.name" [formControlName]="i" />
-        </div>
+    <div class="row">
+      <div class="col-md-4">
+        <ul
+          ngbNav
+          #nav="ngbNav"
+          [(activeId)]="selectedGroupDisplayName"
+          class="nav-pills"
+          orientation="vertical"
+        >
+          <li
+            *ngFor="let group of groups; trackBy: track.by('name')"
+            [ngbNavItem]="selectedGroupDisplayName"
+          >
+            <a ngbNavLink>{{ group.displayName }}</a>
+            <ng-template ngbNavContent>
+              <h4>{{ selectedGroupDisplayName }}</h4>
+              <hr class="mt-2 mb-3" />
+
+              <div
+                class="row my-3"
+                *ngFor="let feature of features[group.name]; let i = index; trackBy: track.by('id')"
+                [ngStyle]="feature.style"
+                [ngSwitch]="feature.valueType?.name"
+                (keyup.enter)="save()"
+              >
+                <div *ngSwitchCase="valueTypes.ToggleStringValueType">
+                  <div class="custom-checkbox custom-control">
+                    <input
+                      class="custom-control-input"
+                      type="checkbox"
+                      [id]="feature.name"
+                      [(ngModel)]="feature.value"
+                    />
+                    <label class="custom-control-label" [htmlFor]="feature.name">{{
+                      feature.displayName
+                    }}</label>
+                    <ng-container
+                      *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
+                    ></ng-container>
+                  </div>
+                </div>
+                <div *ngSwitchCase="valueTypes.FreeTextStringValueType">
+                  <div class="form-group mb-0">
+                    <label [htmlFor]="feature.name">{{ feature.displayName }}</label>
+                    <input
+                      class="form-control"
+                      type="text"
+                      [id]="feature.name"
+                      [(ngModel)]="feature.value"
+                    />
+
+                    <ng-container
+                      *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
+                    ></ng-container>
+                  </div>
+                </div>
+                <div *ngSwitchCase="valueTypes.SelectionStringValueType">
+                  <div class="form-group mb-0">
+                    <label [htmlFor]="feature.name">{{ feature.displayName }}</label>
+                    <select class="form-control" [id]="feature.name" [(ngModel)]="feature.value">
+                      <option [ngValue]=""></option>
+                      <option
+                        *ngFor="
+                          let prop of feature.valueType.properties | keyvalue;
+                          trackBy: track.by('key')
+                        "
+                        [ngValue]="prop.value"
+                      >
+                        {{ prop.key }}</option
+                      >
+                    </select>
+                    <ng-container
+                      *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
+                    ></ng-container>
+                  </div>
+                </div>
+                <div *ngSwitchDefault>{{ feature.displayName }}</div>
+              </div>
+            </ng-template>
+          </li>
+        </ul>
       </div>
-      <div *ngIf="!(features$ | async)?.length">
+
+      <ng-template #descTmp let-description>
+        <small *ngIf="description" class="form-text text-muted">{{ description }}</small>
+      </ng-template>
+
+      <div class="col-md-8"><div [ngbNavOutlet]="nav"></div></div>
+
+      <div class="mx-3" *ngIf="!groups.length">
         {{ 'AbpFeatureManagement::NoFeatureFoundMessage' | abpLocalization }}
       </div>
-    </form>
+    </div>
   </ng-template>
 
   <ng-template #abpFooter>
-    <ng-container *ngIf="(features$ | async)?.length">
+    <ng-container *ngIf="groups.length">
       <button #abpClose type="button" class="btn btn-secondary">
         {{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
       </button>
-      <abp-button iconClass="fa fa-check" [disabled]="form?.invalid || modalBusy" (click)="save()">
+      <abp-button iconClass="fa fa-check" [disabled]="modalBusy" (click)="save()">
         {{ 'AbpFeatureManagement::Save' | abpLocalization }}
       </abp-button>
     </ng-container>
diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
index cd4d00491b..7eca21ecbd 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
@@ -1,11 +1,20 @@
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { Select, Store } from '@ngxs/store';
-import { Observable } from 'rxjs';
-import { GetFeatures, UpdateFeatures } from '../../actions';
+import { TrackByService } from '@abp/ng.core';
+import { LocaleDirection } from '@abp/ng.theme.shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { finalize } from 'rxjs/operators';
 import { FeatureManagement } from '../../models/feature-management';
-import { FeatureManagementState } from '../../states';
-import { FormGroup, FormControl } from '@angular/forms';
-import { pluck, finalize } from 'rxjs/operators';
+import { FeaturesService } from '../../proxy/feature-management/features.service';
+import {
+  FeatureDto,
+  FeatureGroupDto,
+  UpdateFeatureDto,
+} from '../../proxy/feature-management/models';
+
+enum ValueTypes {
+  ToggleStringValueType = 'ToggleStringValueType',
+  FreeTextStringValueType = 'FreeTextStringValueType',
+  SelectionStringValueType = 'SelectionStringValueType',
+}
 
 @Component({
   selector: 'abp-feature-management',
@@ -22,6 +31,16 @@ export class FeatureManagementComponent
   @Input()
   providerName: string;
 
+  selectedGroupDisplayName: string;
+
+  groups: Pick<FeatureGroupDto, 'name' | 'displayName'>[] = [];
+
+  features: {
+    [group: string]: Array<FeatureDto & { style?: { [key: string]: number }; initialValue: any }>;
+  };
+
+  valueTypes = ValueTypes;
+
   protected _visible;
 
   @Input()
@@ -30,78 +49,82 @@ export class FeatureManagementComponent
   }
 
   set visible(value: boolean) {
+    if (this._visible === value) return;
+
     this._visible = value;
     this.visibleChange.emit(value);
-
     if (value) this.openModal();
   }
 
   @Output() readonly visibleChange = new EventEmitter<boolean>();
 
-  @Select(FeatureManagementState.getFeatures)
-  features$: Observable<FeatureManagement.Feature[]>;
-
   modalBusy = false;
 
-  form: FormGroup;
-
-  constructor(private store: Store) {}
+  constructor(public readonly track: TrackByService, private service: FeaturesService) {}
 
   openModal() {
-    if (!this.providerKey || !this.providerName) {
-      throw new Error('Provider Key and Provider Name are required.');
+    if (!this.providerName) {
+      throw new Error('providerName is required.');
     }
 
     this.getFeatures();
   }
 
   getFeatures() {
-    this.store
-      .dispatch(
-        new GetFeatures({
-          providerKey: this.providerKey,
-          providerName: this.providerName,
+    this.service.get(this.providerName, this.providerKey).subscribe(res => {
+      this.groups = res.groups.map(({ name, displayName }) => ({ name, displayName }));
+      this.selectedGroupDisplayName = this.groups[0].displayName;
+      this.features = res.groups.reduce(
+        (acc, val) => ({
+          ...acc,
+          [val.name]: mapFeatures(val.features, document.body.dir as LocaleDirection),
         }),
-      )
-      .pipe(pluck('FeatureManagementState', 'features'))
-      .subscribe(features => {
-        this.buildForm(features);
-      });
-  }
-
-  buildForm(features) {
-    const formGroupObj = {};
-
-    for (let i = 0; i < features.length; i++) {
-      formGroupObj[i] = new FormControl(features[i].value === 'false' ? null : features[i].value);
-    }
-
-    this.form = new FormGroup(formGroupObj);
+        {},
+      );
+    });
   }
 
   save() {
     if (this.modalBusy) return;
 
-    this.modalBusy = true;
+    const changedFeatures = [] as UpdateFeatureDto[];
 
-    let features = this.store.selectSnapshot(FeatureManagementState.getFeatures);
+    Object.keys(this.features).forEach(key => {
+      this.features[key].forEach(feature => {
+        if (feature.value !== feature.initialValue)
+          changedFeatures.push({ name: feature.name, value: feature.value });
+      });
+    });
 
-    features = features.map((feature, i) => ({
-      ...feature,
-      value: this.form.value[i],
-    }));
-
-    this.store
-      .dispatch(
-        new UpdateFeatures({
-          providerKey: this.providerKey,
-          providerName: this.providerName,
-          features,
-        }),
-      )
+    if (!changedFeatures.length) {
+      this.visible = false;
+      return;
+    }
+
+    this.modalBusy = true;
+    this.service
+      .update(this.providerName, this.providerKey, { features: changedFeatures })
       .pipe(finalize(() => (this.modalBusy = false)))
       .subscribe(() => {
         this.visible = false;
       });
   }
 }
+
+function mapFeatures(features: FeatureDto[], dir: LocaleDirection) {
+  const margin = `margin-${dir === 'rtl' ? 'right' : 'left'}.px`;
+
+  return features.map(feature => {
+    const value =
+      feature.valueType?.name === ValueTypes.ToggleStringValueType
+        ? (feature.value || '').toLowerCase() === 'true'
+        : feature.value;
+
+    return {
+      ...feature,
+      value,
+      initialValue: value,
+      style: { [margin]: feature.depth * 20 },
+    };
+  });
+}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts
index ee3eca6d42..0a3d3b822e 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts
@@ -4,10 +4,16 @@ import { NgModule } from '@angular/core';
 import { FeatureManagementComponent } from './components/feature-management/feature-management.component';
 import { NgxsModule } from '@ngxs/store';
 import { FeatureManagementState } from './states/feature-management.state';
+import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [FeatureManagementComponent],
-  imports: [CoreModule, ThemeSharedModule, NgxsModule.forFeature([FeatureManagementState])],
+  imports: [
+    CoreModule,
+    ThemeSharedModule,
+    NgbNavModule,
+    NgxsModule.forFeature([FeatureManagementState]),
+  ],
   exports: [FeatureManagementComponent],
 })
 export class FeatureManagementModule {}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts
index 02f6f687e2..ef53e6d11c 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts
@@ -1,16 +1,25 @@
 import { EventEmitter } from '@angular/core';
 
 export namespace FeatureManagement {
+  /**
+   * @deprecated To be deleted in v4.0.
+   */
   export interface State {
     features: Feature[];
   }
 
+  /**
+   * @deprecated To be deleted in v4.0.
+   */
   export interface ValueType {
     name: string;
     properties: object;
     validator: object;
   }
 
+  /**
+   * @deprecated To be deleted in v4.0.
+   */
   export interface Feature {
     name: string;
     displayName: string;
@@ -21,10 +30,16 @@ export namespace FeatureManagement {
     parentName?: string;
   }
 
+  /**
+   * @deprecated To be deleted in v4.0.
+   */
   export interface Features {
     features: Feature[];
   }
 
+  /**
+   * @deprecated To be deleted in v4.0.
+   */
   export interface Provider {
     providerName: string;
     providerKey: string;
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/README.md b/npm/ng-packs/packages/feature-management/src/lib/proxy/README.md
new file mode 100644
index 0000000000..09967f7e3a
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/README.md
@@ -0,0 +1,13 @@
+# Proxy Generation Output
+
+This directory includes the output of the latest proxy generation.
+The files and folders in it will be overwritten when proxy generation is run again.
+Therefore, please do not place your own content in this folder.
+
+In addition, `generate-proxy.json` works like a lock file.
+It includes information used by the proxy generator, so please do not delete or modify it.
+
+Finally, the name of the files and folders should not be changed for two reasons:
+- Proxy generator will keep creating them at those paths and you will have multiple copies of the same content.
+- ABP Suite generates files which include imports from this folder.
+
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/features.service.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/features.service.ts
new file mode 100644
index 0000000000..c1ff025b1b
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/features.service.ts
@@ -0,0 +1,29 @@
+import type { GetFeatureListResultDto, UpdateFeaturesDto } from './models';
+import { RestService } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class FeaturesService {
+  apiName = 'AbpFeatureManagement';
+
+  get = (providerName: string, providerKey: string) =>
+    this.restService.request<any, GetFeatureListResultDto>({
+      method: 'GET',
+      url: '/api/feature-management/features',
+      params: { providerName, providerKey },
+    },
+    { apiName: this.apiName });
+
+  update = (providerName: string, providerKey: string, input: UpdateFeaturesDto) =>
+    this.restService.request<any, void>({
+      method: 'PUT',
+      url: '/api/feature-management/features',
+      params: { providerName, providerKey },
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  constructor(private restService: RestService) {}
+}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/index.ts
new file mode 100644
index 0000000000..8c604f9964
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/index.ts
@@ -0,0 +1,2 @@
+export * from './features.service';
+export * from './models';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/models.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/models.ts
new file mode 100644
index 0000000000..8ea2d73164
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/models.ts
@@ -0,0 +1,36 @@
+import type { IStringValueType } from '../validation/string-values/models';
+
+export interface FeatureDto {
+  name: string;
+  displayName: string;
+  value: string;
+  provider: FeatureProviderDto;
+  description: string;
+  valueType: IStringValueType;
+  depth: number;
+  parentName: string;
+}
+
+export interface FeatureGroupDto {
+  name: string;
+  displayName: string;
+  features: FeatureDto[];
+}
+
+export interface FeatureProviderDto {
+  name: string;
+  key: string;
+}
+
+export interface GetFeatureListResultDto {
+  groups: FeatureGroupDto[];
+}
+
+export interface UpdateFeatureDto {
+  name: string;
+  value: string;
+}
+
+export interface UpdateFeaturesDto {
+  features: UpdateFeatureDto[];
+}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/generate-proxy.json b/npm/ng-packs/packages/feature-management/src/lib/proxy/generate-proxy.json
new file mode 100644
index 0000000000..eb3fe8d564
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/generate-proxy.json
@@ -0,0 +1,12142 @@
+{
+  "generated": [
+    "featureManagement"
+  ],
+  "modules": {
+    "leptonThemeManagement": {
+      "rootPath": "leptonThemeManagement",
+      "remoteServiceName": "LeptonThemeManagement",
+      "controllers": {
+        "Volo.Abp.LeptonTheme.LeptonThemeSettingsController": {
+          "controllerName": "LeptonThemeSettings",
+          "type": "Volo.Abp.LeptonTheme.LeptonThemeSettingsController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.LeptonTheme.Management.ILeptonThemeSettingsAppService"
+            }
+          ],
+          "actions": {
+            "GetAsync": {
+              "uniqueName": "GetAsync",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/lepton-theme-management/settings",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.LeptonTheme.Management.LeptonThemeSettingsDto",
+                "typeSimple": "Volo.Abp.LeptonTheme.Management.LeptonThemeSettingsDto"
+              }
+            },
+            "UpdateAsyncByInput": {
+              "uniqueName": "UpdateAsyncByInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/lepton-theme-management/settings",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.LeptonTheme.Management.UpdateLeptonThemeSettingsDto, Volo.Abp.LeptonTheme.Management.Application.Contracts",
+                  "type": "Volo.Abp.LeptonTheme.Management.UpdateLeptonThemeSettingsDto",
+                  "typeSimple": "Volo.Abp.LeptonTheme.Management.UpdateLeptonThemeSettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.LeptonTheme.Management.UpdateLeptonThemeSettingsDto",
+                  "typeSimple": "Volo.Abp.LeptonTheme.Management.UpdateLeptonThemeSettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        }
+      }
+    },
+    "saas": {
+      "rootPath": "saas",
+      "remoteServiceName": "SaasHost",
+      "controllers": {
+        "Volo.Saas.Host.EditionController": {
+          "controllerName": "Edition",
+          "type": "Volo.Saas.Host.EditionController",
+          "interfaces": [
+            {
+              "type": "Volo.Saas.Host.IEditionAppService"
+            }
+          ],
+          "actions": {
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/saas/editions/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Saas.Host.Dtos.EditionDto",
+                "typeSimple": "Volo.Saas.Host.Dtos.EditionDto"
+              }
+            },
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/saas/editions",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Saas.Host.Dtos.GetEditionsInput, Volo.Saas.Host.Application.Contracts",
+                  "type": "Volo.Saas.Host.Dtos.GetEditionsInput",
+                  "typeSimple": "Volo.Saas.Host.Dtos.GetEditionsInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Saas.Host.Dtos.EditionDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Saas.Host.Dtos.EditionDto>"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/saas/editions",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Saas.Host.Dtos.EditionCreateDto, Volo.Saas.Host.Application.Contracts",
+                  "type": "Volo.Saas.Host.Dtos.EditionCreateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.EditionCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Saas.Host.Dtos.EditionCreateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.EditionCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Saas.Host.Dtos.EditionDto",
+                "typeSimple": "Volo.Saas.Host.Dtos.EditionDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/saas/editions/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Saas.Host.Dtos.EditionUpdateDto, Volo.Saas.Host.Application.Contracts",
+                  "type": "Volo.Saas.Host.Dtos.EditionUpdateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.EditionUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Saas.Host.Dtos.EditionUpdateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.EditionUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Saas.Host.Dtos.EditionDto",
+                "typeSimple": "Volo.Saas.Host.Dtos.EditionDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/saas/editions/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetUsageStatistics": {
+              "uniqueName": "GetUsageStatistics",
+              "name": "GetUsageStatistics",
+              "httpMethod": "GET",
+              "url": "api/saas/editions/statistics/usage-statistic",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Saas.Host.GetEditionUsageStatisticsResult",
+                "typeSimple": "Volo.Saas.Host.GetEditionUsageStatisticsResult"
+              }
+            }
+          }
+        },
+        "Volo.Saas.Host.TenantController": {
+          "controllerName": "Tenant",
+          "type": "Volo.Saas.Host.TenantController",
+          "interfaces": [
+            {
+              "type": "Volo.Saas.Host.ITenantAppService"
+            }
+          ],
+          "actions": {
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/saas/tenants/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Saas.Host.Dtos.SaasTenantDto",
+                "typeSimple": "Volo.Saas.Host.Dtos.SaasTenantDto"
+              }
+            },
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/saas/tenants",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Saas.Host.Dtos.GetTenantsInput, Volo.Saas.Host.Application.Contracts",
+                  "type": "Volo.Saas.Host.Dtos.GetTenantsInput",
+                  "typeSimple": "Volo.Saas.Host.Dtos.GetTenantsInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "GetEditionNames",
+                  "type": "System.Boolean",
+                  "typeSimple": "boolean",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Saas.Host.Dtos.SaasTenantDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Saas.Host.Dtos.SaasTenantDto>"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/saas/tenants",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Saas.Host.Dtos.SaasTenantCreateDto, Volo.Saas.Host.Application.Contracts",
+                  "type": "Volo.Saas.Host.Dtos.SaasTenantCreateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.SaasTenantCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Saas.Host.Dtos.SaasTenantCreateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.SaasTenantCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Saas.Host.Dtos.SaasTenantDto",
+                "typeSimple": "Volo.Saas.Host.Dtos.SaasTenantDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/saas/tenants/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Saas.Host.Dtos.SaasTenantUpdateDto, Volo.Saas.Host.Application.Contracts",
+                  "type": "Volo.Saas.Host.Dtos.SaasTenantUpdateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.SaasTenantUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Saas.Host.Dtos.SaasTenantUpdateDto",
+                  "typeSimple": "Volo.Saas.Host.Dtos.SaasTenantUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Saas.Host.Dtos.SaasTenantDto",
+                "typeSimple": "Volo.Saas.Host.Dtos.SaasTenantDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/saas/tenants/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetDefaultConnectionStringAsyncById": {
+              "uniqueName": "GetDefaultConnectionStringAsyncById",
+              "name": "GetDefaultConnectionStringAsync",
+              "httpMethod": "GET",
+              "url": "api/saas/tenants/{id}/default-connection-string",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.String",
+                "typeSimple": "string"
+              }
+            },
+            "UpdateDefaultConnectionStringAsyncByIdAndDefaultConnectionString": {
+              "uniqueName": "UpdateDefaultConnectionStringAsyncByIdAndDefaultConnectionString",
+              "name": "UpdateDefaultConnectionStringAsync",
+              "httpMethod": "PUT",
+              "url": "api/saas/tenants/{id}/default-connection-string",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "defaultConnectionString",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "defaultConnectionString",
+                  "name": "defaultConnectionString",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "DeleteDefaultConnectionStringAsyncById": {
+              "uniqueName": "DeleteDefaultConnectionStringAsyncById",
+              "name": "DeleteDefaultConnectionStringAsync",
+              "httpMethod": "DELETE",
+              "url": "api/saas/tenants/{id}/default-connection-string",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        }
+      }
+    },
+    "identity": {
+      "rootPath": "identity",
+      "remoteServiceName": "AbpIdentity",
+      "controllers": {
+        "Volo.Abp.Identity.IdentityClaimTypeController": {
+          "controllerName": "IdentityClaimType",
+          "type": "Volo.Abp.Identity.IdentityClaimTypeController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IIdentityClaimTypeAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/claim-types",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.GetIdentityClaimTypesInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.GetIdentityClaimTypesInput",
+                  "typeSimple": "Volo.Abp.Identity.GetIdentityClaimTypesInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.ClaimTypeDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.ClaimTypeDto>"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/claim-types/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.ClaimTypeDto",
+                "typeSimple": "Volo.Abp.Identity.ClaimTypeDto"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/identity/claim-types",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.CreateClaimTypeDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.CreateClaimTypeDto",
+                  "typeSimple": "Volo.Abp.Identity.CreateClaimTypeDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.CreateClaimTypeDto",
+                  "typeSimple": "Volo.Abp.Identity.CreateClaimTypeDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.ClaimTypeDto",
+                "typeSimple": "Volo.Abp.Identity.ClaimTypeDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/claim-types/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.UpdateClaimTypeDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.UpdateClaimTypeDto",
+                  "typeSimple": "Volo.Abp.Identity.UpdateClaimTypeDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.UpdateClaimTypeDto",
+                  "typeSimple": "Volo.Abp.Identity.UpdateClaimTypeDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.ClaimTypeDto",
+                "typeSimple": "Volo.Abp.Identity.ClaimTypeDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity/claim-types/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Identity.IdentityRoleController": {
+          "controllerName": "IdentityRole",
+          "type": "Volo.Abp.Identity.IdentityRoleController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IIdentityRoleAppService"
+            }
+          ],
+          "actions": {
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/roles/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityRoleDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityRoleDto"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/identity/roles",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.IdentityRoleCreateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityRoleCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.IdentityRoleCreateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityRoleCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityRoleDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityRoleDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/roles/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.IdentityRoleUpdateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityRoleUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.IdentityRoleUpdateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityRoleUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityRoleDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityRoleDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity/roles/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetAllListAsync": {
+              "uniqueName": "GetAllListAsync",
+              "name": "GetAllListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/roles/all",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.IdentityRoleDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.IdentityRoleDto>"
+              }
+            },
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/roles",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.GetIdentityRoleListInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.GetIdentityRoleListInput",
+                  "typeSimple": "Volo.Abp.Identity.GetIdentityRoleListInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityRoleDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityRoleDto>"
+              }
+            },
+            "UpdateClaimsAsyncByIdAndInput": {
+              "uniqueName": "UpdateClaimsAsyncByIdAndInput",
+              "name": "UpdateClaimsAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/roles/{id}/claims",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "System.Collections.Generic.List`1[[Volo.Abp.Identity.IdentityRoleClaimDto, Volo.Abp.Identity.Pro.Application.Contracts, Version=3.2.0.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib",
+                  "type": "System.Collections.Generic.List<Volo.Abp.Identity.IdentityRoleClaimDto>",
+                  "typeSimple": "[Volo.Abp.Identity.IdentityRoleClaimDto]",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "System.Collections.Generic.List<Volo.Abp.Identity.IdentityRoleClaimDto>",
+                  "typeSimple": "[Volo.Abp.Identity.IdentityRoleClaimDto]",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetClaimsAsyncById": {
+              "uniqueName": "GetClaimsAsyncById",
+              "name": "GetClaimsAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/roles/{id}/claims",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.Identity.IdentityRoleClaimDto>",
+                "typeSimple": "[Volo.Abp.Identity.IdentityRoleClaimDto]"
+              }
+            },
+            "GetAllClaimTypesAsync": {
+              "uniqueName": "GetAllClaimTypesAsync",
+              "name": "GetAllClaimTypesAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/roles/all-claim-types",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.Identity.ClaimTypeDto>",
+                "typeSimple": "[Volo.Abp.Identity.ClaimTypeDto]"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Identity.IdentitySecurityLogController": {
+          "controllerName": "IdentitySecurityLog",
+          "type": "Volo.Abp.Identity.IdentitySecurityLogController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IIdentitySecurityLogAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/security-logs",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.GetIdentitySecurityLogListInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.GetIdentitySecurityLogListInput",
+                  "typeSimple": "Volo.Abp.Identity.GetIdentitySecurityLogListInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "StartTime",
+                  "type": "System.DateTime?",
+                  "typeSimple": "string?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "EndTime",
+                  "type": "System.DateTime?",
+                  "typeSimple": "string?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "ApplicationName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Identity",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Action",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "UserName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "ClientId",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "CorrelationId",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentitySecurityLogDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentitySecurityLogDto>"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/security-logs/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentitySecurityLogDto",
+                "typeSimple": "Volo.Abp.Identity.IdentitySecurityLogDto"
+              }
+            },
+            "GetMyListAsyncByInput": {
+              "uniqueName": "GetMyListAsyncByInput",
+              "name": "GetMyListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/security-logs/my",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.GetIdentitySecurityLogListInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.GetIdentitySecurityLogListInput",
+                  "typeSimple": "Volo.Abp.Identity.GetIdentitySecurityLogListInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "StartTime",
+                  "type": "System.DateTime?",
+                  "typeSimple": "string?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "EndTime",
+                  "type": "System.DateTime?",
+                  "typeSimple": "string?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "ApplicationName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Identity",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Action",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "UserName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "ClientId",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "CorrelationId",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Query",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentitySecurityLogDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentitySecurityLogDto>"
+              }
+            },
+            "GetMyAsyncById": {
+              "uniqueName": "GetMyAsyncById",
+              "name": "GetMyAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/security-logs/my/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentitySecurityLogDto",
+                "typeSimple": "Volo.Abp.Identity.IdentitySecurityLogDto"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Identity.IdentitySettingsController": {
+          "controllerName": "IdentitySettings",
+          "type": "Volo.Abp.Identity.IdentitySettingsController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IIdentitySettingsAppService"
+            }
+          ],
+          "actions": {
+            "GetAsync": {
+              "uniqueName": "GetAsync",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/settings",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentitySettingsDto",
+                "typeSimple": "Volo.Abp.Identity.IdentitySettingsDto"
+              }
+            },
+            "UpdateAsyncByInput": {
+              "uniqueName": "UpdateAsyncByInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/settings",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.IdentitySettingsDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.IdentitySettingsDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentitySettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.IdentitySettingsDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentitySettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Identity.IdentityUserController": {
+          "controllerName": "IdentityUser",
+          "type": "Volo.Abp.Identity.IdentityUserController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IIdentityUserAppService"
+            }
+          ],
+          "actions": {
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityUserDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+              }
+            },
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.GetIdentityUsersInput",
+                  "typeSimple": "Volo.Abp.Identity.GetIdentityUsersInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityUserDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityUserDto>"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/identity/users",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.IdentityUserCreateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.IdentityUserCreateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityUserDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/users/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.IdentityUserUpdateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.IdentityUserUpdateDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityUserDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity/users/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetRolesAsyncById": {
+              "uniqueName": "GetRolesAsyncById",
+              "name": "GetRolesAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/{id}/roles",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.IdentityRoleDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.IdentityRoleDto>"
+              }
+            },
+            "GetAssignableRolesAsync": {
+              "uniqueName": "GetAssignableRolesAsync",
+              "name": "GetAssignableRolesAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/assignable-roles",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.IdentityRoleDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.IdentityRoleDto>"
+              }
+            },
+            "GetAvailableOrganizationUnitsAsync": {
+              "uniqueName": "GetAvailableOrganizationUnitsAsync",
+              "name": "GetAvailableOrganizationUnitsAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/available-organization-units",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.OrganizationUnitWithDetailsDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.OrganizationUnitWithDetailsDto>"
+              }
+            },
+            "GetAllClaimTypesAsync": {
+              "uniqueName": "GetAllClaimTypesAsync",
+              "name": "GetAllClaimTypesAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/all-claim-types",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.Identity.ClaimTypeDto>",
+                "typeSimple": "[Volo.Abp.Identity.ClaimTypeDto]"
+              }
+            },
+            "GetClaimsAsyncById": {
+              "uniqueName": "GetClaimsAsyncById",
+              "name": "GetClaimsAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/{id}/claims",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.Identity.IdentityUserClaimDto>",
+                "typeSimple": "[Volo.Abp.Identity.IdentityUserClaimDto]"
+              }
+            },
+            "GetOrganizationUnitsAsyncById": {
+              "uniqueName": "GetOrganizationUnitsAsyncById",
+              "name": "GetOrganizationUnitsAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/{id}/organization-units",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.Identity.OrganizationUnitDto>",
+                "typeSimple": "[Volo.Abp.Identity.OrganizationUnitDto]"
+              }
+            },
+            "UpdateRolesAsyncByIdAndInput": {
+              "uniqueName": "UpdateRolesAsyncByIdAndInput",
+              "name": "UpdateRolesAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/users/{id}/roles",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.IdentityUserUpdateRolesDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.IdentityUserUpdateRolesDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserUpdateRolesDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.IdentityUserUpdateRolesDto",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserUpdateRolesDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "UpdateClaimsAsyncByIdAndInput": {
+              "uniqueName": "UpdateClaimsAsyncByIdAndInput",
+              "name": "UpdateClaimsAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/users/{id}/claims",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "System.Collections.Generic.List`1[[Volo.Abp.Identity.IdentityUserClaimDto, Volo.Abp.Identity.Pro.Application.Contracts, Version=3.2.0.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib",
+                  "type": "System.Collections.Generic.List<Volo.Abp.Identity.IdentityUserClaimDto>",
+                  "typeSimple": "[Volo.Abp.Identity.IdentityUserClaimDto]",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "System.Collections.Generic.List<Volo.Abp.Identity.IdentityUserClaimDto>",
+                  "typeSimple": "[Volo.Abp.Identity.IdentityUserClaimDto]",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "LockAsyncByIdAndLockoutDuration": {
+              "uniqueName": "LockAsyncByIdAndLockoutDuration",
+              "name": "LockAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/users/{id}/lock/{lockoutDuration}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "lockoutDuration",
+                  "typeAsString": "System.Int32, System.Private.CoreLib",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "lockoutDuration",
+                  "name": "lockoutDuration",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "UnlockAsyncById": {
+              "uniqueName": "UnlockAsyncById",
+              "name": "UnlockAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/users/{id}/unlock",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "FindByUsernameAsyncByUsername": {
+              "uniqueName": "FindByUsernameAsyncByUsername",
+              "name": "FindByUsernameAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/by-username/{username}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "username",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "username",
+                  "name": "username",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityUserDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+              }
+            },
+            "FindByEmailAsyncByEmail": {
+              "uniqueName": "FindByEmailAsyncByEmail",
+              "name": "FindByEmailAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/by-email/{email}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "email",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "email",
+                  "name": "email",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityUserDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+              }
+            },
+            "UpdatePasswordAsyncByIdAndInput": {
+              "uniqueName": "UpdatePasswordAsyncByIdAndInput",
+              "name": "UpdatePasswordAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/users/{id}/change-password",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.IdentityUserUpdatePasswordInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.IdentityUserUpdatePasswordInput",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserUpdatePasswordInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.IdentityUserUpdatePasswordInput",
+                  "typeSimple": "Volo.Abp.Identity.IdentityUserUpdatePasswordInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Identity.IdentityUserLookupController": {
+          "controllerName": "IdentityUserLookup",
+          "type": "Volo.Abp.Identity.IdentityUserLookupController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IIdentityUserLookupAppService"
+            }
+          ],
+          "actions": {
+            "FindByIdAsyncById": {
+              "uniqueName": "FindByIdAsyncById",
+              "name": "FindByIdAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/lookup/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Users.UserData",
+                "typeSimple": "Volo.Abp.Users.UserData"
+              }
+            },
+            "FindByUserNameAsyncByUserName": {
+              "uniqueName": "FindByUserNameAsyncByUserName",
+              "name": "FindByUserNameAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/lookup/by-username/{userName}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "userName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "userName",
+                  "name": "userName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Users.UserData",
+                "typeSimple": "Volo.Abp.Users.UserData"
+              }
+            },
+            "SearchAsyncByInput": {
+              "uniqueName": "SearchAsyncByInput",
+              "name": "SearchAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/lookup/search",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.UserLookupSearchInputDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.UserLookupSearchInputDto",
+                  "typeSimple": "Volo.Abp.Identity.UserLookupSearchInputDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Users.UserData>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Users.UserData>"
+              }
+            },
+            "GetCountAsyncByInput": {
+              "uniqueName": "GetCountAsyncByInput",
+              "name": "GetCountAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/lookup/count",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.UserLookupCountInputDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.UserLookupCountInputDto",
+                  "typeSimple": "Volo.Abp.Identity.UserLookupCountInputDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "System.Int64",
+                "typeSimple": "number"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Identity.OrganizationUnitController": {
+          "controllerName": "OrganizationUnit",
+          "type": "Volo.Abp.Identity.OrganizationUnitController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IOrganizationUnitAppService"
+            }
+          ],
+          "actions": {
+            "AddRolesAsyncByIdAndInput": {
+              "uniqueName": "AddRolesAsyncByIdAndInput",
+              "name": "AddRolesAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/organization-units/{id}/roles",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.OrganizationUnitRoleInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.OrganizationUnitRoleInput",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitRoleInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.OrganizationUnitRoleInput",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitRoleInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "AddMembersAsyncByIdAndInput": {
+              "uniqueName": "AddMembersAsyncByIdAndInput",
+              "name": "AddMembersAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/organization-units/{id}/members",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.OrganizationUnitUserInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.OrganizationUnitUserInput",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitUserInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.OrganizationUnitUserInput",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitUserInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/identity/organization-units",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.OrganizationUnitCreateDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.OrganizationUnitCreateDto",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.OrganizationUnitCreateDto",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitCreateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.OrganizationUnitWithDetailsDto",
+                "typeSimple": "Volo.Abp.Identity.OrganizationUnitWithDetailsDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity/organization-units",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/organization-units/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.OrganizationUnitWithDetailsDto",
+                "typeSimple": "Volo.Abp.Identity.OrganizationUnitWithDetailsDto"
+              }
+            },
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/organization-units",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.GetOrganizationUnitInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.GetOrganizationUnitInput",
+                  "typeSimple": "Volo.Abp.Identity.GetOrganizationUnitInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.OrganizationUnitWithDetailsDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.OrganizationUnitWithDetailsDto>"
+              }
+            },
+            "GetListAllAsync": {
+              "uniqueName": "GetListAllAsync",
+              "name": "GetListAllAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/organization-units/all",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.OrganizationUnitWithDetailsDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Identity.OrganizationUnitWithDetailsDto>"
+              }
+            },
+            "GetRolesAsyncByIdAndInput": {
+              "uniqueName": "GetRolesAsyncByIdAndInput",
+              "name": "GetRolesAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/organization-units/{id}/roles",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto, Volo.Abp.Ddd.Application.Contracts",
+                  "type": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+                  "typeSimple": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityRoleDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityRoleDto>"
+              }
+            },
+            "GetMembersAsyncByIdAndInput": {
+              "uniqueName": "GetMembersAsyncByIdAndInput",
+              "name": "GetMembersAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/organization-units/{id}/members",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.GetIdentityUsersInput",
+                  "typeSimple": "Volo.Abp.Identity.GetIdentityUsersInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityUserDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.Identity.IdentityUserDto>"
+              }
+            },
+            "MoveAsyncByIdAndInput": {
+              "uniqueName": "MoveAsyncByIdAndInput",
+              "name": "MoveAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/organization-units/{id}/move",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.OrganizationUnitMoveInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.OrganizationUnitMoveInput",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitMoveInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.OrganizationUnitMoveInput",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitMoveInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/organization-units/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.OrganizationUnitUpdateDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.OrganizationUnitUpdateDto",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.OrganizationUnitUpdateDto",
+                  "typeSimple": "Volo.Abp.Identity.OrganizationUnitUpdateDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.OrganizationUnitWithDetailsDto",
+                "typeSimple": "Volo.Abp.Identity.OrganizationUnitWithDetailsDto"
+              }
+            },
+            "RemoveMemberAsyncByIdAndMemberId": {
+              "uniqueName": "RemoveMemberAsyncByIdAndMemberId",
+              "name": "RemoveMemberAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity/organization-units/{id}/members/{memberId}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "memberId",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "memberId",
+                  "name": "memberId",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "RemoveRoleAsyncByIdAndRoleId": {
+              "uniqueName": "RemoveRoleAsyncByIdAndRoleId",
+              "name": "RemoveRoleAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity/organization-units/{id}/roles/{roleId}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "roleId",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "roleId",
+                  "name": "roleId",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Identity.ProfileController": {
+          "controllerName": "Profile",
+          "type": "Volo.Abp.Identity.ProfileController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Identity.IProfileAppService"
+            }
+          ],
+          "actions": {
+            "GetAsync": {
+              "uniqueName": "GetAsync",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/my-profile",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.ProfileDto",
+                "typeSimple": "Volo.Abp.Identity.ProfileDto"
+              }
+            },
+            "UpdateAsyncByInput": {
+              "uniqueName": "UpdateAsyncByInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity/my-profile",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.UpdateProfileDto, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.UpdateProfileDto",
+                  "typeSimple": "Volo.Abp.Identity.UpdateProfileDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.UpdateProfileDto",
+                  "typeSimple": "Volo.Abp.Identity.UpdateProfileDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.ProfileDto",
+                "typeSimple": "Volo.Abp.Identity.ProfileDto"
+              }
+            },
+            "ChangePasswordAsyncByInput": {
+              "uniqueName": "ChangePasswordAsyncByInput",
+              "name": "ChangePasswordAsync",
+              "httpMethod": "POST",
+              "url": "api/identity/my-profile/change-password",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.ChangePasswordInput, Volo.Abp.Identity.Pro.Application.Contracts",
+                  "type": "Volo.Abp.Identity.ChangePasswordInput",
+                  "typeSimple": "Volo.Abp.Identity.ChangePasswordInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Identity.ChangePasswordInput",
+                  "typeSimple": "Volo.Abp.Identity.ChangePasswordInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        }
+      }
+    },
+    "accountAdmin": {
+      "rootPath": "accountAdmin",
+      "remoteServiceName": "AbpAccountAdmin",
+      "controllers": {
+        "Volo.Abp.Account.AccountSettingsController": {
+          "controllerName": "AccountSettings",
+          "type": "Volo.Abp.Account.AccountSettingsController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Account.IAccountSettingsAppService"
+            }
+          ],
+          "actions": {
+            "GetAsync": {
+              "uniqueName": "GetAsync",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/account-admin/settings",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Account.AccountSettingsDto",
+                "typeSimple": "Volo.Abp.Account.AccountSettingsDto"
+              }
+            },
+            "UpdateAsyncByInput": {
+              "uniqueName": "UpdateAsyncByInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/account-admin/settings",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.AccountSettingsDto, Volo.Abp.Account.Pro.Admin.Application.Contracts",
+                  "type": "Volo.Abp.Account.AccountSettingsDto",
+                  "typeSimple": "Volo.Abp.Account.AccountSettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.AccountSettingsDto",
+                  "typeSimple": "Volo.Abp.Account.AccountSettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetLdapAsync": {
+              "uniqueName": "GetLdapAsync",
+              "name": "GetLdapAsync",
+              "httpMethod": "GET",
+              "url": "api/account-admin/settings/ldap",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Account.AccountLdapSettingsDto",
+                "typeSimple": "Volo.Abp.Account.AccountLdapSettingsDto"
+              }
+            },
+            "UpdateLdapAsyncByInput": {
+              "uniqueName": "UpdateLdapAsyncByInput",
+              "name": "UpdateLdapAsync",
+              "httpMethod": "PUT",
+              "url": "api/account-admin/settings/ldap",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.AccountLdapSettingsDto, Volo.Abp.Account.Pro.Admin.Application.Contracts",
+                  "type": "Volo.Abp.Account.AccountLdapSettingsDto",
+                  "typeSimple": "Volo.Abp.Account.AccountLdapSettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.AccountLdapSettingsDto",
+                  "typeSimple": "Volo.Abp.Account.AccountLdapSettingsDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        }
+      }
+    },
+    "identityServer": {
+      "rootPath": "identityServer",
+      "remoteServiceName": "AbpIdentityServer",
+      "controllers": {
+        "Volo.Abp.IdentityServer.ApiResourcesController": {
+          "controllerName": "ApiResources",
+          "type": "Volo.Abp.IdentityServer.ApiResourcesController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.IdentityServer.ApiResource.IApiResourceAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/api-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.ApiResource.Dtos.GetApiResourceListInput, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.GetApiResourceListInput",
+                  "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.GetApiResourceListInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto>"
+              }
+            },
+            "GetAllListAsync": {
+              "uniqueName": "GetAllListAsync",
+              "name": "GetAllListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/api-resources/all",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto>",
+                "typeSimple": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto]"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/api-resources/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/identity-server/api-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.ApiResource.Dtos.CreateApiResourceDto, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.CreateApiResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.CreateApiResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.CreateApiResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.CreateApiResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity-server/api-resources/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.ApiResource.Dtos.UpdateApiResourceDto, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.UpdateApiResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.UpdateApiResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.UpdateApiResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.UpdateApiResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity-server/api-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        },
+        "Volo.Abp.IdentityServer.ClientsController": {
+          "controllerName": "Clients",
+          "type": "Volo.Abp.IdentityServer.ClientsController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.IdentityServer.Client.IClientAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/clients",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.Client.Dtos.GetClientListInput, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.Client.Dtos.GetClientListInput",
+                  "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.GetClientListInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto>"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/clients/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/identity-server/clients",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.Client.Dtos.CreateClientDto, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.Client.Dtos.CreateClientDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.CreateClientDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.IdentityServer.Client.Dtos.CreateClientDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.CreateClientDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity-server/clients/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.Client.Dtos.UpdateClientDto, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.Client.Dtos.UpdateClientDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.UpdateClientDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.IdentityServer.Client.Dtos.UpdateClientDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.UpdateClientDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity-server/clients",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        },
+        "Volo.Abp.IdentityServer.IdentityResourcesController": {
+          "controllerName": "IdentityResources",
+          "type": "Volo.Abp.IdentityServer.IdentityResourcesController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.IdentityServer.IdentityResource.IIdentityResourceAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/identity-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.IdentityResource.Dtos.GetIdentityResourceListInput, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.GetIdentityResourceListInput",
+                  "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.GetIdentityResourceListInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto>"
+              }
+            },
+            "GetAllListAsync": {
+              "uniqueName": "GetAllListAsync",
+              "name": "GetAllListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/identity-resources/all",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto>",
+                "typeSimple": "[Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto]"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/identity-resources/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/identity-server/identity-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.IdentityResource.Dtos.CreateIdentityResourceDto, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.CreateIdentityResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.CreateIdentityResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.CreateIdentityResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.CreateIdentityResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/identity-server/identity-resources/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.IdentityServer.IdentityResource.Dtos.UpdateIdentityResourceDto, Volo.Abp.IdentityServer.Application.Contracts",
+                  "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.UpdateIdentityResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.UpdateIdentityResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.UpdateIdentityResourceDto",
+                  "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.UpdateIdentityResourceDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto",
+                "typeSimple": "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/identity-server/identity-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "CreateStandardResourcesAsync": {
+              "uniqueName": "CreateStandardResourcesAsync",
+              "name": "CreateStandardResourcesAsync",
+              "httpMethod": "POST",
+              "url": "api/identity-server/identity-resources/create-standard-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        },
+        "Volo.Abp.IdentityServer.IdentityServerClaimTypesController": {
+          "controllerName": "IdentityServerClaimTypes",
+          "type": "Volo.Abp.IdentityServer.IdentityServerClaimTypesController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.IdentityServer.ClaimType.IIdentityServerClaimTypeAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsync": {
+              "uniqueName": "GetListAsync",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/identity-server/claim-types",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.IdentityServer.ClaimType.Dtos.IdentityClaimTypeDto>",
+                "typeSimple": "[Volo.Abp.IdentityServer.ClaimType.Dtos.IdentityClaimTypeDto]"
+              }
+            }
+          }
+        }
+      }
+    },
+    "account": {
+      "rootPath": "account",
+      "remoteServiceName": "AbpAccountPublic",
+      "controllers": {
+        "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.AccountController": {
+          "controllerName": "Account",
+          "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.AccountController",
+          "interfaces": [],
+          "actions": {
+            "LoginByLogin": {
+              "uniqueName": "LoginByLogin",
+              "name": "Login",
+              "httpMethod": "POST",
+              "url": "api/account/login",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "login",
+                  "typeAsString": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo, Volo.Abp.Account.Pro.Public.Web",
+                  "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "typeSimple": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "login",
+                  "name": "login",
+                  "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "typeSimple": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.AbpLoginResult",
+                "typeSimple": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.AbpLoginResult"
+              }
+            },
+            "Logout": {
+              "uniqueName": "Logout",
+              "name": "Logout",
+              "httpMethod": "GET",
+              "url": "api/account/logout",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "CheckPasswordByLogin": {
+              "uniqueName": "CheckPasswordByLogin",
+              "name": "CheckPassword",
+              "httpMethod": "POST",
+              "url": "api/account/checkPassword",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "login",
+                  "typeAsString": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo, Volo.Abp.Account.Pro.Public.Web",
+                  "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "typeSimple": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "login",
+                  "name": "login",
+                  "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "typeSimple": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.AbpLoginResult",
+                "typeSimple": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.AbpLoginResult"
+              }
+            }
+          }
+        },
+        "Volo.Abp.Account.AccountController": {
+          "controllerName": "Account",
+          "type": "Volo.Abp.Account.AccountController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.Account.IAccountAppService"
+            }
+          ],
+          "actions": {
+            "RegisterAsyncByInput": {
+              "uniqueName": "RegisterAsyncByInput",
+              "name": "RegisterAsync",
+              "httpMethod": "POST",
+              "url": "api/account/register",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.RegisterDto, Volo.Abp.Account.Pro.Public.Application.Contracts",
+                  "type": "Volo.Abp.Account.RegisterDto",
+                  "typeSimple": "Volo.Abp.Account.RegisterDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.RegisterDto",
+                  "typeSimple": "Volo.Abp.Account.RegisterDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityUserDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+              }
+            },
+            "SendPasswordResetCodeAsyncByInput": {
+              "uniqueName": "SendPasswordResetCodeAsyncByInput",
+              "name": "SendPasswordResetCodeAsync",
+              "httpMethod": "POST",
+              "url": "api/account/send-password-reset-code",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.SendPasswordResetCodeDto, Volo.Abp.Account.Pro.Public.Application.Contracts",
+                  "type": "Volo.Abp.Account.SendPasswordResetCodeDto",
+                  "typeSimple": "Volo.Abp.Account.SendPasswordResetCodeDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.SendPasswordResetCodeDto",
+                  "typeSimple": "Volo.Abp.Account.SendPasswordResetCodeDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "ResetPasswordAsyncByInput": {
+              "uniqueName": "ResetPasswordAsyncByInput",
+              "name": "ResetPasswordAsync",
+              "httpMethod": "POST",
+              "url": "api/account/reset-password",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.ResetPasswordDto, Volo.Abp.Account.Pro.Public.Application.Contracts",
+                  "type": "Volo.Abp.Account.ResetPasswordDto",
+                  "typeSimple": "Volo.Abp.Account.ResetPasswordDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.ResetPasswordDto",
+                  "typeSimple": "Volo.Abp.Account.ResetPasswordDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "SendPhoneNumberConfirmationTokenAsync": {
+              "uniqueName": "SendPhoneNumberConfirmationTokenAsync",
+              "name": "SendPhoneNumberConfirmationTokenAsync",
+              "httpMethod": "POST",
+              "url": "api/account/send-phone-number-confirmation-token",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "SendEmailConfirmationTokenAsyncByInput": {
+              "uniqueName": "SendEmailConfirmationTokenAsyncByInput",
+              "name": "SendEmailConfirmationTokenAsync",
+              "httpMethod": "POST",
+              "url": "api/account/send-email-confirmation-token",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.SendEmailConfirmationTokenDto, Volo.Abp.Account.Pro.Public.Application.Contracts",
+                  "type": "Volo.Abp.Account.SendEmailConfirmationTokenDto",
+                  "typeSimple": "Volo.Abp.Account.SendEmailConfirmationTokenDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.SendEmailConfirmationTokenDto",
+                  "typeSimple": "Volo.Abp.Account.SendEmailConfirmationTokenDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "ConfirmPhoneNumberAsyncByInput": {
+              "uniqueName": "ConfirmPhoneNumberAsyncByInput",
+              "name": "ConfirmPhoneNumberAsync",
+              "httpMethod": "POST",
+              "url": "api/account/confirm-phone-number",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.ConfirmPhoneNumberInput, Volo.Abp.Account.Pro.Public.Application.Contracts",
+                  "type": "Volo.Abp.Account.ConfirmPhoneNumberInput",
+                  "typeSimple": "Volo.Abp.Account.ConfirmPhoneNumberInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.ConfirmPhoneNumberInput",
+                  "typeSimple": "Volo.Abp.Account.ConfirmPhoneNumberInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "ConfirmEmailAsyncByInput": {
+              "uniqueName": "ConfirmEmailAsyncByInput",
+              "name": "ConfirmEmailAsync",
+              "httpMethod": "POST",
+              "url": "api/account/confirm-email",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.ConfirmEmailInput, Volo.Abp.Account.Pro.Public.Application.Contracts",
+                  "type": "Volo.Abp.Account.ConfirmEmailInput",
+                  "typeSimple": "Volo.Abp.Account.ConfirmEmailInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.ConfirmEmailInput",
+                  "typeSimple": "Volo.Abp.Account.ConfirmEmailInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "SetProfilePictureAsyncByInput": {
+              "uniqueName": "SetProfilePictureAsyncByInput",
+              "name": "SetProfilePictureAsync",
+              "httpMethod": "POST",
+              "url": "api/account/profile-picture",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Account.ProfilePictureInput, Volo.Abp.Account.Pro.Public.Application.Contracts",
+                  "type": "Volo.Abp.Account.ProfilePictureInput",
+                  "typeSimple": "Volo.Abp.Account.ProfilePictureInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.Account.ProfilePictureInput",
+                  "typeSimple": "Volo.Abp.Account.ProfilePictureInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetProfilePictureAsyncById": {
+              "uniqueName": "GetProfilePictureAsyncById",
+              "name": "GetProfilePictureAsync",
+              "httpMethod": "GET",
+              "url": "api/account/profile-picture/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Account.ProfilePictureSourceDto",
+                "typeSimple": "Volo.Abp.Account.ProfilePictureSourceDto"
+              }
+            },
+            "UploadProfilePictureFileAsyncByImage": {
+              "uniqueName": "UploadProfilePictureFileAsyncByImage",
+              "name": "UploadProfilePictureFileAsync",
+              "httpMethod": "POST",
+              "url": "api/account/profile-picture-file",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "image",
+                  "typeAsString": "Microsoft.AspNetCore.Http.IFormFile, Microsoft.AspNetCore.Http.Features",
+                  "type": "Microsoft.AspNetCore.Http.IFormFile",
+                  "typeSimple": "Microsoft.AspNetCore.Http.IFormFile",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "image",
+                  "name": "image",
+                  "type": "Microsoft.AspNetCore.Http.IFormFile",
+                  "typeSimple": "Microsoft.AspNetCore.Http.IFormFile",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "FormFile",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Microsoft.AspNetCore.Mvc.IActionResult",
+                "typeSimple": "Microsoft.AspNetCore.Mvc.IActionResult"
+              }
+            },
+            "GetProfilePictureFileAsyncById": {
+              "uniqueName": "GetProfilePictureFileAsyncById",
+              "name": "GetProfilePictureFileAsync",
+              "httpMethod": "GET",
+              "url": "api/account/profile-picture-file/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Microsoft.AspNetCore.Mvc.IActionResult",
+                "typeSimple": "Microsoft.AspNetCore.Mvc.IActionResult"
+              }
+            }
+          }
+        }
+      }
+    },
+    "languageManagement": {
+      "rootPath": "languageManagement",
+      "remoteServiceName": "LanguageManagement",
+      "controllers": {
+        "Volo.Abp.LanguageManagement.LanguageController": {
+          "controllerName": "Language",
+          "type": "Volo.Abp.LanguageManagement.LanguageController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.LanguageManagement.ILanguageAppService"
+            }
+          ],
+          "actions": {
+            "GetAllListAsync": {
+              "uniqueName": "GetAllListAsync",
+              "name": "GetAllListAsync",
+              "httpMethod": "GET",
+              "url": "api/language-management/languages/all",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.LanguageManagement.Dto.LanguageDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.LanguageManagement.Dto.LanguageDto>"
+              }
+            },
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/language-management/languages",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.LanguageManagement.Dto.GetLanguagesTextsInput, Volo.Abp.LanguageManagement.Application.Contracts",
+                  "type": "Volo.Abp.LanguageManagement.Dto.GetLanguagesTextsInput",
+                  "typeSimple": "Volo.Abp.LanguageManagement.Dto.GetLanguagesTextsInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "ResourceName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "BaseCultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "TargetCultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "GetOnlyEmptyValues",
+                  "type": "System.Boolean",
+                  "typeSimple": "boolean",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.LanguageManagement.Dto.LanguageDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.LanguageManagement.Dto.LanguageDto>"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/language-management/languages/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.LanguageManagement.Dto.LanguageDto",
+                "typeSimple": "Volo.Abp.LanguageManagement.Dto.LanguageDto"
+              }
+            },
+            "CreateAsyncByInput": {
+              "uniqueName": "CreateAsyncByInput",
+              "name": "CreateAsync",
+              "httpMethod": "POST",
+              "url": "api/language-management/languages",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.LanguageManagement.Dto.CreateLanguageDto, Volo.Abp.LanguageManagement.Application.Contracts",
+                  "type": "Volo.Abp.LanguageManagement.Dto.CreateLanguageDto",
+                  "typeSimple": "Volo.Abp.LanguageManagement.Dto.CreateLanguageDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.LanguageManagement.Dto.CreateLanguageDto",
+                  "typeSimple": "Volo.Abp.LanguageManagement.Dto.CreateLanguageDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.LanguageManagement.Dto.LanguageDto",
+                "typeSimple": "Volo.Abp.LanguageManagement.Dto.LanguageDto"
+              }
+            },
+            "UpdateAsyncByIdAndInput": {
+              "uniqueName": "UpdateAsyncByIdAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/language-management/languages/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.LanguageManagement.Dto.UpdateLanguageDto, Volo.Abp.LanguageManagement.Application.Contracts",
+                  "type": "Volo.Abp.LanguageManagement.Dto.UpdateLanguageDto",
+                  "typeSimple": "Volo.Abp.LanguageManagement.Dto.UpdateLanguageDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.LanguageManagement.Dto.UpdateLanguageDto",
+                  "typeSimple": "Volo.Abp.LanguageManagement.Dto.UpdateLanguageDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.LanguageManagement.Dto.LanguageDto",
+                "typeSimple": "Volo.Abp.LanguageManagement.Dto.LanguageDto"
+              }
+            },
+            "DeleteAsyncById": {
+              "uniqueName": "DeleteAsyncById",
+              "name": "DeleteAsync",
+              "httpMethod": "DELETE",
+              "url": "api/language-management/languages/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "SetAsDefaultAsyncById": {
+              "uniqueName": "SetAsDefaultAsyncById",
+              "name": "SetAsDefaultAsync",
+              "httpMethod": "PUT",
+              "url": "api/language-management/languages/{id}/set-as-default",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "GetResourcesAsync": {
+              "uniqueName": "GetResourcesAsync",
+              "name": "GetResourcesAsync",
+              "httpMethod": "GET",
+              "url": "api/language-management/languages/resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.LanguageManagement.Dto.LanguageResourceDto>",
+                "typeSimple": "[Volo.Abp.LanguageManagement.Dto.LanguageResourceDto]"
+              }
+            },
+            "GetCulturelistAsync": {
+              "uniqueName": "GetCulturelistAsync",
+              "name": "GetCulturelistAsync",
+              "httpMethod": "GET",
+              "url": "api/language-management/languages/culture-list",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.LanguageManagement.Dto.CultureInfoDto>",
+                "typeSimple": "[Volo.Abp.LanguageManagement.Dto.CultureInfoDto]"
+              }
+            }
+          }
+        },
+        "Volo.Abp.LanguageManagement.LanguageTextController": {
+          "controllerName": "LanguageText",
+          "type": "Volo.Abp.LanguageManagement.LanguageTextController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.LanguageManagement.ILanguageTextAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/language-management/language-texts",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.LanguageManagement.Dto.GetLanguagesTextsInput, Volo.Abp.LanguageManagement.Application.Contracts",
+                  "type": "Volo.Abp.LanguageManagement.Dto.GetLanguagesTextsInput",
+                  "typeSimple": "Volo.Abp.LanguageManagement.Dto.GetLanguagesTextsInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "ResourceName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "BaseCultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "TargetCultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "GetOnlyEmptyValues",
+                  "type": "System.Boolean",
+                  "typeSimple": "boolean",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.LanguageManagement.Dto.LanguageTextDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.LanguageManagement.Dto.LanguageTextDto>"
+              }
+            },
+            "GetAsyncByResourceNameAndCultureNameAndNameAndBaseCultureName": {
+              "uniqueName": "GetAsyncByResourceNameAndCultureNameAndNameAndBaseCultureName",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/language-management/language-texts/{resourceName}/{cultureName}/{name}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "resourceName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "cultureName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "name",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "baseCultureName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "resourceName",
+                  "name": "resourceName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "cultureName",
+                  "name": "cultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "name",
+                  "name": "name",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "baseCultureName",
+                  "name": "baseCultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.LanguageManagement.Dto.LanguageTextDto",
+                "typeSimple": "Volo.Abp.LanguageManagement.Dto.LanguageTextDto"
+              }
+            },
+            "UpdateAsyncByResourceNameAndCultureNameAndNameAndValue": {
+              "uniqueName": "UpdateAsyncByResourceNameAndCultureNameAndNameAndValue",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/language-management/language-texts/{resourceName}/{cultureName}/{name}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "resourceName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "cultureName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "name",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "value",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "resourceName",
+                  "name": "resourceName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "cultureName",
+                  "name": "cultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "name",
+                  "name": "name",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "value",
+                  "name": "value",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "RestoreToDefaultAsyncByResourceNameAndCultureNameAndName": {
+              "uniqueName": "RestoreToDefaultAsyncByResourceNameAndCultureNameAndName",
+              "name": "RestoreToDefaultAsync",
+              "httpMethod": "PUT",
+              "url": "api/language-management/language-texts/{resourceName}/{cultureName}/{name}/restore",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "resourceName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "cultureName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "name",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "resourceName",
+                  "name": "resourceName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "cultureName",
+                  "name": "cultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "name",
+                  "name": "name",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        }
+      }
+    },
+    "featureManagement": {
+      "rootPath": "featureManagement",
+      "remoteServiceName": "AbpFeatureManagement",
+      "controllers": {
+        "Volo.Abp.FeatureManagement.FeaturesController": {
+          "controllerName": "Features",
+          "type": "Volo.Abp.FeatureManagement.FeaturesController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.FeatureManagement.IFeatureAppService"
+            }
+          ],
+          "actions": {
+            "GetAsyncByProviderNameAndProviderKey": {
+              "uniqueName": "GetAsyncByProviderNameAndProviderKey",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/feature-management/features",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "providerName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "providerKey",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "providerName",
+                  "name": "providerName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "providerKey",
+                  "name": "providerKey",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.FeatureManagement.GetFeatureListResultDto",
+                "typeSimple": "Volo.Abp.FeatureManagement.GetFeatureListResultDto"
+              }
+            },
+            "UpdateAsyncByProviderNameAndProviderKeyAndInput": {
+              "uniqueName": "UpdateAsyncByProviderNameAndProviderKeyAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/feature-management/features",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "providerName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "providerKey",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.FeatureManagement.UpdateFeaturesDto, Volo.Abp.FeatureManagement.Application.Contracts",
+                  "type": "Volo.Abp.FeatureManagement.UpdateFeaturesDto",
+                  "typeSimple": "Volo.Abp.FeatureManagement.UpdateFeaturesDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "providerName",
+                  "name": "providerName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "providerKey",
+                  "name": "providerKey",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.FeatureManagement.UpdateFeaturesDto",
+                  "typeSimple": "Volo.Abp.FeatureManagement.UpdateFeaturesDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        }
+      }
+    },
+    "abp": {
+      "rootPath": "abp",
+      "remoteServiceName": "abp",
+      "controllers": {
+        "Pages.Abp.MultiTenancy.AbpTenantController": {
+          "controllerName": "AbpTenant",
+          "type": "Pages.Abp.MultiTenancy.AbpTenantController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.IAbpTenantAppService"
+            }
+          ],
+          "actions": {
+            "FindTenantByNameAsyncByName": {
+              "uniqueName": "FindTenantByNameAsyncByName",
+              "name": "FindTenantByNameAsync",
+              "httpMethod": "GET",
+              "url": "api/abp/multi-tenancy/tenants/by-name/{name}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "name",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "name",
+                  "name": "name",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto",
+                "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto"
+              }
+            },
+            "FindTenantByIdAsyncById": {
+              "uniqueName": "FindTenantByIdAsyncById",
+              "name": "FindTenantByIdAsync",
+              "httpMethod": "GET",
+              "url": "api/abp/multi-tenancy/tenants/by-id/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto",
+                "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto"
+              }
+            }
+          }
+        },
+        "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationController": {
+          "controllerName": "AbpApplicationConfiguration",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IAbpApplicationConfigurationAppService"
+            }
+          ],
+          "actions": {
+            "GetAsync": {
+              "uniqueName": "GetAsync",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/abp/application-configuration",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationConfigurationDto",
+                "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationConfigurationDto"
+              }
+            }
+          }
+        },
+        "Volo.Abp.AspNetCore.Mvc.ApiExploring.AbpApiDefinitionController": {
+          "controllerName": "AbpApiDefinition",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApiExploring.AbpApiDefinitionController",
+          "interfaces": [],
+          "actions": {
+            "GetByModel": {
+              "uniqueName": "GetByModel",
+              "name": "Get",
+              "httpMethod": "GET",
+              "url": "api/abp/api-definition",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "model",
+                  "typeAsString": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto, Volo.Abp.Http",
+                  "type": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto",
+                  "typeSimple": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "model",
+                  "name": "IncludeTypes",
+                  "type": "System.Boolean",
+                  "typeSimple": "boolean",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "model"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModel",
+                "typeSimple": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModel"
+              }
+            }
+          }
+        }
+      }
+    },
+    "textTemplateManagement": {
+      "rootPath": "textTemplateManagement",
+      "remoteServiceName": "TextTemplateManagement",
+      "controllers": {
+        "Volo.Abp.TextTemplateManagement.TextTemplates.TemplateContentController": {
+          "controllerName": "TemplateContent",
+          "type": "Volo.Abp.TextTemplateManagement.TextTemplates.TemplateContentController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.TextTemplateManagement.TextTemplates.ITemplateContentAppService"
+            }
+          ],
+          "actions": {
+            "GetAsyncByInput": {
+              "uniqueName": "GetAsyncByInput",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/text-template-management/template-contents",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateContentInput, Volo.Abp.TextTemplateManagement.Application.Contracts",
+                  "type": "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateContentInput",
+                  "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateContentInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "TemplateName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "CultureName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.TextTemplateManagement.TextTemplates.TextTemplateContentDto",
+                "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.TextTemplateContentDto"
+              }
+            },
+            "RestoreToDefaultAsyncByInput": {
+              "uniqueName": "RestoreToDefaultAsyncByInput",
+              "name": "RestoreToDefaultAsync",
+              "httpMethod": "PUT",
+              "url": "api/text-template-management/template-contents/restore-to-default",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.TextTemplateManagement.TextTemplates.RestoreTemplateContentInput, Volo.Abp.TextTemplateManagement.Application.Contracts",
+                  "type": "Volo.Abp.TextTemplateManagement.TextTemplates.RestoreTemplateContentInput",
+                  "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.RestoreTemplateContentInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.TextTemplateManagement.TextTemplates.RestoreTemplateContentInput",
+                  "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.RestoreTemplateContentInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            },
+            "UpdateAsyncByInput": {
+              "uniqueName": "UpdateAsyncByInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/text-template-management/template-contents",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.TextTemplateManagement.TextTemplates.UpdateTemplateContentInput, Volo.Abp.TextTemplateManagement.Application.Contracts",
+                  "type": "Volo.Abp.TextTemplateManagement.TextTemplates.UpdateTemplateContentInput",
+                  "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.UpdateTemplateContentInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.TextTemplateManagement.TextTemplates.UpdateTemplateContentInput",
+                  "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.UpdateTemplateContentInput",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.TextTemplateManagement.TextTemplates.TextTemplateContentDto",
+                "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.TextTemplateContentDto"
+              }
+            }
+          }
+        },
+        "Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionController": {
+          "controllerName": "TemplateDefinition",
+          "type": "Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.TextTemplateManagement.TextTemplates.ITemplateDefinitionAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/text-template-management/template-definitions",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateDefinitionListInput, Volo.Abp.TextTemplateManagement.Application.Contracts",
+                  "type": "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateDefinitionListInput",
+                  "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateDefinitionListInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "FilterText",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionDto>"
+              }
+            },
+            "GetAsyncByName": {
+              "uniqueName": "GetAsyncByName",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/text-template-management/template-definitions/{name}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "name",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "name",
+                  "name": "name",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionDto",
+                "typeSimple": "Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionDto"
+              }
+            }
+          }
+        }
+      }
+    },
+    "permissionManagement": {
+      "rootPath": "permissionManagement",
+      "remoteServiceName": "AbpPermissionManagement",
+      "controllers": {
+        "Volo.Abp.PermissionManagement.PermissionsController": {
+          "controllerName": "Permissions",
+          "type": "Volo.Abp.PermissionManagement.PermissionsController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.PermissionManagement.IPermissionAppService"
+            }
+          ],
+          "actions": {
+            "GetAsyncByProviderNameAndProviderKey": {
+              "uniqueName": "GetAsyncByProviderNameAndProviderKey",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/permission-management/permissions",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "providerName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "providerKey",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "providerName",
+                  "name": "providerName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "providerKey",
+                  "name": "providerKey",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.PermissionManagement.GetPermissionListResultDto",
+                "typeSimple": "Volo.Abp.PermissionManagement.GetPermissionListResultDto"
+              }
+            },
+            "UpdateAsyncByProviderNameAndProviderKeyAndInput": {
+              "uniqueName": "UpdateAsyncByProviderNameAndProviderKeyAndInput",
+              "name": "UpdateAsync",
+              "httpMethod": "PUT",
+              "url": "api/permission-management/permissions",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "providerName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "providerKey",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                },
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.PermissionManagement.UpdatePermissionsDto, Volo.Abp.PermissionManagement.Application.Contracts",
+                  "type": "Volo.Abp.PermissionManagement.UpdatePermissionsDto",
+                  "typeSimple": "Volo.Abp.PermissionManagement.UpdatePermissionsDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "providerName",
+                  "name": "providerName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "providerKey",
+                  "name": "providerKey",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": ""
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "input",
+                  "type": "Volo.Abp.PermissionManagement.UpdatePermissionsDto",
+                  "typeSimple": "Volo.Abp.PermissionManagement.UpdatePermissionsDto",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "Body",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "System.Void",
+                "typeSimple": "System.Void"
+              }
+            }
+          }
+        }
+      }
+    },
+    "auditLogging": {
+      "rootPath": "auditLogging",
+      "remoteServiceName": "AbpAuditLogging",
+      "controllers": {
+        "Volo.Abp.AuditLogging.AuditLogsController": {
+          "controllerName": "AuditLogs",
+          "type": "Volo.Abp.AuditLogging.AuditLogsController",
+          "interfaces": [
+            {
+              "type": "Volo.Abp.AuditLogging.IAuditLogsAppService"
+            }
+          ],
+          "actions": {
+            "GetListAsyncByInput": {
+              "uniqueName": "GetListAsyncByInput",
+              "name": "GetListAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.AuditLogging.GetAuditLogListDto, Volo.Abp.AuditLogging.Application.Contracts",
+                  "type": "Volo.Abp.AuditLogging.GetAuditLogListDto",
+                  "typeSimple": "Volo.Abp.AuditLogging.GetAuditLogListDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Url",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "UserName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "ApplicationName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "CorrelationId",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "HttpMethod",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "HttpStatusCode",
+                  "type": "System.Net.HttpStatusCode?",
+                  "typeSimple": "System.Net.HttpStatusCode?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxExecutionDuration",
+                  "type": "System.Int32?",
+                  "typeSimple": "number?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MinExecutionDuration",
+                  "type": "System.Int32?",
+                  "typeSimple": "number?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "HasException",
+                  "type": "System.Boolean?",
+                  "typeSimple": "boolean?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.AuditLogging.AuditLogDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.AuditLogging.AuditLogDto>"
+              }
+            },
+            "GetAsyncById": {
+              "uniqueName": "GetAsyncById",
+              "name": "GetAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.AuditLogging.AuditLogDto",
+                "typeSimple": "Volo.Abp.AuditLogging.AuditLogDto"
+              }
+            },
+            "GetErrorRateAsyncByFilter": {
+              "uniqueName": "GetErrorRateAsyncByFilter",
+              "name": "GetErrorRateAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs/statistics/error-rate",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "filter",
+                  "typeAsString": "Volo.Abp.AuditLogging.GetErrorRateFilter, Volo.Abp.AuditLogging.Application.Contracts",
+                  "type": "Volo.Abp.AuditLogging.GetErrorRateFilter",
+                  "typeSimple": "Volo.Abp.AuditLogging.GetErrorRateFilter",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "filter",
+                  "name": "StartDate",
+                  "type": "System.DateTime",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "filter"
+                },
+                {
+                  "nameOnMethod": "filter",
+                  "name": "EndDate",
+                  "type": "System.DateTime",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "filter"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.AuditLogging.GetErrorRateOutput",
+                "typeSimple": "Volo.Abp.AuditLogging.GetErrorRateOutput"
+              }
+            },
+            "GetAverageExecutionDurationPerDayAsyncByFilter": {
+              "uniqueName": "GetAverageExecutionDurationPerDayAsyncByFilter",
+              "name": "GetAverageExecutionDurationPerDayAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs/statistics/average-execution-duration-per-day",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "filter",
+                  "typeAsString": "Volo.Abp.AuditLogging.GetAverageExecutionDurationPerDayInput, Volo.Abp.AuditLogging.Application.Contracts",
+                  "type": "Volo.Abp.AuditLogging.GetAverageExecutionDurationPerDayInput",
+                  "typeSimple": "Volo.Abp.AuditLogging.GetAverageExecutionDurationPerDayInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "filter",
+                  "name": "StartDate",
+                  "type": "System.DateTime",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "filter"
+                },
+                {
+                  "nameOnMethod": "filter",
+                  "name": "EndDate",
+                  "type": "System.DateTime",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "filter"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.AuditLogging.GetAverageExecutionDurationPerDayOutput",
+                "typeSimple": "Volo.Abp.AuditLogging.GetAverageExecutionDurationPerDayOutput"
+              }
+            },
+            "GetEntityChangesAsyncByInput": {
+              "uniqueName": "GetEntityChangesAsyncByInput",
+              "name": "GetEntityChangesAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs/entity-changes",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.AuditLogging.GetEntityChangesDto, Volo.Abp.AuditLogging.Application.Contracts",
+                  "type": "Volo.Abp.AuditLogging.GetEntityChangesDto",
+                  "typeSimple": "Volo.Abp.AuditLogging.GetEntityChangesDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "AuditLogId",
+                  "type": "System.Guid?",
+                  "typeSimple": "string?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "EntityChangeType",
+                  "type": "Volo.Abp.Auditing.EntityChangeType?",
+                  "typeSimple": "Volo.Abp.Auditing.EntityChangeType?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "EntityId",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "EntityTypeFullName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "StartDate",
+                  "type": "System.DateTime?",
+                  "typeSimple": "string?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "EndDate",
+                  "type": "System.DateTime?",
+                  "typeSimple": "string?",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.AuditLogging.EntityChangeDto>",
+                "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto<Volo.Abp.AuditLogging.EntityChangeDto>"
+              }
+            },
+            "GetEntityChangesWithUsernameAsyncByInput": {
+              "uniqueName": "GetEntityChangesWithUsernameAsyncByInput",
+              "name": "GetEntityChangesWithUsernameAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs/entity-changes-with-username",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.AuditLogging.EntityChangeFilter, Volo.Abp.AuditLogging.Application.Contracts",
+                  "type": "Volo.Abp.AuditLogging.EntityChangeFilter",
+                  "typeSimple": "Volo.Abp.AuditLogging.EntityChangeFilter",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "EntityId",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "EntityTypeFullName",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Abp.AuditLogging.EntityChangeWithUsernameDto>",
+                "typeSimple": "[Volo.Abp.AuditLogging.EntityChangeWithUsernameDto]"
+              }
+            },
+            "GetEntityChangeWithUsernameAsyncByEntityChangeId": {
+              "uniqueName": "GetEntityChangeWithUsernameAsyncByEntityChangeId",
+              "name": "GetEntityChangeWithUsernameAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs/entity-change-with-username/{entityChangeId}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "entityChangeId",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "entityChangeId",
+                  "name": "entityChangeId",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.AuditLogging.EntityChangeWithUsernameDto",
+                "typeSimple": "Volo.Abp.AuditLogging.EntityChangeWithUsernameDto"
+              }
+            },
+            "GetEntityChangeAsyncByEntityChangeId": {
+              "uniqueName": "GetEntityChangeAsyncByEntityChangeId",
+              "name": "GetEntityChangeAsync",
+              "httpMethod": "GET",
+              "url": "api/audit-logging/audit-logs/entity-changes/{entityChangeId}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "entityChangeId",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "entityChangeId",
+                  "name": "entityChangeId",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.AuditLogging.EntityChangeDto",
+                "typeSimple": "Volo.Abp.AuditLogging.EntityChangeDto"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "types": {
+    "Volo.Abp.Account.AccountSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsSelfRegistrationEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "EnableLocalLogin",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsRememberBrowserEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Account.AccountLdapSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "EnableLdapLogin",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "LdapServerHost",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LdapServerPort",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LdapBaseDc",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LdapUserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LdapPassword",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.UserLoginInfo": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserNameOrEmailAddress",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Password",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RememberMe",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "TenanId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.AbpLoginResult": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Result",
+          "type": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.LoginResultType",
+          "typeSimple": "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.LoginResultType"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Account.Public.Web.Areas.Account.Controllers.Models.LoginResultType": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "Success",
+        "InvalidUserNameOrPassword",
+        "NotAllowed",
+        "LockedOut",
+        "RequiresTwoFactor"
+      ],
+      "enumValues": [
+        1,
+        2,
+        3,
+        4,
+        5
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.Account.RegisterDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EmailAddress",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Password",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "AppName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ReturnUrl",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ReturnUrlHash",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Surname",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EmailConfirmed",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "PhoneNumber",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PhoneNumberConfirmed",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "TwoFactorEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "LockoutEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsLockedOut",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ConcurrencyStamp",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.ExtensibleEntityDto<T0>": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "TKey"
+      ],
+      "properties": [
+        {
+          "name": "Id",
+          "type": "TKey",
+          "typeSimple": "TKey"
+        }
+      ]
+    },
+    "Volo.Abp.ObjectExtending.ExtensibleObject": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ExtraProperties",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        }
+      ]
+    },
+    "Volo.Abp.Account.SendPasswordResetCodeDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "AppName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ReturnUrl",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ReturnUrlHash",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Account.ResetPasswordDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ResetToken",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Password",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Account.SendEmailConfirmationTokenDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "AppName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ReturnUrl",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ReturnUrlHash",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Account.ConfirmPhoneNumberInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Token",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Account.ConfirmEmailInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Token",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Account.ProfilePictureInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Type",
+          "type": "Volo.Abp.Account.ProfilePictureType",
+          "typeSimple": "Volo.Abp.Account.ProfilePictureType"
+        },
+        {
+          "name": "ImageContent",
+          "type": "[System.Byte]",
+          "typeSimple": "[number]"
+        }
+      ]
+    },
+    "Volo.Abp.Account.ProfilePictureType": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "None",
+        "Gravatar",
+        "Image"
+      ],
+      "enumValues": [
+        0,
+        1,
+        2
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.Account.ProfilePictureSourceDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Type",
+          "type": "Volo.Abp.Account.ProfilePictureType",
+          "typeSimple": "Volo.Abp.Account.ProfilePictureType"
+        },
+        {
+          "name": "Source",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FileContent",
+          "type": "[System.Byte]",
+          "typeSimple": "[number]"
+        }
+      ]
+    },
+    "Microsoft.AspNetCore.Http.IFormFile": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ContentType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ContentDisposition",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Headers",
+          "type": "{System.String:[System.String]}",
+          "typeSimple": "{string:[string]}"
+        },
+        {
+          "name": "Length",
+          "type": "System.Int64",
+          "typeSimple": "number"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FileName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Microsoft.AspNetCore.Mvc.IActionResult": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Success",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.GetAuditLogListDto": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Url",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ApplicationName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CorrelationId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "HttpMethod",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "HttpStatusCode",
+          "type": "System.Net.HttpStatusCode?",
+          "typeSimple": "System.Net.HttpStatusCode?"
+        },
+        {
+          "name": "MaxExecutionDuration",
+          "type": "System.Int32?",
+          "typeSimple": "number?"
+        },
+        {
+          "name": "MinExecutionDuration",
+          "type": "System.Int32?",
+          "typeSimple": "number?"
+        },
+        {
+          "name": "HasException",
+          "type": "System.Boolean?",
+          "typeSimple": "boolean?"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Sorting",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.PagedResultRequestDto": {
+      "baseType": "Volo.Abp.Application.Dtos.LimitedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "SkipCount",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.LimitedResultRequestDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DefaultMaxResultCount",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "MaxMaxResultCount",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "MaxResultCount",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        }
+      ]
+    },
+    "System.Nullable<T0>": {
+      "baseType": "System.ValueType",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "T"
+      ],
+      "properties": [
+        {
+          "name": "HasValue",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Value",
+          "type": "T",
+          "typeSimple": "T"
+        }
+      ]
+    },
+    "System.Net.HttpStatusCode": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "Continue",
+        "SwitchingProtocols",
+        "Processing",
+        "EarlyHints",
+        "OK",
+        "Created",
+        "Accepted",
+        "NonAuthoritativeInformation",
+        "NoContent",
+        "ResetContent",
+        "PartialContent",
+        "MultiStatus",
+        "AlreadyReported",
+        "IMUsed",
+        "MultipleChoices",
+        "Ambiguous",
+        "MovedPermanently",
+        "Moved",
+        "Found",
+        "Redirect",
+        "SeeOther",
+        "RedirectMethod",
+        "NotModified",
+        "UseProxy",
+        "Unused",
+        "TemporaryRedirect",
+        "RedirectKeepVerb",
+        "PermanentRedirect",
+        "BadRequest",
+        "Unauthorized",
+        "PaymentRequired",
+        "Forbidden",
+        "NotFound",
+        "MethodNotAllowed",
+        "NotAcceptable",
+        "ProxyAuthenticationRequired",
+        "RequestTimeout",
+        "Conflict",
+        "Gone",
+        "LengthRequired",
+        "PreconditionFailed",
+        "RequestEntityTooLarge",
+        "RequestUriTooLong",
+        "UnsupportedMediaType",
+        "RequestedRangeNotSatisfiable",
+        "ExpectationFailed",
+        "MisdirectedRequest",
+        "UnprocessableEntity",
+        "Locked",
+        "FailedDependency",
+        "UpgradeRequired",
+        "PreconditionRequired",
+        "TooManyRequests",
+        "RequestHeaderFieldsTooLarge",
+        "UnavailableForLegalReasons",
+        "InternalServerError",
+        "NotImplemented",
+        "BadGateway",
+        "ServiceUnavailable",
+        "GatewayTimeout",
+        "HttpVersionNotSupported",
+        "VariantAlsoNegotiates",
+        "InsufficientStorage",
+        "LoopDetected",
+        "NotExtended",
+        "NetworkAuthenticationRequired"
+      ],
+      "enumValues": [
+        100,
+        101,
+        102,
+        103,
+        200,
+        201,
+        202,
+        203,
+        204,
+        205,
+        206,
+        207,
+        208,
+        226,
+        300,
+        300,
+        301,
+        301,
+        302,
+        302,
+        303,
+        303,
+        304,
+        305,
+        306,
+        307,
+        307,
+        308,
+        400,
+        401,
+        402,
+        403,
+        404,
+        405,
+        406,
+        407,
+        408,
+        409,
+        410,
+        411,
+        412,
+        413,
+        414,
+        415,
+        416,
+        417,
+        421,
+        422,
+        423,
+        424,
+        426,
+        428,
+        429,
+        431,
+        451,
+        500,
+        501,
+        502,
+        503,
+        504,
+        505,
+        506,
+        507,
+        508,
+        510,
+        511
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.Application.Dtos.PagedResultDto<T0>": {
+      "baseType": "Volo.Abp.Application.Dtos.ListResultDto<T>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "T"
+      ],
+      "properties": [
+        {
+          "name": "TotalCount",
+          "type": "System.Int64",
+          "typeSimple": "number"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.ListResultDto<T0>": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "T"
+      ],
+      "properties": [
+        {
+          "name": "Items",
+          "type": "[T]",
+          "typeSimple": "[T]"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.AuditLogDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "ImpersonatorUserId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "ImpersonatorTenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "ExecutionTime",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ExecutionDuration",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "ClientIpAddress",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "BrowserInfo",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "HttpMethod",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Url",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Exceptions",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Comments",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "HttpStatusCode",
+          "type": "System.Int32?",
+          "typeSimple": "number?"
+        },
+        {
+          "name": "ApplicationName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CorrelationId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EntityChanges",
+          "type": "[Volo.Abp.AuditLogging.EntityChangeDto]",
+          "typeSimple": "[Volo.Abp.AuditLogging.EntityChangeDto]"
+        },
+        {
+          "name": "Actions",
+          "type": "[Volo.Abp.AuditLogging.AuditLogActionDto]",
+          "typeSimple": "[Volo.Abp.AuditLogging.AuditLogActionDto]"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.EntityChangeDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "AuditLogId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "ChangeTime",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ChangeType",
+          "type": "Volo.Abp.Auditing.EntityChangeType",
+          "typeSimple": "Volo.Abp.Auditing.EntityChangeType"
+        },
+        {
+          "name": "EntityId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EntityTypeFullName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PropertyChanges",
+          "type": "[Volo.Abp.AuditLogging.EntityPropertyChangeDto]",
+          "typeSimple": "[Volo.Abp.AuditLogging.EntityPropertyChangeDto]"
+        }
+      ]
+    },
+    "Volo.Abp.Auditing.EntityChangeType": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "Created",
+        "Updated",
+        "Deleted"
+      ],
+      "enumValues": [
+        0,
+        1,
+        2
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.AuditLogging.EntityPropertyChangeDto": {
+      "baseType": "Volo.Abp.Application.Dtos.EntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "EntityChangeId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "NewValue",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "OriginalValue",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PropertyName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PropertyTypeFullName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.EntityDto<T0>": {
+      "baseType": "Volo.Abp.Application.Dtos.EntityDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "TKey"
+      ],
+      "properties": [
+        {
+          "name": "Id",
+          "type": "TKey",
+          "typeSimple": "TKey"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.EntityDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Abp.AuditLogging.AuditLogActionDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "AuditLogId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ServiceName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "MethodName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Parameters",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ExecutionTime",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ExecutionDuration",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.GetErrorRateFilter": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "StartDate",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EndDate",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.GetErrorRateOutput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Data",
+          "type": "{System.String:System.Int64}",
+          "typeSimple": "{string:number}"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.GetAverageExecutionDurationPerDayInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "StartDate",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EndDate",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.GetAverageExecutionDurationPerDayOutput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Data",
+          "type": "{System.String:System.Double}",
+          "typeSimple": "{string:number}"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.GetEntityChangesDto": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "AuditLogId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "EntityChangeType",
+          "type": "Volo.Abp.Auditing.EntityChangeType?",
+          "typeSimple": "Volo.Abp.Auditing.EntityChangeType?"
+        },
+        {
+          "name": "EntityId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EntityTypeFullName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "StartDate",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "EndDate",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.EntityChangeFilter": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "EntityId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EntityTypeFullName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AuditLogging.EntityChangeWithUsernameDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "EntityChange",
+          "type": "Volo.Abp.AuditLogging.EntityChangeDto",
+          "typeSimple": "Volo.Abp.AuditLogging.EntityChangeDto"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.GetIdentityClaimTypesInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.ClaimTypeDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Required",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsStatic",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Regex",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RegexDescription",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ValueType",
+          "type": "Volo.Abp.Identity.IdentityClaimValueType",
+          "typeSimple": "Volo.Abp.Identity.IdentityClaimValueType"
+        },
+        {
+          "name": "ValueTypeAsString",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityClaimValueType": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "String",
+        "Int",
+        "Boolean",
+        "DateTime"
+      ],
+      "enumValues": [
+        0,
+        1,
+        2,
+        3
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.Identity.CreateClaimTypeDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Required",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Regex",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RegexDescription",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ValueType",
+          "type": "Volo.Abp.Identity.IdentityClaimValueType",
+          "typeSimple": "Volo.Abp.Identity.IdentityClaimValueType"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.UpdateClaimTypeDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Required",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Regex",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RegexDescription",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ValueType",
+          "type": "Volo.Abp.Identity.IdentityClaimValueType",
+          "typeSimple": "Volo.Abp.Identity.IdentityClaimValueType"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityRoleDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsDefault",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsStatic",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsPublic",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ConcurrencyStamp",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityRoleCreateDto": {
+      "baseType": "Volo.Abp.Identity.IdentityRoleCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Abp.Identity.IdentityRoleCreateOrUpdateDtoBase": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsDefault",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsPublic",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityRoleUpdateDto": {
+      "baseType": "Volo.Abp.Identity.IdentityRoleCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ConcurrencyStamp",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.GetIdentityRoleListInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityRoleClaimDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "RoleId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClaimType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClaimValue",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.GetIdentitySecurityLogListInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "StartTime",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "EndTime",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "ApplicationName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Identity",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Action",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CorrelationId",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentitySecurityLogDto": {
+      "baseType": "Volo.Abp.Application.Dtos.EntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "ApplicationName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Identity",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Action",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UserId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TenantName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CorrelationId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientIpAddress",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "BrowserInfo",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CreationTime",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ExtraProperties",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentitySettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Password",
+          "type": "Volo.Abp.Identity.IdentityPasswordSettingsDto",
+          "typeSimple": "Volo.Abp.Identity.IdentityPasswordSettingsDto"
+        },
+        {
+          "name": "Lockout",
+          "type": "Volo.Abp.Identity.IdentityLockoutSettingsDto",
+          "typeSimple": "Volo.Abp.Identity.IdentityLockoutSettingsDto"
+        },
+        {
+          "name": "SignIn",
+          "type": "Volo.Abp.Identity.IdentitySignInSettingsDto",
+          "typeSimple": "Volo.Abp.Identity.IdentitySignInSettingsDto"
+        },
+        {
+          "name": "User",
+          "type": "Volo.Abp.Identity.IdentityUserSettingsDto",
+          "typeSimple": "Volo.Abp.Identity.IdentityUserSettingsDto"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityPasswordSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "RequiredLength",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "RequiredUniqueChars",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "RequireNonAlphanumeric",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequireLowercase",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequireUppercase",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequireDigit",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityLockoutSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "AllowedForNewUsers",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "LockoutDuration",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "MaxFailedAccessAttempts",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentitySignInSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "RequireConfirmedEmail",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "EnablePhoneNumberConfirmation",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequireConfirmedPhoneNumber",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsUserNameUpdateEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsEmailUpdateEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.GetIdentityUsersInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserCreateDto": {
+      "baseType": "Volo.Abp.Identity.IdentityUserCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Password",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserCreateOrUpdateDtoBase": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Surname",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PhoneNumber",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TwoFactorEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "LockoutEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RoleNames",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "OrganizationUnitIds",
+          "type": "[System.Guid]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserUpdateDto": {
+      "baseType": "Volo.Abp.Identity.IdentityUserCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ConcurrencyStamp",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitWithDetailsDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleFullAuditedEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ParentId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "Code",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Roles",
+          "type": "[Volo.Abp.Identity.IdentityRoleDto]",
+          "typeSimple": "[Volo.Abp.Identity.IdentityRoleDto]"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.ExtensibleFullAuditedEntityDto<T0>": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleAuditedEntityDto<TPrimaryKey>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "TPrimaryKey"
+      ],
+      "properties": [
+        {
+          "name": "IsDeleted",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "DeleterId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "DeletionTime",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.ExtensibleAuditedEntityDto<T0>": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleCreationAuditedEntityDto<TPrimaryKey>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "TPrimaryKey"
+      ],
+      "properties": [
+        {
+          "name": "LastModificationTime",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "LastModifierId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.ExtensibleCreationAuditedEntityDto<T0>": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<TPrimaryKey>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "TPrimaryKey"
+      ],
+      "properties": [
+        {
+          "name": "CreationTime",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CreatorId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserClaimDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClaimType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClaimValue",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleFullAuditedEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ParentId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "Code",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Roles",
+          "type": "[Volo.Abp.Identity.OrganizationUnitRoleDto]",
+          "typeSimple": "[Volo.Abp.Identity.OrganizationUnitRoleDto]"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitRoleDto": {
+      "baseType": "Volo.Abp.Application.Dtos.CreationAuditedEntityDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "OrganizationUnitId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RoleId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Application.Dtos.CreationAuditedEntityDto": {
+      "baseType": "Volo.Abp.Application.Dtos.EntityDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "CreationTime",
+          "type": "System.DateTime",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CreatorId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserUpdateRolesDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "RoleNames",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.IdentityUserUpdatePasswordInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "NewPassword",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Users.UserData": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Id",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Surname",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EmailConfirmed",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "PhoneNumber",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PhoneNumberConfirmed",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.UserLookupSearchInputDto": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Sorting",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.UserLookupCountInputDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitRoleInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "RoleIds",
+          "type": "[System.Guid]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitUserInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserIds",
+          "type": "[System.Guid]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitCreateDto": {
+      "baseType": "Volo.Abp.Identity.OrganizationUnitCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ParentId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitCreateOrUpdateDtoBase": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.GetOrganizationUnitInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitMoveInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "NewParentId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.OrganizationUnitUpdateDto": {
+      "baseType": "Volo.Abp.Identity.OrganizationUnitCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Abp.Identity.ProfileDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EmailConfirmed",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Surname",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PhoneNumber",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PhoneNumberConfirmed",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsExternal",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "HasPassword",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.UpdateProfileDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Surname",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PhoneNumber",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Identity.ChangePasswordInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "CurrentPassword",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "NewPassword",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.GetApiResourceListInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceWithDetailsDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Enabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "UserClaims",
+          "type": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceClaimClaimDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceClaimClaimDto]"
+        },
+        {
+          "name": "Properties",
+          "type": "{System.String:System.String}",
+          "typeSimple": "{string:string}"
+        },
+        {
+          "name": "Scopes",
+          "type": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeDto]"
+        },
+        {
+          "name": "Secrets",
+          "type": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiSecretDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiSecretDto]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiResourceClaimClaimDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ApiResourceId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ApiResourceId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Required",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Emphasize",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ShowInDiscoveryDocument",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "UserClaims",
+          "type": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeClaimDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeClaimDto]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeClaimDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ApiResourceId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.ApiSecretDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ApiResourceId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Expiration",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.CreateApiResourceDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Claims",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ApiResource.Dtos.UpdateApiResourceDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Enabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Claims",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "Scopes",
+          "type": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiScopeDto]"
+        },
+        {
+          "name": "Secrets",
+          "type": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiSecretDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.ApiResource.Dtos.ApiSecretDto]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.GetClientListInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientWithDetailsDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LogoUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Enabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ProtocolType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RequireClientSecret",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequireConsent",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AllowRememberConsent",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AlwaysIncludeUserClaimsInIdToken",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequirePkce",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AllowPlainTextPkce",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AllowAccessTokensViaBrowser",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "FrontChannelLogoutUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FrontChannelLogoutSessionRequired",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "BackChannelLogoutUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "BackChannelLogoutSessionRequired",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AllowOfflineAccess",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IdentityTokenLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "AccessTokenLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "AuthorizationCodeLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "ConsentLifetime",
+          "type": "System.Int32?",
+          "typeSimple": "number?"
+        },
+        {
+          "name": "AbsoluteRefreshTokenLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "SlidingRefreshTokenLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "RefreshTokenUsage",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "UpdateAccessTokenClaimsOnRefresh",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RefreshTokenExpiration",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "AccessTokenType",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "EnableLocalLogin",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IncludeJwtId",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AlwaysSendClientClaims",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ClientClaimsPrefix",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PairWiseSubjectSalt",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UserSsoLifetime",
+          "type": "System.Int32?",
+          "typeSimple": "number?"
+        },
+        {
+          "name": "UserCodeType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DeviceCodeLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "ClientSecrets",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientSecretDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientSecretDto]"
+        },
+        {
+          "name": "AllowedScopes",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientScopeDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientScopeDto]"
+        },
+        {
+          "name": "Claims",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientClaimDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientClaimDto]"
+        },
+        {
+          "name": "AllowedGrantTypes",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientGrantTypeDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientGrantTypeDto]"
+        },
+        {
+          "name": "IdentityProviderRestrictions",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientIdentityProviderRestrictionDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientIdentityProviderRestrictionDto]"
+        },
+        {
+          "name": "Properties",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientPropertyDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientPropertyDto]"
+        },
+        {
+          "name": "AllowedCorsOrigins",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientCorsOriginDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientCorsOriginDto]"
+        },
+        {
+          "name": "RedirectUris",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientRedirectUriDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientRedirectUriDto]"
+        },
+        {
+          "name": "PostLogoutRedirectUris",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientPostLogoutRedirectUriDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientPostLogoutRedirectUriDto]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientSecretDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Expiration",
+          "type": "System.DateTime?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientScopeDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Scope",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientClaimDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientGrantTypeDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "GrantType",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientIdentityProviderRestrictionDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Provider",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientPropertyDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Key",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientCorsOriginDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Origin",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientRedirectUriDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RedirectUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.ClientPostLogoutRedirectUriDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PostLogoutRedirectUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.CreateClientDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LogoUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RequireConsent",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "CallbackUrl",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LogoutUrl",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Secrets",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientSecretDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientSecretDto]"
+        },
+        {
+          "name": "Scopes",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.Client.Dtos.UpdateClientDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ClientName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ClientUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LogoUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Enabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequireConsent",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AllowOfflineAccess",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AllowRememberConsent",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequirePkce",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "RequireClientSecret",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AccessTokenLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "ConsentLifetime",
+          "type": "System.Int32?",
+          "typeSimple": "number?"
+        },
+        {
+          "name": "AccessTokenType",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "EnableLocalLogin",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "FrontChannelLogoutUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FrontChannelLogoutSessionRequired",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "BackChannelLogoutUri",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "BackChannelLogoutSessionRequired",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IncludeJwtId",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AlwaysSendClientClaims",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "PairWiseSubjectSalt",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UserSsoLifetime",
+          "type": "System.Int32?",
+          "typeSimple": "number?"
+        },
+        {
+          "name": "UserCodeType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DeviceCodeLifetime",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "ClientSecrets",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientSecretDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientSecretDto]"
+        },
+        {
+          "name": "Claims",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientClaimDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientClaimDto]"
+        },
+        {
+          "name": "Properties",
+          "type": "[Volo.Abp.IdentityServer.Client.Dtos.ClientPropertyDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.Client.Dtos.ClientPropertyDto]"
+        },
+        {
+          "name": "AllowedGrantTypes",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "IdentityProviderRestrictions",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "Scopes",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "AllowedCorsOrigins",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "RedirectUris",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "PostLogoutRedirectUris",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.IdentityResource.Dtos.GetIdentityResourceListInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityResourceWithDetailsDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Enabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Required",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Emphasize",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ShowInDiscoveryDocument",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "UserClaims",
+          "type": "[Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityClaimDto]",
+          "typeSimple": "[Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityClaimDto]"
+        },
+        {
+          "name": "Properties",
+          "type": "{System.String:System.String}",
+          "typeSimple": "{string:string}"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.IdentityResource.Dtos.IdentityClaimDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IdentityResourceId",
+          "type": "System.Guid",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.IdentityResource.Dtos.CreateIdentityResourceDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Enabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Required",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Emphasize",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ShowInDiscoveryDocument",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Claims",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.IdentityResource.Dtos.UpdateIdentityResourceDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Enabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Required",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Emphasize",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "ShowInDiscoveryDocument",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Claims",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.IdentityServer.ClaimType.Dtos.IdentityClaimTypeDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.LanguageManagement.Dto.LanguageDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleCreationAuditedEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UiCultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FlagIcon",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "IsDefaultLanguage",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.LanguageManagement.Dto.GetLanguagesTextsInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ResourceName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "BaseCultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TargetCultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "GetOnlyEmptyValues",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.LanguageManagement.Dto.CreateLanguageDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UiCultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FlagIcon",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.LanguageManagement.Dto.UpdateLanguageDto": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FlagIcon",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.LanguageManagement.Dto.LanguageResourceDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.LanguageManagement.Dto.CultureInfoDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.LanguageManagement.Dto.LanguageTextDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ResourceName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "BaseCultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "BaseValue",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.LeptonTheme.Management.LeptonThemeSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "BoxedLayout",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "MenuPlacement",
+          "type": "Volo.Abp.LeptonTheme.Management.MenuPlacement",
+          "typeSimple": "Volo.Abp.LeptonTheme.Management.MenuPlacement"
+        },
+        {
+          "name": "MenuStatus",
+          "type": "Volo.Abp.LeptonTheme.Management.MenuStatus",
+          "typeSimple": "Volo.Abp.LeptonTheme.Management.MenuStatus"
+        },
+        {
+          "name": "Style",
+          "type": "Volo.Abp.LeptonTheme.Management.LeptonStyle",
+          "typeSimple": "Volo.Abp.LeptonTheme.Management.LeptonStyle"
+        }
+      ]
+    },
+    "Volo.Abp.LeptonTheme.Management.MenuPlacement": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "Left",
+        "Top"
+      ],
+      "enumValues": [
+        0,
+        1
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.LeptonTheme.Management.MenuStatus": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "AlwaysOpened",
+        "OpenOnHover"
+      ],
+      "enumValues": [
+        0,
+        1
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.LeptonTheme.Management.LeptonStyle": {
+      "baseType": "System.Enum",
+      "isEnum": true,
+      "enumNames": [
+        "Style1",
+        "Style2",
+        "Style3",
+        "Style4",
+        "Style5",
+        "Style6"
+      ],
+      "enumValues": [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5
+      ],
+      "genericArguments": null,
+      "properties": null
+    },
+    "Volo.Abp.LeptonTheme.Management.UpdateLeptonThemeSettingsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "BoxedLayout",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "MenuPlacement",
+          "type": "Volo.Abp.LeptonTheme.Management.MenuPlacement",
+          "typeSimple": "Volo.Abp.LeptonTheme.Management.MenuPlacement"
+        },
+        {
+          "name": "MenuStatus",
+          "type": "Volo.Abp.LeptonTheme.Management.MenuStatus",
+          "typeSimple": "Volo.Abp.LeptonTheme.Management.MenuStatus"
+        },
+        {
+          "name": "Style",
+          "type": "Volo.Abp.LeptonTheme.Management.LeptonStyle",
+          "typeSimple": "Volo.Abp.LeptonTheme.Management.LeptonStyle"
+        }
+      ]
+    },
+    "Volo.Abp.PermissionManagement.GetPermissionListResultDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "EntityDisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Groups",
+          "type": "[Volo.Abp.PermissionManagement.PermissionGroupDto]",
+          "typeSimple": "[Volo.Abp.PermissionManagement.PermissionGroupDto]"
+        }
+      ]
+    },
+    "Volo.Abp.PermissionManagement.PermissionGroupDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Permissions",
+          "type": "[Volo.Abp.PermissionManagement.PermissionGrantInfoDto]",
+          "typeSimple": "[Volo.Abp.PermissionManagement.PermissionGrantInfoDto]"
+        }
+      ]
+    },
+    "Volo.Abp.PermissionManagement.PermissionGrantInfoDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ParentName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsGranted",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "AllowedProviders",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "GrantedProviders",
+          "type": "[Volo.Abp.PermissionManagement.ProviderInfoDto]",
+          "typeSimple": "[Volo.Abp.PermissionManagement.ProviderInfoDto]"
+        }
+      ]
+    },
+    "Volo.Abp.PermissionManagement.ProviderInfoDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ProviderName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ProviderKey",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.PermissionManagement.UpdatePermissionsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Permissions",
+          "type": "[Volo.Abp.PermissionManagement.UpdatePermissionDto]",
+          "typeSimple": "[Volo.Abp.PermissionManagement.UpdatePermissionDto]"
+        }
+      ]
+    },
+    "Volo.Abp.PermissionManagement.UpdatePermissionDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsGranted",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateContentInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TemplateName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.TextTemplateManagement.TextTemplates.TextTemplateContentDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Content",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.TextTemplateManagement.TextTemplates.RestoreTemplateContentInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TemplateName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.TextTemplateManagement.TextTemplates.UpdateTemplateContentInput": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TemplateName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Content",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.TextTemplateManagement.TextTemplates.GetTemplateDefinitionListInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "FilterText",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsLayout",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Layout",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsInlineLocalized",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "DefaultCultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.EditionDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.GetEditionsInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.EditionCreateDto": {
+      "baseType": "Volo.Saas.Host.Dtos.EditionCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Saas.Host.Dtos.EditionCreateOrUpdateDtoBase": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.EditionUpdateDto": {
+      "baseType": "Volo.Saas.Host.Dtos.EditionCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Saas.Host.GetEditionUsageStatisticsResult": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Data",
+          "type": "{System.String:System.Int32}",
+          "typeSimple": "{string:number}"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.SaasTenantDto": {
+      "baseType": "Volo.Abp.Application.Dtos.ExtensibleEntityDto<System.Guid>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EditionId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "EditionName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.GetTenantsInput": {
+      "baseType": "Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Filter",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "GetEditionNames",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.SaasTenantCreateDto": {
+      "baseType": "Volo.Saas.Host.Dtos.SaasTenantCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "AdminEmailAddress",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "AdminPassword",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.SaasTenantCreateOrUpdateDtoBase": {
+      "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EditionId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        }
+      ]
+    },
+    "Volo.Saas.Host.Dtos.SaasTenantUpdateDto": {
+      "baseType": "Volo.Saas.Host.Dtos.SaasTenantCreateOrUpdateDtoBase",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Abp.FeatureManagement.GetFeatureListResultDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Groups",
+          "type": "[Volo.Abp.FeatureManagement.FeatureGroupDto]",
+          "typeSimple": "[Volo.Abp.FeatureManagement.FeatureGroupDto]"
+        }
+      ]
+    },
+    "Volo.Abp.FeatureManagement.FeatureGroupDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Features",
+          "type": "[Volo.Abp.FeatureManagement.FeatureDto]",
+          "typeSimple": "[Volo.Abp.FeatureManagement.FeatureDto]"
+        }
+      ]
+    },
+    "Volo.Abp.FeatureManagement.FeatureDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Provider",
+          "type": "Volo.Abp.FeatureManagement.FeatureProviderDto",
+          "typeSimple": "Volo.Abp.FeatureManagement.FeatureProviderDto"
+        },
+        {
+          "name": "Description",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ValueType",
+          "type": "Volo.Abp.Validation.StringValues.IStringValueType",
+          "typeSimple": "Volo.Abp.Validation.StringValues.IStringValueType"
+        },
+        {
+          "name": "Depth",
+          "type": "System.Int32",
+          "typeSimple": "number"
+        },
+        {
+          "name": "ParentName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.FeatureManagement.FeatureProviderDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Key",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Validation.StringValues.IStringValueType": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Item",
+          "type": "System.Object",
+          "typeSimple": "object"
+        },
+        {
+          "name": "Properties",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        },
+        {
+          "name": "Validator",
+          "type": "Volo.Abp.Validation.StringValues.IValueValidator",
+          "typeSimple": "Volo.Abp.Validation.StringValues.IValueValidator"
+        }
+      ]
+    },
+    "Volo.Abp.Validation.StringValues.IValueValidator": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Item",
+          "type": "System.Object",
+          "typeSimple": "object"
+        },
+        {
+          "name": "Properties",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        }
+      ]
+    },
+    "Volo.Abp.FeatureManagement.UpdateFeaturesDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Features",
+          "type": "[Volo.Abp.FeatureManagement.UpdateFeatureDto]",
+          "typeSimple": "[Volo.Abp.FeatureManagement.UpdateFeatureDto]"
+        }
+      ]
+    },
+    "Volo.Abp.FeatureManagement.UpdateFeatureDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationConfigurationDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Localization",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationLocalizationConfigurationDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationLocalizationConfigurationDto"
+        },
+        {
+          "name": "Auth",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationAuthConfigurationDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationAuthConfigurationDto"
+        },
+        {
+          "name": "Setting",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationSettingConfigurationDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationSettingConfigurationDto"
+        },
+        {
+          "name": "CurrentUser",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentUserDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentUserDto"
+        },
+        {
+          "name": "Features",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationFeatureConfigurationDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationFeatureConfigurationDto"
+        },
+        {
+          "name": "MultiTenancy",
+          "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.MultiTenancyInfoDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.MultiTenancyInfoDto"
+        },
+        {
+          "name": "CurrentTenant",
+          "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.CurrentTenantDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.CurrentTenantDto"
+        },
+        {
+          "name": "Timing",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimingDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimingDto"
+        },
+        {
+          "name": "Clock",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClockDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClockDto"
+        },
+        {
+          "name": "ObjectExtensions",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ObjectExtensionsDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ObjectExtensionsDto"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationLocalizationConfigurationDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Values",
+          "type": "{System.String:{System.String:System.String}}",
+          "typeSimple": "{string:{string:string}}"
+        },
+        {
+          "name": "Languages",
+          "type": "[Volo.Abp.Localization.LanguageInfo]",
+          "typeSimple": "[Volo.Abp.Localization.LanguageInfo]"
+        },
+        {
+          "name": "CurrentCulture",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentCultureDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentCultureDto"
+        },
+        {
+          "name": "DefaultResourceName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LanguagesMap",
+          "type": "{System.String:[Volo.Abp.NameValue]}",
+          "typeSimple": "{string:[Volo.Abp.NameValue]}"
+        },
+        {
+          "name": "LanguageFilesMap",
+          "type": "{System.String:[Volo.Abp.NameValue]}",
+          "typeSimple": "{string:[Volo.Abp.NameValue]}"
+        }
+      ]
+    },
+    "Volo.Abp.Localization.LanguageInfo": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "UiCultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FlagIcon",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentCultureDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "DisplayName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EnglishName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ThreeLetterIsoLanguageName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TwoLetterIsoLanguageName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsRightToLeft",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "CultureName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "NativeName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DateTimeFormat",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.DateTimeFormatDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.DateTimeFormatDto"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.DateTimeFormatDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "CalendarAlgorithmType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DateTimeFormatLong",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ShortDatePattern",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "FullDateTimePattern",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DateSeparator",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "ShortTimePattern",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "LongTimePattern",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.NameValue": {
+      "baseType": "Volo.Abp.NameValue<System.String>",
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": []
+    },
+    "Volo.Abp.NameValue<T0>": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": [
+        "T"
+      ],
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "T",
+          "typeSimple": "T"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationAuthConfigurationDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Policies",
+          "type": "{System.String:System.Boolean}",
+          "typeSimple": "{string:boolean}"
+        },
+        {
+          "name": "GrantedPolicies",
+          "type": "{System.String:System.Boolean}",
+          "typeSimple": "{string:boolean}"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationSettingConfigurationDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Values",
+          "type": "{System.String:System.String}",
+          "typeSimple": "{string:string}"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentUserDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsAuthenticated",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Id",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "TenantId",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "UserName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "SurName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Email",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "EmailVerified",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "PhoneNumber",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "PhoneNumberVerified",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "Roles",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationFeatureConfigurationDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Values",
+          "type": "{System.String:System.String}",
+          "typeSimple": "{string:string}"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.MultiTenancy.MultiTenancyInfoDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsEnabled",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.MultiTenancy.CurrentTenantDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Id",
+          "type": "System.Guid?",
+          "typeSimple": "string?"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsAvailable",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimingDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TimeZone",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimeZone",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimeZone"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimeZone": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Iana",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IanaTimeZone",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IanaTimeZone"
+        },
+        {
+          "name": "Windows",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.WindowsTimeZone",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.WindowsTimeZone"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IanaTimeZone": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TimeZoneName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.WindowsTimeZone": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TimeZoneId",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClockDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Kind",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ObjectExtensionsDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Modules",
+          "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ModuleExtensionDto}",
+          "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ModuleExtensionDto}"
+        },
+        {
+          "name": "Enums",
+          "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumDto}",
+          "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumDto}"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ModuleExtensionDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Entities",
+          "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.EntityExtensionDto}",
+          "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.EntityExtensionDto}"
+        },
+        {
+          "name": "Configuration",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.EntityExtensionDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Properties",
+          "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyDto}",
+          "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyDto}"
+        },
+        {
+          "name": "Configuration",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TypeSimple",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DisplayName",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.LocalizableStringDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.LocalizableStringDto"
+        },
+        {
+          "name": "Api",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiDto"
+        },
+        {
+          "name": "Ui",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiDto"
+        },
+        {
+          "name": "Attributes",
+          "type": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyAttributeDto]",
+          "typeSimple": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyAttributeDto]"
+        },
+        {
+          "name": "Configuration",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        },
+        {
+          "name": "DefaultValue",
+          "type": "System.Object",
+          "typeSimple": "object"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.LocalizableStringDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Resource",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "OnGet",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiGetDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiGetDto"
+        },
+        {
+          "name": "OnCreate",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiCreateDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiCreateDto"
+        },
+        {
+          "name": "OnUpdate",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiUpdateDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiUpdateDto"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiGetDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsAvailable",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiCreateDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsAvailable",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiUpdateDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsAvailable",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "OnTable",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiTableDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiTableDto"
+        },
+        {
+          "name": "OnCreateForm",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto"
+        },
+        {
+          "name": "OnEditForm",
+          "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto",
+          "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiTableDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsVisible",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IsVisible",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyAttributeDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "TypeSimple",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Config",
+          "type": "{System.String:System.Object}",
+          "typeSimple": "{string:object}"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Fields",
+          "type": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumFieldDto]",
+          "typeSimple": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumFieldDto]"
+        },
+        {
+          "name": "LocalizationResource",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumFieldDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Value",
+          "type": "System.Object",
+          "typeSimple": "object"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "IncludeTypes",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Modules",
+          "type": "{System.String:Volo.Abp.Http.Modeling.ModuleApiDescriptionModel}",
+          "typeSimple": "{string:Volo.Abp.Http.Modeling.ModuleApiDescriptionModel}"
+        },
+        {
+          "name": "Types",
+          "type": "{System.String:Volo.Abp.Http.Modeling.TypeApiDescriptionModel}",
+          "typeSimple": "{string:Volo.Abp.Http.Modeling.TypeApiDescriptionModel}"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ModuleApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "RootPath",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "RemoteServiceName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Controllers",
+          "type": "{System.String:Volo.Abp.Http.Modeling.ControllerApiDescriptionModel}",
+          "typeSimple": "{string:Volo.Abp.Http.Modeling.ControllerApiDescriptionModel}"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ControllerApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "ControllerName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Interfaces",
+          "type": "[Volo.Abp.Http.Modeling.ControllerInterfaceApiDescriptionModel]",
+          "typeSimple": "[Volo.Abp.Http.Modeling.ControllerInterfaceApiDescriptionModel]"
+        },
+        {
+          "name": "Actions",
+          "type": "{System.String:Volo.Abp.Http.Modeling.ActionApiDescriptionModel}",
+          "typeSimple": "{string:Volo.Abp.Http.Modeling.ActionApiDescriptionModel}"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ControllerInterfaceApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ActionApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "UniqueName",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "HttpMethod",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Url",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "SupportedVersions",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "ParametersOnMethod",
+          "type": "[Volo.Abp.Http.Modeling.MethodParameterApiDescriptionModel]",
+          "typeSimple": "[Volo.Abp.Http.Modeling.MethodParameterApiDescriptionModel]"
+        },
+        {
+          "name": "Parameters",
+          "type": "[Volo.Abp.Http.Modeling.ParameterApiDescriptionModel]",
+          "typeSimple": "[Volo.Abp.Http.Modeling.ParameterApiDescriptionModel]"
+        },
+        {
+          "name": "ReturnValue",
+          "type": "Volo.Abp.Http.Modeling.ReturnValueApiDescriptionModel",
+          "typeSimple": "Volo.Abp.Http.Modeling.ReturnValueApiDescriptionModel"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.MethodParameterApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TypeAsString",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TypeSimple",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsOptional",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "DefaultValue",
+          "type": "System.Object",
+          "typeSimple": "object"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ParameterApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "NameOnMethod",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TypeSimple",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsOptional",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "DefaultValue",
+          "type": "System.Object",
+          "typeSimple": "object"
+        },
+        {
+          "name": "ConstraintTypes",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "BindingSourceId",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "DescriptorName",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.ReturnValueApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TypeSimple",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.TypeApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "BaseType",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "IsEnum",
+          "type": "System.Boolean",
+          "typeSimple": "boolean"
+        },
+        {
+          "name": "EnumNames",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "EnumValues",
+          "type": "[System.Object]",
+          "typeSimple": "[object]"
+        },
+        {
+          "name": "GenericArguments",
+          "type": "[System.String]",
+          "typeSimple": "[string]"
+        },
+        {
+          "name": "Properties",
+          "type": "[Volo.Abp.Http.Modeling.PropertyApiDescriptionModel]",
+          "typeSimple": "[Volo.Abp.Http.Modeling.PropertyApiDescriptionModel]"
+        }
+      ]
+    },
+    "Volo.Abp.Http.Modeling.PropertyApiDescriptionModel": {
+      "baseType": null,
+      "isEnum": false,
+      "enumNames": null,
+      "enumValues": null,
+      "genericArguments": null,
+      "properties": [
+        {
+          "name": "Name",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "Type",
+          "type": "System.String",
+          "typeSimple": "string"
+        },
+        {
+          "name": "TypeSimple",
+          "type": "System.String",
+          "typeSimple": "string"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/index.ts
new file mode 100644
index 0000000000..68eb7e2964
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/index.ts
@@ -0,0 +1,2 @@
+export * as FeatureManagement from './feature-management';
+export * as Validation from './validation';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts
new file mode 100644
index 0000000000..bcd4535b81
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts
@@ -0,0 +1 @@
+export * as StringValues from './string-values';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/index.ts
new file mode 100644
index 0000000000..e9644dae47
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/index.ts
@@ -0,0 +1 @@
+export * from './models';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/models.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/models.ts
new file mode 100644
index 0000000000..f4f9381611
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/models.ts
@@ -0,0 +1,13 @@
+
+export interface IStringValueType {
+  name: string;
+  item: object;
+  properties: Record<string, object>;
+  validator: IValueValidator;
+}
+
+export interface IValueValidator {
+  name: string;
+  item: object;
+  properties: Record<string, object>;
+}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts
index 79d7fbef34..20c76c41ae 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts
@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngxs/store';
-import { FeatureManagementState } from '../states';
-import { FeatureManagement } from '../models';
-import { GetFeatures, UpdateFeatures } from '../actions';
+import { GetFeatures, UpdateFeatures } from '../actions/feature-management.actions';
+import { FeatureManagementState } from '../states/feature-management.state';
 
 @Injectable({
   providedIn: 'root',
diff --git a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts
index 4aabf7bf80..ad66f0946e 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts
@@ -7,6 +7,9 @@ import { FeatureManagement } from '../models';
 @Injectable({
   providedIn: 'root',
 })
+/**
+ * @deprecated Use FeaturesService instead. To be deleted in v4.0.
+ */
 export class FeatureManagementService {
   apiName = 'FeatureManagement';
 
diff --git a/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts b/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts
index 676918708c..4ea68704f2 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts
@@ -5,6 +5,9 @@ import { FeatureManagement } from '../models/feature-management';
 import { FeatureManagementService } from '../services/feature-management.service';
 import { Injectable } from '@angular/core';
 
+/**
+ * @deprecated To be deleted in v4.0.
+ */
 @State<FeatureManagement.State>({
   name: 'FeatureManagementState',
   defaults: { features: {} } as FeatureManagement.State,
@@ -21,7 +24,7 @@ export class FeatureManagementState {
   @Action(GetFeatures)
   getFeatures({ patchState }: StateContext<FeatureManagement.State>, { payload }: GetFeatures) {
     return this.featureManagementService.getFeatures(payload).pipe(
-      tap(({ features }) =>
+      tap(({ features = [] }) =>
         patchState({
           features,
         }),
diff --git a/npm/ng-packs/packages/feature-management/src/public-api.ts b/npm/ng-packs/packages/feature-management/src/public-api.ts
index 382e9ed884..1d9ef938b8 100644
--- a/npm/ng-packs/packages/feature-management/src/public-api.ts
+++ b/npm/ng-packs/packages/feature-management/src/public-api.ts
@@ -1,3 +1,5 @@
 export * from './lib/feature-management.module';
 export * from './lib/components';
 export * from './lib/enums/components';
+export * from './lib/proxy/feature-management';
+export * from './lib/proxy/validation/string-values';
diff --git a/npm/ng-packs/packages/feature-management/tslint.json b/npm/ng-packs/packages/feature-management/tslint.json
index 8c3919ea62..081ce1077e 100644
--- a/npm/ng-packs/packages/feature-management/tslint.json
+++ b/npm/ng-packs/packages/feature-management/tslint.json
@@ -1,17 +1,8 @@
 {
   "extends": "../../tslint.json",
   "rules": {
-    "directive-selector": [
-      true,
-      "attribute",
-      "abp",
-      "camelCase"
-    ],
-    "component-selector": [
-      true,
-      "element",
-      "abp",
-      "kebab-case"
-    ]
+    "interface-name": false,
+    "directive-selector": [true, "attribute", "abp", "camelCase"],
+    "component-selector": [true, "element", "abp", "kebab-case"]
   }
 }
diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json
index d114bf97ad..0aaecc1eac 100644
--- a/npm/ng-packs/packages/identity/package.json
+++ b/npm/ng-packs/packages/identity/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.identity",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.permission-management": "~3.1.1",
-    "@abp/ng.theme.shared": "~3.1.1",
+    "@abp/ng.permission-management": "~3.1.2",
+    "@abp/ng.theme.shared": "~3.1.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json
index a1a51631b7..141b86ec57 100644
--- a/npm/ng-packs/packages/permission-management/package.json
+++ b/npm/ng-packs/packages/permission-management/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.permission-management",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.1",
+    "@abp/ng.theme.shared": "~3.1.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json
index 0e6465f86c..0124874238 100644
--- a/npm/ng-packs/packages/schematics/package.json
+++ b/npm/ng-packs/packages/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.schematics",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Schematics that works with ABP Backend",
   "keywords": [
     "schematics"
diff --git a/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template b/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template
index ed2f8296c7..1d77599e7e 100644
--- a/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template
+++ b/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template
@@ -10,7 +10,9 @@ export class <%= name %>Service {
 
   <%= camel(signature.name) %> = (<%= serializeParameters(signature.parameters) %>) =>
     this.restService.request<<%= body.requestType %>, <%= body.responseType %>>({
-      method: '<%= body.method %>',
+      method: '<%= body.method %>',<% 
+      if (body.responseType === 'string') { %>
+      responseType: 'text',<% } %>
       url: `/<%= body.url %>`,<%
       if (body.params.length) { %>
       params: { <%= body.params.join(', ') %> },<% }
diff --git a/npm/ng-packs/packages/schematics/src/constants/proxy.ts b/npm/ng-packs/packages/schematics/src/constants/proxy.ts
index 847b373f75..7e159090e1 100644
--- a/npm/ng-packs/packages/schematics/src/constants/proxy.ts
+++ b/npm/ng-packs/packages/schematics/src/constants/proxy.ts
@@ -15,4 +15,8 @@ Finally, the name of the files and folders should not be changed for two reasons
 - Proxy generator will keep creating them at those paths and you will have multiple copies of the same content.
 - ABP Suite generates files which include imports from this folder.
 
+> **Important Notice:** If you are building a module and are planning to publish to npm,
+> some of the generated proxies are likely to be exported from public-api.ts file. In such a case,
+> please make sure you export files directly and not from barrel exports. In other words,
+> do not include index.ts exports in your public-api.ts exports.
 `;
diff --git a/npm/ng-packs/packages/schematics/src/utils/barrel.ts b/npm/ng-packs/packages/schematics/src/utils/barrel.ts
index adf6779ebe..1681362568 100644
--- a/npm/ng-packs/packages/schematics/src/utils/barrel.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/barrel.ts
@@ -43,6 +43,8 @@ export function generateBarrelFromPath(tree: Tree, indexPath: string) {
     saveFile(
       indexPath + '/index.ts',
       _exports.join(`
-`),
+`) +
+        `
+`,
     );
 }
diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json
index a885922d79..2c8cb50356 100644
--- a/npm/ng-packs/packages/setting-management/package.json
+++ b/npm/ng-packs/packages/setting-management/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.setting-management",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.1",
+    "@abp/ng.theme.shared": "~3.1.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json
index 8157ee14fb..4e4f96671a 100644
--- a/npm/ng-packs/packages/tenant-management/package.json
+++ b/npm/ng-packs/packages/tenant-management/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.tenant-management",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.feature-management": "~3.1.1",
-    "@abp/ng.theme.shared": "~3.1.1",
+    "@abp/ng.feature-management": "~3.1.2",
+    "@abp/ng.theme.shared": "~3.1.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
index c966b2c4af..78c8d10a81 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
@@ -5,6 +5,16 @@
         <h5 class="card-title">{{ 'AbpTenantManagement::Tenants' | abpLocalization }}</h5>
       </div>
       <div class="text-right col col-md-6">
+        <button
+          *abpPermission="'FeatureManagement.ManageHostFeatures'"
+          id="manage-host-features"
+          class="btn btn-primary mr-1"
+          type="button"
+          (click)="openFeaturesModal(null)"
+        >
+          <i class="fa fa-plus mr-1"></i>
+          <span>{{ 'AbpTenantManagement::ManageHostFeatures' | abpLocalization }}</span>
+        </button>
         <button
           *abpPermission="'AbpTenantManagement.Tenants.Create'"
           id="create-tenants"
diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json
index ea34ab7918..9a5674d42e 100644
--- a/npm/ng-packs/packages/theme-basic/package.json
+++ b/npm/ng-packs/packages/theme-basic/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.basic",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.1",
+    "@abp/ng.theme.shared": "~3.1.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
index 42bdd7376a..4e6395da05 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
@@ -60,7 +60,7 @@
 
   <ng-template #defaultChild let-child>
     <div class="dropdown-submenu" *abpPermission="child.requiredPolicy">
-      <a class="dropdown-item" [routerLink]="[child.path]">
+      <a class="dropdown-item" [routerLink]="[child.path]" (click)="closeDropdown()">
         <i *ngIf="child.iconClass" [ngClass]="child.iconClass"></i>
         {{ child.name | abpLocalization }}</a
       >
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts
index de1b6199ee..3b66af77bc 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts
@@ -1,5 +1,13 @@
 import { ABP, RoutesService, TreeNode } from '@abp/ng.core';
-import { Component, Input, TrackByFunction } from '@angular/core';
+import {
+  Component,
+  ElementRef,
+  Input,
+  QueryList,
+  Renderer2,
+  TrackByFunction,
+  ViewChildren,
+} from '@angular/core';
 
 @Component({
   selector: 'abp-routes',
@@ -8,11 +16,20 @@ import { Component, Input, TrackByFunction } from '@angular/core';
 export class RoutesComponent {
   @Input() smallScreen: boolean;
 
+  @ViewChildren('childrenContainer') childrenContainers: QueryList<ElementRef<HTMLDivElement>>;
+
   trackByFn: TrackByFunction<TreeNode<ABP.Route>> = (_, item) => item.name;
 
-  constructor(public readonly routes: RoutesService) {}
+  constructor(public readonly routes: RoutesService, protected renderer: Renderer2) {}
 
   isDropdown(node: TreeNode<ABP.Route>) {
     return !node?.isLeaf || this.routes.hasChildren(node.name);
   }
+
+  closeDropdown() {
+    this.childrenContainers.forEach(({ nativeElement }) => {
+      this.renderer.addClass(nativeElement, 'd-none');
+      setTimeout(() => this.renderer.removeClass(nativeElement, 'd-none'), 0);
+    });
+  }
 }
diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json
index 391d739edd..430a6dcff1 100644
--- a/npm/ng-packs/packages/theme-shared/package.json
+++ b/npm/ng-packs/packages/theme-shared/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.shared",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.core": "~3.1.1",
+    "@abp/ng.core": "~3.1.2",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@ng-bootstrap/ng-bootstrap": "^7.0.0",
     "@ngx-validate/core": "^0.0.11",
diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock
index 0f1b338e7d..3c7c96dae9 100644
--- a/npm/ng-packs/yarn.lock
+++ b/npm/ng-packs/yarn.lock
@@ -2,20 +2,20 @@
 # yarn lockfile v1
 
 
-"@abp/ng.account@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.1.0.tgz#cd5fb46dffd7455188c10769220ed58806f455fa"
-  integrity sha512-/v+yyagHIUhjpJ1exzubf54XQBsgO2o3r3bFJFlWqzJoeCLufzyyppqK2UQ+6sQ7CjWP5jFCqo87R9myNn2xHA==
+"@abp/ng.account@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.1.2.tgz#42f95ad70f06586848737ad5e18461a193a51348"
+  integrity sha512-sFJPvak4pGbX0dDtVjBhY0slRRI0oTz8reJqcFfpUywPMJj2VsCz97W70xB33Yr/mQZDg6BjhXkrl15GdyWt2w==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.core@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.1.0.tgz#aba988fd915a633ea7af3a68278cc2557a37446f"
-  integrity sha512-SRRA7MYh12irJMRCj9emE5hyw+5aeiETlohP1CdgpdhhT3/RSPwrSeZNGJU0ilk6tKoO2rcZT6fgGjhqQfMyOw==
+"@abp/ng.core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.1.2.tgz#edc2de8fa7332f4bd17ddeaee94c52aa8bb51fcc"
+  integrity sha512-ura5fD4ZIJhLD97WrSNILoFfwFqJJJOygeZuGpfslCbeNM1JEf4Jk4XQzfnk7u+xW7IgtBZXtisheIuY2taawA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.4"
+    "@abp/utils" "^3.1.1"
     "@angular/localize" "~10.0.10"
     "@ngxs/router-plugin" "^3.6.2"
     "@ngxs/storage-plugin" "^3.6.2"
@@ -27,35 +27,35 @@
     ts-toolbelt "6.15.4"
     tslib "^2.0.0"
 
-"@abp/ng.feature-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.1.0.tgz#a93b0d63dc542e3880a1c79ac1e630b2db19b8bf"
-  integrity sha512-CayqVZ8XJQXsmz+IU+OchXK/vl01x6DHA/oTpvkW9HM2kYYJ8dmD940kjr5i3ZX6WF2Q4yTc+wLgZhGQt7eK9Q==
+"@abp/ng.feature-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.1.2.tgz#91269097f925bc0772c443d688f46070fce5def9"
+  integrity sha512-s59KNoOY2TWuume2iAzdKz9GBFVyj3q0BmhL7hW6IgyV96Zg9FP+UKYCXvPM8HtsLmXis3Zrv7TnJDAF+5VrHw==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.identity@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.1.0.tgz#d3086dd887c7ea2786e4c8620b3448333065053a"
-  integrity sha512-G4CToeEou4Zwr4NkpauwMKJme61lofd77PycWvFPVJ8Df6EctmxJc+u6NVgG7+ZjuFI+oTQrLwCEl3uPuznnpA==
+"@abp/ng.identity@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.1.2.tgz#6d039a6cbb431c61a8bf9d291c1e6bf2120e478e"
+  integrity sha512-p+NGSuSd6OPxDZQr7iOhUIWTkpzyGUcphy6iloDgXX9YoTdIoh03ZMMJMpR6UBmPYLjPpP4U/eUFVxi2DjdCzA==
   dependencies:
-    "@abp/ng.permission-management" "~3.1.0"
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.permission-management" "~3.1.2"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.permission-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.1.0.tgz#c0a9a135699b7c8a329c0c9ac839cde06dce3db2"
-  integrity sha512-u3JwxK1vAlqC6YBVqnyP26FZqArrIQn94fZ/Vm6n9rjId7VaJbA0UrX9d2YAwKROKOpAnBNc5GA0A2gaWIO9rg==
+"@abp/ng.permission-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.1.2.tgz#bacc09d3e92262d111734e4ffc4344300b16f978"
+  integrity sha512-nqLo3VFNFeouU33qQHK0abbKCjSlT9VXJk0WYzsiS2Z7lENYqtImRCxqpHlB32ACIdMMUWbmo8OMvYzpt++kRg==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.schematics@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.1.0.tgz#ea7dd6d7dfd02425e7eff25c7e350614a4c0cad8"
-  integrity sha512-Vn0G6Wi+/JJ7vFgSkt5sRtdWBWdBQSncwH+kI2O1F0GvhJTrf1eDQ8XTk2yZiOD8oFLgt8mnJzTVzJbs3RqR+Q==
+"@abp/ng.schematics@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.1.2.tgz#37a634ada068967468e68def9110ead6960bf8a4"
+  integrity sha512-ULvkA/smLhErHLe6TdW0CzrortAf4Rjq/eshrMqS0A7EANzlw2TBpjZmn7kJSFawLTatDy9+GyQ8Cewc9H0VXA==
   dependencies:
     "@angular-devkit/core" "~10.0.3"
     "@angular-devkit/schematics" "~10.0.3"
@@ -63,37 +63,37 @@
     jsonc-parser "^2.3.0"
     typescript "~3.9.2"
 
-"@abp/ng.setting-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.1.0.tgz#eebb1c7bdfd75a04cba4c1f8d0f5cfc306a64f43"
-  integrity sha512-jPBn9vpDHqCDscyo445MWdCd/C0pR+WEnXPxCu7lCOs+ry1n16etoWuLAIfI2LtpI0+g8AgMyL3hacP0MPzpGg==
+"@abp/ng.setting-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.1.2.tgz#dda39e646e79e853b090c3f4af79181a65446af2"
+  integrity sha512-o01Z7abV0kL4wwsOcRJZp8btev+X0qHCHfLf4u0zAwTjtXc4LzTtlU2hHLT19U42UYZlFUJvENnmTAhLnCLAVw==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.tenant-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.1.0.tgz#d0b58b711269d91530f36f8ddcb3f6d8f80c0927"
-  integrity sha512-//g3O2b2NvV7NQtEydbrhZqkdyS3FccVs6wX204ylTLCaLDAwneqNnAnSCQHnUI9GNMjBpj3/VFRGBlvGeW+tw==
+"@abp/ng.tenant-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.1.2.tgz#94fd626515575f8c0e361b36eb173a772ea3fc54"
+  integrity sha512-vdPSBYYxWUSZxhDg2FMadndj+kZ3ddPkzgBaQldncIvhHsxLQCPwj4ZhqXJ7HHqvZ30JqGiJzk4Ejx0Rv5vu+Q==
   dependencies:
-    "@abp/ng.feature-management" "~3.1.0"
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.feature-management" "~3.1.2"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.theme.basic@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.1.0.tgz#53db1e40ed4bf34d2efdc4a990ce9838f61b8d5e"
-  integrity sha512-C2yXYoSApLzUaOiLAAfFGEkAAP59KHJXaJTG2tsyGAsf+H2yFp2sQW+R0i59opmhW3LUXpAZV9aHKk++w+CGcQ==
+"@abp/ng.theme.basic@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.1.2.tgz#e60d15db641a13eebc76d7e793efdc5cf4a6a8f7"
+  integrity sha512-gYS82euwyVU0D9GLXIqt8h1qtwqXtmu7KqIRyjb0IFi2iIvBGal6jMNKHk6wEI0A0/iNy6pra98bYPUZo+FKxQ==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.theme.shared@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.1.0.tgz#12fc8fb84b27c74603945dc5384afcf62bb985b6"
-  integrity sha512-cknvClcDbaCrfTagNuojRbOG88NYCLDEPOOrXdTcSKfieJM2L7w/Ku2piqneV17CCM51Ce7Tl1BO7osYtxTS9Q==
+"@abp/ng.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.1.2.tgz#b86940d569a992e72e279c34f50f4e4353b6ecc8"
+  integrity sha512-/e0oB0azdms4QJTtw+7l95t/UmxU5CxQAB4RLIlbnuJFK4NXZObRjb2ujc6PqdaUCGh5djsWxNqVjkcsWcHX2Q==
   dependencies:
-    "@abp/ng.core" "~3.1.0"
+    "@abp/ng.core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.14.0"
     "@ng-bootstrap/ng-bootstrap" "^7.0.0"
     "@ngx-validate/core" "^0.0.11"
@@ -102,47 +102,48 @@
     chart.js "^2.9.3"
     tslib "^2.0.0"
 
-"@abp/utils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0.tgz#ccbfed6591ab11466bf3fed740c8422acf6a84df"
-  integrity sha512-I5yjM1ovqcpBAT2LFOfwLibVE0Ql6XbP3tQj6YMEZ/foDXekn/4P6Spgq5DTZCMo+0jskS0D8NfL7Ce4p89buw==
-  dependencies:
-    just-compare "^1.3.0"
-
-"@abp/utils@^3.1.0-rc.4":
-  version "3.1.0-rc.4"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.4.tgz#e0d25d60b1806d4bee23e1c9c0ffa7855cdffc2a"
-  integrity sha512-qzUqqkLJcrQV3OngDyQ0S8hEh3D1MxvvlFLOo77ajnaTO2X8hgnFm9mgQ2QnvH2QbKttaWpaaTX7TCYu/d7nBg==
+"@abp/utils@^3.1.1", "@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
 "@angular-builders/jest@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@angular-builders/jest/-/jest-10.0.0.tgz#1d4f80c15544a2a13de9e335b0d2d8f076026388"
-  integrity sha512-TrREFfoD5YigvUyu4P1UrolTVtIHqBMPDWOCUVcgpx6GyEQPmQNBLm+GJbybxC2Ks8OUmCma9aWLeVIJ9isrbA==
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-builders/jest/-/jest-10.0.1.tgz#a1a6fb5d11b5d54c051bdaa2012b5f046371560c"
+  integrity sha512-kRMdksXZLiWqBQtIF6RbF0q6AQkn2LbsSF3V9dbsX11kOlwn9teOEND4LnT5KHmBnnejSoVwP9DuIKQV+qKVBQ==
   dependencies:
     "@angular-devkit/architect" ">=0.1000.0 < 0.1100.0"
     "@angular-devkit/core" "^10.0.0"
     jest-preset-angular "^8.2.1"
     lodash "^4.17.15"
 
-"@angular-devkit/architect@0.1000.6", "@angular-devkit/architect@>=0.1000.0 < 0.1100.0":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1000.6.tgz#d8143abbf1a1cef8e0ea9c80690821e8ca4cd54c"
-  integrity sha512-IZ8yiiW+LQ5mI3VbNHzisTIn0j6D1inQZgcZtc5W2A7fFNvBlIh6vGU3mB6Qvg678Gt6tlvnNT6/R9A9Ct7VnA==
+"@angular-devkit/architect@0.1000.8":
+  version "0.1000.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1000.8.tgz#dac11e07877145056ca6d22319f2a859bab6720d"
+  integrity sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
+    "@angular-devkit/core" "10.0.8"
     rxjs "6.5.5"
 
+"@angular-devkit/architect@>=0.1000.0 < 0.1100.0":
+  version "0.1001.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1001.1.tgz#ec17baf535160199dd7497a931ea60b185d82bfc"
+  integrity sha512-2jRO7L/k9gNxHVJxPoUMVvtf/KzsSXNT7akbAbb8CkBJxjx3NC3Y9NssPD9E78kyiXogO6IvkwyalBGrWvOPBQ==
+  dependencies:
+    "@angular-devkit/core" "10.1.1"
+    rxjs "6.6.2"
+
 "@angular-devkit/build-angular@~0.1000.6":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1000.6.tgz#7c4a8a4792f7252fe8d0bd57b46e86f44c93d4b3"
-  integrity sha512-tKyVD8Wqfo2wFdfWmc7OMzFn30Zl37heEusnMrQD5/zZ3Hw4Nqt2kf3pf3hbWl1GExUVFYyRNoCOCh9DaIfh0w==
-  dependencies:
-    "@angular-devkit/architect" "0.1000.6"
-    "@angular-devkit/build-optimizer" "0.1000.6"
-    "@angular-devkit/build-webpack" "0.1000.6"
-    "@angular-devkit/core" "10.0.6"
+  version "0.1000.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz#28744499b59d85e6d16b27f3ee09e4d86c5770fe"
+  integrity sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==
+  dependencies:
+    "@angular-devkit/architect" "0.1000.8"
+    "@angular-devkit/build-optimizer" "0.1000.8"
+    "@angular-devkit/build-webpack" "0.1000.8"
+    "@angular-devkit/core" "10.0.8"
     "@babel/core" "7.9.6"
     "@babel/generator" "7.9.6"
     "@babel/plugin-transform-runtime" "7.9.6"
@@ -150,7 +151,7 @@
     "@babel/runtime" "7.9.6"
     "@babel/template" "7.8.6"
     "@jsdevtools/coverage-istanbul-loader" "3.0.3"
-    "@ngtools/webpack" "10.0.6"
+    "@ngtools/webpack" "10.0.8"
     ajv "6.12.3"
     autoprefixer "9.8.0"
     babel-loader "8.1.0"
@@ -206,36 +207,36 @@
     worker-plugin "4.0.3"
 
 "@angular-devkit/build-ng-packagr@~0.1000.6":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.1000.6.tgz#08fe3a0e140cd4be01949449c443a4e02fb68846"
-  integrity sha512-agE6Dw8EZmKw+vgdiJOpbrDX7JDX8jYFXVxkeCpkl3QIQSx3pDjBoggwV4NDo9mT8/R/i1WD5idFrrm+vbI/0w==
+  version "0.1000.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.1000.8.tgz#092805975248203043f0fbaf7a723be90bcdcbf0"
+  integrity sha512-sif0JkCjghhtHpxFfb2fJ6MnlyJXxhaWxswxnFSNQd9uLEr101AC7Ep0aDRnSJ2JUoSk1nlZnVtDqYUYAYexWw==
   dependencies:
-    "@angular-devkit/architect" "0.1000.6"
+    "@angular-devkit/architect" "0.1000.8"
     rxjs "6.5.5"
 
-"@angular-devkit/build-optimizer@0.1000.6":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.6.tgz#f5b208be155b0ffb37d7380fc1a0e12a3765319d"
-  integrity sha512-R8zDEAvd9PeUKvOKh6I7xp3w+MViCwjGKoOZcznjH/i/9PQjOHCMwU5S48RQloQjMGu96eDMUGOVnd9qkzXUEw==
+"@angular-devkit/build-optimizer@0.1000.8":
+  version "0.1000.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz#55023cf9e16813cc01b255e99fabb92426eeb632"
+  integrity sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==
   dependencies:
     loader-utils "2.0.0"
     source-map "0.7.3"
     tslib "2.0.0"
     webpack-sources "1.4.3"
 
-"@angular-devkit/build-webpack@0.1000.6":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1000.6.tgz#1ec6942b4079b6cb6704b5d39af7df14102d562e"
-  integrity sha512-R01bJWuvckU5IdjcqoCeikLBpHRqt5fgfD0a4Hsg3evqW6xxXcSgc+YhWfeEmyU/nF/kVel8G2bFyPzhZP4QdQ==
+"@angular-devkit/build-webpack@0.1000.8":
+  version "0.1000.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz#048bd8e2db19b42cb3913dd2959dcd2589e5ec10"
+  integrity sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==
   dependencies:
-    "@angular-devkit/architect" "0.1000.6"
-    "@angular-devkit/core" "10.0.6"
+    "@angular-devkit/architect" "0.1000.8"
+    "@angular-devkit/core" "10.0.8"
     rxjs "6.5.5"
 
-"@angular-devkit/core@10.0.6", "@angular-devkit/core@^10.0.0":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.6.tgz#cbb40a34f976f9496270efc4fbdb3ad836b9723e"
-  integrity sha512-mVvqSEoeErZ7bAModk95EAa6R9Nl23rvX+/TXuKVTK2dziMFBOrwHjb1DYhnZxFIH4xfUftCx+BWHjXBXCPYlA==
+"@angular-devkit/core@10.0.8", "@angular-devkit/core@~10.0.3":
+  version "10.0.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.8.tgz#ca4ea9f464cfa7ff17e2dab3bcd4c59da1ea450d"
+  integrity sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==
   dependencies:
     ajv "6.12.3"
     fast-json-stable-stringify "2.1.0"
@@ -243,15 +244,15 @@
     rxjs "6.5.5"
     source-map "0.7.3"
 
-"@angular-devkit/core@10.0.8", "@angular-devkit/core@~10.0.3":
-  version "10.0.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.8.tgz#ca4ea9f464cfa7ff17e2dab3bcd4c59da1ea450d"
-  integrity sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==
+"@angular-devkit/core@10.1.1", "@angular-devkit/core@^10.0.0":
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.1.1.tgz#96e4f7af4ef17810f6ff87786c83841f466b4122"
+  integrity sha512-0ZmknL5I177JO+iOz2gDSqHtPK3zGGwyz4ix9IIu172eFRX53sdbl1vDiMikovyvZWx5fXqU3Vazf7CUeGA28w==
   dependencies:
-    ajv "6.12.3"
+    ajv "6.12.4"
     fast-json-stable-stringify "2.1.0"
     magic-string "0.25.7"
-    rxjs "6.5.5"
+    rxjs "6.6.2"
     source-map "0.7.3"
 
 "@angular-devkit/core@8.3.29", "@angular-devkit/core@^8.0.3":
@@ -265,15 +266,37 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.6.tgz#dc3486448cc34544f7076f7fe0a67b75137ae840"
-  integrity sha512-V3T4cf+jVKiPYyBrSVHf3ZSnk4wIc1WEaaeFta56HccEGQCQpvAFKqDurmtMHer50Hhaxhn7IC3Oi5kPnvkNyQ==
+"@angular-devkit/schematics-cli@^0.1001.1":
+  version "0.1001.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics-cli/-/schematics-cli-0.1001.1.tgz#b4ff180e7b5134928d1588c2cf2f7350296d4a0f"
+  integrity sha512-VkmbbI8boHwUNO1JEv0GPEzddScvrNu1ZEIhX6++M7s58sVbdIQhE2zX2MpFOQfUBCPtJXmWPUuXEcMsbKzQ2g==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
+    "@angular-devkit/core" "10.1.1"
+    "@angular-devkit/schematics" "10.1.1"
+    "@schematics/schematics" "0.1001.1"
+    inquirer "7.3.3"
+    minimist "1.2.5"
+    rxjs "6.6.2"
+    symbol-observable "1.2.0"
+
+"@angular-devkit/schematics@10.0.8", "@angular-devkit/schematics@~10.0.3":
+  version "10.0.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.8.tgz#6064d6323a1c9abc195e67ae4c88e373ce36b5e2"
+  integrity sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==
+  dependencies:
+    "@angular-devkit/core" "10.0.8"
     ora "4.0.4"
     rxjs "6.5.5"
 
+"@angular-devkit/schematics@10.1.1":
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.1.1.tgz#70e3ff6c25047f4d97d3eb61912e5d1e245b022a"
+  integrity sha512-4UrBbDkuzGmBN1YDG3+GBJ21C+X29vxO0k2EDGrFFjQROsDeogeyWJoUP789v4JCCz9DHF2TRmdhQiEBctZXMg==
+  dependencies:
+    "@angular-devkit/core" "10.1.1"
+    ora "5.0.0"
+    rxjs "6.6.2"
+
 "@angular-devkit/schematics@^8.0.6":
   version "8.3.29"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.3.29.tgz#b3ba658b90fb3226a80ff12977be7dd583e99c49"
@@ -282,19 +305,10 @@
     "@angular-devkit/core" "8.3.29"
     rxjs "6.4.0"
 
-"@angular-devkit/schematics@~10.0.3":
-  version "10.0.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.8.tgz#6064d6323a1c9abc195e67ae4c88e373ce36b5e2"
-  integrity sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==
-  dependencies:
-    "@angular-devkit/core" "10.0.8"
-    ora "4.0.4"
-    rxjs "6.5.5"
-
 "@angular/animations@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-10.0.10.tgz#c4f872e2917e9e7d4ffd04a64539e2aae67eef0c"
-  integrity sha512-lIbNeLVVl9bO41orPFpKoobCvxZIZ2wdcKJBEFtQiOdw0khRQQ8k7so4TAWOZXRJR+MkOUCjU2pO8gbMXgBweQ==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-10.0.14.tgz#8e7fa9b26c70cf8e67ec0cc943211eb3957dda8c"
+  integrity sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==
   dependencies:
     tslib "^2.0.0"
 
@@ -306,15 +320,15 @@
     parse5 "^5.0.0"
 
 "@angular/cli@~10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.0.6.tgz#366114e36a155611b553be535bec166bd28b4119"
-  integrity sha512-gQbQA/CsCyMf9RKEv1hJBCdBebV2BHeT4lGi56Eii0IkvZD5WIH0dNfQzR+6ErqGDgE1EI+9YCuX3psMEvCRUA==
-  dependencies:
-    "@angular-devkit/architect" "0.1000.6"
-    "@angular-devkit/core" "10.0.6"
-    "@angular-devkit/schematics" "10.0.6"
-    "@schematics/angular" "10.0.6"
-    "@schematics/update" "0.1000.6"
+  version "10.0.8"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.0.8.tgz#133f1ea23e622923fd5dae27f5689379cfacaad3"
+  integrity sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==
+  dependencies:
+    "@angular-devkit/architect" "0.1000.8"
+    "@angular-devkit/core" "10.0.8"
+    "@angular-devkit/schematics" "10.0.8"
+    "@schematics/angular" "10.0.8"
+    "@schematics/update" "0.1000.8"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.1"
     debug "4.1.1"
@@ -332,9 +346,9 @@
     uuid "8.1.0"
 
 "@angular/common@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.0.10.tgz#405c3640449bbf9f2c3c764be93a91749cb931d4"
-  integrity sha512-p6/pTk0s0Ai5uUkOHHFZwp+TjxRNPldPxTU2LVxg2xuBEQTO53BsfBKn3zi74epdb1kBC0Yjdj6yEL4dITBs7A==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.0.14.tgz#a08228323609a22559590f4295b26f247f7438f4"
+  integrity sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==
   dependencies:
     tslib "^2.0.0"
 
@@ -365,51 +379,51 @@
     tslib "^2.0.0"
 
 "@angular/core@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.0.10.tgz#10ca31d55899992e0b1585cfef4df8c40a1c60ac"
-  integrity sha512-PIQhLqjZayVXJoXs4WQu7orkePqFiux19y7bgBrsSAithe+g9BkrSIdX7+tkkX0zggUWKywY92YuMZCJ/S+uiw==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.0.14.tgz#000f091e6c17239232120fdca871fdac6b529ebd"
+  integrity sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/forms@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.0.10.tgz#c9ed1728be678209beaae89f9aa257357764fb36"
-  integrity sha512-bWjbsqMTiCNQZzXAfiEwT/tiAzSvChnqBimrJWNSHVYRkp71TkDcKXn6mA+E//YR0eZ84GKNNiVlKFxqkmeyqQ==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.0.14.tgz#b6e1a7f872c318039be21b0a11839c8df063f0a3"
+  integrity sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/language-service@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-10.0.10.tgz#ef01bcd48b8ce51b57c755e75c725b2b6ae43d2f"
-  integrity sha512-Id3hmPR5UeWAKsDeB6+O7m+4+FpUr5zcYdM8xXAzTjjn8laSuDUMb17wsAVRntPgRJv4SeaqUbWevwSkM5KExA==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-10.0.14.tgz#b9c33d27dcd11e2bb0c5453df1e7b334a0896a94"
+  integrity sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==
 
 "@angular/localize@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-10.0.10.tgz#42f981685d4bbd949ac6e6066a142e45331d65da"
-  integrity sha512-5zIbAqcwzHPqOg/LK7G8WJ2cNEl8hpmObcsqiw3IVyD831htnwWglfkgcR+dJvPWiYRxTGnxe2fvEnIhFpZOXQ==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-10.0.14.tgz#99064a3b12e94e54e791c0638fbbbcc8783d8a62"
+  integrity sha512-tV1oUii6bxpQ6bKELcZsibUEEGmNiROxy8xRW015VgrgMFhuNuesHSmNUIstZ7ag8/sjh0/w1p55PUB6LEiPFA==
   dependencies:
     "@babel/core" "7.8.3"
     glob "7.1.2"
     yargs "15.3.0"
 
 "@angular/platform-browser-dynamic@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.10.tgz#0ae069a67c3fa7d593af554a333dd2b69d12903c"
-  integrity sha512-6jbn0Ldyc+80BCETGtE7pzfKlbjfa/wEPhLEGWoYtxrrJ5UB3CblGpDMOsv1ibOQijPZ/JSmIMmAxz66+pLx3g==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz#4ee2257b2ccb94949f0a8083884020a814b5d47c"
+  integrity sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/platform-browser@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.0.10.tgz#13ea3e32fb798c6d10148d38f1c9589a26f74e6d"
-  integrity sha512-srNGkvg9177skff7QOe3L+nGOSbrKLzFt3Z5O3oM0N0TWr8QlWEA+zQm8n0zLHI8AmdZbmFzAYYJiBvVCSc5RQ==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.0.14.tgz#43b9aa7fcd8f312b58f371206df265c31ea13fac"
+  integrity sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/router@~10.0.10":
-  version "10.0.10"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.0.10.tgz#fee0fccbe00c3f4a29ddeef9fe1bcbcb8b7ad28c"
-  integrity sha512-wDmr/Spuv4OhPK5a49AvgJhaedRw4yb7nmPMd51sWqzOV31RRcGXORjiXZOcSpElLxM9f7JV0tWDR5p5ko/kPA==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.0.14.tgz#e8942e93a8154e1be749e1f9d79afa5f7b5b9cb9"
+  integrity sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==
   dependencies:
     tslib "^2.0.0"
 
@@ -487,18 +501,18 @@
     source-map "^0.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
-  integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
+  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.0"
+    "@babel/generator" "^7.11.6"
     "@babel/helper-module-transforms" "^7.11.0"
     "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.11.1"
+    "@babel/parser" "^7.11.5"
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.11.0"
-    "@babel/types" "^7.11.0"
+    "@babel/traverse" "^7.11.5"
+    "@babel/types" "^7.11.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -518,12 +532,12 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.11.0", "@babel/generator@^7.8.3", "@babel/generator@^7.9.6":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
-  integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
+"@babel/generator@^7.11.5", "@babel/generator@^7.11.6", "@babel/generator@^7.8.3", "@babel/generator@^7.9.6":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
+  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.11.5"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -572,11 +586,10 @@
     lodash "^4.17.19"
 
 "@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
-  integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b"
+  integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==
   dependencies:
-    "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-function-name@^7.10.4":
@@ -649,14 +662,13 @@
     lodash "^4.17.19"
 
 "@babel/helper-remap-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
-  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
+  integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
 "@babel/helper-replace-supers@^7.10.4":
@@ -724,10 +736,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.1", "@babel/parser@^7.8.3", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
-  version "7.11.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.3.tgz#9e1eae46738bcd08e23e867bab43e7b95299a8f9"
-  integrity sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.5", "@babel/parser@^7.8.3", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
+  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.10.5"
@@ -1216,9 +1228,9 @@
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1258,25 +1270,25 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24"
-  integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
+  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.0"
+    "@babel/generator" "^7.11.5"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.11.0"
-    "@babel/types" "^7.11.0"
+    "@babel/parser" "^7.11.5"
+    "@babel/types" "^7.11.5"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.6":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
-  integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.6":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
+  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
     lodash "^4.17.19"
@@ -1295,38 +1307,38 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@commitlint/execute-rule@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-9.1.2.tgz#74a77eae50c8d2e5766822061ddf0df1b4f08027"
-  integrity sha512-NGbeo0KCVYo1yj9vVPFHv6RGFpIF6wcQxpFYUKGIzZVV9Vz1WyiKS689JXa99Dt1aN0cZlEJJLnTNDIgYls0Vg==
+"@commitlint/execute-rule@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-11.0.0.tgz#3ed60ab7a33019e58d90e2d891b75d7df77b4b4d"
+  integrity sha512-g01p1g4BmYlZ2+tdotCavrMunnPFPhTzG1ZiLKTCYrooHRbmvqo42ZZn4QMStUEIcn+jfLb6BRZX3JzIwA1ezQ==
 
 "@commitlint/load@>6.1.1":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-9.1.2.tgz#c79634e8805ab35f318c535fdbda748288bf5395"
-  integrity sha512-FPL82xBuF7J3EJ57kLVoligQP4BFRwrknooP+vNT787AXmQ/Fddc/iYYwHwy67pNkk5N++/51UyDl/CqiHb6nA==
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-11.0.0.tgz#f736562f0ffa7e773f8808fea93319042ee18211"
+  integrity sha512-t5ZBrtgvgCwPfxmG811FCp39/o3SJ7L+SNsxFL92OR4WQxPcu6c8taD0CG2lzOHGuRyuMxZ7ps3EbngT2WpiCg==
   dependencies:
-    "@commitlint/execute-rule" "^9.1.2"
-    "@commitlint/resolve-extends" "^9.1.2"
-    "@commitlint/types" "^9.1.2"
+    "@commitlint/execute-rule" "^11.0.0"
+    "@commitlint/resolve-extends" "^11.0.0"
+    "@commitlint/types" "^11.0.0"
     chalk "4.1.0"
-    cosmiconfig "^6.0.0"
+    cosmiconfig "^7.0.0"
     lodash "^4.17.19"
     resolve-from "^5.0.0"
 
-"@commitlint/resolve-extends@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-9.1.2.tgz#222dcb73b139b6645cf3ce3bd55db429a98600b3"
-  integrity sha512-HcoL+qFGmWEu9VM4fY0HI+VzF4yHcg3x+9Hx6pYFZ+r2wLbnKs964y0v68oyMO/mS/46MVoLNXZGR8U3adpadg==
+"@commitlint/resolve-extends@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-11.0.0.tgz#158ecbe27d4a2a51d426111a01478e216fbb1036"
+  integrity sha512-WinU6Uv6L7HDGLqn/To13KM1CWvZ09VHZqryqxXa1OY+EvJkfU734CwnOEeNlSCK7FVLrB4kmodLJtL1dkEpXw==
   dependencies:
     import-fresh "^3.0.0"
     lodash "^4.17.19"
     resolve-from "^5.0.0"
     resolve-global "^1.0.0"
 
-"@commitlint/types@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-9.1.2.tgz#d05f66db03e3a3638a654e8badf2deb489eb220d"
-  integrity sha512-r3fwVbVH+M8W0qYlBBZFsUwKe6NT5qvz+EmU7sr8VeN1cQ63z+3cfXyTo7WGGEMEgKiT0jboNAK3b1FZp8k9LQ==
+"@commitlint/types@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-11.0.0.tgz#719cf05fcc1abb6533610a2e0f5dd1e61eac14fe"
+  integrity sha512-VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ==
 
 "@evocateur/libnpmaccess@^3.1.2":
   version "3.1.2"
@@ -2323,20 +2335,20 @@
     tslib "^2.0.0"
 
 "@ngneat/spectator@^5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@ngneat/spectator/-/spectator-5.13.0.tgz#0a9720c3d3b60571c3619054f9831856997acf67"
-  integrity sha512-BlCmmgHMPtrdJECwctFmziRhHzSF3xxRnKiR/qJIerCd4csgpwGbhtEEh/2jnFEyLP6yLo4T4nCslwq3dHdFrQ==
+  version "5.13.3"
+  resolved "https://registry.yarnpkg.com/@ngneat/spectator/-/spectator-5.13.3.tgz#e02104fcd6938c921d6a792601ec609e665eafda"
+  integrity sha512-y85WJeowMW6nqoWCY1ZkiXUEGuBO7dpGUAcL2CQL+GZ2ldr8iEtH00jLIoqWaW4C9pqopficsM8oFYPJIS4b2w==
   dependencies:
     "@testing-library/dom" "6.1.0"
     jquery "3.5.0"
     replace-in-file "^4.1.3"
 
-"@ngtools/webpack@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.0.6.tgz#6fe392ecad9f2869fc68eda7f1344ad0b68a8898"
-  integrity sha512-AbSDhPmsljkZO2jHFpge/5AHLQIrbscWgo4brrhF7NQ5TvPgE0Xn0wU7gxB9++hVUKQLGnnbAvewJyB/uYb9Nw==
+"@ngtools/webpack@10.0.8":
+  version "10.0.8"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.0.8.tgz#c818415a150ff6d578b25311b97859220b9d5a10"
+  integrity sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
+    "@angular-devkit/core" "10.0.8"
     enhanced-resolve "4.1.1"
     rxjs "6.5.5"
     webpack-sources "1.4.3"
@@ -2348,38 +2360,38 @@
   dependencies:
     tslib "^1.9.0"
 
-"@ngxs/devtools-plugin@^3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@ngxs/devtools-plugin/-/devtools-plugin-3.6.2.tgz#aa0a4835f90fb905951d7712dc3ce508cbc15a2c"
-  integrity sha512-0UUZlpXgEtrHoWNeVQXEvUyC6pW8nTACpqJgecuBjYJMa5imCCUSXdrpear8ztJuWwpLqMUSGk5cICNhKqK59g==
+"@ngxs/devtools-plugin@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@ngxs/devtools-plugin/-/devtools-plugin-3.7.0.tgz#5b6b3e63411da527fcee1e8280714e1b95a838c7"
+  integrity sha512-jjq91AbnnhzSm4QRUd7M0Y+HnUYnsSTVwUy8c1BsH8rGQ9c77xIveQaF2UBngPaDKQzTyzdVO2rV7twy3W2/fg==
   dependencies:
     tslib "^1.9.0"
 
-"@ngxs/logger-plugin@^3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@ngxs/logger-plugin/-/logger-plugin-3.6.2.tgz#1a8132a0b1eb95cad79736120fd50a331fe7347b"
-  integrity sha512-qF4ci9Ua7jL7r5EhZBEb0JB0HuGsTgFShK3OVTYSXU9+XfSb+5vrDLtmTshmBqQy6dWCd+2xq4LzBgc8IKMRuQ==
+"@ngxs/logger-plugin@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@ngxs/logger-plugin/-/logger-plugin-3.7.0.tgz#a27d6bb27360fc2677773c57868740b8cd33cc41"
+  integrity sha512-yr3NXXJEqJnxSuKiHaTbNmoprKKcrIS1PUIlOm9nvKsOmyrGskxu+MYCzUifemXDIyXSP2u0OBNPrVUumcXyhg==
   dependencies:
     tslib "^1.9.0"
 
-"@ngxs/router-plugin@^3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@ngxs/router-plugin/-/router-plugin-3.6.2.tgz#058b09565011203bbf52294f16f29f9337aeaa27"
-  integrity sha512-5J3G9+Qsy/s7iqFivzAN1S6EmaZYTb9hqz7Xjn3c0u3Y44VMP5VWiz77jZ/eowXX0slJywcMxk6oCEFPwz4lXQ==
+"@ngxs/router-plugin@^3.6.2", "@ngxs/router-plugin@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@ngxs/router-plugin/-/router-plugin-3.7.0.tgz#9d0595d8ec12e6143eb9f2f726fcc7cdec8cd635"
+  integrity sha512-nmArryNIBLWqIKLWelOQhgxEC3evLPDNDkE+PEYvwoASC4NP5rHIqJv0borJAWBCwo10t5wPeT1417vBQex5aQ==
   dependencies:
     tslib "^1.9.0"
 
-"@ngxs/storage-plugin@^3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@ngxs/storage-plugin/-/storage-plugin-3.6.2.tgz#6fe2168891382c635406df02308f67b585efc60a"
-  integrity sha512-x9CATYmXDH9bWmKW4uQxt5xxb51naSAmMkhvv1QHIrE9hG4uYNqiV3ERAM1wZvZbu2MJB9iXEN0cBziTgrwe2Q==
+"@ngxs/storage-plugin@^3.6.2", "@ngxs/storage-plugin@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@ngxs/storage-plugin/-/storage-plugin-3.7.0.tgz#3a0bc75f5dbba17a18e37b69cfde5d470cfceb45"
+  integrity sha512-j5rGYfhi1S+sAky956DIs+6AYP9FMBWL2Uz+omKBS/i42mjhyD26UfApORjwCOyW5PCb4Tq3B14ZPxyAaSi/OA==
   dependencies:
     tslib "^1.9.0"
 
-"@ngxs/store@^3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@ngxs/store/-/store-3.6.2.tgz#cfba63dc1e5bd422e89e54b3332cd69818510624"
-  integrity sha512-al7GU618SAuz2Ul4rFYVDgS1DM0gHReGOGvbnE7LBt4Etz3gsJERNYXPp2bSA7lZGaRPRaFfIHJN+Lm/GikFJw==
+"@ngxs/store@^3.6.2", "@ngxs/store@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@ngxs/store/-/store-3.7.0.tgz#e46387219dae610c685accc119ae42e351afcaa4"
+  integrity sha512-w9fG/DhKBgH1VJMKSoeNW9x9ycD9/Dzy+VkpFD8Jv0JBNX0MRgP+5KQQe3ZKwnJ+7S0UV/99JvJaWgxc/WOvPw==
   dependencies:
     tslib "^1.9.0"
 
@@ -2424,12 +2436,12 @@
     "@octokit/types" "^5.0.0"
 
 "@octokit/endpoint@^6.0.1":
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.5.tgz#43a6adee813c5ffd2f719e20cfd14a1fee7c193a"
-  integrity sha512-70K5u6zd45ItOny6aHQAsea8HHQjlQq85yqOMe+Aj8dkhN2qSJ9T+Q3YjUjEYfPRBcuUWNgMn62DQnP/4LAIiQ==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.6.tgz#4f09f2b468976b444742a1d5069f6fa45826d999"
+  integrity sha512-7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ==
   dependencies:
     "@octokit/types" "^5.0.0"
-    is-plain-object "^4.0.0"
+    is-plain-object "^5.0.0"
     universal-user-agent "^6.0.0"
 
 "@octokit/plugin-enterprise-rest@^6.0.1":
@@ -2476,16 +2488,16 @@
     once "^1.4.0"
 
 "@octokit/request@^5.2.0":
-  version "5.4.7"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.7.tgz#fd703ee092e0463ceba49ff7a3e61cb4cf8a0fde"
-  integrity sha512-FN22xUDP0i0uF38YMbOfx6TotpcENP5W8yJM1e/LieGXn6IoRxDMnBf7tx5RKSW4xuUZ/1P04NFZy5iY3Rax1A==
+  version "5.4.9"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.9.tgz#0a46f11b82351b3416d3157261ad9b1558c43365"
+  integrity sha512-CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.0.0"
     "@octokit/types" "^5.0.0"
     deprecation "^2.0.0"
-    is-plain-object "^4.0.0"
-    node-fetch "^2.3.0"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
     once "^1.4.0"
     universal-user-agent "^6.0.0"
 
@@ -2519,9 +2531,9 @@
     "@types/node" ">= 8"
 
 "@octokit/types@^5.0.0", "@octokit/types@^5.0.1":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.4.0.tgz#25f2f8e24fec09214553168c41c06383c9d0f529"
-  integrity sha512-D/uotqF69M50OIlwMqgyIg9PuLT2daOiBAYF0P40I2ekFA2ESwwBY5dxZe/UhXdPvIbNKDzuZmQrO7rMpuFbcg==
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
+  integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
   dependencies:
     "@types/node" ">= 8"
 
@@ -2566,21 +2578,29 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@schematics/angular@10.0.6", "@schematics/angular@~10.0.5":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.0.6.tgz#568590574dca1556280a0a04f625f79bee34ee4a"
-  integrity sha512-TPBpo0GnMJLvKE6rYZDkSy9pnkMH55rSJ6nfLDpQ5zzmhoD/QnASUr8trfTFs3+MqmPlX61xI00+HmStmI8sJQ==
+"@schematics/angular@10.0.8", "@schematics/angular@~10.0.5":
+  version "10.0.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.0.8.tgz#af730827b2de6cab7561157a8772250eb5f277e1"
+  integrity sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==
+  dependencies:
+    "@angular-devkit/core" "10.0.8"
+    "@angular-devkit/schematics" "10.0.8"
+
+"@schematics/schematics@0.1001.1":
+  version "0.1001.1"
+  resolved "https://registry.yarnpkg.com/@schematics/schematics/-/schematics-0.1001.1.tgz#7760dffad188fbc69b9615c2e1f42d9f3c1ab6f3"
+  integrity sha512-dPL2XTad83vDczKk+p1Jd7mEOoU7CTrBL8+JmXHsVL++58hmoVppm2NyBmdDsFSCL8Sw8/J8UWp/0lJRXM6lqw==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
-    "@angular-devkit/schematics" "10.0.6"
+    "@angular-devkit/core" "10.1.1"
+    "@angular-devkit/schematics" "10.1.1"
 
-"@schematics/update@0.1000.6":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1000.6.tgz#f0131d4b3ed879ae8f19c032d310bece79691738"
-  integrity sha512-GGfPGPjRF/MA4EeJ+h1ebzoYDzChF4BV7SaTfpT107LPCD3McRjKS39Jw2qH/ArGNSbrbJ8fYNOIj3g/uh1GoA==
+"@schematics/update@0.1000.8":
+  version "0.1000.8"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1000.8.tgz#3b745ec14e92cfd1f7d16f9a4c3864e1f12249c9"
+  integrity sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
-    "@angular-devkit/schematics" "10.0.6"
+    "@angular-devkit/core" "10.0.8"
+    "@angular-devkit/schematics" "10.0.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     npm-package-arg "^8.0.0"
@@ -2594,15 +2614,10 @@
   resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#5405ee8e444ed212db44e79351f0c70a582aae25"
   integrity sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw==
 
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
-
-"@sindresorhus/is@^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc"
-  integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ==
+"@sindresorhus/is@^3.1.1":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.2.tgz#548650de521b344e3781fbdb0ece4aa6f729afb8"
+  integrity sha512-JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ==
 
 "@sinonjs/commons@^1.7.0":
   version "1.8.1"
@@ -2616,13 +2631,6 @@
   resolved "https://registry.yarnpkg.com/@swimlane/ngx-datatable/-/ngx-datatable-17.1.0.tgz#ef2f91c3783526e7e89ac7a62a53e7bc9e1c90d5"
   integrity sha512-zYUS7uNO9OJ5UQZFuuTRjlPu6vdKA+FHYLfeEs7PgSuUiDCcbl2SWoUdS/3zIoWn/qQyws767ueWiAvvWUbpEw==
 
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
-  dependencies:
-    defer-to-connect "^1.0.1"
-
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.5.tgz#bfbd50211e9dfa51ba07da58a14cdfd333205152"
@@ -2669,9 +2677,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz#1874914be974a492e1b4cb00585cabb274e8ba18"
-  integrity sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz#e99da8c075d4fb098c774ba65dabf7dc9954bd13"
+  integrity sha512-8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -2748,14 +2756,14 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jasmine@^3.3.9":
-  version "3.5.12"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.12.tgz#5c378c1545cdc7cb339cff5578f854b6d1e0a17d"
-  integrity sha512-vJaQ58oceFao+NzpKNqLOWwHPsqA7YEhKv+mOXvYU4/qh+BfVWIxaBtL0Ck5iCS67yOkNwGkDCrzepnzIWF+7g==
+  version "3.5.14"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.14.tgz#f41a14e8ffa939062a71cf9722e5ee7d4e1f94af"
+  integrity sha512-Fkgk536sHPqcOtd+Ow+WiUNuk0TSo/BntKkF8wSvcd6M2FvPjeXcUE6Oz/bwDZiUZEaXLslAgw00Q94Pnx6T4w==
 
 "@types/jest@26.x":
-  version "26.0.10"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.10.tgz#8faf7e9756c033c39014ae76a7329efea00ea607"
-  integrity sha512-i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q==
+  version "26.0.13"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz#5a7b9d5312f5dd521a38329c38ee9d3802a0b85e"
+  integrity sha512-sCzjKow4z9LILc6DhBvn5AkIfmQzDZkgtVVKmGwVrs5tuid38ws281D4l+7x1kP487+FlKDh5kfMZ8WSPAdmdA==
   dependencies:
     jest-diff "^25.2.1"
     pretty-format "^25.2.1"
@@ -2768,10 +2776,10 @@
     jest-diff "^25.2.1"
     pretty-format "^25.2.1"
 
-"@types/json-schema@^7.0.4":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
-  integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
+"@types/json-schema@^7.0.5":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
 
 "@types/keyv@*":
   version "3.1.1"
@@ -2791,19 +2799,19 @@
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*", "@types/node@>= 8":
-  version "14.6.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499"
-  integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==
+  version "14.10.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.10.1.tgz#cc323bad8e8a533d4822f45ce4e5326f36e42177"
+  integrity sha512-aYNbO+FZ/3KGeQCEkNhHFRIzBOUgc7QvcVNKXbfnhDkSfwUv91JsQQa10rDgKSTSLkXZ1UIyPe4FJJNVgw1xWQ==
 
 "@types/node@^12.11.1":
-  version "12.12.54"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.54.tgz#a4b58d8df3a4677b6c08bfbc94b7ad7a7a5f82d1"
-  integrity sha512-ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w==
+  version "12.12.58"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.58.tgz#46dae9b2b9ee5992818c8f7cee01ff4ce03ab44c"
+  integrity sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA==
 
 "@types/node@^8.0.31":
-  version "8.10.62"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.62.tgz#8d0d0db44a46ae7679d92e2e36d41bf1c3625d6a"
-  integrity sha512-76fupxOYVxk36kb7O/6KtrAPZ9jnSK3+qisAX4tQMEuGNdlvl7ycwatlHqjoE6jHfVtXFM3pCrCixZOidc5cuw==
+  version "8.10.63"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.63.tgz#f86775d576bc07a2992da244f41c23d3ba66d402"
+  integrity sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3072,9 +3080,9 @@ JSONStream@^1.0.4, JSONStream@^1.3.4:
     through ">=2.2.7 <3"
 
 abab@^2.0.0, abab@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.4.tgz#6dfa57b417ca06d21b2478f0e638302f99c2405c"
-  integrity sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
 abbrev@1:
   version "1.1.1"
@@ -3155,9 +3163,9 @@ agentkeepalive@^3.4.1:
     humanize-ms "^1.2.1"
 
 aggregate-error@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
-  integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
@@ -3167,7 +3175,7 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
@@ -3182,7 +3190,7 @@ ajv@6.12.3:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3:
+ajv@6.12.4:
   version "6.12.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
   integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
@@ -3192,6 +3200,16 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -3204,13 +3222,6 @@ angular-oauth2-oidc@^10.0.0, angular-oauth2-oidc@^10.0.3:
   dependencies:
     tslib "^2.0.0"
 
-ansi-align@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
-  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
-  dependencies:
-    string-width "^3.0.0"
-
 ansi-colors@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -3755,20 +3766,6 @@ bootstrap@^4.5.0:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz#a85c4eda59155f0d71186b6e6ad9b875813779ab"
   integrity sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A==
 
-boxen@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
-  integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^3.0.0"
-    cli-boxes "^2.2.0"
-    string-width "^4.1.0"
-    term-size "^2.1.0"
-    type-fest "^0.8.1"
-    widest-line "^3.1.0"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3879,14 +3876,14 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.11.1, browserslist@^4.12.0, browserslist@^4.7.0, browserslist@^4.8.5, browserslist@^4.9.1:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000"
-  integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
+  integrity sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==
   dependencies:
-    caniuse-lite "^1.0.30001111"
-    electron-to-chromium "^1.3.523"
+    caniuse-lite "^1.0.30001125"
+    electron-to-chromium "^1.3.564"
     escalade "^3.0.2"
-    node-releases "^1.1.60"
+    node-releases "^1.1.61"
 
 browserstack@^1.5.1:
   version "1.6.0"
@@ -4065,19 +4062,6 @@ cacheable-lookup@^5.0.3:
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz#049fdc59dffdd4fc285e8f4f82936591bd59fec3"
   integrity sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w==
 
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
-
 cacheable-request@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58"
@@ -4181,10 +4165,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001061, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111:
-  version "1.0.30001115"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001115.tgz#c04cd828883ba47f6f776312e0817bcc9040cfa4"
-  integrity sha512-NZrG0439ePYna44lJX8evHX2L7Z3/z3qjVLnHgbBb/duNEnGo348u+BQS5o4HTWcrb++100dHFrU36IesIrC1Q==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001061, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125:
+  version "1.0.30001131"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz#afad8a28fc2b7a0d3ae9407e71085a0ead905d54"
+  integrity sha512-4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -4203,7 +4187,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@4.1.0, chalk@^4.0.0:
+chalk@4.1.0, chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -4351,11 +4335,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
-  integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
-
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -4370,7 +4349,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-spinners@^2.0.0, cli-spinners@^2.2.0:
+cli-spinners@^2.0.0, cli-spinners@^2.2.0, cli-spinners@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
   integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
@@ -4380,6 +4359,11 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
   integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -4546,15 +4530,15 @@ commander@^2.11.0, commander@^2.12.1, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+commander@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
+  integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==
 
 commitizen@^4.0.3:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-4.1.2.tgz#6095eb825fd3f0d3611df88e6803c69b23307e9a"
-  integrity sha512-LBxTQKHbVgroMz9ohpm86N+GfJobonGyvDc3zBGdZazbwCLz2tqLa48Rf2TnAdKx7/06W1i1R3SXUt5QW97qVQ==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-4.2.1.tgz#3b098b16c6b1a37f0d129018dff6751b20cd3103"
+  integrity sha512-nZsp8IThkDu7C+93BFD/mLShb9Gd6Wsaf90tpKE3x/6u5y/Q52kzanIJpGr0qvIsJ5bCMpgKtr3Lbu3miEJfaA==
   dependencies:
     cachedir "2.2.0"
     cz-conventional-changelog "3.2.0"
@@ -4564,9 +4548,9 @@ commitizen@^4.0.3:
     find-root "1.1.0"
     fs-extra "8.1.0"
     glob "7.1.4"
-    inquirer "6.5.0"
+    inquirer "6.5.2"
     is-utf8 "^0.2.1"
-    lodash "4.17.15"
+    lodash "^4.17.20"
     minimist "1.2.5"
     strip-bom "4.0.0"
     strip-json-comments "3.0.1"
@@ -4649,18 +4633,6 @@ config-chain@^1.1.11:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configstore@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
-  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
-  dependencies:
-    dot-prop "^5.2.0"
-    graceful-fs "^4.1.2"
-    make-dir "^3.0.0"
-    unique-string "^2.0.0"
-    write-file-atomic "^3.0.0"
-    xdg-basedir "^4.0.0"
-
 connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
@@ -4978,16 +4950,16 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.1.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
-  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
   dependencies:
     "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
+    import-fresh "^3.2.1"
     parse-json "^5.0.0"
     path-type "^4.0.0"
-    yaml "^1.7.2"
+    yaml "^1.10.0"
 
 create-ecdh@^4.0.0:
   version "4.0.4"
@@ -5057,11 +5029,6 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
-  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-
 css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -5356,9 +5323,9 @@ data-urls@^2.0.0:
     whatwg-url "^8.0.0"
 
 date-fns@^2.10.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f"
-  integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ==
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
+  integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==
 
 dateformat@^3.0.0:
   version "3.0.3"
@@ -5416,13 +5383,6 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
-  dependencies:
-    mimic-response "^1.0.0"
-
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -5447,11 +5407,6 @@ deep-equal@^1.0.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -5477,17 +5432,12 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-defer-to-connect@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
-  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-
 defer-to-connect@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1"
   integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -5695,9 +5645,9 @@ domelementtype@1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
-  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
+  integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
 
 domexception@^1.0.1:
   version "1.0.1"
@@ -5722,17 +5672,12 @@ dot-prop@^4.2.0:
     is-obj "^1.0.0"
 
 dot-prop@^5.1.0, dot-prop@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
-  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
     is-obj "^2.0.0"
 
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
 duplexer@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -5761,10 +5706,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.523:
-  version "1.3.534"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.534.tgz#fc7af8518dd00a5b22a24aed3f116b5d097e2330"
-  integrity sha512-7x2S3yUrspNHQOoPk+Eo+iHViSiJiEGPI6BpmLy1eT2KRNGCkBt/NUYqjfXLd1DpDCQp7n3+LfA1RkbG+LqTZQ==
+electron-to-chromium@^1.3.564:
+  version "1.3.568"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.568.tgz#0fa28cd3e5cbd9e8c66f72309eef0646f65a5b66"
+  integrity sha512-j9MlEwgTHVW/lq93Hw8yhzA886oLjDm3Hz7eDkWP2v4fzLVuqOWhpNluziSnmR/tBqgoYldagbLknrdg+B7Tlw==
 
 elliptic@^6.5.3:
   version "6.5.3"
@@ -5847,9 +5792,9 @@ env-paths@^2.2.0:
   integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
 
 envinfo@^7.3.1:
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.2.tgz#098f97a0e902f8141f9150553c92dbb282c4cabe"
-  integrity sha512-k3Eh5bKuQnZjm49/L7H4cHzs2FlL5QjbTB3JrPxoTI8aJG7hVMe4uKyJxSYH4ahseby2waUwk5OaKX/nAsaYgg==
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
+  integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==
 
 err-code@^1.0.0:
   version "1.1.2"
@@ -5887,6 +5832,24 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
+es-abstract@^1.18.0-next.0:
+  version "1.18.0-next.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz#b302834927e624d8e5837ed48224291f2c66e6fc"
+  integrity sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.0"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -5935,14 +5898,9 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3:
     ext "^1.1.2"
 
 escalade@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
-  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
-
-escape-goat@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
-  integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
+  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -5985,17 +5943,22 @@ esprima@^4.0.0, esprima@^4.0.1:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
+estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
@@ -6022,9 +5985,9 @@ eventemitter3@^3.1.0:
   integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
 eventemitter3@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
-  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^3.0.0:
   version "3.2.0"
@@ -6710,9 +6673,9 @@ git-up@^4.0.0:
     parse-url "^5.0.0"
 
 git-url-parse@^11.1.2:
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.3.tgz#03625b6fc09905e9ad1da7bb2b84be1bf9123143"
-  integrity sha512-GPsfwticcu52WQ+eHp0IYkAyaOASgYdtsQDIt4rUp6GbiNt1P9ddrh3O0kQB0eD4UJZszVqNT3+9Zwcg40fywA==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.2.0.tgz#2955fd51befd6d96ea1389bbe2ef57e8e6042b04"
+  integrity sha512-KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g==
   dependencies:
     git-up "^4.0.0"
 
@@ -6786,13 +6749,6 @@ global-dirs@^0.1.1:
   dependencies:
     ini "^1.3.4"
 
-global-dirs@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
-  integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
-  dependencies:
-    ini "^1.3.5"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -6868,39 +6824,22 @@ globby@^9.2.0:
     slash "^2.0.0"
 
 got@^11.5.2:
-  version "11.5.2"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.5.2.tgz#772e3f3a06d9c7589c7c94dc3c83cdb31ddbf742"
-  integrity sha512-yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww==
+  version "11.6.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.6.2.tgz#79d7bb8c11df212b97f25565407a1f4ae73210ec"
+  integrity sha512-/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A==
   dependencies:
-    "@sindresorhus/is" "^3.0.0"
+    "@sindresorhus/is" "^3.1.1"
     "@szmarczak/http-timer" "^4.0.5"
     "@types/cacheable-request" "^6.0.1"
     "@types/responselike" "^1.0.0"
     cacheable-lookup "^5.0.3"
     cacheable-request "^7.0.1"
     decompress-response "^6.0.0"
-    http2-wrapper "^1.0.0-beta.5.0"
+    http2-wrapper "^1.0.0-beta.5.2"
     lowercase-keys "^2.0.0"
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
@@ -6963,7 +6902,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -7004,11 +6943,6 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
 has@^1.0.0, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -7196,7 +7130,7 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-http2-wrapper@^1.0.0-beta.5.0:
+http2-wrapper@^1.0.0-beta.5.2:
   version "1.0.0-beta.5.2"
   resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz#8b923deb90144aea65cf834b016a340fc98556f3"
   integrity sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==
@@ -7309,7 +7243,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0, import-fresh@^3.1.0:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
   integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
@@ -7324,11 +7258,6 @@ import-from@^2.1.0:
   dependencies:
     resolve-from "^3.0.0"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -7400,7 +7329,7 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@1.3.5, ini@^1.3.2, ini@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -7438,10 +7367,10 @@ inquirer-file-tree-selection-prompt@^1.0.2:
     lodash "^4.17.11"
     rxjs "^6.5.2"
 
-inquirer@6.5.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
-  integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==
+inquirer@6.5.2, inquirer@^6.2.0, inquirer@^6.4.1:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -7476,23 +7405,23 @@ inquirer@7.1.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-inquirer@^6.2.0, inquirer@^6.4.1:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+inquirer@7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
     external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
     through "^2.3.6"
 
 internal-ip@^4.3.0:
@@ -7589,9 +7518,9 @@ is-buffer@^1.1.5:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
-  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz#4d1e21a4f437509d25ce55f8184350771421c96d"
+  integrity sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -7717,14 +7646,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
-  dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
-
 is-interactive@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
@@ -7735,10 +7656,10 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-npm@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
-  integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
+is-negative-zero@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
+  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -7800,11 +7721,6 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-path-inside@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
-  integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
-
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -7817,10 +7733,10 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-plain-object@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-4.1.1.tgz#1a14d6452cbd50790edc7fdaa0aed5a40a35ebb5"
-  integrity sha512-5Aw8LLVsDlZsETVMhoMXzqsXwQqr/0vlnBYzIXJbYo2F4yYlhLHs+Ez7Bod7IIQKWkJbJfxrWD7pA1Dw1TKrwA==
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
 is-reference@^1.2.1:
   version "1.2.1"
@@ -7829,7 +7745,7 @@ is-reference@^1.2.1:
   dependencies:
     "@types/estree" "*"
 
-is-regex@^1.0.4, is-regex@^1.1.0:
+is-regex@^1.0.4, is-regex@^1.1.0, is-regex@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
   integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
@@ -7906,11 +7822,6 @@ is-wsl@^2.1.1:
   dependencies:
     is-docker "^2.0.0"
 
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -8218,12 +8129,12 @@ jest-pnp-resolver@^1.2.1:
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
 jest-preset-angular@^8.2.0, jest-preset-angular@^8.2.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-8.2.1.tgz#eaf5f7f6e72c1f700fbdb4c3d812976325f26d4e"
-  integrity sha512-6t7lavnIHnZWz6a03jpZ5L7phMefi6SoBIRZ/GQdyML8YgwMtbJszbhUE+dh5lzmeNbd6AJ1gfleetGy2Rg4cQ==
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz#b8e4867639982a0989f4ef5ef0bad1c084070ef4"
+  integrity sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==
   dependencies:
-    pretty-format "^26.0.0"
-    ts-jest "^26.0.0"
+    pretty-format "26.x"
+    ts-jest "26.x"
 
 jest-regex-util@^25.2.6:
   version "25.2.6"
@@ -8485,11 +8396,6 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
-
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -8500,6 +8406,11 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-bet
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -8597,13 +8508,6 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
-  dependencies:
-    json-buffer "3.0.0"
-
 keyv@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.1.tgz#9fe703cb4a94d6d11729d320af033307efd02ee6"
@@ -8645,13 +8549,6 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-latest-version@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
-  dependencies:
-    package-json "^6.3.0"
-
 lerna@^3.19.0:
   version "3.22.1"
   resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.22.1.tgz#82027ac3da9c627fd8bf02ccfeff806a98e65b62"
@@ -8888,12 +8785,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.2.1:
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.2.1:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -8912,10 +8804,17 @@ log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+  dependencies:
+    chalk "^4.0.0"
+
 loglevel@^1.6.8:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
-  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
+  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
 
 lolex@^5.0.0:
   version "5.1.2"
@@ -8944,11 +8843,6 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
 lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
@@ -9137,9 +9031,9 @@ meow@^4.0.0:
     trim-newlines "^2.0.0"
 
 meow@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-7.1.0.tgz#50ecbcdafa16f8b58fb7eb9675b933f6473b3a59"
-  integrity sha512-kq5F0KVteskZ3JdfyQFivJEj2RaA8NFsS4+r9DaMKLcUHpk5OcHS3Q0XkCXONB1mZRPsu/Y/qImKri0nwSEZog==
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-7.1.1.tgz#7c01595e3d337fcb0ec4e8eed1666ea95903d306"
+  integrity sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==
   dependencies:
     "@types/minimist" "^1.2.0"
     camelcase-keys "^6.2.2"
@@ -9252,7 +9146,7 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-response@^1.0.0, mimic-response@^1.0.1:
+mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
@@ -9416,9 +9310,9 @@ modify-values@^1.0.0:
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 moment@^2.10.2:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.28.0.tgz#cdfe73ce01327cee6537b0fafac2e0f21a237d75"
+  integrity sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -9544,9 +9438,9 @@ next-tick@~1.0.0:
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 ng-packagr@^10.0.0:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-10.0.4.tgz#8c4503d0a7b49d7622d493527717f0b5b2e0ad97"
-  integrity sha512-ddx8+sRCXV8FXlmBVft+G3tdHH9W11MV4au/k+ZWEijPviGiUh0mj7JKfY0CTvtpyGAorE4ZzveiSTk5oIhlBQ==
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-10.1.0.tgz#a2fc0f86f5f8895f811597d33d943f93c7c77c17"
+  integrity sha512-KXyajkAyY/51iMJPVezDybb5Bn1rtl/JDGC4w9jjIdeL2Ip+KTMDGsqpc+5nQm/vnasZcJ/Xj2a+0VOwrbyVWg==
   dependencies:
     "@rollup/plugin-commonjs" "^15.0.0"
     "@rollup/plugin-json" "^4.0.0"
@@ -9556,7 +9450,7 @@ ng-packagr@^10.0.0:
     browserslist "^4.7.0"
     chalk "^4.0.0"
     chokidar "^3.2.1"
-    commander "^5.0.0"
+    commander "^6.0.0"
     cssnano-preset-default "^4.0.7"
     fs-extra "^9.0.0"
     glob "^7.1.2"
@@ -9573,7 +9467,6 @@ ng-packagr@^10.0.0:
     sass "^1.23.0"
     stylus "^0.54.7"
     terser "^5.0.0"
-    update-notifier "^4.0.0"
 
 ng-zorro-antd@^9.3.0:
   version "9.3.0"
@@ -9619,10 +9512,10 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-fetch@^2.3.0, node-fetch@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+node-fetch@^2.5.0, node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 node-forge@0.9.0:
   version "0.9.0"
@@ -9696,10 +9589,10 @@ node-notifier@^6.0.0:
     shellwords "^0.1.1"
     which "^1.3.1"
 
-node-releases@^1.1.60:
-  version "1.1.60"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
-  integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
+node-releases@^1.1.61:
+  version "1.1.61"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
 
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
@@ -9920,7 +9813,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.7.0:
+object-inspect@^1.7.0, object-inspect@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
   integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
@@ -9933,7 +9826,7 @@ object-is@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -9951,14 +9844,14 @@ object-visit@^1.0.0:
     isobject "^3.0.0"
 
 object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
+  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.0"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
 object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
   version "2.1.0"
@@ -10069,6 +9962,20 @@ ora@4.0.4:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
+ora@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.0.0.tgz#4f0b34f2994877b49b452a707245ab1e9f6afccb"
+  integrity sha512-s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw==
+  dependencies:
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.4.0"
+    is-interactive "^1.0.0"
+    log-symbols "^4.0.0"
+    mute-stream "0.0.8"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 ora@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
@@ -10119,11 +10026,6 @@ osenv@^0.1.4, osenv@^0.1.5:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
-
 p-cancelable@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e"
@@ -10246,16 +10148,6 @@ p-waterfall@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
-
 pacote@9.5.12:
   version "9.5.12"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz#1e11dd7a8d736bcc36b375a9804d41bb0377bf66"
@@ -10352,13 +10244,13 @@ parse-json@^4.0.0:
     json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz#7cfe35c1ccd641bce3981467e6c2ece61b3b3878"
-  integrity sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
+  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
+    json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
 parse-passwd@^1.0.0:
@@ -10583,9 +10475,9 @@ posix-character-classes@^0.1.0:
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-calc@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.3.tgz#d65cca92a3c52bf27ad37a5f732e0587b74f1623"
-  integrity sha512-IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz#5e177ddb417341e6d4a193c5d9fd8ada79094f8b"
+  integrity sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==
   dependencies:
     postcss "^7.0.27"
     postcss-selector-parser "^6.0.2"
@@ -10966,16 +10858,21 @@ prepend-http@^1.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-
 prettier@^1.18.2:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
+pretty-format@26.x:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237"
+  integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
+
 pretty-format@^24.3.0, pretty-format@^24.8.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
@@ -10996,16 +10893,6 @@ pretty-format@^25.2.1, pretty-format@^25.5.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-pretty-format@^26.0.0:
-  version "26.4.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.0.tgz#c08073f531429e9e5024049446f42ecc9f933a3b"
-  integrity sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==
-  dependencies:
-    "@jest/types" "^26.3.0"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -11152,13 +11039,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726"
-  integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==
-  dependencies:
-    escape-goat "^2.0.0"
-
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
@@ -11255,16 +11135,6 @@ raw-loader@4.0.1:
     loader-utils "^2.0.0"
     schema-utils "^2.6.5"
 
-rc@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 react-is@^16.12.0, react-is@^16.8.4:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -11285,16 +11155,14 @@ read-cmd-shim@^1.0.1:
     graceful-fs "^4.1.2"
 
 "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1"
-  integrity sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
+  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
   dependencies:
     glob "^7.1.1"
-    json-parse-better-errors "^1.0.1"
+    json-parse-even-better-errors "^2.3.0"
     normalize-package-data "^2.0.0"
     npm-normalize-package-bin "^1.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.2"
 
 read-package-tree@5.3.1, read-package-tree@^5.1.6:
   version "5.3.1"
@@ -11524,20 +11392,6 @@ regexpu-core@^4.7.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
-registry-auth-token@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.0.tgz#1d37dffda72bbecd0f581e4715540213a65eb7da"
-  integrity sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
-  dependencies:
-    rc "^1.2.8"
-
 regjsgen@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
@@ -11725,13 +11579,6 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2
   dependencies:
     path-parse "^1.0.6"
 
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
-  dependencies:
-    lowercase-keys "^1.0.0"
-
 responselike@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723"
@@ -11841,9 +11688,9 @@ rollup@2.10.9:
     fsevents "~2.1.2"
 
 rollup@^2.8.0:
-  version "2.26.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.3.tgz#502c755872a4590937cfa4e8f7eb99d3bc3c4025"
-  integrity sha512-Mlt39/kL2rA9egcbQbaZV1SNVplGqYYhDDMcGgHPPE0tvM3R4GrB+IEdYy2QtTrdzMQx57ZcqDFf/KWWm8F+uw==
+  version "2.26.11"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.11.tgz#4fc31de9c7b83d50916fc8395f8c3d24730cdaae"
+  integrity sha512-xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw==
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -11883,13 +11730,20 @@ rxjs@6.5.5, rxjs@~6.5.4:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0, rxjs@^6.5.0, rxjs@^6.5.2, rxjs@^6.5.3:
+rxjs@6.6.2:
   version "6.6.2"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
   integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.4.0, rxjs@^6.5.0, rxjs@^6.5.2, rxjs@^6.5.3, rxjs@^6.6.0:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -11981,13 +11835,13 @@ schema-utils@^1.0.0:
     ajv-keywords "^3.1.0"
 
 schema-utils@^2.6.1, schema-utils@^2.6.4, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
   dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
 
 select-hose@^2.0.0:
   version "2.0.0"
@@ -12011,13 +11865,6 @@ selfsigned@^1.10.7:
   dependencies:
     node-forge "0.9.0"
 
-semver-diff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
-  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
-  dependencies:
-    semver "^6.3.0"
-
 semver-dsl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
@@ -12609,7 +12456,7 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
   integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
@@ -12727,11 +12574,6 @@ strip-json-comments@3.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
   integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 strong-log-transformer@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
@@ -12815,9 +12657,9 @@ supports-color@^6.1.0:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
@@ -12937,11 +12779,6 @@ tempfile@^3.0.0:
     temp-dir "^2.0.0"
     uuid "^3.3.2"
 
-term-size@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
-  integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
-
 terminal-link@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -12999,9 +12836,9 @@ terser@^4.1.2, terser@^4.6.13:
     source-map-support "~0.5.12"
 
 terser@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.1.0.tgz#1f4ab81c8619654fdded51f3157b001e1747281d"
-  integrity sha512-pwC1Jbzahz1ZPU87NQ8B3g5pKbhyJSiHih4gLH6WZiPU8mmS1IlGbB0A2Nuvkj/LCNsgIKctg6GkYwWCeTvXZQ==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.1.tgz#f50fe20ab48b15234fe9bdd86b10148ad5fca787"
+  integrity sha512-yD80f4hdwCWTH5mojzxe1q8bN1oJbsK/vfJGLcPZM/fl+/jItIVNKhFIHqqR71OipFWMLgj3Kc+GIp6CeIqfnA==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -13119,11 +12956,6 @@ to-object-path@^0.3.0:
   dependencies:
     kind-of "^3.0.2"
 
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
@@ -13210,10 +13042,10 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
-ts-jest@^26.0.0:
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.2.0.tgz#7ec22faceb05ee1467fdb5265d1b33c27441f163"
-  integrity sha512-9+y2qwzXdAImgLSYLXAb/Rhq9+K4rbt0417b8ai987V60g2uoNWBBmMkYgutI7D8Zhu+IbCSHbBtrHxB9d7xyA==
+ts-jest@26.x:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.3.0.tgz#6b2845045347dce394f069bb59358253bc1338a9"
+  integrity sha512-Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q==
   dependencies:
     "@types/jest" "26.x"
     bs-logger "0.x"
@@ -13365,9 +13197,9 @@ type@^1.0.1:
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
 type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
-  integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
+  integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
 
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
@@ -13387,9 +13219,9 @@ typescript@^3.5.2, typescript@~3.9.2, typescript@~3.9.5:
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
 
 uglify-js@^3.1.4:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.1.tgz#dd14767eb7150de97f2573a5ff210db14fffe4ad"
-  integrity sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q==
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.4.tgz#dd680f5687bc0d7a93b14a3482d16db6eba2bfbb"
+  integrity sha512-kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==
 
 uid-number@0.0.6:
   version "0.0.6"
@@ -13458,13 +13290,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
-  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
-  dependencies:
-    crypto-random-string "^2.0.0"
-
 universal-analytics@0.4.20:
   version "0.4.20"
   resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
@@ -13519,29 +13344,10 @@ upath@^1.1.1, upath@^1.2.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-notifier@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.1.tgz#895fc8562bbe666179500f9f2cebac4f26323746"
-  integrity sha512-9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg==
-  dependencies:
-    boxen "^4.2.0"
-    chalk "^3.0.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.1"
-    is-npm "^4.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.0.0"
-    pupa "^2.0.1"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
-
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
   dependencies:
     punycode "^2.1.0"
 
@@ -13550,13 +13356,6 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
 url-parse@^1.4.3:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
@@ -13767,10 +13566,10 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+webidl-conversions@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 webpack-dev-middleware@3.7.2, webpack-dev-middleware@^3.7.2:
   version "3.7.2"
@@ -13924,13 +13723,13 @@ whatwg-url@^7.0.0:
     webidl-conversions "^4.0.2"
 
 whatwg-url@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz#c628acdcf45b82274ce7281ee31dd3c839791771"
-  integrity sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz#85e7f9795108b53d554cec640b2e8aee2a0d4bfd"
+  integrity sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^2.0.2"
-    webidl-conversions "^5.0.0"
+    webidl-conversions "^6.1.0"
 
 when@~3.6.x:
   version "3.6.4"
@@ -13963,13 +13762,6 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
 windows-release@^3.1.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.3.3.tgz#1c10027c7225743eec6b89df160d64c2e0293999"
@@ -14087,11 +13879,6 @@ ws@^7.0.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
 
-xdg-basedir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
-  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
@@ -14142,7 +13929,7 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.7.2:
+yaml@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json
index aca885c270..200595eb2e 100644
--- a/npm/packs/anchor-js/package.json
+++ b/npm/packs/anchor-js/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/anchor-js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "anchor-js": "^4.2.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
index 6657cbf351..e827121657 100644
--- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
+++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/aspnetcore.mvc.ui.theme.basic",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
index d438671fb7..e046576658 100644
--- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
+++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
@@ -1,24 +1,24 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/aspnetcore.mvc.ui.theme.shared",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui": "~3.1.1",
-    "@abp/bootstrap": "~3.1.1",
-    "@abp/bootstrap-datepicker": "~3.1.1",
-    "@abp/datatables.net-bs4": "~3.1.1",
-    "@abp/font-awesome": "~3.1.1",
-    "@abp/jquery-form": "~3.1.1",
-    "@abp/jquery-validation-unobtrusive": "~3.1.1",
-    "@abp/lodash": "~3.1.1",
-    "@abp/luxon": "~3.1.1",
-    "@abp/malihu-custom-scrollbar-plugin": "~3.1.1",
-    "@abp/select2": "~3.1.1",
-    "@abp/sweetalert": "~3.1.1",
-    "@abp/timeago": "~3.1.1",
-    "@abp/toastr": "~3.1.1"
+    "@abp/aspnetcore.mvc.ui": "~3.1.2",
+    "@abp/bootstrap": "~3.1.2",
+    "@abp/bootstrap-datepicker": "~3.1.2",
+    "@abp/datatables.net-bs4": "~3.1.2",
+    "@abp/font-awesome": "~3.1.2",
+    "@abp/jquery-form": "~3.1.2",
+    "@abp/jquery-validation-unobtrusive": "~3.1.2",
+    "@abp/lodash": "~3.1.2",
+    "@abp/luxon": "~3.1.2",
+    "@abp/malihu-custom-scrollbar-plugin": "~3.1.2",
+    "@abp/select2": "~3.1.2",
+    "@abp/sweetalert": "~3.1.2",
+    "@abp/timeago": "~3.1.2",
+    "@abp/toastr": "~3.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json
index 4eddb7456d..7cc83a9198 100644
--- a/npm/packs/aspnetcore.mvc.ui/package.json
+++ b/npm/packs/aspnetcore.mvc.ui/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/aspnetcore.mvc.ui",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json
index ec0a8eafa5..b15bc6af52 100644
--- a/npm/packs/blogging/package.json
+++ b/npm/packs/blogging/package.json
@@ -1,14 +1,14 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/blogging",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.1",
-    "@abp/owl.carousel": "~3.1.1",
-    "@abp/prismjs": "~3.1.1",
-    "@abp/tui-editor": "~3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.2",
+    "@abp/owl.carousel": "~3.1.2",
+    "@abp/prismjs": "~3.1.2",
+    "@abp/tui-editor": "~3.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json
index 2d3f67f15a..ffc2a8289e 100644
--- a/npm/packs/bootstrap-datepicker/package.json
+++ b/npm/packs/bootstrap-datepicker/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/bootstrap-datepicker",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json
index 1c84800fd7..163384ef57 100644
--- a/npm/packs/bootstrap/package.json
+++ b/npm/packs/bootstrap/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/bootstrap",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "bootstrap": "^4.5.0",
     "bootstrap-v4-rtl": "4.4.1-2"
   },
diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json
index 2e42128d13..6d20afe165 100644
--- a/npm/packs/chart.js/package.json
+++ b/npm/packs/chart.js/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/chart.js",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json
index 94f6d0a7a3..eff71fe0a4 100644
--- a/npm/packs/clipboard/package.json
+++ b/npm/packs/clipboard/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/clipboard",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "clipboard": "^2.0.6"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json
index 5ca9d9ed9d..fb5dbaf012 100644
--- a/npm/packs/codemirror/package.json
+++ b/npm/packs/codemirror/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/codemirror",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "codemirror": "^5.54.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json
index 4f4e28a84e..0804bbcd7c 100644
--- a/npm/packs/core/package.json
+++ b/npm/packs/core/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/core",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/utils": "^3.1.1"
+    "@abp/utils": "^3.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json
index 48d25af210..94655cdd69 100644
--- a/npm/packs/datatables.net-bs4/package.json
+++ b/npm/packs/datatables.net-bs4/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/datatables.net-bs4",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/datatables.net": "~3.1.1",
+    "@abp/datatables.net": "~3.1.2",
     "datatables.net-bs4": "^1.10.21"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json
index 38fb8dadb0..fbe0db7cc7 100644
--- a/npm/packs/datatables.net/package.json
+++ b/npm/packs/datatables.net/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/datatables.net",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.1",
+    "@abp/jquery": "~3.1.2",
     "datatables.net": "^1.10.21"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json
index 60e10f5bb1..034a7ef953 100644
--- a/npm/packs/docs/package.json
+++ b/npm/packs/docs/package.json
@@ -1,15 +1,15 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/docs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/anchor-js": "~3.1.1",
-    "@abp/clipboard": "~3.1.1",
-    "@abp/malihu-custom-scrollbar-plugin": "~3.1.1",
-    "@abp/popper.js": "~3.1.1",
-    "@abp/prismjs": "~3.1.1"
+    "@abp/anchor-js": "~3.1.2",
+    "@abp/clipboard": "~3.1.2",
+    "@abp/malihu-custom-scrollbar-plugin": "~3.1.2",
+    "@abp/popper.js": "~3.1.2",
+    "@abp/prismjs": "~3.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json
index 2058237720..93cf0dd8c7 100644
--- a/npm/packs/flag-icon-css/package.json
+++ b/npm/packs/flag-icon-css/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/flag-icon-css",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json
index 3d0c84563a..e56023e51a 100644
--- a/npm/packs/font-awesome/package.json
+++ b/npm/packs/font-awesome/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/font-awesome",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "@fortawesome/fontawesome-free": "^5.13.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json
index 02d0ef9113..0a48c7daaf 100644
--- a/npm/packs/highlight.js/package.json
+++ b/npm/packs/highlight.js/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/highlight.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1"
+    "@abp/core": "~3.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json
index 13f00d1852..6dbd8acfb3 100644
--- a/npm/packs/jquery-form/package.json
+++ b/npm/packs/jquery-form/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/jquery-form",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.1",
+    "@abp/jquery": "~3.1.2",
     "jquery-form": "^4.3.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json
index 45e660bd5e..cd69e024a9 100644
--- a/npm/packs/jquery-validation-unobtrusive/package.json
+++ b/npm/packs/jquery-validation-unobtrusive/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/jquery-validation-unobtrusive",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery-validation": "~3.1.1",
+    "@abp/jquery-validation": "~3.1.2",
     "jquery-validation-unobtrusive": "^3.2.11"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json
index 7b3531edb3..20e5e77d33 100644
--- a/npm/packs/jquery-validation/package.json
+++ b/npm/packs/jquery-validation/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/jquery-validation",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.1",
+    "@abp/jquery": "~3.1.2",
     "jquery-validation": "^1.19.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json
index 4a4522764f..c1704850b1 100644
--- a/npm/packs/jquery/package.json
+++ b/npm/packs/jquery/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/jquery",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "jquery": "~3.5.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json
index 2956f3f9dd..f88f44ade6 100644
--- a/npm/packs/jstree/package.json
+++ b/npm/packs/jstree/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/jstree",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.1",
+    "@abp/jquery": "~3.1.2",
     "jstree": "^3.3.9"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json
index 5f87af569c..422559a5bd 100644
--- a/npm/packs/lodash/package.json
+++ b/npm/packs/lodash/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/lodash",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "lodash": "^4.17.15"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json
index cc28dea978..8637db252c 100644
--- a/npm/packs/luxon/package.json
+++ b/npm/packs/luxon/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/luxon",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json
index e765860fdb..ccf94b26ee 100644
--- a/npm/packs/malihu-custom-scrollbar-plugin/package.json
+++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/malihu-custom-scrollbar-plugin",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "malihu-custom-scrollbar-plugin": "^3.1.5"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json
index ad2c33f799..f5d2b66ee6 100644
--- a/npm/packs/markdown-it/package.json
+++ b/npm/packs/markdown-it/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/markdown-it",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "markdown-it": "^11.0.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json
index e61c59dca5..3078a57938 100644
--- a/npm/packs/owl.carousel/package.json
+++ b/npm/packs/owl.carousel/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/owl.carousel",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "owl.carousel": "^2.3.4"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json
index 6993fc3ee3..c5214c6725 100644
--- a/npm/packs/popper.js/package.json
+++ b/npm/packs/popper.js/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/popper.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "popper.js": "^1.16.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json
index a91d6c22fd..415595090c 100644
--- a/npm/packs/prismjs/package.json
+++ b/npm/packs/prismjs/package.json
@@ -1,12 +1,12 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/prismjs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/clipboard": "~3.1.1",
-    "@abp/core": "~3.1.1",
+    "@abp/clipboard": "~3.1.2",
+    "@abp/core": "~3.1.2",
     "prismjs": "^1.20.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json
index 93334e2d39..09f86a032b 100644
--- a/npm/packs/select2/package.json
+++ b/npm/packs/select2/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/select2",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "select2": "^4.0.13"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json
index 37df3e583d..f5a403a332 100644
--- a/npm/packs/signalr/package.json
+++ b/npm/packs/signalr/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/signalr",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "@microsoft/signalr": "~3.1.5"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/sweetalert/package.json b/npm/packs/sweetalert/package.json
index 1b89a3e5d3..fee0f451fe 100644
--- a/npm/packs/sweetalert/package.json
+++ b/npm/packs/sweetalert/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/sweetalert",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "sweetalert": "^2.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json
index 0848153249..080393a147 100644
--- a/npm/packs/timeago/package.json
+++ b/npm/packs/timeago/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/timeago",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.1",
+    "@abp/jquery": "~3.1.2",
     "timeago": "^1.6.7"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json
index baf0284072..9eeff84cd8 100644
--- a/npm/packs/toastr/package.json
+++ b/npm/packs/toastr/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/toastr",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.1",
+    "@abp/jquery": "~3.1.2",
     "toastr": "^2.1.4"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json
index f29cf308d8..7477d1ac48 100644
--- a/npm/packs/tui-editor/package.json
+++ b/npm/packs/tui-editor/package.json
@@ -1,14 +1,14 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/tui-editor",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/codemirror": "~3.1.1",
-    "@abp/highlight.js": "~3.1.1",
-    "@abp/jquery": "~3.1.1",
-    "@abp/markdown-it": "~3.1.1",
+    "@abp/codemirror": "~3.1.2",
+    "@abp/highlight.js": "~3.1.2",
+    "@abp/jquery": "~3.1.2",
+    "@abp/markdown-it": "~3.1.2",
     "tui-editor": "^1.4.10"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json
index 5f272ee392..4832b14213 100644
--- a/npm/packs/uppy/package.json
+++ b/npm/packs/uppy/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/uppy",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.1",
+    "@abp/core": "~3.1.2",
     "uppy": "^1.16.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json
index f4f6707c38..e7eb5ab3b9 100644
--- a/npm/packs/utils/package.json
+++ b/npm/packs/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/utils",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "scripts": {
     "prepublish": "yarn install --ignore-scripts && node prepublish.js",
     "ng": "ng",
diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json
index dc84b85077..98fdc0d8f7 100644
--- a/npm/packs/virtual-file-explorer/package.json
+++ b/npm/packs/virtual-file-explorer/package.json
@@ -1,12 +1,12 @@
 {
-  "version": "3.1.1",
+  "version": "3.1.2",
   "name": "@abp/virtual-file-explorer",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/clipboard": "~3.1.1",
-    "@abp/prismjs": "~3.1.1"
+    "@abp/clipboard": "~3.1.2",
+    "@abp/prismjs": "~3.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/nupkg/common.ps1 b/nupkg/common.ps1
index b45b4a47da..4fc9d83184 100644
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@@ -29,9 +29,14 @@ $projects = (
     "framework/src/Volo.Abp.ApiVersioning.Abstractions",
     "framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer",
     "framework/src/Volo.Abp.AspNetCore.Authentication.OAuth",
+    "framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect",
     "framework/src/Volo.Abp.AspNetCore",
+    "framework/src/Volo.Abp.AspNetCore.Components.WebAssembly",
+    "framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming",
+    "framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme",
     "framework/src/Volo.Abp.AspNetCore.MultiTenancy",
     "framework/src/Volo.Abp.AspNetCore.Mvc.Client",
+    "framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common",
     "framework/src/Volo.Abp.AspNetCore.Mvc.Contracts",
     "framework/src/Volo.Abp.AspNetCore.Mvc",
     "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap",
@@ -48,6 +53,7 @@ $projects = (
     "framework/src/Volo.Abp.Auditing",
     "framework/src/Volo.Abp.Authorization",
     "framework/src/Volo.Abp.Autofac",
+    "framework/src/Volo.Abp.Autofac.WebAssembly",
     "framework/src/Volo.Abp.AutoMapper",
     "framework/src/Volo.Abp.BackgroundJobs.Abstractions",
     "framework/src/Volo.Abp.BackgroundJobs",
@@ -56,6 +62,7 @@ $projects = (
     "framework/src/Volo.Abp.BackgroundJobs.Quartz",
     "framework/src/Volo.Abp.BackgroundWorkers",
     "framework/src/Volo.Abp.BackgroundWorkers.Quartz",
+    "framework/src/Volo.Abp.BlazoriseUI",
     "framework/src/Volo.Abp.BlobStoring",
     "framework/src/Volo.Abp.BlobStoring.FileSystem",
     "framework/src/Volo.Abp.BlobStoring.Aliyun",
@@ -94,6 +101,7 @@ $projects = (
     "framework/src/Volo.Abp.Http.Client",
     "framework/src/Volo.Abp.Http.Client.IdentityModel",
     "framework/src/Volo.Abp.Http.Client.IdentityModel.Web",
+    "framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly",
     "framework/src/Volo.Abp.Http",
     "framework/src/Volo.Abp.IdentityModel",
     "framework/src/Volo.Abp.Json",
@@ -193,6 +201,7 @@ $projects = (
     "modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi",
     "modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB",
     "modules/feature-management/src/Volo.Abp.FeatureManagement.Web",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor",
 
     # modules/identity
     "modules/identity/src/Volo.Abp.Identity.Application.Contracts",
@@ -205,6 +214,7 @@ $projects = (
     "modules/identity/src/Volo.Abp.Identity.HttpApi",
     "modules/identity/src/Volo.Abp.Identity.MongoDB",
     "modules/identity/src/Volo.Abp.Identity.Web",
+    "modules/identity/src/Volo.Abp.Identity.Blazor",
     "modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity",
     
     # modules/identityserver
@@ -224,6 +234,7 @@ $projects = (
     "modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi",
     "modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB",
     "modules/permission-management/src/Volo.Abp.PermissionManagement.Web",
+    "modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor",
 
     # modules/setting-management
     "modules/setting-management/src/Volo.Abp.SettingManagement.Domain",
diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json
index b7c1b0b2ee..0afed93663 100644
--- a/templates/app/angular/package.json
+++ b/templates/app/angular/package.json
@@ -12,11 +12,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.1.1",
-    "@abp/ng.identity": "~3.1.1",
-    "@abp/ng.setting-management": "~3.1.1",
-    "@abp/ng.tenant-management": "~3.1.1",
-    "@abp/ng.theme.basic": "~3.1.1",
+    "@abp/ng.account": "~3.1.2",
+    "@abp/ng.identity": "~3.1.2",
+    "@abp/ng.setting-management": "~3.1.2",
+    "@abp/ng.tenant-management": "~3.1.2",
+    "@abp/ng.theme.basic": "~3.1.2",
     "@angular/animations": "~10.0.10",
     "@angular/common": "~10.0.10",
     "@angular/compiler": "~10.0.10",
@@ -30,7 +30,7 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~3.1.1",
+    "@abp/ng.schematics": "~3.1.2",
     "@angular-devkit/build-angular": "~0.1000.6",
     "@angular-devkit/build-ng-packagr": "~0.1000.6",
     "@angular/cli": "~10.0.6",
diff --git a/templates/app/angular/yarn.lock b/templates/app/angular/yarn.lock
index 1a778347bd..21aac67a2d 100644
--- a/templates/app/angular/yarn.lock
+++ b/templates/app/angular/yarn.lock
@@ -2,20 +2,20 @@
 # yarn lockfile v1
 
 
-"@abp/ng.account@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.1.0.tgz#cd5fb46dffd7455188c10769220ed58806f455fa"
-  integrity sha512-/v+yyagHIUhjpJ1exzubf54XQBsgO2o3r3bFJFlWqzJoeCLufzyyppqK2UQ+6sQ7CjWP5jFCqo87R9myNn2xHA==
+"@abp/ng.account@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.1.2.tgz#42f95ad70f06586848737ad5e18461a193a51348"
+  integrity sha512-sFJPvak4pGbX0dDtVjBhY0slRRI0oTz8reJqcFfpUywPMJj2VsCz97W70xB33Yr/mQZDg6BjhXkrl15GdyWt2w==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.core@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.1.0.tgz#aba988fd915a633ea7af3a68278cc2557a37446f"
-  integrity sha512-SRRA7MYh12irJMRCj9emE5hyw+5aeiETlohP1CdgpdhhT3/RSPwrSeZNGJU0ilk6tKoO2rcZT6fgGjhqQfMyOw==
+"@abp/ng.core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.1.2.tgz#edc2de8fa7332f4bd17ddeaee94c52aa8bb51fcc"
+  integrity sha512-ura5fD4ZIJhLD97WrSNILoFfwFqJJJOygeZuGpfslCbeNM1JEf4Jk4XQzfnk7u+xW7IgtBZXtisheIuY2taawA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.4"
+    "@abp/utils" "^3.1.1"
     "@angular/localize" "~10.0.10"
     "@ngxs/router-plugin" "^3.6.2"
     "@ngxs/storage-plugin" "^3.6.2"
@@ -27,35 +27,35 @@
     ts-toolbelt "6.15.4"
     tslib "^2.0.0"
 
-"@abp/ng.feature-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.1.0.tgz#a93b0d63dc542e3880a1c79ac1e630b2db19b8bf"
-  integrity sha512-CayqVZ8XJQXsmz+IU+OchXK/vl01x6DHA/oTpvkW9HM2kYYJ8dmD940kjr5i3ZX6WF2Q4yTc+wLgZhGQt7eK9Q==
+"@abp/ng.feature-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.1.2.tgz#91269097f925bc0772c443d688f46070fce5def9"
+  integrity sha512-s59KNoOY2TWuume2iAzdKz9GBFVyj3q0BmhL7hW6IgyV96Zg9FP+UKYCXvPM8HtsLmXis3Zrv7TnJDAF+5VrHw==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.identity@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.1.0.tgz#d3086dd887c7ea2786e4c8620b3448333065053a"
-  integrity sha512-G4CToeEou4Zwr4NkpauwMKJme61lofd77PycWvFPVJ8Df6EctmxJc+u6NVgG7+ZjuFI+oTQrLwCEl3uPuznnpA==
+"@abp/ng.identity@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.1.2.tgz#6d039a6cbb431c61a8bf9d291c1e6bf2120e478e"
+  integrity sha512-p+NGSuSd6OPxDZQr7iOhUIWTkpzyGUcphy6iloDgXX9YoTdIoh03ZMMJMpR6UBmPYLjPpP4U/eUFVxi2DjdCzA==
   dependencies:
-    "@abp/ng.permission-management" "~3.1.0"
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.permission-management" "~3.1.2"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.permission-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.1.0.tgz#c0a9a135699b7c8a329c0c9ac839cde06dce3db2"
-  integrity sha512-u3JwxK1vAlqC6YBVqnyP26FZqArrIQn94fZ/Vm6n9rjId7VaJbA0UrX9d2YAwKROKOpAnBNc5GA0A2gaWIO9rg==
+"@abp/ng.permission-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.1.2.tgz#bacc09d3e92262d111734e4ffc4344300b16f978"
+  integrity sha512-nqLo3VFNFeouU33qQHK0abbKCjSlT9VXJk0WYzsiS2Z7lENYqtImRCxqpHlB32ACIdMMUWbmo8OMvYzpt++kRg==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.schematics@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.1.0.tgz#ea7dd6d7dfd02425e7eff25c7e350614a4c0cad8"
-  integrity sha512-Vn0G6Wi+/JJ7vFgSkt5sRtdWBWdBQSncwH+kI2O1F0GvhJTrf1eDQ8XTk2yZiOD8oFLgt8mnJzTVzJbs3RqR+Q==
+"@abp/ng.schematics@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.1.2.tgz#37a634ada068967468e68def9110ead6960bf8a4"
+  integrity sha512-ULvkA/smLhErHLe6TdW0CzrortAf4Rjq/eshrMqS0A7EANzlw2TBpjZmn7kJSFawLTatDy9+GyQ8Cewc9H0VXA==
   dependencies:
     "@angular-devkit/core" "~10.0.3"
     "@angular-devkit/schematics" "~10.0.3"
@@ -63,37 +63,37 @@
     jsonc-parser "^2.3.0"
     typescript "~3.9.2"
 
-"@abp/ng.setting-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.1.0.tgz#eebb1c7bdfd75a04cba4c1f8d0f5cfc306a64f43"
-  integrity sha512-jPBn9vpDHqCDscyo445MWdCd/C0pR+WEnXPxCu7lCOs+ry1n16etoWuLAIfI2LtpI0+g8AgMyL3hacP0MPzpGg==
+"@abp/ng.setting-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.1.2.tgz#dda39e646e79e853b090c3f4af79181a65446af2"
+  integrity sha512-o01Z7abV0kL4wwsOcRJZp8btev+X0qHCHfLf4u0zAwTjtXc4LzTtlU2hHLT19U42UYZlFUJvENnmTAhLnCLAVw==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.tenant-management@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.1.0.tgz#d0b58b711269d91530f36f8ddcb3f6d8f80c0927"
-  integrity sha512-//g3O2b2NvV7NQtEydbrhZqkdyS3FccVs6wX204ylTLCaLDAwneqNnAnSCQHnUI9GNMjBpj3/VFRGBlvGeW+tw==
+"@abp/ng.tenant-management@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.1.2.tgz#94fd626515575f8c0e361b36eb173a772ea3fc54"
+  integrity sha512-vdPSBYYxWUSZxhDg2FMadndj+kZ3ddPkzgBaQldncIvhHsxLQCPwj4ZhqXJ7HHqvZ30JqGiJzk4Ejx0Rv5vu+Q==
   dependencies:
-    "@abp/ng.feature-management" "~3.1.0"
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.feature-management" "~3.1.2"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.theme.basic@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.1.0.tgz#53db1e40ed4bf34d2efdc4a990ce9838f61b8d5e"
-  integrity sha512-C2yXYoSApLzUaOiLAAfFGEkAAP59KHJXaJTG2tsyGAsf+H2yFp2sQW+R0i59opmhW3LUXpAZV9aHKk++w+CGcQ==
+"@abp/ng.theme.basic@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.1.2.tgz#e60d15db641a13eebc76d7e793efdc5cf4a6a8f7"
+  integrity sha512-gYS82euwyVU0D9GLXIqt8h1qtwqXtmu7KqIRyjb0IFi2iIvBGal6jMNKHk6wEI0A0/iNy6pra98bYPUZo+FKxQ==
   dependencies:
-    "@abp/ng.theme.shared" "~3.1.0"
+    "@abp/ng.theme.shared" "~3.1.2"
     tslib "^2.0.0"
 
-"@abp/ng.theme.shared@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.1.0.tgz#12fc8fb84b27c74603945dc5384afcf62bb985b6"
-  integrity sha512-cknvClcDbaCrfTagNuojRbOG88NYCLDEPOOrXdTcSKfieJM2L7w/Ku2piqneV17CCM51Ce7Tl1BO7osYtxTS9Q==
+"@abp/ng.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.1.2.tgz#b86940d569a992e72e279c34f50f4e4353b6ecc8"
+  integrity sha512-/e0oB0azdms4QJTtw+7l95t/UmxU5CxQAB4RLIlbnuJFK4NXZObRjb2ujc6PqdaUCGh5djsWxNqVjkcsWcHX2Q==
   dependencies:
-    "@abp/ng.core" "~3.1.0"
+    "@abp/ng.core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.14.0"
     "@ng-bootstrap/ng-bootstrap" "^7.0.0"
     "@ngx-validate/core" "^0.0.11"
@@ -102,10 +102,10 @@
     chart.js "^2.9.3"
     tslib "^2.0.0"
 
-"@abp/utils@^3.1.0-rc.4":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0.tgz#ccbfed6591ab11466bf3fed740c8422acf6a84df"
-  integrity sha512-I5yjM1ovqcpBAT2LFOfwLibVE0Ql6XbP3tQj6YMEZ/foDXekn/4P6Spgq5DTZCMo+0jskS0D8NfL7Ce4p89buw==
+"@abp/utils@^3.1.1":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
@@ -9717,4 +9717,4 @@ yn@^3.0.0:
 zone.js@~0.10.2:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16"
-  integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==
\ No newline at end of file
+  integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==
diff --git a/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln b/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln
index bc8ab2ff39..d8b8d51d8a 100644
--- a/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln
+++ b/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln
@@ -49,7 +49,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.DbMigrator", "src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.HostWithIds", "src\MyCompanyName.MyProjectName.HttpApi.HostWithIds\MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj", "{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.HostWithIds", "src\MyCompanyName.MyProjectName.HttpApi.HostWithIds\MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj", "{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Blazor", "src\MyCompanyName.MyProjectName.Blazor\MyCompanyName.MyProjectName.Blazor.csproj", "{27B2DDC7-8B75-4322-A312-25419C15D9D8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -145,6 +147,10 @@ Global
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27B2DDC7-8B75-4322-A312-25419C15D9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27B2DDC7-8B75-4322-A312-25419C15D9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27B2DDC7-8B75-4322-A312-25419C15D9D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27B2DDC7-8B75-4322-A312-25419C15D9D8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -172,6 +178,7 @@ Global
 		{EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
 		{AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{27B2DDC7-8B75-4322-A312-25419C15D9D8} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}
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
new file mode 100644
index 0000000000..cd24bd29d2
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.1.2" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Blazor\Volo.Abp.Account.Blazor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.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
new file mode 100644
index 0000000000..486c74cffe
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Net.Http;
+using Blazorise;
+using Blazorise.Bootstrap;
+using Blazorise.Icons.FontAwesome;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+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.Autofac.WebAssembly;
+using Volo.Abp.Modularity;
+using Volo.Abp.UI.Navigation;
+using Volo.Abp.Identity.Blazor;
+using Volo.Abp.Account.Blazor;
+
+namespace MyCompanyName.MyProjectName.Blazor
+{
+    [DependsOn(
+        typeof(AbpAutofacWebAssemblyModule),
+        typeof(MyProjectNameHttpApiClientModule),
+        typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
+        typeof(AbpIdentityBlazorModule),
+        typeof(AbpAccountBlazorModule)
+    )]
+    public class MyProjectNameBlazorModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            var environment = context.Services.GetSingletonInstance<IWebAssemblyHostEnvironment>();
+            var builder = context.Services.GetSingletonInstance<WebAssemblyHostBuilder>();
+
+            ConfigureAuthentication(builder);
+            ConfigureHttpClient(context, environment);
+            ConfigureBlazorise(context);
+            ConfigureRouter(context);
+            ConfigureUI(builder);
+            ConfigureMenu(context);
+        }
+
+        private void ConfigureRouter(ServiceConfigurationContext context)
+        {
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AppAssembly = typeof(MyProjectNameBlazorModule).Assembly;
+            });
+        }
+
+        private void ConfigureMenu(ServiceConfigurationContext context)
+        {
+            Configure<AbpNavigationOptions>(options =>
+            {
+                options.MenuContributors.Add(new MyProjectNameMenuContributor());
+            });
+        }
+
+        private void ConfigureBlazorise(ServiceConfigurationContext context)
+        {
+            context.Services
+                .AddBlazorise()
+                .AddBootstrapProviders()
+                .AddFontAwesomeIcons();
+        }
+
+        private static void ConfigureAuthentication(WebAssemblyHostBuilder builder)
+        {
+            builder.Services.AddOidcAuthentication(options =>
+            {
+                builder.Configuration.Bind("AuthServer", options.ProviderOptions);
+                options.ProviderOptions.DefaultScopes.Add("MyProjectName");
+            });
+        }
+
+        private static void ConfigureUI(WebAssemblyHostBuilder builder)
+        {
+            builder.RootComponents.Add<App>("app");
+        }
+
+        private static void ConfigureHttpClient(ServiceConfigurationContext context, IWebAssemblyHostEnvironment environment)
+        {
+            context.Services.AddTransient(sp => new HttpClient
+            {
+                BaseAddress = new Uri(environment.BaseAddress)
+            });
+        }
+
+        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            context.ServiceProvider
+                .UseBootstrapProviders()
+                .UseFontAwesomeIcons();
+        }
+    }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBrandingProvider.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBrandingProvider.cs
new file mode 100644
index 0000000000..cada0bba19
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBrandingProvider.cs
@@ -0,0 +1,9 @@
+using Volo.Abp.Ui.Branding;
+
+namespace MyCompanyName.MyProjectName.Blazor
+{
+    public class MyProjectNameBrandingProvider : DefaultBrandingProvider
+    {
+        public override string AppName => "MyProjectName";
+    }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameMenuContributor.cs
new file mode 100644
index 0000000000..9dda814d93
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameMenuContributor.cs
@@ -0,0 +1,31 @@
+using System.Threading.Tasks;
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.UI.Navigation;
+
+namespace MyCompanyName.MyProjectName.Blazor
+{
+    public class MyProjectNameMenuContributor : IMenuContributor
+    {
+        public Task ConfigureMenuAsync(MenuConfigurationContext context)
+        {
+            if(context.Menu.DisplayName != StandardMenus.Main)
+            {
+                return Task.CompletedTask;
+            }
+
+            var l = context.GetLocalizer<MyProjectNameResource>();
+
+            context.Menu.Items.Insert(
+                0,
+                new ApplicationMenuItem(
+                    "MyProjectName.Home",
+                    l["Menu:Home"],
+                    "/",
+                    icon: "fas fa-home"
+                )
+            );
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
new file mode 100644
index 0000000000..66c4949ac9
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
@@ -0,0 +1,60 @@
+@page "/"
+@using Volo.Abp.Users
+@using Volo.Abp.MultiTenancy
+@using System.Security.Claims
+@inject ICurrentUser CurrentUser
+@inject ICurrentTenant CurrentTenant
+@inject AuthenticationStateProvider AuthenticationStateProvider
+
+<h1>Welcome to MyProjectName!</h1>
+
+@if (CurrentUser.IsAuthenticated)
+{
+    <h3>Current User</h3>
+    <ul>
+        <li>Id: <strong>@CurrentUser.Id</strong></li>
+        <li>TenantId: <strong>@CurrentUser.TenantId</strong></li>
+        <li>UserName: <strong>@CurrentUser.UserName</strong></li>
+        <li>Name: <strong>@CurrentUser.Name</strong></li>
+        <li>SurName: <strong>@CurrentUser.SurName</strong></li>
+        <li>Email: <strong>@CurrentUser.Email</strong></li>
+        <li>EmailVerified: <strong>@CurrentUser.EmailVerified</strong></li>
+        <li>PhoneNumber: <strong>@CurrentUser.PhoneNumber</strong></li>
+        <li>PhoneNumberVerified: <strong>@CurrentUser.PhoneNumberVerified</strong></li>
+        <li>Roles: <strong>@CurrentUser.Roles.JoinAsString(", ")</strong></li>
+    </ul>
+}
+
+@if (_claims != null)
+{
+    <h3>Current Claims</h3>
+    <ul>
+        @foreach (var claim in _claims)
+        {
+            <li>@claim.Type: @claim.Value</li>
+        }
+    </ul>
+}
+
+@if (CurrentTenant.IsAvailable)
+{
+    <h3>Current Tenant</h3>
+    <ul>
+        <li>Id: <strong>@CurrentTenant.Id</strong></li>
+        <li>Name: <strong>@CurrentTenant.Name</strong></li>
+    </ul>
+}
+
+@code
+{
+    private IEnumerable<Claim> _claims;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+        if (authState.User.Identity.IsAuthenticated)
+        {
+            _claims = authState.User.Claims;
+        }
+    }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs
new file mode 100644
index 0000000000..31f1c228ad
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs
@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+
+namespace MyCompanyName.MyProjectName.Blazor
+{
+    public class Program
+    {
+        public static async Task Main(string[] args)
+        {
+            var builder = WebAssemblyHostBuilder.CreateDefault(args);
+
+            var application = builder.AddApplication<MyProjectNameBlazorModule>(options =>
+            {
+                options.UseAutofac();
+            });
+
+            var host = builder.Build();
+
+            await application.InitializeAsync(host.Services);
+
+            await host.RunAsync();
+        }
+    }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Properties/launchSettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Properties/launchSettings.json
new file mode 100644
index 0000000000..9ef766441e
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Properties/launchSettings.json
@@ -0,0 +1,29 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "https://localhost:44307",
+      "sslPort": 44307
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "MyCompanyName.MyProjectName.Blazor": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "https://localhost:44307",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
new file mode 100644
index 0000000000..b1ade9c628
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
@@ -0,0 +1,11 @@
+@using System.Net.Http
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.WebAssembly.Http
+@using Microsoft.JSInterop
+@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using MyCompanyName.MyProjectName.Blazor
+@using Blazorise
+@using Blazorise.DataGrid
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.Development.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.Development.json
new file mode 100644
index 0000000000..0db3279e44
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.Development.json
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json
new file mode 100644
index 0000000000..af7cddcc72
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json
@@ -0,0 +1,12 @@
+{
+  "AuthServer": {
+    "Authority": "https://localhost:44305",
+    "ClientId": "MyProjectName_Blazor",
+    "ResponseType": "code"
+  },
+  "RemoteServices": {
+    "Default": {
+      "BaseUrl": "https://localhost:44305"
+    } 
+  } 
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/favicon.ico b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/favicon.ico
new file mode 100644
index 0000000000..a3a799985c
Binary files /dev/null and b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/favicon.ico differ
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html
new file mode 100644
index 0000000000..99ab025095
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>MyCompanyName.MyProjectName.Blazor</title>
+    <base href="/" />
+
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.0/css/all.css">
+
+    <link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
+    <link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
+    <link href="_content/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/theme.css" rel="stylesheet" />
+    <link href="main.css" rel="stylesheet" />
+</head>
+
+<body>
+    <app>Loading...</app>
+
+    <div id="blazor-error-ui">
+        An unhandled error has occurred.
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+    <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
+    <script src="_framework/blazor.webassembly.js"></script>
+
+    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+
+    <script src="_content/Blazorise/blazorise.js"></script>
+    <script src="_content/Blazorise.Bootstrap/blazorise.bootstrap.js"></script>
+    <script src="_content/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/theme.js"></script>
+</body>
+
+</html>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.css
new file mode 100644
index 0000000000..23e0f7a249
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.css
@@ -0,0 +1,18 @@
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+#blazor-error-ui .dismiss {
+    cursor: pointer;
+    position: absolute;
+    right: 0.75rem;
+    top: 0.5rem;
+}
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj
index 3d8faa57d9..d32a16f9d2 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs
index 9db16e69b4..85ea0e1111 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs
@@ -22,8 +22,8 @@ namespace MyCompanyName.MyProjectName.DbMigrator
                 .MinimumLevel.Override("MyCompanyName.MyProjectName", LogEventLevel.Information)
 #endif
                 .Enrich.FromLogContext()
-                .WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt"))
-                .WriteTo.Console()
+                .WriteTo.Async(c => c.File("Logs/logs.txt"))
+                .WriteTo.Async(c => c.Console())
                 .CreateLogger();
 
             await CreateHostBuilder(args).RunConsoleAsync();
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
index 17ce15c462..0accabeaaa 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
@@ -13,6 +13,10 @@
         "ClientId": "MyProjectName_App",
         "ClientSecret": "1q2w3e*",
         "RootUrl": "http://localhost:4200"
+      },
+      "MyProjectName_Blazor": {
+        "ClientId": "MyProjectName_Blazor",
+        "RootUrl": "https://localhost:44307"
       }
     }
   }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
index 932518ba86..fe86ebe33b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
@@ -47,27 +47,25 @@ namespace MyCompanyName.MyProjectName.Data
             var migratedDatabaseSchemas = new HashSet<string>();
             foreach (var tenant in tenants)
             {
-                if (!tenant.ConnectionStrings.Any())
+                if (tenant.ConnectionStrings.Any())
                 {
-                    continue;
-                }
-
-                using (_currentTenant.Change(tenant.Id))
-                {
-                    var tenantConnectionStrings = tenant.ConnectionStrings
-                        .Select(x => x.Value)
-                        .ToList();
-
-                    if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings))
+                    using (_currentTenant.Change(tenant.Id))
                     {
-                        await MigrateDatabaseSchemaAsync(tenant);
+                        var tenantConnectionStrings = tenant.ConnectionStrings
+                            .Select(x => x.Value)
+                            .ToList();
 
-                        migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings);
-                    }
+                        if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings))
+                        {
+                            await MigrateDatabaseSchemaAsync(tenant);
 
-                    await SeedDataAsync(tenant);
+                            migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings);
+                        }
+                    }
                 }
 
+                await SeedDataAsync(tenant);
+
                 Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations.");
             }
 
@@ -92,4 +90,4 @@ namespace MyCompanyName.MyProjectName.Data
             await _dataSeeder.SeedAsync(tenant?.Id);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
index 805bc0e424..dcd105a4e9 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
@@ -142,13 +142,30 @@ namespace MyCompanyName.MyProjectName.IdentityServer
                     postLogoutRedirectUri: webClientRootUrl
                 );
             }
+
+            // Blazor Client
+            var blazorClientId = configurationSection["MyProjectName_Blazor:ClientId"];
+            if (!blazorClientId.IsNullOrWhiteSpace())
+            {
+                var blazorRootUrl = configurationSection["MyProjectName_Blazor:RootUrl"].TrimEnd('/');
+
+                await CreateClientAsync(
+                    name: blazorClientId,
+                    scopes: commonScopes,
+                    grantTypes: new[] { "authorization_code" },
+                    secret: configurationSection["MyProjectName_Blazor:ClientSecret"]?.Sha256(),
+                    requireClientSecret: false,
+                    redirectUri: $"{blazorRootUrl}/authentication/login-callback",
+                    postLogoutRedirectUri: $"{blazorRootUrl}/authentication/logout-callback"
+                );
+            }
         }
 
         private async Task<Client> CreateClientAsync(
             string name,
             IEnumerable<string> scopes,
             IEnumerable<string> grantTypes,
-            string secret,
+            string secret = null,
             string redirectUri = null,
             string postLogoutRedirectUri = null,
             string frontChannelLogoutUri = null,
@@ -199,9 +216,12 @@ namespace MyCompanyName.MyProjectName.IdentityServer
                 }
             }
 
-            if (client.FindSecret(secret) == null)
+            if (!secret.IsNullOrEmpty())
             {
-                client.AddSecret(secret);
+                if (client.FindSecret(secret) == null)
+                {
+                    client.AddSecret(secret);
+                }
             }
 
             if (redirectUri != null)
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
index e497fa9a69..8510978cb0 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
index b9a7094c54..c8dc3d4740 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
@@ -19,6 +19,9 @@ namespace MyCompanyName.MyProjectName
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
index 45b4e0517b..4621ec6fdc 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
index 1cd8ea1c0b..25d1598438 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -12,7 +11,6 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs
index b9a7094c54..c8dc3d4740 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs
@@ -19,6 +19,9 @@ namespace MyCompanyName.MyProjectName
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json
index 2ac6a310cc..d71ef4ef79 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json
@@ -1,7 +1,7 @@
 {
   "App": {
     "SelfUrl": "https://localhost:44305",
-    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
+    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307"
   },
   "ConnectionStrings": {
     "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
index 0216c44b06..aa8511a4d3 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock
index 8d80e8eb3e..30f258f8db 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
index a21593b5d3..396e7c455b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
@@ -33,7 +33,6 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs
index 3264de7167..a159ca7aed 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs
@@ -19,6 +19,9 @@ namespace MyCompanyName.MyProjectName
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
index 390efeb07d..887908f3db 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
@@ -1,7 +1,7 @@
 {
   "App": {
     "SelfUrl": "https://localhost:44301",
-    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
+    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307"
   },
   "ConnectionStrings": {
     "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true"
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json
index c2703b4d59..526fb222ef 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
index c04f0b3aee..2e73b4cb6f 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs
new file mode 100644
index 0000000000..395ff28b39
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using MongoDB.Driver;
+using MyCompanyName.MyProjectName.Data;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MongoDB;
+
+namespace MyCompanyName.MyProjectName.MongoDB
+{
+    public class MongoDbMyProjectNameDbSchemaMigrator : IMyProjectNameDbSchemaMigrator , ITransientDependency
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public MongoDbMyProjectNameDbSchemaMigrator(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public Task MigrateAsync()
+        {
+            var dbContexts = _serviceProvider.GetServices<IAbpMongoDbContext>();
+            var connectionStringResolver = _serviceProvider.GetService<IConnectionStringResolver>();
+
+            foreach (var dbContext in dbContexts)
+            {
+                var connectionString =
+                    connectionStringResolver.Resolve(
+                        ConnectionStringNameAttribute.GetConnStringName(dbContext.GetType()));
+                var mongoUrl = new MongoUrl(connectionString);
+                var databaseName = mongoUrl.DatabaseName;
+                var client = new MongoClient(mongoUrl);
+
+                if (databaseName.IsNullOrWhiteSpace())
+                {
+                    databaseName = ConnectionStringNameAttribute.GetConnStringName(dbContext.GetType());
+                }
+
+                (dbContext as AbpMongoDbContext)?.InitializeCollections(client.GetDatabase(databaseName));
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
index 777288a513..31ad54d1d2 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
@@ -17,10 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
   </ItemGroup>
 
@@ -28,7 +26,7 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.Client\Volo.Abp.AspNetCore.Mvc.Client.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OAuth\Volo.Abp.AspNetCore.Authentication.OAuth.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.Web\Volo.Abp.Http.Client.IdentityModel.Web.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
index 699db2cec0..7939bf80d0 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
@@ -1,12 +1,16 @@
 using System;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication.OAuth.Claims;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -16,6 +20,8 @@ using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.OAuth;
+using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
+using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc.Client;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI;
@@ -44,7 +50,7 @@ namespace MyCompanyName.MyProjectName.Web
     [DependsOn(
         typeof(MyProjectNameHttpApiModule),
         typeof(MyProjectNameHttpApiClientModule),
-        typeof(AbpAspNetCoreAuthenticationOAuthModule),
+        typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),
         typeof(AbpAspNetCoreMvcClientModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule),
         typeof(AbpAutofacModule),
@@ -121,7 +127,7 @@ namespace MyCompanyName.MyProjectName.Web
                 {
                     options.ExpireTimeSpan = TimeSpan.FromDays(365);
                 })
-                .AddOpenIdConnect("oidc", options =>
+                .AddAbpOpenIdConnect("oidc", options =>
                 {
                     options.Authority = configuration["AuthServer:Authority"];
                     options.RequireHttpsMetadata = true;
@@ -137,8 +143,6 @@ namespace MyCompanyName.MyProjectName.Web
                     options.Scope.Add("email");
                     options.Scope.Add("phone");
                     options.Scope.Add("MyProjectName");
-
-                    options.ClaimActions.MapAbpClaimTypes();
                 });
         }
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
index b57311cc96..75f75a25b6 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
@@ -20,6 +20,9 @@ namespace MyCompanyName.MyProjectName.Web
                 .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
index 0216c44b06..aa8511a4d3 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock
index c04f0b3aee..2e73b4cb6f 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
index 961e8e33d4..fc974286f5 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
@@ -33,7 +33,6 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs
index b57311cc96..75f75a25b6 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs
@@ -20,6 +20,9 @@ namespace MyCompanyName.MyProjectName.Web
                 .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json
index 0216c44b06..aa8511a4d3 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock
index 8d80e8eb3e..30f258f8db 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs
index 44783b67e4..30687dd407 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace MyCompanyName.MyProjectName.MongoDB
 {
@@ -12,7 +13,7 @@ namespace MyCompanyName.MyProjectName.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MyProjectNameMongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MyProjectNameMongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
                                    Guid.NewGuid().ToString("N");
 
@@ -20,6 +21,11 @@ namespace MyCompanyName.MyProjectName.MongoDB
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
 }
diff --git a/templates/console/src/MyCompanyName.MyProjectName/Program.cs b/templates/console/src/MyCompanyName.MyProjectName/Program.cs
index 2e913e7d4b..3bab7d9933 100644
--- a/templates/console/src/MyCompanyName.MyProjectName/Program.cs
+++ b/templates/console/src/MyCompanyName.MyProjectName/Program.cs
@@ -21,7 +21,7 @@ namespace MyCompanyName.MyProjectName
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
-                .WriteTo.Console()
+                .WriteTo.Async(c => c.Console())
                 .CreateLogger();
 
             try
diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json
index a1cbee7789..7c53d9819b 100644
--- a/templates/module/angular/package.json
+++ b/templates/module/angular/package.json
@@ -15,11 +15,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.1.1",
-    "@abp/ng.identity": "~3.1.1",
-    "@abp/ng.setting-management": "~3.1.1",
-    "@abp/ng.tenant-management": "~3.1.1",
-    "@abp/ng.theme.basic": "~3.1.1",
+    "@abp/ng.account": "~3.1.2",
+    "@abp/ng.identity": "~3.1.2",
+    "@abp/ng.setting-management": "~3.1.2",
+    "@abp/ng.tenant-management": "~3.1.2",
+    "@abp/ng.theme.basic": "~3.1.2",
     "@angular/animations": "~10.0.0",
     "@angular/common": "~10.0.0",
     "@angular/compiler": "~10.0.0",
@@ -33,7 +33,7 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~3.1.1",
+    "@abp/ng.schematics": "~3.1.2",
     "@angular-devkit/build-angular": "~0.1000.0",
     "@angular-devkit/build-ng-packagr": "~0.1000.0",
     "@angular/cli": "~10.0.0",
diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json
index f735683fa6..02e0d9ba39 100644
--- a/templates/module/angular/projects/my-project-name/package.json
+++ b/templates/module/angular/projects/my-project-name/package.json
@@ -4,8 +4,8 @@
   "peerDependencies": {
     "@angular/common": "^9.1.11",
     "@angular/core": "^9.1.11",
-    "@abp/ng.core": ">=3.1.1",
-    "@abp/ng.theme.shared": ">=3.1.1"
+    "@abp/ng.core": ">=3.1.2",
+    "@abp/ng.theme.shared": ">=3.1.2"
   },
   "dependencies": {
     "tslib": "^2.0.0"
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
index 8e5e31fcc6..77f607aea8 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
     <PackageReference Include="IdentityModel" Version="4.3.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
index 31537b2398..80441853d0 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
@@ -19,7 +19,10 @@ namespace MyCompanyName.MyProjectName
 #endif
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
-                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
index a344b1c9eb..afceed0461 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs
index 31537b2398..80441853d0 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs
@@ -19,7 +19,10 @@ namespace MyCompanyName.MyProjectName
 #endif
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
-                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json
index c2703b4d59..526fb222ef 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
index c04f0b3aee..2e73b4cb6f 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
index 06e5b092e5..d517f927a1 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
@@ -11,15 +11,14 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.Client\Volo.Abp.AspNetCore.Mvc.Client.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OAuth\Volo.Abp.AspNetCore.Authentication.OAuth.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.Web\Volo.Abp.Http.Client.IdentityModel.Web.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Web\Volo.Abp.Identity.Web.csproj" />
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
index 74d1ab1be9..be3b55d793 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
@@ -4,10 +4,13 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
 using System.IO;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -15,6 +18,8 @@ using MyCompanyName.MyProjectName.Web;
 using StackExchange.Redis;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.OAuth;
+using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
+using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc.Client;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI;
@@ -47,7 +52,7 @@ namespace MyCompanyName.MyProjectName
     [DependsOn(
         typeof(MyProjectNameWebModule),
         typeof(MyProjectNameHttpApiClientModule),
-        typeof(AbpAspNetCoreAuthenticationOAuthModule),
+        typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),
         typeof(AbpAspNetCoreMvcClientModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule),
         typeof(AbpAutofacModule),
@@ -136,7 +141,7 @@ namespace MyCompanyName.MyProjectName
                 {
                     options.ExpireTimeSpan = TimeSpan.FromDays(365);
                 })
-                .AddOpenIdConnect("oidc", options =>
+                .AddAbpOpenIdConnect("oidc", options =>
                 {
                     options.Authority = configuration["AuthServer:Authority"];
                     options.RequireHttpsMetadata = false;
@@ -152,9 +157,6 @@ namespace MyCompanyName.MyProjectName
                     options.Scope.Add("email");
                     options.Scope.Add("phone");
                     options.Scope.Add("MyProjectName");
-
-                    options.ClaimActions.MapJsonKey(AbpClaimTypes.UserName, "name");
-                    options.ClaimActions.DeleteClaim("name");
                 });
         }
 
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs
index 31537b2398..80441853d0 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs
@@ -19,7 +19,10 @@ namespace MyCompanyName.MyProjectName
 #endif
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
-                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json
index 0216c44b06..aa8511a4d3 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
index c04f0b3aee..2e73b4cb6f 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj
index 75581e4e16..0ef9f485fb 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs
index e196a31cb4..d2561fbf4d 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs
@@ -15,7 +15,10 @@ namespace MyCompanyName.MyProjectName
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
-                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Async(c => c.File("Logs/logs.txt"))
+#if DEBUG
+                .WriteTo.Async(c => c.Console())
+#endif
                 .CreateLogger();
 
             try
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json
index 0216c44b06..aa8511a4d3 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.2"
   }
 }
\ No newline at end of file
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
index 362d519a4a..7473b4ed5f 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.1.tgz#3b18bfe7f5cb982d8a16c748a809dc27403ba7ee"
-  integrity sha512-aO5PNzTviqy9lu7n2kJ3+UuZZVsLWwkyFeytJ9Hvugx2w10CKjuq2XSXwg3LxlcRhPk6VlTkTciULgC4dwYksw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.1.tgz#e69f9d11b69d221c729567347ddb727512a83ed0"
-  integrity sha512-tfrj7ZKnMFXE44VWycYajKTclB+dh2CXp1CvyHdEMcxFkvx9MgMZ/M3++6YUbwYGELM+P20e2nvqLI0iI3uwww==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.1"
-    "@abp/bootstrap" "~3.1.1"
-    "@abp/bootstrap-datepicker" "~3.1.1"
-    "@abp/datatables.net-bs4" "~3.1.1"
-    "@abp/font-awesome" "~3.1.1"
-    "@abp/jquery-form" "~3.1.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.1"
-    "@abp/lodash" "~3.1.1"
-    "@abp/luxon" "~3.1.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.1"
-    "@abp/select2" "~3.1.1"
-    "@abp/sweetalert" "~3.1.1"
-    "@abp/timeago" "~3.1.1"
-    "@abp/toastr" "~3.1.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.1.tgz#3462dd49a2940d6e7fb3878cd0db299aa8b136b8"
-  integrity sha512-LaDQGAQjRqKQeroBWNKo3JgD+BRe+2l9gWMwgXlZ/tGdkPY3BkklUTy2Gvq0HXl7rAk+0GFbCJifoAGI2qZNlA==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.2.tgz#202b33837a470079c1bd44fbf4a645c071ad4a00"
+  integrity sha512-gvU9CJnEMBjNrRlpHGqlLK00xTdxcUe0z9ZRHucT9bPS3V4+Xe1c9cnpMM9oDpsMo5oha0suxTx695/G1t/jaA==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.2.tgz#88ea020b1d26f3e551ff81b96a848c700bed97ca"
+  integrity sha512-CjqinzcmES96dJ+IzEDSYO+uJE3Z3k3CZ5jGfgg97N0rYCTkt9LzYpuFHGeX4W+qI2qMurr5jstgsuLQY0cCzg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.2"
+    "@abp/bootstrap" "~3.1.2"
+    "@abp/bootstrap-datepicker" "~3.1.2"
+    "@abp/datatables.net-bs4" "~3.1.2"
+    "@abp/font-awesome" "~3.1.2"
+    "@abp/jquery-form" "~3.1.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.2"
+    "@abp/lodash" "~3.1.2"
+    "@abp/luxon" "~3.1.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.2"
+    "@abp/select2" "~3.1.2"
+    "@abp/sweetalert" "~3.1.2"
+    "@abp/timeago" "~3.1.2"
+    "@abp/toastr" "~3.1.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.2.tgz#4689ff7e4b722803f2133856f2fb39171bbfd752"
+  integrity sha512-jlBR+IgKuNGCerHbx6BEn2f1Xf9Vi9Dgge1/5VYzqu2MVk7dHRXHE7WYkZqpJuQKZtGMxF3c8ul2/u6uGlkmqw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.1.tgz#907324ef6ae075671347210272098b2109acbf75"
-  integrity sha512-ZH/Elh/+gNxziv4Q/tQs4rsEODCmjFgYs4QbADnN6/tLqZ4YBTMr/chqQEPlgHythxfkdiuvHX1kDWsjksQ5VQ==
+"@abp/bootstrap-datepicker@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.2.tgz#90ed84f4345bf8e47c0a05511fab9c63a5a3424c"
+  integrity sha512-sY9jXReDXCNzuSoNCiSkUD9cbdj9W/AR/glOsCb29zC7GX3XLEykuT42b8W6Kl6prS5NgfmXaX2pZOuyv0KBeQ==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.1.tgz#48775acff3fbf445217375333b300b303b42bc1b"
-  integrity sha512-GhutgKENrlr2t/nCFFvzTNJruTdzYqQ9fnLUyJG5Sq8dWSA8c5y/CIyxoe0nsIQLntSqc/BIBC0JeP/Q+q3QPQ==
+"@abp/bootstrap@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.2.tgz#d80e14d0cfa0b3213fafecf275520eddd9b846e2"
+  integrity sha512-neI766oMxwrwrsQc477koPXaT2/yy1mG4djGvnC+g2DgLeqxU7ye6dt6Lf/rKmQuZD9jtz28920wPN3N4N/HrQ==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.1.tgz#472051a7bdcf7c8f3bba2391ae4ec2f065b298ca"
-  integrity sha512-79u+Ccg8lD7Ob+8f4vGJORq7UtfY0VuYJX+l90hvVbZqG9r5t51uvs9jW4g1iBnQ09kHw9KpwBFPTQ73WT30vg==
+"@abp/core@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.2.tgz#1d204b2f6eb3c04e036a30b416ecf77d5ce51a47"
+  integrity sha512-Tb/E8VHTESFoioj0gO1PB5AxZB5aIZSgAS4/V5GFne4Z399DPwkX8+XJIIRtQVzlFySAdoA37Emml/7eHCvMMQ==
   dependencies:
-    "@abp/utils" "^3.1.1"
+    "@abp/utils" "^3.1.2"
 
-"@abp/datatables.net-bs4@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.1.tgz#235f6851d376c9c8208aaac202c24d90dd5b9ed6"
-  integrity sha512-h89GSMN9+HVaCs9Ef2JqQrN6oIUlZXShsRPN2R9R1LOYX6tx+EFue9sKjFvwPabKCcLyVrVxm3QpRXZs5ZBwZA==
+"@abp/datatables.net-bs4@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.2.tgz#23530f20d01776c34669c7d15df5ecd19beb6c95"
+  integrity sha512-dbJOTSkiyYHMW3Og9kQFqcSONNE+ElEHgfO/sfIT4Aj9hFpNHkGBTnaDTYXJ22ViFcSMWOTynvg6u+I3ZHe8qw==
   dependencies:
-    "@abp/datatables.net" "~3.1.1"
+    "@abp/datatables.net" "~3.1.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.1.tgz#91f548d659897f977e4be641dcce884b1c254189"
-  integrity sha512-u/MbxGlcRAtCFOTApWXUidMCgTculwXYLKTmGsn1hkB2eFhK55XXyunzx1o8avkvKdBwQQpM646ztY7NIxyegg==
+"@abp/datatables.net@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.2.tgz#34a0718bdac6802336484c4011067cf665cdd413"
+  integrity sha512-TJWp/+sMZIQqEy1F7Zb4/kSvrUQoC3AfG5qrSFIRmKyZMEsuUzTLugtfYWUi0BKEHdc454ErWrGuD1MCMIzEsQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.1.tgz#8c6331a0ddde80a3de36723bffd3b3d8de2ee317"
-  integrity sha512-mcI20id/13pqHrgHVlZcPKNYIfPQK68EXwxT/POHv+36sX6MtCQctu+J7WwDy+7j1CkPiIBzfaU87PQo0xzwNg==
+"@abp/font-awesome@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.2.tgz#1b14dc64cfe5f903bbcc25a4d2c88df54b561e87"
+  integrity sha512-33C0lAioBWcIs5wU+M7+SF06+Yvoq9BKVDjPx1R8TndphOfXU6IRneZvHDCLig76EY/BNcEYEREbv33Wqnie9Q==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.1.tgz#45f9b2a05065387921aace6dbd018cecf2aac943"
-  integrity sha512-T/4sHCT+TMX8oxcZqrdMco4maNXcxnT97BDmBKlcjo7+CXj+PHzturNqVWyhCFszHqJtGqNb1Gng1mSa6qLHnA==
+"@abp/jquery-form@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.2.tgz#8d516356e443e0ae8f1367ce3090e84a5afc2867"
+  integrity sha512-UCWZLnu7qETSeX69Wui0VtMpEiPrRv2+JsoJKsS3XcqXehNGJktMc5H5sNCDgPaQXzE5SY6hWnfLBj88014T6g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.1.tgz#6ba72c1dc57fd80f134df170f4e863f04471876d"
-  integrity sha512-9bgg1GEeqBlrFBmvPMKoYeB2PzH0ssznQ6z04kNC+sfWVqqJjB/biaX/4Pu0JP9BEfRAFiBbYHNCpF3/+S+ktQ==
+"@abp/jquery-validation-unobtrusive@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.2.tgz#64e6c2f287c21a4a569f4152936e84afa4a66c50"
+  integrity sha512-soZjLE2ygApecWs9DqKh7hRkf067esvLXSQOwUvw5WdeHOWccgAu/GxzAeFzwNA3CpfjFGoHqNNeSnETLLVEUQ==
   dependencies:
-    "@abp/jquery-validation" "~3.1.1"
+    "@abp/jquery-validation" "~3.1.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.1.tgz#a448cce8efc4a7afc5a9d119796ce80214109971"
-  integrity sha512-aZQjJoGJFEbMaDbgUP2Kf4x3q9ovTmPtiNv1paR9fd2DjQbo/QnqJO0fmSIJVVFYKkD+uauodU/M4BNTTHd7jw==
+"@abp/jquery-validation@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.2.tgz#a34fea85a67e2552d9ee278ecc22b5740bbcc5eb"
+  integrity sha512-RrzdY3nay9/OHpd58DyJ9oYnwr3++6gJoI135QMYz+otlJnUjrM6bFfqSeWQaetvbiCVy7nOVYVyqIFO7KgQUw==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.1.tgz#d5c2c1eecb6623f28574ca1b6ea83ee34f22471d"
-  integrity sha512-rglVUMxi2Wa+OYT5KBRwIs9P+QbLrLW0Lmr4T9iKCiHJXS9myo6/Y13EQxmlTdXWDLRc5f/nTHSB4BK8BsM9HA==
+"@abp/jquery@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.2.tgz#f890d872d2d0287e7c195801f8c51c88c64602a0"
+  integrity sha512-Pk3Ybx/S88rFThDUlziiKIq7uKwiu2J1xYuzJTlP+xc1IgIcJNkBONl07KFdoHvctOtFtdf4mVN7SGYmNePK4g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.1.tgz#6cbaa6caf060f0cf1a967b852c36a89ad4872601"
-  integrity sha512-sOyoBb3/Y35Id2HFJhjQnG6ARXnjpOhMyPtama3Ff0T4mdoQrefxnYlnqDVCBqFuykFsjmvZsSSKcMCrzKx+tQ==
+"@abp/lodash@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.2.tgz#07ab3001e463f1c452865ff98e051251322c7061"
+  integrity sha512-0XMWCKQJyPVpn22OVEYlQR7+zEn1yz4sTb5ilUFhLOSTHXEOJXNVzxEYlGYCPUjxGZFvZH+vdeurSjXdIOOB5w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.1.tgz#c7ff6613161818b6df0b179a376efa9838736eef"
-  integrity sha512-HCxwPh4STiyo0kIVGbr1HbRwq+qd7CpH+zV5/x61WnezPVXtF8GsT7T45wQAaDN9mq6xqaC1mgmaNQd8riYZig==
+"@abp/luxon@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.2.tgz#ed3adfd1e7e46939c2ac456d44d9987b0d923334"
+  integrity sha512-fZj3yIT1H+I6vcRxMONw9VRYLWfvzdzLeDZ1xlkXsC4NqI7cK6vchYNTqZlTg4zH6DNYNg6+WOoxQ8ao8a00QA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.1.tgz#b44213ae3551ab1639fe4f4e2c28146a3b5bbfc6"
-  integrity sha512-srQ1oC2xlC9pcd8FN2Muyzh4pdneEv8Fv1hutqRpdziY/c+pp4BE8bD+wpysOL7vRyw5JASba/GAASrW/sdq/A==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.2.tgz#3556912136a85289b0b237e5bb7368b08f5efac8"
+  integrity sha512-b0uU/PwNOQaAurEkEZ4e4103pGomeKduo3Rg0hsyN7eeUrTzNw2tq1AQlgGRxw2v1pzyOvzNd0v14jyERE947g==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.1.tgz#7cb30709c32f5922ee7ba9f1d8ee1739a0bee648"
-  integrity sha512-ABTp+t5brngekgwLe0C+wZ0Vj4ygB6K3AjamYdIIwO90VbbMRbwjfaxz1nqbWPSvQEwRbZl1DGWP9qdKVwPogA==
+"@abp/select2@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.2.tgz#05997301b2800249ed560c4d24c9bfcfee68f99a"
+  integrity sha512-PyIiCGkvRUEfSyVF4M7p4BzHgaUG7lysYPop0R1tGiJcEVSxkXvhCJnEODPYiqvVjdFFKVz8Ni1R+xpEIEL/2w==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.1.tgz#f5f8ab2e696065bf77ae9d0c1f40baaaa962ca0e"
-  integrity sha512-Jc280fyZ2QFlpJXHVD8Y7D9VtK+e9UCxhg31lO/+iPnJrJoVcd5p1oqy+qdMnR40k52vGOAHxEx8U2KBx5FeNw==
+"@abp/sweetalert@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.2.tgz#18b062b0d5c5d5c78b4f8d13186587ab87d46464"
+  integrity sha512-MJXLyrqPgxiy5NViyVvo6iasDoO3Jfdb3+4Jf+5PFlR7pZd1MmhmvNWn/rc5yFcCwOKvJkXVaWYaT9UsvZPxIA==
   dependencies:
-    "@abp/core" "~3.1.1"
+    "@abp/core" "~3.1.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.1.tgz#80d841bdc7a620b78d1d7efa5ebfce159556336f"
-  integrity sha512-48YbqFag7d7u39gcyv/Bm9LqgXp6uAJC4f6qFT6xeru5kfceEn8Wl8f9ARhj9uWmTYsXXaufgLBVhXqDgK95ig==
+"@abp/timeago@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.2.tgz#120cdd99a9dde1fbd1276571fdc5f415eee2941e"
+  integrity sha512-C3d1RLMEUBctPA/ASpqt9+gumsziYu0De7PWdmCmkPC7q23JpZaOmvWffaTpP2QoInyQXUPo51obOmEaC23InQ==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.1.tgz#36522615739c7f97b75b37e95453c2c28c3828d7"
-  integrity sha512-WhFoo0tc1G8Lu9h4dcqsZI4kRlhiD27U3qU0DuiNAFsDOOngW8xNv1KCxqEoeTdShTpb7ui+qiMwuNGM6SvS3w==
+"@abp/toastr@~3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.2.tgz#3f8838423559482b8791cd7ce5bb6ff3a8f3722a"
+  integrity sha512-Omb/7Mkv73hRunVfWbRJxlNoTC3cqKJACB+pAcB5rb+rCTiR3c9HaSf1C7ljlofpxY/AKMN+JfJZP9VmgH2e4g==
   dependencies:
-    "@abp/jquery" "~3.1.1"
+    "@abp/jquery" "~3.1.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.1.tgz#3b0d4d74fef14798712df7634c392fa46b193baf"
-  integrity sha512-DzSNkGN9Nxytno/KDUo4RwWqtMdW/RvtrcORRt8WgARFHB7HWLnJp1v5ikV3xtL+O7ZKt/fQQKQ+i+xsZ/BZDQ==
+"@abp/utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96"
+  integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
index f29c713c05..25db3dbaeb 100644
--- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace MyCompanyName.MyProjectName.MongoDB
 {
@@ -12,14 +13,19 @@ namespace MyCompanyName.MyProjectName.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/')  +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
         }
     }
-}
\ No newline at end of file
+}