Merge branch 'dev' into blazor-module-extensions

6 years ago · 400cbd5e48
258 changed files with 7354 additions and 2816 deletions
--- a/.github/workflows/auto-pr.yml
+++ b/.github/workflows/auto-pr.yml
@ -4,7 +4,7 @@ on:
    branches:
      - rel-4.2
 jobs:
-  merge-dev-with-rel:
+  merge-dev-with-rel-4-2:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
@ -12,8 +12,8 @@ jobs:
          ref: dev
      - name: Reset promotion branch
        run: |
-          git fetch origin $GITHUB_REF:$GITHUB_REF
-          git reset --hard $GITHUB_REF
+          git fetch origin rel-4.2:rel-4.2
+          git reset --hard rel-4.2
      - name: Create Pull Request
        uses: peter-evans/create-pull-request@v3
        with:
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json
@ -34,8 +34,8 @@
    "MyOrganizations": "My organizations",
    "EmailNotValid": "Please enter a valid email address.",
    "FeatureRequest": "Feature Request",
-    "CreateArticleTitleInfo": "Title of the article to be shown on the article list.",
-    "CreateArticleSummaryInfo": "A short summary of the article to be shown on the article list.",
+    "CreateArticleTitleInfo": "Title of the post to be shown on the post list.",
+    "CreateArticleSummaryInfo": "A short summary of the post to be shown on the post list.",
    "CreateArticleCoverInfo": "For creating an effective article, add a cover photo. Upload 16:9 aspect ratio pictures for the best view. Maximum file size: 1MB.",
    "ThisExtensionIsNotAllowed": "This extension is not allowed.",
    "TheFileIsTooLarge": "The file is too large.",
@ -100,17 +100,38 @@
    "ArticleRequestMessageTitle": "<a href=\"https://github.com/abpframework/abp/issues/new\">Open an issue</a> on the GitHub to request an article/tutorial you want to see on this web site.",
    "ArticleRequestMessageBody": "Here, the list of the requested articles by the community. Do you want to write a requested article? Please click to the request and join to the discussion.",
    "Language": "Language",
-    "CreateArticleLanguageInfo": "The language in which the article is written",
+    "CreateArticleLanguageInfo": "The language for the post content.",
    "VideoPost": "Video Post",
    "Article": "Article",
    "Read": "Read",
    "CreateGithubArticleUrlInfo": "Original GitHub URL of the article.",
-    "CreateVideoContentUrlInfo": "Original Youtube URL of the article.",
+    "CreateVideoContentUrlInfo": "Original Youtube URL of the post.",
    "CreateExternalArticleUrlInfo": "Original External Url of the article.",
-    "VideoContentForm": "Video Content Form",
-    "GithubPostForm": "Github Post Form",
-    "ExternalPostForm": "External Post Form",
-    "PostSourceTypeChooses": "We accept three source types for the posts;",
-    "Posts": "Posts"
+    "VideoContentForm": "Submit Video on YouTube",
+    "GithubPostForm": "Submit Article on GitHub",
+    "ExternalPostForm": "Submit an External Content",
+    "HowToPost": "How to Post?",
+    "Posts": "Posts",
+    "VideoUrl": "Video Url",
+    "GithubArticleUrl": "Github Article Url",
+    "ExternalArticleUrl": "External Article Url",
+    "CreatePostCoverInfo": "For creating an effective post, add a cover photo. Upload 16:9 aspect ratio pictures for the best view. Maximum file size: 1MB.",
+    "ThankYouForContribution": "Thank you for contributing to the ABP Community.",
+    "GithubArticle": "Github Article",
+    "GithubArticleSubmitStepOne": "<span class=\"font-weight-bold\">1.</span> Write an article on any public GitHub repository with the Markdown format. <a target=\"_blank\" href=\"https://github.com/abpframework/abp/blob/dev/docs/en/Community-Articles/2020-12-04-Event-Organizer/Post.md\">example</a>",
+    "GithubArticleSubmitStepTwo": "<span class=\"font-weight-bold\">2.</span> Submit your article URL using the form.",
+    "GithubArticleSubmitStepThree": "<span class=\"font-weight-bold\">3.</span> Your article will be rendered in this web site.",
+    "YoutubeVideo": "Youtube Video",
+    "YoutubeVideoSubmitStepOne": "<span class=\"font-weight-bold\">1.</span> Publish your video on YouTube.",
+    "YoutubeVideoSubmitStepTwo": "<span class=\"font-weight-bold\">2.</span> Submit the video URL using the form.",
+    "YoutubeVideoSubmitStepThree": "<span class=\"font-weight-bold\">3.</span> Visitors will be able to watch your video content directly on this website.",
+    "ExternalContent": "External Content",
+    "ExternalContentSubmitStepOne": "<span class=\"font-weight-bold\">1.</span> Create a content on any public platform (medium, your own blog or anywhere you like).",
+    "ExternalContentSubmitStepTwo": "<span class=\"font-weight-bold\">2.</span> Submit your content URL using the form.",
+    "ExternalContentSubmitStepThree": "<span class=\"font-weight-bold\">3.</span> Visitors are redirected to the content on the original website.",
+    "ChooseYourContentType": "Please choose the way you want to add your content.",
+    "PostContentViaGithub": "I want to add my article with <span class=\"font-weight-bold\"><i class=\"fa fa-github\"></i> GitHub</span> in accordance with the markdown rules.",
+    "PostContentViaYoutube": "I want to share my videos available on <span class=\"font-weight-bold\"><i class=\"fa fa-youtube\"></i> Youtube</span> here.",
+    "PostContentViaExternalSource": "I want to add the content I published on <span class=\"font-weight-bold\">another platform</span> here."
  }
 }
--- a/common.props
+++ b/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>4.2.0</Version>
+    <Version>4.3.0</Version>
    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
    <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
    <PackageProjectUrl>https://abp.io/</PackageProjectUrl>
--- a/docs/en/Blog-Posts/2021-01-14
+++ b/docs/en/Blog-Posts/2021-01-14
@ -0,0 +1,225 @@
+# ABP Framework 4.2 RC Has Been Published
+
+Today, we have released the [ABP Framework](https://abp.io/) and the [ABP Commercial](https://commercial.abp.io/) 4.2.0 RC (Release Candidate). This blog post introduces the new features and important changes in this new version.
+
+> **The planned release date for the [4.2.0 final](https://github.com/abpframework/abp/milestone/48) version is January 28, 2021**.
+
+## Get Started with the 4.2 RC
+
+If you want to try the version `4.2.0` today, follow the steps below;
+
+1) **Upgrade** the ABP CLI to the version `4.2.0-rc.1` using a command line terminal:
+
+````bash
+dotnet tool update Volo.Abp.Cli -g --version 4.2.0-rc.1
+````
+
+**or install** if you haven't installed before:
+
+````bash
+dotnet tool install Volo.Abp.Cli -g --version 4.2.0-rc.1
+````
+
+2) Create a **new application** with the `--preview` option:
+
+````bash
+abp new BookStore --preview
+````
+
+See the [ABP CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all the available options.
+
+> You can also use the *Direct Download* tab on the [Get Started](https://abp.io/get-started) page by selecting the **Preview checkbox**.
+
+## What's new with the ABP Framework 4.2
+
+## IRepository.GetQueryableAsync()
+
+> **This version comes with an important change about using `IQueryable` features over the [repositories](https://docs.abp.io/en/abp/4.2/Repositories). It is suggested to read this section carefully and apply in your applications.**
+
+`IRepository` interface inherits `IQueryable`, so you can directly use the standard LINQ extension methods, like `Where`, `OrderBy`, `First`, `Sum`... etc.
+
+**Example: Using LINQ directly over the repository object**
+
+````csharp
+public class BookAppService : ApplicationService, IBookAppService
+{
+    private readonly IRepository<Book, Guid> _bookRepository;
+
+    public BookAppService(IRepository<Book, Guid> bookRepository)
+    {
+        _bookRepository = bookRepository;
+    }
+
+    public async Task DoItInOldWayAsync()
+    {
+        //Apply any standard LINQ extension method
+        var query = _bookRepository
+            .Where(x => x.Price > 10)
+            .OrderBy(x => x.Name);
+
+        //Execute the query asynchronously
+        var books = await AsyncExecuter.ToListAsync(query);
+    }
+}
+````
+
+*See [the documentation](https://docs.abp.io/en/abp/4.2/Repositories#iqueryable-async-operations) if you wonder what is the `AsyncExecuter`.*
+
+Beginning from the version 4.2, the recommended way is using `IRepository.GetQueryableAsync()` to obtain an `IQueryable`, then use the LINQ extension methods over it.
+
+**Example: Using the new GetQueryableAsync method**
+
+````csharp
+public async Task DoItInNewWayAsync()
+{
+    //Use GetQueryableAsync to obtain the IQueryable<Book> first
+    var queryable = await _bookRepository.GetQueryableAsync();
+
+    //Then apply any standard LINQ extension method
+    var query = queryable
+        .Where(x => x.Price > 10)
+        .OrderBy(x => x.Name);
+
+    //Finally, execute the query asynchronously
+    var books = await AsyncExecuter.ToListAsync(query);
+}
+````
+
+ABP may start a database transaction when you get an `IQueryable` (If current [Unit Of Work](https://docs.abp.io/en/abp/latest/Unit-Of-Work) is transactional). In this new way, it is possible to **start the database transaction in an asynchronous way**. Previously, we could not get the advantage of asynchronous while starting the transactions.
+
+> **The new way has a significant performance and scalability gain. The old usage (directly using LINQ over the repositories) will be removed in the next major version.** You have a lot of time for the change, but we recommend to immediately take the action since the old usage has a big scalability problem.
+
+#### About IRepository Async Extension Methods
+
+Using IRepository Async Extension Methods has no such a problem. The examples below are pretty fine:
+
+````csharp
+var countAll = await _personRepository
+    .CountAsync();
+
+var count = await _personRepository
+    .CountAsync(x => x.Name.StartsWith("A"));
+
+var book1984 = await _bookRepository
+    .FirstOrDefaultAsync(x => x.Name == "John");   
+````
+
+See the [repository documentation](https://docs.abp.io/en/abp/4.2/Repositories#iqueryable-async-operations) to understand the relation between `IQueryable` and asynchronous operations.
+
+### Repository Bulk Operations
+
+This version adds the following methods to the repositories:
+
+* `InsertManyAsync`
+* `UpdateManyAsync`
+* `DeleteManyAsync`
+
+The purpose of these methods to insert, update or delete many entities in one call with a better performance.
+
+Currently, **MongoDB** provider implements these methods as a single bulk operation since MongoDB API natively supports. But current **Entity Framework Core** implementation is not a real bulk operation. Instead, it does its best with the native API of the EF Core. If you want to implement in a more performant way, you can [customize the bulk operations](https://docs.abp.io/en/abp/4.2/Entity-Framework-Core#customize-bulk-operations) with your own implementation or by using a library. We could find a good open source library for EF Core 5.0 to implement it.
+
+### Selecting DBMS on Template Creation
+
+[ABP CLI](https://docs.abp.io/en/abp/4.2/CLI#new) now has an option to specify the DBMS when you use EF Core as the database provider.
+
+**Example: Select MySQL as the DBMS**
+
+````bash
+abp new BookStore -dbms mysql --preview
+````
+
+Available options: `SqlServer` (default), `MySQL`, `SQLite`, `Oracle-Devart`, `PostgreSQL`. See the [documentation](https://docs.abp.io/en/abp/latest/Entity-Framework-Core-Other-DBMS) to use any other DBMS or switch the DBMS later.
+
+> If you select a DBMS other than the SQL Server, then the database migrations are also created when you first run the `DbMigrator` application.
+
+### Swagger Login
+
+TODO
+
+### Angular Unit Testing
+
+We've improved the modules and the startup template to setup and write unit tests easier with the Angular UI. See the [Angular Unit Testing document](https://docs.abp.io/en/abp/4.2/UI/Angular/Testing) for details.
+
+### Other News
+
+* Improved HTTP **request-response performance** by resolving dependencies in a deferred way in the action/page filters, interceptors and some other services.
+* Removed `MultipleActiveResultSets` from connection strings for new templates for SQL Server, since the new EF Core gives a warning when using it. If you want to use it, you need to change the connection string yourself.
+* Added `HardDeleteAsync` extension method that takes a predicate to delete multiple entities. This extension method is available if the entity [Soft Delete](https://docs.abp.io/en/abp/latest/Data-Filtering).
+* Implemented the [Page Alerts](https://docs.abp.io/en/abp/4.2/UI/Angular/Page-Alerts) for the **Angular UI**.
+* Implemented [Page Progress](https://docs.abp.io/en/abp/4.2/UI/Blazor/Page-Progress) for the **Blazor UI**. It automatically shows an undetermined progress bar on top of the page while performing an AJAX request. It also proves an API to you if you need to show/hide the progress bar in your code.
+
+## What's new with the ABP Commercial 4.2
+
+### Microservice Startup Template
+
+The new [Microservice Startup Template](https://docs.abp.io/en/commercial/4.2/startup-templates/microservice/index) is a generic solution to start a new microservice solution.
+
+While we accept that every microservice solution will be different and every system has its own design requirements and trade-offs, we believe such a startup solution is a very useful starting point for most of the solutions, and a useful example for others.
+
+![microservice-template-diagram](microservice-template-diagram.png)
+
+*Figure: A simplified overall diagram of the microservice solution.*
+
+You can [follow the documentation](https://docs.abp.io/en/commercial/4.2/startup-templates/microservice/index) to get started with this startup template. **This template should be considered as an early release**. We will improve it and write a lot of guides.
+
+If you want to use the ABP Suite to create your solution, then you need to first upgrade it:
+
+````bash
+abp suite update
+````
+
+If you want, you can directly create a new solution from the command line:
+
+````bash
+abp new Volosoft.MyMicroserviceSystem -t microservice-pro --preview
+````
+
+Company Name is optional. Solution name could be *MyMicroserviceSystem* for this example.
+
+### Public Website in the Startup Templates
+
+As mentioned in the previous release post, we've added a *Public Website* application to the startup templates. It is configured to authenticate through the IdentityServer with a single sign-on system.
+
+You can use this application to create a landing page for your actual application or a corporate website for your business. An example screenshot:
+
+![public-website](public-website.jpg)
+
+It uses the same *Lepton Theme*, so you can apply [all the styles](https://commercial.abp.io/themes). The Public Website has a different layout and also has a different setting for the styling (that can be configured in the *Settings / Lepton Theme* page of the main web application).
+
+> *Public Website* is optional and you need to select the "Public Website" option while creating a new solution using the ABP Suite, or use the `--with-public-website` option while using the `abp new` CLI command.
+
+### Easy CRM Blazor UI
+
+Easy CRM is an example application built with the ABP Commercial. MVC (Razor Pages) and Angular UI implementations were already provided. With the version 4.2, we are providing the Blazor UI implementation for this application.
+
+![easy-crm](easy-crm.png)
+
+### Other News
+
+* Implemented Iyzico as a payment gateway provider for the [payment module](https://commercial.abp.io/modules/Volo.Payment) in addition to Paypal, Stripe, 2Checkout and Payu providers.
+
+## ABP Community News
+
+### Sharing Video Contents
+
+[community.abp.io](https://community.abp.io/) is a place to share ABP related contents. It started with publishing articles. Now, it supports to publish video contents. [See this example](https://community.abp.io/articles/be-a-superhero-on-day-1-with-abp.io-wvifcy9s). All you need to do is to create a video and upload to YouTube. Then you can [submit](https://community.abp.io/articles/submit) the YouTube link to the ABP Community website.
+
+### Multi-language support
+
+We planned ABP Community to publish English-only contents. However, we see that people want to share contents in other languages too. Now, **it is possible to submit a content in any language**. Just select the Language option while submitting your content.
+
+**When you submit a non-English content, it is not visible to all the visitors by default**. Visitors can see a non-English content only if their browser language or the selected language matches to the content language (there is a language selection at the end of the website).
+
+### External Contents
+
+If you want to publish your content anywhere else, but want to post a link of your content, you can select *External Content* option while submitting the post. For example, [this article](https://community.abp.io/articles/aspnet-boilerplate-to-abp-framework-xml-to-json-localization-conversion-0mxyjrzj) is an external article and also written in Chinese language.
+
+## About the Next Release
+
+The next feature version will be 4.3.0. It is planned to release the 4.3 RC (Release Candidate) on March 11 and the final version on March 25, 2021.
+
+We decided to slow down the feature development for the [next milestone](https://github.com/abpframework/abp/milestone/49). We will continue to improve the existing features and introduce new ones, sure, but wanted to have more time for the planning, documentation, creating guides and improving the development experience.
+
+## Feedback
+
+Please check out the ABP Framework 4.2.0 RC and [provide feedback](https://github.com/abpframework/abp/issues/new) to help us to release a more stable version. **The planned release date for the [4.2.0 final](https://github.com/abpframework/abp/milestone/48) version is January 28, 2021**.
--- a/docs/en/Blog-Posts/2021-01-14
+++ b/docs/en/Blog-Posts/2021-01-14
--- a/v4_2_Preview/microservice-template-diagram.png
+++ b/v4_2_Preview/microservice-template-diagram.png
--- a/v4_2_Preview/public-website.jpg
+++ b/v4_2_Preview/public-website.jpg
--- a/docs/en/CSRF-Anti-Forgery.md
+++ b/docs/en/CSRF-Anti-Forgery.md
@ -144,4 +144,19 @@ Let's talk about why.

 First, take a look at [Angular's code](https://github.com/angular/angular/blob/master/packages/common/http/src/xsrf.ts#L81)

-It does not intercept any request that starts with `http://` or `https://`. There is a good reason for that. Any cross-site request does not need this token for security. This verification is only valid if the request is made to the same domain from which the web page is served. So, simply put, if you serve everything from a single domain, you just use a relative path.
+It does not intercept any request that starts with `http://` or `https://`. There is a good reason for that. Any cross-site request does not need this token for security. This verification is only valid if the request is made to the same domain from which the web page is served. So, simply put, if you serve everything from a single domain, you just use a relative path.
+
+If you serve your APIs from the root, i.e. no context root (https://testdomain.com/api/identity/users), leave `url` empty as follows: 
+
+```typescript
+export const environment = {
+  production: true,
+  // ....
+  apis: {
+    default: {
+      url: '', // <- should be empty string, not '/'
+     // ...
+    },
+  },
+} as Config.Environment;
+```
--- a/docs/en/UI/Angular/Authorization.md
+++ b/docs/en/UI/Angular/Authorization.md
@ -0,0 +1,28 @@
+# Authorization in Angular UI
+
+OAuth is preconfigured in Angular application templates. So, when you start a project using the CLI (or Suite, for that matter), authorization already works. You can find **OAuth configuration** in the _environment.ts_ files.
+
+```js
+import { Config } from '@abp/ng.core';
+
+const baseUrl = 'http://localhost:4200';
+
+export const environment = {
+  // other options removed for sake of brevity
+
+  oAuthConfig: {
+    issuer: 'https://localhost:44305',
+    redirectUri: baseUrl,
+    clientId: 'MyProjectName_App',
+    responseType: 'code',
+    scope: 'offline_access MyProjectName',
+  },
+
+  // other options removed for sake of brevity
+} as Config.Environment;
+
+```
+
+This configuration results in an [OAuth authorization code flow with PKCE](https://tools.ietf.org/html/rfc7636) and we are using [angular-oauth2-oidc library](https://github.com/manfredsteyer/angular-oauth2-oidc#logging-in) for managing OAuth in the Angular client.
+
+According to this flow, the user is redirected to an external login page which is built with MVC. So, if you need **to customize the login page**, please follow [this community article](https://community.abp.io/articles/how-to-customize-the-login-page-for-mvc-razor-page-applications-9a40f3cd).
--- a/docs/en/UI/Angular/Multi-Tenancy.md
+++ b/docs/en/UI/Angular/Multi-Tenancy.md
@ -1,4 +1,4 @@
-# Multi Tenancy in Angular UI
+# Multi-Tenancy in Angular UI

 ABP Angular UI supports the multi-tenancy. The following features related to multi-tenancy are available in the startup templates.

@ -8,7 +8,7 @@ ABP Angular UI supports the multi-tenancy. The following features related to mul

 On the page above, you can;

- See the all tenants.
+- See all tenants.
 - Create a new tenant.
 - Edit an existing tenant.
 - Delete a tenant.
@ -17,9 +17,11 @@ On the page above, you can;

 <p style="font-size:small;text-align:center;">Tenant Switching Component</p>

-You can switch between existing tenants by using the tenant switching component in the child pages of the `AccountLayoutComponent` (like Login page). Angular UI sends the selected tenant id to the backend as `__tenant` header on each request.
+You can switch between existing tenants by using the tenant switching box in the child pages of the MVC Account Public Module (like Login page). Angular UI gets selected tenant from `application-configuration` response and sends the tenant id to the backend as `__tenant` header on each request.

-## Domain Tenant Resolver
+## Domain/Subdomain Tenant Resolver
+
+> **Note:** If you are going to implement the steps below, you should also implement the domain/subdomain tenant resolver feature for the backend. See the [Domain/Subdomain Tenant Resolver section in Multi-Tenancy document](../../Multi-Tenancy#domain-subdomain-tenant-resolver) to learn the backend implementation.

 Angular UI can get the tenant name from the app running URL. You can determine the current tenant by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). To do this, you need to set the `application.baseUrl` property in the environment:

--- a/docs/en/UI/Angular/Page-Alerts.md
+++ b/docs/en/UI/Angular/Page-Alerts.md
@ -0,0 +1,64 @@
+# Page Alerts
+
+A page alert is useful for displaying an important message to the user. The ABP Framework provides an easy way to show the following alert to the user.
+
+![angular-page-alert-example](./images/page-alert-warning-example.png)
+
+You can simply import `PageAlertService` from `@abp/ng.theme.shared` and utilize it as follows:
+
+```typescript
+import { PageAlertService } from '@abp/ng.theme.shared';
+
+@Component({
+  // ...
+})
+export class MyComponent {
+  constructor(private service: PageAlertService) {}
+
+  showWarning() {
+    this.service.show({
+      type: 'warning',
+      message:
+        'We will have a service interruption between 02:00 AM and 04:00 AM at October 23, 2023!',
+      title: 'Service Interruption',
+    });
+  }
+}
+```
+
+## `SHOW`
+
+The method `show` accepts a single object that is type of `PageAlert`
+
+```typescript
+export interface PageAlert {
+  type: 'primary' | 'secondary' | 'success' | 'danger' | 'warning' | 'info' | 'light' | 'dark';
+  message: string;
+  title?: string;
+  dismissible?: boolean;
+  messageLocalizationParams?: string[];
+  titleLocalizationParams?: string[];
+}
+```
+
+* `type` (Required): Defines what type of alert will be shown
+* `message` (Required): The message who will be shown, also works with localization as well. 
+* `title` (Optional): The title of the message. If it is not provided, the title will be hidden.
+* `dismissible` (Optional): Default is `true`. If enabled, a button on the top right corner will be shown to the users so that they can dismiss the message.
+* `messageLocalizationParams` and `titleLocalizationParams` (Optional): If the message and/or the title is a key for localization service and contains some parameters, these fields could be used to pass those parameters. 
+
+### An example with Localization
+
+```typescript
+this.service.show({
+  type: 'danger',
+  message: 'AbpAccount::PagerInfo{0}{1}{2}',
+  messageLocalizationParams: ['10', '20', '30'],
+  title: 'AbpAccount::EntityNotFoundErrorMessage',
+  titleLocalizationParams: ['Test', 'id123'],
+});
+```
+
+![angular-page-alert-with-params-example](./images/page-alert-with-params-example.png)
+
+
--- a/docs/en/UI/Angular/images/page-alert-warning-example.png
+++ b/docs/en/UI/Angular/images/page-alert-warning-example.png
--- a/docs/en/UI/Angular/images/page-alert-with-params-example.png
+++ b/docs/en/UI/Angular/images/page-alert-with-params-example.png
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@ -681,6 +681,10 @@
                {
                  "text": "Page Alerts",
                  "path": "UI/Blazor/Page-Alerts.md"
+                },
+                {
+                  "text": "Page Progress",
+                  "path": "UI/Blazor/Page-Progress.md"
                }
              ]
            },
@ -754,6 +758,10 @@
                  "text": "Config State Service",
                  "path": "UI/Angular/Config-State-Service.md"
                },
+                {
+                  "text": "Authorization",
+                  "path": "UI/Angular/Authorization.md"
+                },
                {
                  "text": "HTTP Requests",
                  "path": "UI/Angular/HTTP-Requests.md"
@ -818,6 +826,10 @@
                {
                  "text": "Toast Overlay",
                  "path": "UI/Angular/Toaster-Service.md"
+                },
+                {
+                  "text": "Page Alerts",
+                  "path": "UI/Angular/Page-Alerts.md"
                }
              ]
            },
--- a/docs/zh-Hans/Domain-Driven-Design-Implementation-Guide.md
+++ b/docs/zh-Hans/Domain-Driven-Design-Implementation-Guide.md
@ -1767,7 +1767,7 @@ public async Task ChangeTitleAsync(Issue issue, string title)

 如前所述,领域驱动设计中的*业务逻辑*分为两部分(各层):领域逻辑和应用逻辑

-![domain-driven-design-domain-vs-application-logic](../../../abpframework.abp/docs/en/images/domain-driven-design-domain-vs-application-logic.png)
+![domain-driven-design-domain-vs-application-logic](images/domain-driven-design-domain-vs-application-logic.png)

 领域逻辑是系统的*核心领域规则*组成,而应用逻辑则满足特定的*用例*.

@ -1783,7 +1783,7 @@ public async Task ChangeTitleAsync(Issue issue, string title)
 * 一个**后台管理系统**,UI使用Angular,通过REST API请求数据.内部员工使用这个系统来维护数据(例如,编辑商品说明).
 * 一个**移动端应用程序**,它比公开的网站UI上更加简洁.它通过REST API或其它技术(例如,TCP sockets)请求数据.

-![domain-driven-design-multiple-applications](../../../abpframework.abp/docs/en/images/domain-driven-design-multiple-applications.png)
+![domain-driven-design-multiple-applications](images/domain-driven-design-multiple-applications.png)

 每个应用程序都有不同的**需求**,不同的**用例**(应用服务方法),不同的DTO,不同的**验证**和**授权**规则等.

--- a/docs/zh-Hans/Entity-Framework-Core-Other-DBMS.md
+++ b/docs/zh-Hans/Entity-Framework-Core-Other-DBMS.md
@ -62,22 +62,25 @@ MySQL连接字符串与SQL Server连接字符串不同. 所以检查你的解决

 通常需要更改 `.DbMigrator` 和 `.Web` 项目里面的 `appsettings.json` ,但它取决于你的解决方案结构.

-## 更改迁移DbContext
+## 更改迁移DbContext Factory

-MySQL DBMS与SQL Server有一些细微的差异. 某些模块数据库映射配置(尤其是字段长度)会导致MySQL出现问题. 例如某些[IdentityServer模块](Modules/IdentityServer.md)表就存在这样的问题,它提供了一个选项可以根据你的DBMS配置字段.
+启动模板包含***YourProjectName*MigrationsDbContextFactory**类，这是EF Core控制台命令所必须的类（比如[Add-Migration](https://docs.microsoft.com/en-us/ef/ef6/modeling/code-first/migrations/#generating--running-migrations)和[Update-Database](https://docs.microsoft.com/en-us/ef/ef6/modeling/code-first/migrations/#generating--running-migrations)），在切换到MySql数据库时，我们同时也需要修改`DbContextOptionsBuilder`

-启动模板包含*YourProjectName*MigrationsDbContext,它负责维护和迁移数据库架构. 此DbContext基本上调用依赖模块的扩展方法来配置其数据库表.
+在 *YourProjectName*MigrationsDbContextFactory 类中找到以下代码：

-打开 *YourProjectName*MigrationsDbContext 更改 `builder.ConfigureIdentityServer();` 行,如下所示:
+````csharp
+var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+    .UseSqlServer(configuration.GetConnectionString("Default"));
+````
+
+将其替换为：

 ````csharp
-builder.ConfigureIdentityServer(options =>
-{
-    options.DatabaseProvider = EfCoreDatabaseProvider.MySql;
-});
+var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+    .UseMySql(configuration.GetConnectionString("Default"));
 ````

-然后 `ConfigureIdentityServer()` 方法会将字段长度设置为超过MySQL的限制. 如果在创建或执行数据库迁移时遇到任何问题请参考相关的模块文档.
+如果在创建或执行数据库迁移时遇到任何问题，请参考相关模块文档

 ## 重新生成迁移

@ -105,5 +108,6 @@ builder.ConfigureIdentityServer(options =>
    options.DatabaseProvider = EfCoreDatabaseProvider.MySql;
 });
 ```
+v2.9+版本无需手动设置 ([版本历史](https://github.com/abpframework/abp/blob/dev/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs))

-相关讨论: https://github.com/abpframework/abp/issues/1920
+相关讨论: https://github.com/abpframework/abp/issues/1920
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
@ -25,7 +25,12 @@ namespace Volo.Abp.AspNetCore.MultiTenancy

        protected override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
        {
-            var hostName = httpContext.Request.Host.Host.RemovePreFix(ProtocolPrefixes);
+            if (!httpContext.Request.Host.HasValue)
+            {
+                return Task.FromResult<string>(null);
+            }
+
+            var hostName = httpContext.Request.Host.Value.RemovePreFix(ProtocolPrefixes);
            var extractResult = FormattedStringValueExtracter.Extract(hostName, _domainFormat, ignoreCase: true);

            context.Handled = true;
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/nl.json
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Localization/nl.json
@ -0,0 +1,10 @@
+{
+  "culture": "nl",
+  "texts": {
+    "Volo.Authorization:010001": "Autorisatie mislukt! De benodigde policy is niet aan u verleend.",
+    "Volo.Authorization:010002": "Autorisatie mislukt! De benodigde policy: '{PolicyName}' is niet aan u verleend.",
+    "Volo.Authorization:010003": "Autorisatie mislukt! De benodigde policy is niet aan de opgegeven resource: '{ResourceName}' verleend.",
+    "Volo.Authorization:010004": "Autorisatie mislukt! De benodigde requirement is niet aan de opgegeven resource: '{ResourceName}' verleend.",
+    "Volo.Authorization:010005": "Autorisatie mislukt! De benodigde requirements zijn niet aan de opgegeven resource: '{ResourceName}' verleend."
+  }
+}
--- a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/AbpBackgroundJobQuartzOptions.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/AbpBackgroundJobQuartzOptions.cs
@ -10,7 +10,7 @@ namespace Volo.Abp.BackgroundJobs.Quartz
        public int RetryCount { get; set; }

        public int RetryIntervalMillisecond { get; set; }
-        
+

        [NotNull]
        public Func<int, IJobExecutionContext, JobExecutionException,Task> RetryStrategy
@ -19,28 +19,28 @@ namespace Volo.Abp.BackgroundJobs.Quartz
            set => _retryStrategy = Check.NotNull(value, nameof(value));
        }
        private Func<int, IJobExecutionContext, JobExecutionException,Task> _retryStrategy;
-        
+
        public AbpBackgroundJobQuartzOptions()
        {
            RetryCount = 3;
            RetryIntervalMillisecond = 3000;
            _retryStrategy = DefaultRetryStrategy;
        }
-        
+
        private async Task DefaultRetryStrategy(int retryIndex, IJobExecutionContext executionContext, JobExecutionException exception)
        {
            exception.RefireImmediately = true;
-            
-            var retryCount = executionContext.JobDetail.JobDataMap.GetIntValue(QuartzBackgroundJobManager.JobDataPrefix+ nameof(RetryCount));
+
+            var retryCount = executionContext.JobDetail.JobDataMap.GetString(QuartzBackgroundJobManager.JobDataPrefix+ nameof(RetryCount)).To<int>();
            if (retryIndex > retryCount)
            {
                exception.RefireImmediately = false;
                exception.UnscheduleAllTriggers = true;
                return;
            }
-            
-            var retryInterval = executionContext.JobDetail.JobDataMap.GetIntValue(QuartzBackgroundJobManager.JobDataPrefix+ nameof(RetryIntervalMillisecond));
+
+            var retryInterval = executionContext.JobDetail.JobDataMap.GetString(QuartzBackgroundJobManager.JobDataPrefix+ nameof(RetryIntervalMillisecond)).To<int>();
            await Task.Delay(retryInterval);
        }
    }
-}
+}
--- a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs
@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using Quartz;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Json;

 namespace Volo.Abp.BackgroundJobs.Quartz
 {
@ -16,9 +17,12 @@ namespace Volo.Abp.BackgroundJobs.Quartz

        protected AbpBackgroundJobQuartzOptions Options { get; }

-        public QuartzBackgroundJobManager(IScheduler scheduler, IOptions<AbpBackgroundJobQuartzOptions> options)
+        protected IJsonSerializer JsonSerializer { get; }
+
+        public QuartzBackgroundJobManager(IScheduler scheduler, IOptions<AbpBackgroundJobQuartzOptions> options, IJsonSerializer jsonSerializer)
        {
            Scheduler = scheduler;
+            JsonSerializer = jsonSerializer;
            Options = options.Value;
        }

@ -33,10 +37,10 @@ namespace Volo.Abp.BackgroundJobs.Quartz
        {
            var jobDataMap = new JobDataMap
            {
-                {nameof(TArgs), args},
-                {JobDataPrefix+ nameof(Options.RetryCount), retryCount},
-                {JobDataPrefix+ nameof(Options.RetryIntervalMillisecond), retryIntervalMillisecond},
-                {JobDataPrefix+ RetryIndex, 0}
+                {nameof(TArgs), JsonSerializer.Serialize(args)},
+                {JobDataPrefix+ nameof(Options.RetryCount), retryCount.ToString()},
+                {JobDataPrefix+ nameof(Options.RetryIntervalMillisecond), retryIntervalMillisecond.ToString()},
+                {JobDataPrefix+ RetryIndex, "0"}
            };

            var jobDetail = JobBuilder.Create<QuartzJobExecutionAdapter<TArgs>>().RequestRecovery().SetJobData(jobDataMap).Build();
--- a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs
@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Quartz;
+using Volo.Abp.Json;

 namespace Volo.Abp.BackgroundJobs.Quartz
 {
@ -16,15 +17,18 @@ namespace Volo.Abp.BackgroundJobs.Quartz
        protected AbpBackgroundJobQuartzOptions BackgroundJobQuartzOptions { get; }
        protected IServiceScopeFactory ServiceScopeFactory { get; }
        protected IBackgroundJobExecuter JobExecuter { get; }
+        protected IJsonSerializer JsonSerializer { get; }

        public QuartzJobExecutionAdapter(
            IOptions<AbpBackgroundJobOptions> options,
            IOptions<AbpBackgroundJobQuartzOptions> backgroundJobQuartzOptions,
            IBackgroundJobExecuter jobExecuter,
-            IServiceScopeFactory serviceScopeFactory)
+            IServiceScopeFactory serviceScopeFactory,
+            IJsonSerializer jsonSerializer)
        {
            JobExecuter = jobExecuter;
            ServiceScopeFactory = serviceScopeFactory;
+            JsonSerializer = jsonSerializer;
            Options = options.Value;
            BackgroundJobQuartzOptions = backgroundJobQuartzOptions.Value;
            Logger = NullLogger<QuartzJobExecutionAdapter<TArgs>>.Instance;
@ -34,7 +38,7 @@ namespace Volo.Abp.BackgroundJobs.Quartz
        {
            using (var scope = ServiceScopeFactory.CreateScope())
            {
-                var args = (TArgs) context.JobDetail.JobDataMap.Get(nameof(TArgs));
+                var args =  JsonSerializer.Deserialize<TArgs>(context.JobDetail.JobDataMap.GetString(nameof(TArgs)));
                var jobType = Options.GetJob(typeof(TArgs)).JobType;
                var jobContext = new JobExecutionContext(scope.ServiceProvider, jobType, args);
                try
@ -44,16 +48,16 @@ namespace Volo.Abp.BackgroundJobs.Quartz
                catch (Exception exception)
                {
                    var jobExecutionException = new JobExecutionException(exception);
-                    
-                    var retryIndex = context.JobDetail.JobDataMap.GetIntValue(QuartzBackgroundJobManager.JobDataPrefix+ QuartzBackgroundJobManager.RetryIndex);
+
+                    var retryIndex = context.JobDetail.JobDataMap.GetString(QuartzBackgroundJobManager.JobDataPrefix+ QuartzBackgroundJobManager.RetryIndex).To<int>();
                    retryIndex++;
-                    context.JobDetail.JobDataMap.Put(QuartzBackgroundJobManager.JobDataPrefix+ QuartzBackgroundJobManager.RetryIndex, retryIndex);
-                    
+                    context.JobDetail.JobDataMap.Put(QuartzBackgroundJobManager.JobDataPrefix+ QuartzBackgroundJobManager.RetryIndex, retryIndex.ToString());
+
                    await BackgroundJobQuartzOptions.RetryStrategy.Invoke(retryIndex, context, jobExecutionException);
-                    
+
                    throw jobExecutionException;
                }
            }
        }
    }
-}
+}
--- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
@ -12,9 +12,9 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Blazorise" Version="0.9.3-preview4" />
-        <PackageReference Include="Blazorise.DataGrid" Version="0.9.3-preview4" />
-        <PackageReference Include="Blazorise.Snackbar" Version="0.9.3-preview4" />
+        <PackageReference Include="Blazorise" Version="0.9.3-preview6" />
+        <PackageReference Include="Blazorise.DataGrid" Version="0.9.3-preview6" />
+        <PackageReference Include="Blazorise.Snackbar" Version="0.9.3-preview6" />
    </ItemGroup>

 </Project>
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContextExtensions.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContextExtensions.cs
@ -16,5 +16,10 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building

            return file;
        }
+
+        public static FileEntry FindFile(this ProjectBuildContext context, string filePath)
+        {
+            return context.Files.FirstOrDefault(f => f.Name == filePath);
+        }
    }
-}
+}
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs
@ -7,8 +7,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
    public class RemoveProjectFromSolutionStep : ProjectBuildPipelineStep
    {
        private readonly string _projectName;
-        private readonly string _solutionFilePath;
-        private readonly string _projectFolderPath;
+        private string _solutionFilePath;
+        private string _projectFolderPath;

        private string ProjectNameWithQuotes => $"\"{_projectName}\"";

@ -18,12 +18,19 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
            string projectFolderPath = null)
        {
            _projectName = projectName;
-            _solutionFilePath = solutionFilePath ?? "/aspnet-core/MyCompanyName.MyProjectName.sln";
-            _projectFolderPath = projectFolderPath ?? ("/aspnet-core/src/" + projectName);
+            _solutionFilePath = solutionFilePath;
+            _projectFolderPath = projectFolderPath;
        }

        public override void Execute(ProjectBuildContext context)
        {
+            SetSolutionAndProjectPathsIfNull(context);
+
+            if (_solutionFilePath == null || _projectFolderPath == null)
+            {
+                return;
+            }
+
            new RemoveFolderStep(_projectFolderPath).Execute(context);
            var solutionFile = context.GetFile(_solutionFilePath);
            solutionFile.NormalizeLineEndings();
@ -75,5 +82,20 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps

            return null;
        }
+
+        private void SetSolutionAndProjectPathsIfNull(ProjectBuildContext context)
+        {
+
+            if (_solutionFilePath == null)
+            {
+                _solutionFilePath = context.FindFile("/aspnet-core/MyCompanyName.MyProjectName.sln")?.Name ??
+                                    context.FindFile("/MyCompanyName.MyProjectName.sln")?.Name;
+            }
+            if (_projectFolderPath == null)
+            {
+                _projectFolderPath = context.FindFile("/aspnet-core/src/" + _projectName.EnsureEndsWith('/'))?.Name ??
+                                     context.FindFile("/src/" + _projectName.EnsureEndsWith('/'))?.Name;
+            }
+        }
    }
 }
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs
@ -54,10 +54,12 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
                    if (_companyName != null)
                    {
                        RenameHelper.RenameAll(_entries, _companyNamePlaceHolder, _companyName);
+                        RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase(), _companyName.ToCamelCase());
                    }
                    else
                    {
                        RenameHelper.RenameAll(_entries, _companyNamePlaceHolder + "." + _projectNamePlaceHolder, _projectNamePlaceHolder);
+                        RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase() + "." + _projectNamePlaceHolder.ToCamelCase(), _projectNamePlaceHolder.ToCamelCase());
                    }
                }

--- 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
@ -1,5 +1,6 @@
 using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
 using Volo.Abp.Cli.ProjectBuilding.Templates.App;
+using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice;
 using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;

 namespace Volo.Abp.Cli.ProjectBuilding.Building
@ -25,6 +26,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
            pipeline.Steps.Add(new SolutionRenameStep());

            if (context.Template.Name == AppProTemplate.TemplateName ||
+                context.Template.Name == MicroserviceProTemplate.TemplateName ||
                context.Template.Name == ModuleProTemplate.TemplateName)
            {
                pipeline.Steps.Add(new LicenseCodeReplaceStep()); // todo: move to custom steps?
@ -37,7 +39,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
            }

            if ((context.BuildArgs.UiFramework == UiFramework.Mvc || context.BuildArgs.UiFramework == UiFramework.Blazor)
-                && context.BuildArgs.MobileApp == MobileApp.None)
+                && context.BuildArgs.MobileApp == MobileApp.None && context.Template.Name != MicroserviceProTemplate.TemplateName)
            {
                pipeline.Steps.Add(new RemoveRootFolderStep());
            }
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
@ -8,6 +8,7 @@ using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.Cli.ProjectBuilding.Templates.App;
 using Volo.Abp.Cli.ProjectBuilding.Templates.Console;
+using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice;
 using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
 using Volo.Abp.Cli.ProjectBuilding.Templates.Wpf;
 using Volo.Abp.DependencyInjection;
@ -49,6 +50,8 @@ namespace Volo.Abp.Cli.ProjectBuilding
                    return new AppTemplate();
                case AppProTemplate.TemplateName:
                    return new AppProTemplate();
+                case MicroserviceProTemplate.TemplateName:
+                    return new MicroserviceProTemplate();
                case ModuleTemplate.TemplateName:
                    return new ModuleTemplate();
                case ModuleProTemplate.TemplateName:
--- 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
@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using NuGet.Versioning;
 using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
@ -138,12 +139,13 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                steps.Add(new ChangePublicAuthPortStep());
            }

-            if (context.BuildArgs.DatabaseProvider != DatabaseProvider.NotSpecified || context.BuildArgs.DatabaseProvider != DatabaseProvider.EntityFrameworkCore)
+            if (context.BuildArgs.DatabaseProvider != DatabaseProvider.NotSpecified && context.BuildArgs.DatabaseProvider != DatabaseProvider.EntityFrameworkCore)
            {
                steps.Add(new RemoveEfCoreDependencyFromPublicStep());
            }

-            if (context.BuildArgs.ExtraProperties.ContainsKey("without-cms-kit"))
+            // We disabled cms-kit for v4.2 release.
+            if (true || context.BuildArgs.ExtraProperties.ContainsKey("without-cms-kit"))
            {
                steps.Add(new RemoveCmsKitStep());
            }
@ -277,7 +279,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App

        private static void RemoveMigrations(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
        {
-            steps.Add(new RemoveFolderStep("/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations"));
+            if (string.IsNullOrWhiteSpace(context.BuildArgs.Version) ||
+                SemanticVersion.Parse(context.BuildArgs.Version) > new SemanticVersion(4,1,99))
+            {
+                steps.Add(new RemoveFolderStep("/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations"));
+            }
        }

        private static void CleanupFolderHierarchy(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceProTemplate.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceProTemplate.cs
@ -0,0 +1,16 @@
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice
+{
+    public class MicroserviceProTemplate : MicroserviceTemplateBase
+    {
+        /// <summary>
+        /// "microservice-pro".
+        /// </summary>
+        public const string TemplateName = "microservice-pro";
+
+        public MicroserviceProTemplate()
+            : base(TemplateName)
+        {
+            DocumentUrl = null; // todo: set this
+        }
+    }
+}
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs
@ -0,0 +1,74 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice
+{
+    public abstract class MicroserviceTemplateBase : TemplateInfo
+    {
+        protected MicroserviceTemplateBase([NotNull] string name)
+            : base(name)
+        {
+        }
+
+        public override IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)
+        {
+            var steps = new List<ProjectBuildPipelineStep>();
+
+            DeleteUnrelatedProjects(context, steps);
+            RandomizeStringEncryption(context, steps);
+            UpdateNuGetConfig(context, steps);
+
+            return steps;
+        }
+
+        private static void DeleteUnrelatedProjects(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            switch (context.BuildArgs.UiFramework)
+            {
+                case UiFramework.None:
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.WebGateway"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor"));
+                    steps.Add(new RemoveFolderStep("/angular"));
+                    break;
+
+                case UiFramework.Angular:
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.WebGateway"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor"));
+                    break;
+
+
+                case UiFramework.Blazor:
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.WebGateway"));
+                    steps.Add(new RemoveFolderStep("/angular"));
+                    break;
+
+                case UiFramework.Mvc:
+                case UiFramework.NotSpecified:
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor"));
+                    steps.Add(new RemoveFolderStep("/angular"));
+                    break;
+            }
+
+            if (!context.BuildArgs.PublicWebSite)
+            {
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.PublicWeb"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.PublicWebGateway"));
+            }
+        }
+
+        private static void RandomizeStringEncryption(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            steps.Add(new RandomizeStringEncryptionStep());
+        }
+
+        private static void UpdateNuGetConfig(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            steps.Add(new UpdateNuGetConfigStep("/NuGet.Config"));
+        }
+    }
+}
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
@ -75,7 +75,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module

        private static void UpdateNuGetConfig(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
        {
-            steps.Add(new UpdateNuGetConfigStep("/NuGet.Config"));
+            steps.Add(new UpdateNuGetConfigStep("/aspnet-core/NuGet.Config"));
        }

        private void CleanupFolderHierarchy(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularModuleSourceCodeAdder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularModuleSourceCodeAdder.cs
@ -39,7 +39,7 @@ namespace Volo.Abp.Cli.ProjectModification
            }
            catch (Exception e)
            {
-                Logger.LogError("Unable to add angular source code: " + e.Message);
+                Logger.LogError("Unable to add angular source code: " + e.Message + Environment.NewLine + e.StackTrace);
            }
        }

@ -127,6 +127,11 @@ namespace Volo.Abp.Cli.ProjectModification
                        subFolderName = $"/{subFolderName}";
                    }

+                    if (compilerOptions["paths"][$"{projectPackageName}{subFolderName}"] != null)
+                    {
+                        continue;
+                    }
+
                    ((JObject) compilerOptions["paths"]).Add(
                        new JProperty($"{projectPackageName}{subFolderName}",
                            new JArray(new object[] {publicApi})
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
@ -115,7 +115,7 @@ namespace Volo.Abp.Cli.ProjectModification
                    await NugetPackageToLocalReferenceConverter.Convert(module, solutionFile);
                }

-                await AddAngularSourceCode(modulesFolderInSolution, solutionFile);
+                await AddAngularSourceCode(modulesFolderInSolution, solutionFile, module.Name, newTemplate || newProTemplate);
            }
            else
            {
@ -277,7 +277,7 @@ namespace Volo.Abp.Cli.ProjectModification
            }
        }

-        private async Task AddAngularSourceCode(string modulesFolderInSolution, string solutionFilePath)
+        private async Task AddAngularSourceCode(string modulesFolderInSolution, string solutionFilePath, string moduleName, bool newTemplate)
        {
            var angularPath = Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(solutionFilePath)), "angular");

@ -287,6 +287,11 @@ namespace Volo.Abp.Cli.ProjectModification
                return;
            }

+            if (newTemplate)
+            {
+                MoveAngularFolderInNewTemplate(modulesFolderInSolution, moduleName);
+            }
+
            await AngularModuleSourceCodeAdder.AddAsync(solutionFilePath, angularPath);
        }

@ -304,6 +309,30 @@ namespace Volo.Abp.Cli.ProjectModification
            }
        }

+        private static void MoveAngularFolderInNewTemplate(string modulesFolderInSolution, string moduleName)
+        {
+            var moduleAngularFolder = Path.Combine(modulesFolderInSolution, moduleName, "angular");
+
+            if (!Directory.Exists(moduleAngularFolder))
+            {
+                return;
+            }
+
+            var files = Directory.GetFiles(moduleAngularFolder);
+            var folders = Directory.GetDirectories(moduleAngularFolder);
+
+            Directory.CreateDirectory(Path.Combine(moduleAngularFolder, moduleName));
+
+            foreach (var file in files)
+            {
+                File.Move(file, Path.Combine(moduleAngularFolder, moduleName, Path.GetFileName(file)));
+            }
+            foreach (var folder in folders)
+            {
+                Directory.Move(folder, Path.Combine(moduleAngularFolder, moduleName, Path.GetFileName(folder)));
+            }
+        }
+
        private async Task DownloadSourceCodesToSolutionFolder(ModuleWithMastersInfo module,
            string modulesFolderInSolution, string version = null, bool newTemplate = false,
            bool newProTemplate = false)
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/nl.json
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/nl.json
@ -1,23 +1,25 @@
 {
  "culture": "nl",
  "texts": {
-    "DisplayName:Abp.Mailing.DefaultFromAddress": "Standard vanaf adres",
-    "DisplayName:Abp.Mailing.DefaultFromDisplayName": "Standaard vanaf weergave naam",
+    "DisplayName:Abp.Mailing.DefaultFromAddress": "Standaard vanaf adres",
+    "DisplayName:Abp.Mailing.DefaultFromDisplayName": "Standaard vanaf weergavenaam",
    "DisplayName:Abp.Mailing.Smtp.Host": "Host",
    "DisplayName:Abp.Mailing.Smtp.Port": "Poort",
-    "DisplayName:Abp.Mailing.Smtp.UserName": "Gebruiker naam",
-    "DisplayName:Abp.Mailing.Smtp.Password": "wachtwoord",
+    "DisplayName:Abp.Mailing.Smtp.UserName": "Gebruikersnaam",
+    "DisplayName:Abp.Mailing.Smtp.Password": "Wachtwoord",
    "DisplayName:Abp.Mailing.Smtp.Domain": "Domein",
    "DisplayName:Abp.Mailing.Smtp.EnableSsl": "SSL toestaan",
    "DisplayName:Abp.Mailing.Smtp.UseDefaultCredentials": "Gebruik standaard inloggegevens",
-    "Description:Abp.Mailing.DefaultFromAddress": "Standard vanaf adres",
-    "Description:Abp.Mailing.DefaultFromDisplayName": "Standaard vanaf weergave naam",
+    "Description:Abp.Mailing.DefaultFromAddress": "Standaard vanaf adres",
+    "Description:Abp.Mailing.DefaultFromDisplayName": "Standaard vanaf weergavenaam",
    "Description:Abp.Mailing.Smtp.Host": "De naam of het IP-adres van de host die wordt gebruikt voor SMTP-transacties.",
    "Description:Abp.Mailing.Smtp.Port": "De poort die wordt gebruikt voor SMTP-transacties.",
    "Description:Abp.Mailing.Smtp.UserName": "Gebruikersnaam gekoppeld aan de inloggegevens.",
    "Description:Abp.Mailing.Smtp.Password": "Het wachtwoord voor de gebruikersnaam die bij de inloggegevens hoort.",
    "Description:Abp.Mailing.Smtp.Domain": "Het domein of de computernaam die de inloggegevens verifieert.",
    "Description:Abp.Mailing.Smtp.EnableSsl": "Of de SmtpClient Secure Sockets Layer (SSL) gebruikt om de verbinding te versleutelen.",
-    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "Of de standaard inloggegevens worden verzonden met verzoeken."
+    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "Of de standaard inloggegevens worden verzonden met verzoeken.",
+    "TextTemplate:StandardEmailTemplates.Layout": "Standaard sjabloon voor e-mail lay-out",
+    "TextTemplate:StandardEmailTemplates.Message": "Eenvoudig berichtsjabloon voor e-mails"
  }
 }
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
@ -409,7 +409,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
        public virtual async Task<TEntity> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default)
        {
            return includeDetails
-                ? await (await WithDetailsAsync()).FirstOrDefaultAsync(e => e.Id.Equals(id), GetCancellationToken(cancellationToken))
+                ? await (await WithDetailsAsync()).OrderBy(e => e.Id).FirstOrDefaultAsync(e => e.Id.Equals(id), GetCancellationToken(cancellationToken))
                : await (await GetDbSetAsync()).FindAsync(new object[] {id}, GetCancellationToken(cancellationToken));
        }

--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
@ -39,7 +39,8 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
        [Obsolete("Use GetDbContextAsync method.")]
        public TDbContext GetDbContext()
        {
-            if (!UnitOfWork.DisableObsoleteDbContextCreationWarning.Value)
+            if (UnitOfWork.EnableObsoleteDbContextCreationWarning &&
+                !UnitOfWorkManager.DisableObsoleteDbContextCreationWarning.Value)
            {
                Logger.LogWarning(
                    "UnitOfWorkDbContextProvider.GetDbContext is deprecated. Use GetDbContextAsync instead! " +
--- a/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/nl.json
+++ b/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/nl.json
@ -4,7 +4,7 @@
    "InternalServerErrorMessage": "Er is een interne fout opgetreden tijdens uw verzoek!",
    "ValidationErrorMessage": "Uw verzoek is niet geldig!",
    "ValidationNarrativeErrorMessageTitle": "Tijdens de validatie zijn de volgende fouten gedetecteerd.",
-    "DefaultErrorMessage": "er is een fout opgetreden!",
+    "DefaultErrorMessage": "Er is een fout opgetreden!",
    "DefaultErrorMessageDetail": "Foutdetails niet verzonden door server.",
    "DefaultErrorMessage401": "U bent niet geverifieerd!",
    "DefaultErrorMessage401Detail": "U moet inloggen om deze bewerking uit te voeren.",
@ -18,6 +18,8 @@
    "401Message": "Ongeautoriseerd",
    "403Message": "Verboden",
    "404Message": "Pagina niet gevonden",
-    "500Message": "Interne Server Fout"
+    "500Message": "Interne Server Fout",
+    "403MessageDetail": "U bent niet bevoegd om deze handeling uit te voeren!",
+    "404MessageDetail": "Sorry, op dit adres is niks gevonden."
  }
-}
+}
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/nl.json
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/Localization/nl.json
@ -0,0 +1,8 @@
+{
+  "culture": "nl",
+  "texts": {
+    "Volo.Feature:010001": "Functie '{FeatureName}' is niet ingeschakeld",
+    "Volo.Feature:010002": "Vereiste functies zijn niet ingeschakeld. Al deze functies moeten zijn ingeschakeld: {FeatureNames}",
+    "Volo.Feature:010003": "Vereiste functies zijn niet ingeschakeld. Ten minste een van deze functies moet zijn ingeschakeld: {FeatureNames}"
+  }
+}
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/nl.json
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/nl.json
@ -0,0 +1,15 @@
+{
+  "culture": "nl",
+  "texts": {
+    "DisplayName:Abp.Ldap.ServerHost": "Serverhost",
+    "Description:Abp.Ldap.ServerHost": "Serverhost",
+    "DisplayName:Abp.Ldap.ServerPort": "Server poort",
+    "Description:Abp.Ldap.ServerPort": "Server poort",
+    "DisplayName:Abp.Ldap.BaseDc": "Basisdomein component",
+    "Description:Abp.Ldap.BaseDc": "Basisdomein component",
+    "DisplayName:Abp.Ldap.UserName": "Gebruikersnaam",
+    "Description:Abp.Ldap.UserName": "Gebruikersnaam",
+    "DisplayName:Abp.Ldap.Password": "Wachtwoord",
+    "Description:Abp.Ldap.Password": "Wachtwoord"
+  }
+}
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbBulkOperationProvider.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbBulkOperationProvider.cs
@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Entities;
-using Volo.Abp.Domain.Repositories.MongoDB;

-namespace Volo.Abp.MongoDB.Volo.Abp.Domain.Repositories.MongoDB
+namespace Volo.Abp.Domain.Repositories.MongoDB
 {
    public interface IMongoDbBulkOperationProvider
    {
--- 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
@ -16,7 +16,6 @@ using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Guids;
 using Volo.Abp.MongoDB;
-using Volo.Abp.MongoDB.Volo.Abp.Domain.Repositories.MongoDB;

 namespace Volo.Abp.Domain.Repositories.MongoDB
 {
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDbCoreRepositoryExtensions.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDbCoreRepositoryExtensions.cs
@ -22,7 +22,7 @@ namespace Volo.Abp.Domain.Repositories
            return repository.ToMongoDbRepository().GetDatabaseAsync();
        }

-        [Obsolete("Use GetCollection method.")]
+        [Obsolete("Use GetCollectionAsync method.")]
        public static IMongoCollection<TEntity> GetCollection<TEntity, TKey>(this IBasicRepository<TEntity, TKey> repository)
            where TEntity : class, IEntity<TKey>
        {
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs
@ -36,7 +36,8 @@ namespace Volo.Abp.Uow.MongoDB
        [Obsolete("Use CreateDbContextAsync")]
        public TMongoDbContext GetDbContext()
        {
-            if (!UnitOfWork.DisableObsoleteDbContextCreationWarning.Value)
+            if (UnitOfWork.EnableObsoleteDbContextCreationWarning &&
+                !UnitOfWorkManager.DisableObsoleteDbContextCreationWarning.Value)
            {
                Logger.LogWarning(
                    "UnitOfWorkDbContextProvider.GetDbContext is deprecated. Use GetDbContextAsync instead! " +
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfiguration.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfiguration.cs
@ -15,7 +15,7 @@ namespace Volo.Abp.MultiTenancy

        public TenantConfiguration()
        {
-            
+
        }

        public TenantConfiguration(Guid id, [NotNull] string name)
@ -28,4 +28,4 @@ namespace Volo.Abp.MultiTenancy
            ConnectionStrings = new ConnectionStrings();
        }
    }
-}
+}
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs
@ -1,13 +1,20 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
+using Volo.Abp.Security.Claims;
 using Volo.Abp.Security.Encryption;

 namespace Volo.Abp.Security
 {
    public class AbpSecurityModule : AbpModule
    {
+        public override void PostConfigureServices(ServiceConfigurationContext context)
+        {
+            AutoAddClaimsPrincipalContributors(context.Services);
+        }
+
        public override void ConfigureServices(ServiceConfigurationContext context)
        {
            var configuration = context.Services.GetConfiguration();
@ -41,5 +48,23 @@ namespace Volo.Abp.Security
                }
            });
        }
+
+        private static void AutoAddClaimsPrincipalContributors(IServiceCollection services)
+        {
+            var contributorTypes = new List<Type>();
+
+            services.OnRegistred(context =>
+            {
+                if (typeof(IAbpClaimsPrincipalContributor).IsAssignableFrom(context.ImplementationType))
+                {
+                    contributorTypes.Add(context.ImplementationType);
+                }
+            });
+
+            services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
+            {
+                options.Contributors.AddIfNotContains(contributorTypes);
+            });
+        }
    }
 }
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalContributorContext.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalContributorContext.cs
@ -0,0 +1,23 @@
+using System;
+using System.Security.Claims;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Security.Claims
+{
+    public class AbpClaimsPrincipalContributorContext
+    {
+        [NotNull]
+        public ClaimsPrincipal ClaimsPrincipal { get; }
+
+        [NotNull]
+        public IServiceProvider ServiceProvider { get; }
+
+        public AbpClaimsPrincipalContributorContext(
+            [NotNull] ClaimsPrincipal claimsIdentity,
+            [NotNull] IServiceProvider serviceProvider)
+        {
+            ClaimsPrincipal = claimsIdentity;
+            ServiceProvider = serviceProvider;
+        }
+    }
+}
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactory.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactory.cs
@ -0,0 +1,40 @@
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Security.Claims
+{
+    public class AbpClaimsPrincipalFactory : IAbpClaimsPrincipalFactory, ITransientDependency
+    {
+        protected IServiceScopeFactory ServiceScopeFactory { get; }
+        protected AbpClaimsPrincipalFactoryOptions Options { get; }
+
+        public AbpClaimsPrincipalFactory(
+            IServiceScopeFactory serviceScopeFactory,
+            IOptions<AbpClaimsPrincipalFactoryOptions> abpClaimOptions)
+        {
+            ServiceScopeFactory = serviceScopeFactory;
+            Options = abpClaimOptions.Value;
+        }
+
+        public virtual async Task<ClaimsPrincipal> CreateAsync()
+        {
+            using (var scope = ServiceScopeFactory.CreateScope())
+            {
+                var claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity());
+
+                var context = new AbpClaimsPrincipalContributorContext(claimsPrincipal, scope.ServiceProvider);
+
+                foreach (var contributorType in Options.Contributors)
+                {
+                    var contributor = (IAbpClaimsPrincipalContributor) scope.ServiceProvider.GetRequiredService(contributorType);
+                    await contributor.ContributeAsync(context);
+                }
+
+                return claimsPrincipal;
+            }
+        }
+    }
+}
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs
@ -0,0 +1,14 @@
+using Volo.Abp.Collections;
+
+namespace Volo.Abp.Security.Claims
+{
+    public class AbpClaimsPrincipalFactoryOptions
+    {
+        public ITypeList<IAbpClaimsPrincipalContributor> Contributors { get; }
+
+        public AbpClaimsPrincipalFactoryOptions()
+        {
+            Contributors = new TypeList<IAbpClaimsPrincipalContributor>();
+        }
+    }
+}
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ClaimsIdentityExtensions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ClaimsIdentityExtensions.cs
@ -2,7 +2,7 @@
 using System.Linq;
 using System.Security.Claims;

-namespace Volo.Abp.Identity
+namespace Volo.Abp.Security.Claims
 {
    public static class ClaimsIdentityExtensions
    {
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/IAbpClaimsPrincipalContributor.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/IAbpClaimsPrincipalContributor.cs
@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Security.Claims
+{
+    public interface IAbpClaimsPrincipalContributor
+    {
+        Task ContributeAsync(AbpClaimsPrincipalContributorContext context);
+    }
+}
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/IAbpClaimsPrincipalFactory.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/IAbpClaimsPrincipalFactory.cs
@ -0,0 +1,10 @@
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Security.Claims
+{
+    public interface IAbpClaimsPrincipalFactory
+    {
+        Task<ClaimsPrincipal> CreateAsync();
+    }
+}
--- a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Localization/nl.json
+++ b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Localization/nl.json
@ -0,0 +1,7 @@
+{
+  "culture": "nl",
+  "texts": {
+    "DisplayName:Abp.Timing.Timezone": "Tijdzone",
+    "Description:Abp.Timing.Timezone": "Tijdzone van applicatie"
+  }
+}
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json
@ -30,7 +30,7 @@
    "PagerPrevious": "Anterior",
    "PagerFirst": "Primero",
    "PagerLast": "Último",
-    "PagerInfo": "Mostrando de la _START a la _END_ de _TOTAL_ entradas",
+    "PagerInfo": "Mostrando de la _START_ a la _END_ de _TOTAL_ entradas",
    "PagerInfo{0}{1}{2}": "Mostrando de la {0} a la {1} de {2} entradas",
    "PagerInfoEmpty": "Mostrando de la 0 a la 0 de 0 entradas",
    "PagerInfoFiltered": "(filtrado desde _MAX_ entradas totales)",
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json
@ -4,9 +4,10 @@
    "Languages": "Talen",
    "AreYouSure": "Bent u zeker?",
    "Cancel": "Annuleren",
+    "Clear": "Wissen",
    "Yes": "Ja",
    "No": "Nee",
-    "Ok": "Ok",
+    "Ok": "Oké",
    "Close": "Sluiten",
    "Save": "Opslaan",
    "SavingWithThreeDot": "Opslaan...",
@ -34,6 +35,8 @@
    "PagerInfoEmpty": "Toont 0 tot 0 van 0 vermeldingen",
    "PagerInfoFiltered": "(gefilterd uit in totaal _MAX_ vermeldingen)",
    "NoDataAvailableInDatatable": "Geen gegevens beschikbaar",
+    "Total": "totaal",
+    "Selected": "geselecteed",
    "PagerShowMenuEntries": "Toon _MENU_-vermeldingen",
    "DatatableActionDropdownDefaultText": "Acties",
    "ChangePassword": "Verander wachtwoord",
@ -41,6 +44,9 @@
    "AreYouSureYouWantToCancelEditingWarningMessage": "U heeft nog niet-opgeslagen wijzigingen.",
    "GoHomePage": "Ga naar de homepage",
    "GoBack": "Ga terug",
-    "Search": "Zoeken"
+    "Search": "Zoeken",
+    "ItemWillBeDeletedMessageWithFormat": "{0} wordt verwijderd!",
+    "ItemWillBeDeletedMessage": "Dit item wordt verwijderd!",
+    "ManageYourAccount": "Beheer uw account"
  }
-}
+}
--- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs
+++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs
@ -11,8 +11,10 @@ namespace Volo.Abp.Uow
 {
    public class UnitOfWork : IUnitOfWork, ITransientDependency
    {
-        [Obsolete("This will be removed in next versions.")]
-        public static AsyncLocal<bool> DisableObsoleteDbContextCreationWarning { get; } = new AsyncLocal<bool>();
+        /// <summary>
+        /// Default: false.
+        /// </summary>
+        public static bool EnableObsoleteDbContextCreationWarning { get; } = false;

        public const string UnitOfWorkReservationName = "_AbpActionUnitOfWork";

--- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs
+++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs
@ -1,10 +1,15 @@
-using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Threading;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Uow
 {
    public class UnitOfWorkManager : IUnitOfWorkManager, ISingletonDependency
    {
+        [Obsolete("This will be removed in next versions.")]
+        public static AsyncLocal<bool> DisableObsoleteDbContextCreationWarning { get; } = new AsyncLocal<bool>();
+
        public IUnitOfWork Current => GetCurrentUnitOfWork();

        private readonly IServiceScopeFactory _serviceScopeFactory;
--- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
@ -38,7 +38,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy

                services.Configure<AbpTenantResolveOptions>(options =>
                {
-                    options.AddDomainTenantResolver("{0}.abp.io");
+                    options.AddDomainTenantResolver("{0}.abp.io:8080");
                });
            });
        }
@ -46,14 +46,14 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
        [Fact]
        public async Task Should_Use_Host_If_Tenant_Is_Not_Specified()
        {
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io");
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io:8080");
            result["TenantId"].ShouldBe("");
        }

        [Fact]
        public async Task Should_Use_Domain_If_Specified()
        {
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io:8080");
            result["TenantId"].ShouldBe(_testTenantId.ToString());
        }

@ -62,8 +62,8 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
        {
            Client.DefaultRequestHeaders.Add(_options.TenantKey, Guid.NewGuid().ToString());

-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io:8080");
            result["TenantId"].ShouldBe(_testTenantId.ToString());
        }
    }
-}
+}
--- 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": "^4.1.0",
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^4.2.0-rc.1",
    "highlight.js": "^9.13.1"
  },
  "devDependencies": {}
--- 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@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.1.0.tgz#40ef6d20a83a8e700179be7f3989c8d5135808d0"
-  integrity sha512-UdT3XCUMEKguB1w7qF4TO1ClayWn63oiP7wnOUmIg+O1EdKTHUBYfztle4Qb/aqtzjHoZBsOnMZH/KOyQKejDg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.1.0"
-    "@abp/bootstrap" "~4.1.0"
-    "@abp/bootstrap-datepicker" "~4.1.0"
-    "@abp/datatables.net-bs4" "~4.1.0"
-    "@abp/font-awesome" "~4.1.0"
-    "@abp/jquery-form" "~4.1.0"
-    "@abp/jquery-validation-unobtrusive" "~4.1.0"
-    "@abp/lodash" "~4.1.0"
-    "@abp/luxon" "~4.1.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.1.0"
-    "@abp/select2" "~4.1.0"
-    "@abp/sweetalert" "~4.1.0"
-    "@abp/timeago" "~4.1.0"
-    "@abp/toastr" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.1.0.tgz#c23ba554270a9534ac29a7e7ca8ab1ed0dc1cc7b"
-  integrity sha512-CaPVi8dKLD0/7zrsCdi3hA1alkUKVE3jVoUa2bl0mrBg30Xzu+IDAu6aIWFXOCnIX8YthejhA2Wtn4knbTOB4g==
+"@abp/aspnetcore.mvc.ui.theme.shared@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.0-rc.1.tgz#8b66c41ceb578b6187afa9cbba69fad36e6a7717"
+  integrity sha512-3rt9k6FYIZ5BmUOGLuixOIESNaJwskF+ySvufbI1Os8wyTeD/Q1HiYDIM1oJZ28qexAbKamdZuyKmWYmxqpqDQ==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~4.2.0-rc.1"
+    "@abp/bootstrap" "~4.2.0-rc.1"
+    "@abp/bootstrap-datepicker" "~4.2.0-rc.1"
+    "@abp/datatables.net-bs4" "~4.2.0-rc.1"
+    "@abp/font-awesome" "~4.2.0-rc.1"
+    "@abp/jquery-form" "~4.2.0-rc.1"
+    "@abp/jquery-validation-unobtrusive" "~4.2.0-rc.1"
+    "@abp/lodash" "~4.2.0-rc.1"
+    "@abp/luxon" "~4.2.0-rc.1"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.0-rc.1"
+    "@abp/select2" "~4.2.0-rc.1"
+    "@abp/sweetalert" "~4.2.0-rc.1"
+    "@abp/timeago" "~4.2.0-rc.1"
+    "@abp/toastr" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.0-rc.1.tgz#aae1153bf503cc5ce5443ce9f2efe5057af7314d"
+  integrity sha512-5EZlaHjdKYn6I+9kCXQWu/FjbNgyBSl2xW97nbF5Or3e9bUs+Ne6yLJMYypoLHzhcPUTzyemBozMf/VXX9oOhQ==
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -36,145 +36,145 @@
    micromatch "^4.0.2"
    path "^0.12.7"

-"@abp/bootstrap-datepicker@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.1.0.tgz#5c97fba78e56ba90820014a13e4c2d394d27332f"
-  integrity sha512-5XDW/Y2Gu1SgIm/tyRuo6vwcJdpFWIEnqDJ+0wjdOvWl3a+HnQTDya5g74mCmEBfYQgYDw8Wz8ovChOOzExh7Q==
+"@abp/bootstrap-datepicker@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.0-rc.1.tgz#1f49d714743453a83b76410e0f2b6ddc21378146"
+  integrity sha512-1zk19yIUgvy1aO9LnZ0qdLH/8f43qIGSwT5FYPc9Q9p/f3MquLEUq1i/A/BUVYqK9LJHJZFuZv0+XMopG7YJ2g==
  dependencies:
    bootstrap-datepicker "^1.9.0"

-"@abp/bootstrap@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.1.0.tgz#50ac670e319a60a985109e96302eed3e46d36afe"
-  integrity sha512-4lFrbaNPYRa45oH/D+fFUSmgD/OdSoCmHXvSdG2ye6+wyl6gy4JRfjjTOFmwpsyOWJdPMJSV6CARCSSsfeaItA==
+"@abp/bootstrap@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.0-rc.1.tgz#dd650bdc7c10fbb27d3e39d0081c80dd7b8bc077"
+  integrity sha512-oax5sp1MwqxNqhzo1/YnjcBhzztkHAceT9t5PfRfJvYr98idREGfo1G2yC5dOplIOnHM87DIbLQTW47m/Edrbw==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"

-"@abp/core@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.1.0.tgz#6bdfa378d44cbf8f611d52dddf0915e5bbc188d5"
-  integrity sha512-HXkKCfh8+Yc9iVBsZy7eSoQbkBSdV1QTRAF8+cPgbEpU4x4WlUOy61xqb2pSLFzX9nSma83WhdDyQkzWDBTRZQ==
+"@abp/core@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.0-rc.1.tgz#45d7961216709a9d4c57ee04a1e18d58150b29af"
+  integrity sha512-KIaHlCdAEkwhXgHTW0ACTbyPH/Y1Va/SsyMDVye7vcUldL/dp5HXXGaUWRR/Qrwxl55e8rXJTmOnX9ibtS5ydQ==
  dependencies:
-    "@abp/utils" "^4.1.0"
+    "@abp/utils" "^4.2.0-rc.1"

-"@abp/datatables.net-bs4@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.1.0.tgz#c28097b82f62b236d6f2578d7148128914eb5cd8"
-  integrity sha512-/fM/3Q/yXJaPsXGKIOZBgihxGLZ/T+n+6wguFeEypsAXCJ4MfpcRZ/eFPvVlBmmc/PVIdE8xtj5rnH9+/2KHWg==
+"@abp/datatables.net-bs4@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.0-rc.1.tgz#7f0c0dcb92f813d7a4d98d6f2c123092a84b5483"
+  integrity sha512-QaK9cSTeBTxeWrP/3g+jAAzGy9Jfkdbz0p7ycvHjbcSnHS3h4JRsUw9B3RNdmh3bnF1eVbRu97NiUgqJ3w6kQA==
  dependencies:
-    "@abp/datatables.net" "~4.1.0"
+    "@abp/datatables.net" "~4.2.0-rc.1"
    datatables.net-bs4 "^1.10.21"

-"@abp/datatables.net@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.1.0.tgz#a037fdae4beb9805e8eea71f086573eed4fd3c92"
-  integrity sha512-OZogC3UEvTSyas+VcxffggQ8U2fi399Ka+++4p+oXCPGykDLU1EKOSA/CToiu9uYNYJQ3125SjRZSOJD5h/ukg==
+"@abp/datatables.net@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.0-rc.1.tgz#9f9af39f23bd91cd1467b4a2de9aa743e5a6d693"
+  integrity sha512-un0DoikRJtrUAwDvG2En21Hz7IeGdfYufeeVIG5SPxzc2zxBi8h/8Cd6Zo0MJWFrU+gbW63ADB0wiuB6haC/fA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    datatables.net "^1.10.21"

-"@abp/font-awesome@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.1.0.tgz#a95f8df5f7e3695aaf05e3eab9f3087f4017d7e9"
-  integrity sha512-Zc4mPp740ACe10ollWez4qNg2QnM/AexDkF3pkxYNb1B9J4Fb8H7SefOOtMRdRgHK+sEe5vrPfIs8//gTf4xeQ==
+"@abp/font-awesome@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.0-rc.1.tgz#d1bfaa88fb9f76d0e71061c36493698cb50abbfa"
+  integrity sha512-e3bprerNY7kU26np7xSHUAkPrBr7+Nn0UvEiwWYgen1/TS0rs7usTkhIVtnF6w334bRIxjDcXLWDsZ3QswnVGA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    "@fortawesome/fontawesome-free" "^5.13.0"

-"@abp/jquery-form@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.1.0.tgz#b773c4f4619c3731c781993bba59a1cf38357918"
-  integrity sha512-7Mio+ehj7M2qt3oOyDBi97yNg1ip6BZiUpHkMtmPc/OxdnxpOZV9tZHyhbsoZFYTu1dUSmrpY6HKY0zibohyBQ==
+"@abp/jquery-form@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.0-rc.1.tgz#1625df5844564887836a698b9709c5ea58a87c07"
+  integrity sha512-JSC+xQmoPuSEdjm5gpVKpF9VS1X48uUxlRmAfeiWLHDorFZvzpiak3NhVU8XHfv5UG2SGYVqQmwnRxk5f9D4HA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-form "^4.3.0"

-"@abp/jquery-validation-unobtrusive@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.1.0.tgz#954ce53a46475c09056d789eba761568482ea8c9"
-  integrity sha512-diykqQiGzowYDpsG9PMd3ipeXFrilRQiHQX2mglBf+FNKMocp7LBAIeD2INkiObczZfIKkoqu7WCRqb1bl5uKg==
+"@abp/jquery-validation-unobtrusive@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.0-rc.1.tgz#0e30042735f8f1da831691ef0b67ff0efceb8cd8"
+  integrity sha512-dSWlUvKUj0hsJby8UP5gEVBPXL7TYTe8VskyoSxVCvMs7jMD0yuH67ZImP+2c5p6X5Pww+ImEZ5RUjr0hKh1WA==
  dependencies:
-    "@abp/jquery-validation" "~4.1.0"
+    "@abp/jquery-validation" "~4.2.0-rc.1"
    jquery-validation-unobtrusive "^3.2.11"

-"@abp/jquery-validation@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.1.0.tgz#29cffb21270c52758804cf0d3f5b6e83b327047d"
-  integrity sha512-JrDcejGKz33LeNMn3+DguzDd8XN6LXlceffMc8jz4zYvtb+NqwUn7NFvH3gnKfNKBc8V9cQIHxQpYQa8luYcsA==
+"@abp/jquery-validation@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.0-rc.1.tgz#b5e0b2b2b7c0826f9d11c1f9a93f300945769368"
+  integrity sha512-GxPE2+NOGGl4NZThMpLLexF65AwpF6oMVc3StvOVfgNstzl+VezhkJwjytiLVK4acr6zSTIUNbKsKjGIWLVG/A==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-validation "^1.19.2"

-"@abp/jquery@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.1.0.tgz#3c021d24eb5ef7fe198da8982657075556556701"
-  integrity sha512-1HLjkxj5EudcoxZ9CVqsP0tgKwLQBs5KI9vnnW9I9pco6fIf1Q2PT+TZZywOZ3ftkYfMp90PF+A5IL/JfovnpQ==
+"@abp/jquery@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.0-rc.1.tgz#7cdec9c3e5cd796c65bd0d7317025728b577ff14"
+  integrity sha512-/bIQVKQqDJn9pSlzv5pteYEef+bLw6iqPCwNamLsSjpMPCVMukgD6DuL+1bY1Yb/9fVORODnqctCsxXxl0W/iQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    jquery "~3.5.1"

-"@abp/lodash@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.1.0.tgz#e605644ba745813a2937b24f3b9d2ad86b20dec9"
-  integrity sha512-jUjua8iZIE5P/AELI/nffS09IorBRM/Jfq6agCOX6Qg7d8od66B9gV727mTuaMd9ZW65S1wW5+zMJhm5gy7Qpg==
+"@abp/lodash@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.0-rc.1.tgz#11ed50c96b85b129fd83224defd0c54627ea6ce4"
+  integrity sha512-RQLTOv4wRgeCMEFFi8bWnbLblYmk0p4U4NRaMEX+Y3Hxuh1ROCvxwl2jCxqfdAAx+Jpg1SFtyxTU+wMDYeR6IA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    lodash "^4.17.15"

-"@abp/luxon@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.1.0.tgz#12c9b6eb2a87e0ebe7df58bcbd5f38211ca62e81"
-  integrity sha512-gc8DAZHa+fcnDGWGQHmI8Tllr+QzHAZejrwoVSRiRX+Oebf67sCEDdbwB8yWeEHSa3MbpPtm7I1aTc/+dQI8Dg==
+"@abp/luxon@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.0-rc.1.tgz#7eabef77537651e13faf8be32030e382427d3f98"
+  integrity sha512-nRb7RvUdhVSfeSI+HEGVkhlW1VKJKSiwbDxKB0okubGE4L+siYUhN8FKCtRTCP4NjxNMLCS7v73XA2DxkyjcVg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    luxon "^1.24.1"

-"@abp/malihu-custom-scrollbar-plugin@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.1.0.tgz#a340fa3757eb01bd510d3dcb54331b5b0a93a63f"
-  integrity sha512-CMCIxQNwPNRmmg4WctusMWhg8evrCoq3frQ5Fxnc/fKaMrrzQKL5PY2cV2jY2m5Se+Y+S9EPa3cNOQ1/KYuQ9w==
+"@abp/malihu-custom-scrollbar-plugin@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.0-rc.1.tgz#b346aa9545fa157647f8932e04d3051ade63aeb5"
+  integrity sha512-CKXalT+pgeLVoX1k2J17ia5hjignsabaJZBRG81JAkAHI20JGxvNLL2cVXv+M1KdmQGla+Douf7/c6eNiaSheA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    malihu-custom-scrollbar-plugin "^3.1.5"

-"@abp/select2@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.1.0.tgz#c1b8b7cca16bfe813d83e84f738acda8f8182159"
-  integrity sha512-p6atSzYTU5o36S4GHCHvi3wHf3fgg6wNJIxk4ohSxu1mOQnUbmyYbxKiDFxq+MOR2sOfVmAjqb4xvcIjexg6hA==
+"@abp/select2@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.0-rc.1.tgz#48a38319b4fb52ce3fa25d5c3647258dfceb42b5"
+  integrity sha512-8wB1DOkUotJxV3HE2ga8Nkb1I9t/VSQL6YsiK+EEfENuPuqOPD5N3mevLtQFOdy/c/i6s/Nx7Nb4VRT3cIBW5g==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    select2 "^4.0.13"

-"@abp/sweetalert@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.1.0.tgz#e5c8cb0c84435a0ca97be62c7b9204bbd05ae23d"
-  integrity sha512-VwIp7VD7zzkRMJw3yu7YOlWbIA/JbLYZeyEpNFMIDxAGYG936tVsmH+aQVTovHF/3+VsYf9Da1JjKymLVHkWRg==
+"@abp/sweetalert@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.0-rc.1.tgz#ca26dad346f79ec18c7a9b8d7a64f374f497cea4"
+  integrity sha512-N2agFY5TkJTozYlBOmzlnKJLfyJpNHDol5DyLRWF5zAkudUiDDaYJrvKVqmORsbZSDwJzKbgDcqwiuoPM14Fmg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    sweetalert "^2.1.2"

-"@abp/timeago@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.1.0.tgz#06df44618398cbec7bd174b7afd180907b67bb69"
-  integrity sha512-e1n9i8O0CaT4EIrnzMOur1HxSDpelgaVCLS9NWsTf4j4fIR3ojFqSNt76tpaPqVGBY9vRraGGu16XembYFF+jA==
+"@abp/timeago@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.0-rc.1.tgz#c001df75e78bf86ebb0a4b9de2361da4e0d04dd3"
+  integrity sha512-vHt7T+rW0HyqAwTRhTiBoDFEnb2b00MhBEUEU1u6v5uzmgco1erMD3+ae3EHuVHCQ+p5/mxrFTUnIpBxMEs7pg==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    timeago "^1.6.7"

-"@abp/toastr@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.1.0.tgz#eaa79a9e48638a2e86cb9573516e8614bfaf15a4"
-  integrity sha512-lA3pCdXgAWe1sVhC+/UNJa4T9AdxgN5ncW/3KW+9fg+IOieDwDibPIiuyornxrm+8G6uvrGxi//I3EeeqHABbg==
+"@abp/toastr@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.0-rc.1.tgz#66f34ab51d6c30666703f44ab2f0bccc26b2a1d7"
+  integrity sha512-BNYXnCPtFZtCemZ7yghi4/iYstqHTKUJZ+gkf1vXcHlLvE7JeM6SBMQYotyiiD/n1yKYrx8GRCKssf/gqO/VgQ==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    toastr "^2.1.4"

-"@abp/utils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.1.0.tgz#1f5d8b4dc8a234c15d87869436485fd737f18b50"
-  integrity sha512-fksnKF1bsOab5AVe8qBs2HZmcRVjrnsMwXs23xaqSRdpWXpPgsLRuKCJHlD0usREyerDGPkpY5opUnXWggHvCg==
+"@abp/utils@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
+  integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
  dependencies:
    just-compare "^1.3.0"

--- 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,8 +3,8 @@
  "name": "asp.net",
  "private": true,
  "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.1.0",
-	"@abp/prismjs": "^4.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0-rc.1",
+	"@abp/prismjs": "^4.2.0-rc.1"
  },
  "devDependencies": {}
 }
--- 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@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.1.0.tgz#ef1b31feb678fdf4ce6fa76fb1e9d091ca97c9a4"
-  integrity sha512-eAD39TaMVnXsEOVyKcChIggpzJw3TzDua8x/APlHfxWBQOuCb7C/PWLWH9DIN14kl8JsVpgRrUSlKsvvY8CIRA==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.1.0.tgz#40ef6d20a83a8e700179be7f3989c8d5135808d0"
-  integrity sha512-UdT3XCUMEKguB1w7qF4TO1ClayWn63oiP7wnOUmIg+O1EdKTHUBYfztle4Qb/aqtzjHoZBsOnMZH/KOyQKejDg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.1.0"
-    "@abp/bootstrap" "~4.1.0"
-    "@abp/bootstrap-datepicker" "~4.1.0"
-    "@abp/datatables.net-bs4" "~4.1.0"
-    "@abp/font-awesome" "~4.1.0"
-    "@abp/jquery-form" "~4.1.0"
-    "@abp/jquery-validation-unobtrusive" "~4.1.0"
-    "@abp/lodash" "~4.1.0"
-    "@abp/luxon" "~4.1.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.1.0"
-    "@abp/select2" "~4.1.0"
-    "@abp/sweetalert" "~4.1.0"
-    "@abp/timeago" "~4.1.0"
-    "@abp/toastr" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.1.0.tgz#c23ba554270a9534ac29a7e7ca8ab1ed0dc1cc7b"
-  integrity sha512-CaPVi8dKLD0/7zrsCdi3hA1alkUKVE3jVoUa2bl0mrBg30Xzu+IDAu6aIWFXOCnIX8YthejhA2Wtn4knbTOB4g==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.0-rc.1.tgz#42cda7aad84aea49cf6e9bba7a3bbb4709cbe5a9"
+  integrity sha512-tiERvctW+bcgH3pKqhMZrGXL1uCqw2W8LvjyxFoygJmjncTK9cjq5TEpwR0XXhlslfqPhr2DsglMeM1MOm+OVg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.0-rc.1.tgz#8b66c41ceb578b6187afa9cbba69fad36e6a7717"
+  integrity sha512-3rt9k6FYIZ5BmUOGLuixOIESNaJwskF+ySvufbI1Os8wyTeD/Q1HiYDIM1oJZ28qexAbKamdZuyKmWYmxqpqDQ==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~4.2.0-rc.1"
+    "@abp/bootstrap" "~4.2.0-rc.1"
+    "@abp/bootstrap-datepicker" "~4.2.0-rc.1"
+    "@abp/datatables.net-bs4" "~4.2.0-rc.1"
+    "@abp/font-awesome" "~4.2.0-rc.1"
+    "@abp/jquery-form" "~4.2.0-rc.1"
+    "@abp/jquery-validation-unobtrusive" "~4.2.0-rc.1"
+    "@abp/lodash" "~4.2.0-rc.1"
+    "@abp/luxon" "~4.2.0-rc.1"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.0-rc.1"
+    "@abp/select2" "~4.2.0-rc.1"
+    "@abp/sweetalert" "~4.2.0-rc.1"
+    "@abp/timeago" "~4.2.0-rc.1"
+    "@abp/toastr" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.0-rc.1.tgz#aae1153bf503cc5ce5443ce9f2efe5057af7314d"
+  integrity sha512-5EZlaHjdKYn6I+9kCXQWu/FjbNgyBSl2xW97nbF5Or3e9bUs+Ne6yLJMYypoLHzhcPUTzyemBozMf/VXX9oOhQ==
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -43,162 +43,162 @@
    micromatch "^4.0.2"
    path "^0.12.7"

-"@abp/bootstrap-datepicker@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.1.0.tgz#5c97fba78e56ba90820014a13e4c2d394d27332f"
-  integrity sha512-5XDW/Y2Gu1SgIm/tyRuo6vwcJdpFWIEnqDJ+0wjdOvWl3a+HnQTDya5g74mCmEBfYQgYDw8Wz8ovChOOzExh7Q==
+"@abp/bootstrap-datepicker@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.0-rc.1.tgz#1f49d714743453a83b76410e0f2b6ddc21378146"
+  integrity sha512-1zk19yIUgvy1aO9LnZ0qdLH/8f43qIGSwT5FYPc9Q9p/f3MquLEUq1i/A/BUVYqK9LJHJZFuZv0+XMopG7YJ2g==
  dependencies:
    bootstrap-datepicker "^1.9.0"

-"@abp/bootstrap@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.1.0.tgz#50ac670e319a60a985109e96302eed3e46d36afe"
-  integrity sha512-4lFrbaNPYRa45oH/D+fFUSmgD/OdSoCmHXvSdG2ye6+wyl6gy4JRfjjTOFmwpsyOWJdPMJSV6CARCSSsfeaItA==
+"@abp/bootstrap@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.0-rc.1.tgz#dd650bdc7c10fbb27d3e39d0081c80dd7b8bc077"
+  integrity sha512-oax5sp1MwqxNqhzo1/YnjcBhzztkHAceT9t5PfRfJvYr98idREGfo1G2yC5dOplIOnHM87DIbLQTW47m/Edrbw==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"

-"@abp/clipboard@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.1.0.tgz#257d582a28e2311f4d433500aff3a529d5756d0a"
-  integrity sha512-BlJ3+eHXJcj0RJ5PdZ1I8ag0wylp4lW7ukzmXifzSYbT0on6o8pJuCvQM5rAyNqA5ucunjj9QiYXRRo44guKtQ==
+"@abp/clipboard@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.2.0-rc.1.tgz#c98b9639d34ece6249929a958d22f2c2a8997979"
+  integrity sha512-/mIRwYlwx6oJGWbuhQZ7e0otKi98yzzDjJtNVi1IDimtn9EbfW2aXQ9U7QKX8tZAag9Yran8NYg1KaaghpYSxQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    clipboard "^2.0.6"

-"@abp/core@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.1.0.tgz#6bdfa378d44cbf8f611d52dddf0915e5bbc188d5"
-  integrity sha512-HXkKCfh8+Yc9iVBsZy7eSoQbkBSdV1QTRAF8+cPgbEpU4x4WlUOy61xqb2pSLFzX9nSma83WhdDyQkzWDBTRZQ==
+"@abp/core@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.0-rc.1.tgz#45d7961216709a9d4c57ee04a1e18d58150b29af"
+  integrity sha512-KIaHlCdAEkwhXgHTW0ACTbyPH/Y1Va/SsyMDVye7vcUldL/dp5HXXGaUWRR/Qrwxl55e8rXJTmOnX9ibtS5ydQ==
  dependencies:
-    "@abp/utils" "^4.1.0"
+    "@abp/utils" "^4.2.0-rc.1"

-"@abp/datatables.net-bs4@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.1.0.tgz#c28097b82f62b236d6f2578d7148128914eb5cd8"
-  integrity sha512-/fM/3Q/yXJaPsXGKIOZBgihxGLZ/T+n+6wguFeEypsAXCJ4MfpcRZ/eFPvVlBmmc/PVIdE8xtj5rnH9+/2KHWg==
+"@abp/datatables.net-bs4@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.0-rc.1.tgz#7f0c0dcb92f813d7a4d98d6f2c123092a84b5483"
+  integrity sha512-QaK9cSTeBTxeWrP/3g+jAAzGy9Jfkdbz0p7ycvHjbcSnHS3h4JRsUw9B3RNdmh3bnF1eVbRu97NiUgqJ3w6kQA==
  dependencies:
-    "@abp/datatables.net" "~4.1.0"
+    "@abp/datatables.net" "~4.2.0-rc.1"
    datatables.net-bs4 "^1.10.21"

-"@abp/datatables.net@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.1.0.tgz#a037fdae4beb9805e8eea71f086573eed4fd3c92"
-  integrity sha512-OZogC3UEvTSyas+VcxffggQ8U2fi399Ka+++4p+oXCPGykDLU1EKOSA/CToiu9uYNYJQ3125SjRZSOJD5h/ukg==
+"@abp/datatables.net@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.0-rc.1.tgz#9f9af39f23bd91cd1467b4a2de9aa743e5a6d693"
+  integrity sha512-un0DoikRJtrUAwDvG2En21Hz7IeGdfYufeeVIG5SPxzc2zxBi8h/8Cd6Zo0MJWFrU+gbW63ADB0wiuB6haC/fA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    datatables.net "^1.10.21"

-"@abp/font-awesome@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.1.0.tgz#a95f8df5f7e3695aaf05e3eab9f3087f4017d7e9"
-  integrity sha512-Zc4mPp740ACe10ollWez4qNg2QnM/AexDkF3pkxYNb1B9J4Fb8H7SefOOtMRdRgHK+sEe5vrPfIs8//gTf4xeQ==
+"@abp/font-awesome@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.0-rc.1.tgz#d1bfaa88fb9f76d0e71061c36493698cb50abbfa"
+  integrity sha512-e3bprerNY7kU26np7xSHUAkPrBr7+Nn0UvEiwWYgen1/TS0rs7usTkhIVtnF6w334bRIxjDcXLWDsZ3QswnVGA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    "@fortawesome/fontawesome-free" "^5.13.0"

-"@abp/jquery-form@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.1.0.tgz#b773c4f4619c3731c781993bba59a1cf38357918"
-  integrity sha512-7Mio+ehj7M2qt3oOyDBi97yNg1ip6BZiUpHkMtmPc/OxdnxpOZV9tZHyhbsoZFYTu1dUSmrpY6HKY0zibohyBQ==
+"@abp/jquery-form@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.0-rc.1.tgz#1625df5844564887836a698b9709c5ea58a87c07"
+  integrity sha512-JSC+xQmoPuSEdjm5gpVKpF9VS1X48uUxlRmAfeiWLHDorFZvzpiak3NhVU8XHfv5UG2SGYVqQmwnRxk5f9D4HA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-form "^4.3.0"

-"@abp/jquery-validation-unobtrusive@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.1.0.tgz#954ce53a46475c09056d789eba761568482ea8c9"
-  integrity sha512-diykqQiGzowYDpsG9PMd3ipeXFrilRQiHQX2mglBf+FNKMocp7LBAIeD2INkiObczZfIKkoqu7WCRqb1bl5uKg==
+"@abp/jquery-validation-unobtrusive@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.0-rc.1.tgz#0e30042735f8f1da831691ef0b67ff0efceb8cd8"
+  integrity sha512-dSWlUvKUj0hsJby8UP5gEVBPXL7TYTe8VskyoSxVCvMs7jMD0yuH67ZImP+2c5p6X5Pww+ImEZ5RUjr0hKh1WA==
  dependencies:
-    "@abp/jquery-validation" "~4.1.0"
+    "@abp/jquery-validation" "~4.2.0-rc.1"
    jquery-validation-unobtrusive "^3.2.11"

-"@abp/jquery-validation@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.1.0.tgz#29cffb21270c52758804cf0d3f5b6e83b327047d"
-  integrity sha512-JrDcejGKz33LeNMn3+DguzDd8XN6LXlceffMc8jz4zYvtb+NqwUn7NFvH3gnKfNKBc8V9cQIHxQpYQa8luYcsA==
+"@abp/jquery-validation@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.0-rc.1.tgz#b5e0b2b2b7c0826f9d11c1f9a93f300945769368"
+  integrity sha512-GxPE2+NOGGl4NZThMpLLexF65AwpF6oMVc3StvOVfgNstzl+VezhkJwjytiLVK4acr6zSTIUNbKsKjGIWLVG/A==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-validation "^1.19.2"

-"@abp/jquery@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.1.0.tgz#3c021d24eb5ef7fe198da8982657075556556701"
-  integrity sha512-1HLjkxj5EudcoxZ9CVqsP0tgKwLQBs5KI9vnnW9I9pco6fIf1Q2PT+TZZywOZ3ftkYfMp90PF+A5IL/JfovnpQ==
+"@abp/jquery@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.0-rc.1.tgz#7cdec9c3e5cd796c65bd0d7317025728b577ff14"
+  integrity sha512-/bIQVKQqDJn9pSlzv5pteYEef+bLw6iqPCwNamLsSjpMPCVMukgD6DuL+1bY1Yb/9fVORODnqctCsxXxl0W/iQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    jquery "~3.5.1"

-"@abp/lodash@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.1.0.tgz#e605644ba745813a2937b24f3b9d2ad86b20dec9"
-  integrity sha512-jUjua8iZIE5P/AELI/nffS09IorBRM/Jfq6agCOX6Qg7d8od66B9gV727mTuaMd9ZW65S1wW5+zMJhm5gy7Qpg==
+"@abp/lodash@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.0-rc.1.tgz#11ed50c96b85b129fd83224defd0c54627ea6ce4"
+  integrity sha512-RQLTOv4wRgeCMEFFi8bWnbLblYmk0p4U4NRaMEX+Y3Hxuh1ROCvxwl2jCxqfdAAx+Jpg1SFtyxTU+wMDYeR6IA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    lodash "^4.17.15"

-"@abp/luxon@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.1.0.tgz#12c9b6eb2a87e0ebe7df58bcbd5f38211ca62e81"
-  integrity sha512-gc8DAZHa+fcnDGWGQHmI8Tllr+QzHAZejrwoVSRiRX+Oebf67sCEDdbwB8yWeEHSa3MbpPtm7I1aTc/+dQI8Dg==
+"@abp/luxon@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.0-rc.1.tgz#7eabef77537651e13faf8be32030e382427d3f98"
+  integrity sha512-nRb7RvUdhVSfeSI+HEGVkhlW1VKJKSiwbDxKB0okubGE4L+siYUhN8FKCtRTCP4NjxNMLCS7v73XA2DxkyjcVg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    luxon "^1.24.1"

-"@abp/malihu-custom-scrollbar-plugin@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.1.0.tgz#a340fa3757eb01bd510d3dcb54331b5b0a93a63f"
-  integrity sha512-CMCIxQNwPNRmmg4WctusMWhg8evrCoq3frQ5Fxnc/fKaMrrzQKL5PY2cV2jY2m5Se+Y+S9EPa3cNOQ1/KYuQ9w==
+"@abp/malihu-custom-scrollbar-plugin@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.0-rc.1.tgz#b346aa9545fa157647f8932e04d3051ade63aeb5"
+  integrity sha512-CKXalT+pgeLVoX1k2J17ia5hjignsabaJZBRG81JAkAHI20JGxvNLL2cVXv+M1KdmQGla+Douf7/c6eNiaSheA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    malihu-custom-scrollbar-plugin "^3.1.5"

-"@abp/prismjs@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.1.0.tgz#fde3454460013490f566fc3b27fbc1031251b98b"
-  integrity sha512-jXE8oS8JyLgZS/oXrVS2CxtIH09WEHoUPM4HfndzxSPzxmg3G+E8kzMXbPrHGGx7AhHgmSxNVFGuR2+1YFpSPQ==
+"@abp/prismjs@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.2.0-rc.1.tgz#4a091790900b23eea2390b016ae20b7fc3c57331"
+  integrity sha512-dYvcCJ9loOdgnMED0wid7zHK4wQu+3W+7p0nF/+yregZXQt87n8H7nZvAkxiq7PUSkgeJ+8kyutXfddY/Opgsw==
  dependencies:
-    "@abp/clipboard" "~4.1.0"
-    "@abp/core" "~4.1.0"
+    "@abp/clipboard" "~4.2.0-rc.1"
+    "@abp/core" "~4.2.0-rc.1"
    prismjs "^1.20.0"

-"@abp/select2@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.1.0.tgz#c1b8b7cca16bfe813d83e84f738acda8f8182159"
-  integrity sha512-p6atSzYTU5o36S4GHCHvi3wHf3fgg6wNJIxk4ohSxu1mOQnUbmyYbxKiDFxq+MOR2sOfVmAjqb4xvcIjexg6hA==
+"@abp/select2@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.0-rc.1.tgz#48a38319b4fb52ce3fa25d5c3647258dfceb42b5"
+  integrity sha512-8wB1DOkUotJxV3HE2ga8Nkb1I9t/VSQL6YsiK+EEfENuPuqOPD5N3mevLtQFOdy/c/i6s/Nx7Nb4VRT3cIBW5g==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    select2 "^4.0.13"

-"@abp/sweetalert@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.1.0.tgz#e5c8cb0c84435a0ca97be62c7b9204bbd05ae23d"
-  integrity sha512-VwIp7VD7zzkRMJw3yu7YOlWbIA/JbLYZeyEpNFMIDxAGYG936tVsmH+aQVTovHF/3+VsYf9Da1JjKymLVHkWRg==
+"@abp/sweetalert@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.0-rc.1.tgz#ca26dad346f79ec18c7a9b8d7a64f374f497cea4"
+  integrity sha512-N2agFY5TkJTozYlBOmzlnKJLfyJpNHDol5DyLRWF5zAkudUiDDaYJrvKVqmORsbZSDwJzKbgDcqwiuoPM14Fmg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    sweetalert "^2.1.2"

-"@abp/timeago@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.1.0.tgz#06df44618398cbec7bd174b7afd180907b67bb69"
-  integrity sha512-e1n9i8O0CaT4EIrnzMOur1HxSDpelgaVCLS9NWsTf4j4fIR3ojFqSNt76tpaPqVGBY9vRraGGu16XembYFF+jA==
+"@abp/timeago@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.0-rc.1.tgz#c001df75e78bf86ebb0a4b9de2361da4e0d04dd3"
+  integrity sha512-vHt7T+rW0HyqAwTRhTiBoDFEnb2b00MhBEUEU1u6v5uzmgco1erMD3+ae3EHuVHCQ+p5/mxrFTUnIpBxMEs7pg==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    timeago "^1.6.7"

-"@abp/toastr@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.1.0.tgz#eaa79a9e48638a2e86cb9573516e8614bfaf15a4"
-  integrity sha512-lA3pCdXgAWe1sVhC+/UNJa4T9AdxgN5ncW/3KW+9fg+IOieDwDibPIiuyornxrm+8G6uvrGxi//I3EeeqHABbg==
+"@abp/toastr@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.0-rc.1.tgz#66f34ab51d6c30666703f44ab2f0bccc26b2a1d7"
+  integrity sha512-BNYXnCPtFZtCemZ7yghi4/iYstqHTKUJZ+gkf1vXcHlLvE7JeM6SBMQYotyiiD/n1yKYrx8GRCKssf/gqO/VgQ==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    toastr "^2.1.4"

-"@abp/utils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.1.0.tgz#1f5d8b4dc8a234c15d87869436485fd737f18b50"
-  integrity sha512-fksnKF1bsOab5AVe8qBs2HZmcRVjrnsMwXs23xaqSRdpWXpPgsLRuKCJHlD0usREyerDGPkpY5opUnXWggHvCg==
+"@abp/utils@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
+  integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
  dependencies:
    just-compare "^1.3.0"

--- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/nl.json
+++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/nl.json
@ -0,0 +1,6 @@
+{
+  "culture": "nl",
+  "texts": {
+    "Volo.Abp.Http.DynamicProxying:10001": "Business-uitzondering met data: {0}"
+  }
+}
--- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/Localization/nl.json
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/Localization/nl.json
@ -0,0 +1,7 @@
+{
+  "culture": "nl",
+  "texts": {
+    "HelloText": "Hallo {0}",
+    "HowAreYou": "hoe is het met je?"
+  }
+}
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json
@ -3,9 +3,9 @@
  "texts": {
    "UserName": "Gebruikersnaam",
    "EmailAddress": "E-mailadres",
-    "UserNameOrEmailAddress": "Gebruikersnaam of e-mail adres",
+    "UserNameOrEmailAddress": "Gebruikersnaam of e-mailadres",
    "Password": "Wachtwoord",
-    "RememberMe": "Herinner me",
+    "RememberMe": "Onthoud me",
    "UseAnotherServiceToLogin": "Gebruik een andere dienst om in te loggen",
    "UserLockedOutMessage": "Het gebruikersaccount is geblokkeerd vanwege ongeldige inlogpogingen. Wacht even en probeer het opnieuw.",
    "InvalidUserNameOrPassword": "Ongeldige gebruikersnaam of wachtwoord!",
@ -29,17 +29,37 @@
    "DisplayName:Name": "Naam",
    "DisplayName:Surname": "Achternaam",
    "DisplayName:Password": "Wachtwoord",
-    "DisplayName:EmailAddress": "E-mail adres",
+    "DisplayName:EmailAddress": "E-mailadres",
    "DisplayName:PhoneNumber": "Telefoonnummer",
    "PersonalSettings": "Persoonlijke instellingen",
    "PersonalSettingsSaved": "Persoonlijke instellingen opgeslagen",
-    "PasswordChanged": "wachtwoord veranderd",
-    "NewPasswordConfirmFailed": "Bevestig het nieuwe wachtwoord a.u.b..",
+    "PasswordChanged": "Wachtwoord veranderd",
+    "NewPasswordConfirmFailed": "Bevestig het nieuwe wachtwoord a.u.b.",
    "Manage": "Beheer",
    "ManageYourProfile": "Beheer uw profiel",
    "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Is zelfregistratie ingeschakeld",
    "Description:Abp.Account.IsSelfRegistrationEnabled": "Of een gebruiker het account zelf kan registreren.",
    "DisplayName:Abp.Account.EnableLocalLogin": "Verifieer met een lokaal account",
-    "Description:Abp.Account.EnableLocalLogin": "Geeft aan of de server gebruikers toestaat zich te verifiëren met een lokaal account."
+    "Description:Abp.Account.EnableLocalLogin": "Geeft aan of de server gebruikers toestaat zich te verifiëren met een lokaal account.",
+    "LoggedOutTitle": "Uitgelogd",
+    "LoggedOutText": "U bent uitgelogd en u wordt binnen enkele ogenblikken doorgestuurd.",
+    "ReturnToText": "Klik hier om doorgestuurd te worden naar {0}",
+    "OrLoginWith": "Of log in met:",
+    "ForgotPassword": "Wachtwoord vergeten?",
+    "SendPasswordResetLink_Information": "Er wordt een link voor het opnieuw instellen van uw wachtwoord naar uw e-mailadres gestuurd. Als u binnen een paar minuten geen e-mail ontvangt, probeer het dan opnieuw.",
+    "PasswordResetMailSentMessage": "Er is een link voor het opnieuw instellen van uw wachtwoord naar uw e-mailadres gestuurd. Als u deze e-mail niet binnen 15 minuten in uw inbox ziet, zoek hem dan in uw map met ongewenste e-mail. Als u de mail daar vindt, markeer hem dan als niet ongewenst.",
+    "ResetPassword": "Wachtwoord opnieuw instellen",
+    "ConfirmPassword": "Bevestig (herhaal) het wachtwoord",
+    "ResetPassword_Information": "Voer uw nieuwe wachtwoord in.",
+    "YourPasswordIsSuccessfullyReset": "Uw wachtwoord is succesvol opnieuw ingesteld.",
+    "GoToTheApplication": "Ga naar de applicatie",
+    "BackToLogin": "Terug naar Inloggen",
+    "ProfileTab:Password": "Wachtwoord wijzigen",
+    "ProfileTab:PersonalInfo": "Persoonlijke informatie",
+    "ReturnToApplication": "Ga terug naar de applicatie",
+    "Volo.Account:InvalidEmailAddress": "Kan het opgegeven e-mailadres '{0}' niet vinden",
+    "PasswordReset": "Wachtwoord opnieuw instellen",
+    "PasswordResetInfoInEmail": "We hebben een verzoek ontvangen om uw wachtwoord opnieuw in te stellen. Als u dit verzoek heeft ingediend, klikt u op de volgende link om een nieuw wachtwoord in te stellen.",
+    "ResetMyPassword": "Reset mijn wachtwoord"
  }
-}
+}
--- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/Localization/nl.json
+++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/Localization/nl.json
@ -0,0 +1,6 @@
+{
+  "culture": "nl",
+  "texts": {
+    "ManageYourProfile": "Beheer uw profiel"
+  }
+}
--- 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": "^4.1.0",
-    "@abp/blogging": "^4.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0-rc.1",
+    "@abp/blogging": "^4.2.0-rc.1"
  }
 }
--- 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@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.1.0.tgz#ef1b31feb678fdf4ce6fa76fb1e9d091ca97c9a4"
-  integrity sha512-eAD39TaMVnXsEOVyKcChIggpzJw3TzDua8x/APlHfxWBQOuCb7C/PWLWH9DIN14kl8JsVpgRrUSlKsvvY8CIRA==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.1.0.tgz#40ef6d20a83a8e700179be7f3989c8d5135808d0"
-  integrity sha512-UdT3XCUMEKguB1w7qF4TO1ClayWn63oiP7wnOUmIg+O1EdKTHUBYfztle4Qb/aqtzjHoZBsOnMZH/KOyQKejDg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.1.0"
-    "@abp/bootstrap" "~4.1.0"
-    "@abp/bootstrap-datepicker" "~4.1.0"
-    "@abp/datatables.net-bs4" "~4.1.0"
-    "@abp/font-awesome" "~4.1.0"
-    "@abp/jquery-form" "~4.1.0"
-    "@abp/jquery-validation-unobtrusive" "~4.1.0"
-    "@abp/lodash" "~4.1.0"
-    "@abp/luxon" "~4.1.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.1.0"
-    "@abp/select2" "~4.1.0"
-    "@abp/sweetalert" "~4.1.0"
-    "@abp/timeago" "~4.1.0"
-    "@abp/toastr" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.1.0.tgz#c23ba554270a9534ac29a7e7ca8ab1ed0dc1cc7b"
-  integrity sha512-CaPVi8dKLD0/7zrsCdi3hA1alkUKVE3jVoUa2bl0mrBg30Xzu+IDAu6aIWFXOCnIX8YthejhA2Wtn4knbTOB4g==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.0-rc.1.tgz#42cda7aad84aea49cf6e9bba7a3bbb4709cbe5a9"
+  integrity sha512-tiERvctW+bcgH3pKqhMZrGXL1uCqw2W8LvjyxFoygJmjncTK9cjq5TEpwR0XXhlslfqPhr2DsglMeM1MOm+OVg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.0-rc.1.tgz#8b66c41ceb578b6187afa9cbba69fad36e6a7717"
+  integrity sha512-3rt9k6FYIZ5BmUOGLuixOIESNaJwskF+ySvufbI1Os8wyTeD/Q1HiYDIM1oJZ28qexAbKamdZuyKmWYmxqpqDQ==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~4.2.0-rc.1"
+    "@abp/bootstrap" "~4.2.0-rc.1"
+    "@abp/bootstrap-datepicker" "~4.2.0-rc.1"
+    "@abp/datatables.net-bs4" "~4.2.0-rc.1"
+    "@abp/font-awesome" "~4.2.0-rc.1"
+    "@abp/jquery-form" "~4.2.0-rc.1"
+    "@abp/jquery-validation-unobtrusive" "~4.2.0-rc.1"
+    "@abp/lodash" "~4.2.0-rc.1"
+    "@abp/luxon" "~4.2.0-rc.1"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.0-rc.1"
+    "@abp/select2" "~4.2.0-rc.1"
+    "@abp/sweetalert" "~4.2.0-rc.1"
+    "@abp/timeago" "~4.2.0-rc.1"
+    "@abp/toastr" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.0-rc.1.tgz#aae1153bf503cc5ce5443ce9f2efe5057af7314d"
+  integrity sha512-5EZlaHjdKYn6I+9kCXQWu/FjbNgyBSl2xW97nbF5Or3e9bUs+Ne6yLJMYypoLHzhcPUTzyemBozMf/VXX9oOhQ==
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -43,214 +43,214 @@
    micromatch "^4.0.2"
    path "^0.12.7"

-"@abp/blogging@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-4.1.0.tgz#28796d30cc9066fecb4f6c9393f74b9a18b6b652"
-  integrity sha512-AdnqmfJfA6AQ7qGUfrBK3XgJH4fVKp/zFgk1mtYO+oHnJ1oU9D707s49szFOVCIy5txfKdkxQ+hlJH3G8fg95g==
+"@abp/blogging@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-4.2.0-rc.1.tgz#433c8baea0ad489796e04b96dff9e55959e82d71"
+  integrity sha512-codkbZrBX7GtW5owjv58gWJIY3HeKAiTJl5pnPpvioxIDa/+Oto9W1hIlcFTgqWzC4QJd43RjF0rPb3cYGHtWw==
  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.1.0"
-    "@abp/owl.carousel" "~4.1.0"
-    "@abp/prismjs" "~4.1.0"
-    "@abp/tui-editor" "~4.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.0-rc.1"
+    "@abp/owl.carousel" "~4.2.0-rc.1"
+    "@abp/prismjs" "~4.2.0-rc.1"
+    "@abp/tui-editor" "~4.2.0-rc.1"

-"@abp/bootstrap-datepicker@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.1.0.tgz#5c97fba78e56ba90820014a13e4c2d394d27332f"
-  integrity sha512-5XDW/Y2Gu1SgIm/tyRuo6vwcJdpFWIEnqDJ+0wjdOvWl3a+HnQTDya5g74mCmEBfYQgYDw8Wz8ovChOOzExh7Q==
+"@abp/bootstrap-datepicker@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.0-rc.1.tgz#1f49d714743453a83b76410e0f2b6ddc21378146"
+  integrity sha512-1zk19yIUgvy1aO9LnZ0qdLH/8f43qIGSwT5FYPc9Q9p/f3MquLEUq1i/A/BUVYqK9LJHJZFuZv0+XMopG7YJ2g==
  dependencies:
    bootstrap-datepicker "^1.9.0"

-"@abp/bootstrap@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.1.0.tgz#50ac670e319a60a985109e96302eed3e46d36afe"
-  integrity sha512-4lFrbaNPYRa45oH/D+fFUSmgD/OdSoCmHXvSdG2ye6+wyl6gy4JRfjjTOFmwpsyOWJdPMJSV6CARCSSsfeaItA==
+"@abp/bootstrap@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.0-rc.1.tgz#dd650bdc7c10fbb27d3e39d0081c80dd7b8bc077"
+  integrity sha512-oax5sp1MwqxNqhzo1/YnjcBhzztkHAceT9t5PfRfJvYr98idREGfo1G2yC5dOplIOnHM87DIbLQTW47m/Edrbw==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"

-"@abp/clipboard@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.1.0.tgz#257d582a28e2311f4d433500aff3a529d5756d0a"
-  integrity sha512-BlJ3+eHXJcj0RJ5PdZ1I8ag0wylp4lW7ukzmXifzSYbT0on6o8pJuCvQM5rAyNqA5ucunjj9QiYXRRo44guKtQ==
+"@abp/clipboard@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.2.0-rc.1.tgz#c98b9639d34ece6249929a958d22f2c2a8997979"
+  integrity sha512-/mIRwYlwx6oJGWbuhQZ7e0otKi98yzzDjJtNVi1IDimtn9EbfW2aXQ9U7QKX8tZAag9Yran8NYg1KaaghpYSxQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    clipboard "^2.0.6"

-"@abp/codemirror@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.1.0.tgz#b1a094b51338f9902cb3e11679caf86af5ebae23"
-  integrity sha512-aibQkbvzxMdKwL+iPhNnrB3ovXmD4B/qoiv9EaB9xGAkOVwHwMgJDxC2HZdoH/r72wtaBPEySZaAzwuMzEBcBA==
+"@abp/codemirror@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.2.0-rc.1.tgz#e6af9e93dde6b13854e73031f6c626b83d405eee"
+  integrity sha512-Sqzb4IJ+8B48O5hoFhdhDFzT7AJ5+6AgRfwJKH2kFm0c3PrYzPvr7gGVmitaI7Rb8oN4ROJzRIZDZ90YPMZTSA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    codemirror "^5.54.0"

-"@abp/core@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.1.0.tgz#6bdfa378d44cbf8f611d52dddf0915e5bbc188d5"
-  integrity sha512-HXkKCfh8+Yc9iVBsZy7eSoQbkBSdV1QTRAF8+cPgbEpU4x4WlUOy61xqb2pSLFzX9nSma83WhdDyQkzWDBTRZQ==
+"@abp/core@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.0-rc.1.tgz#45d7961216709a9d4c57ee04a1e18d58150b29af"
+  integrity sha512-KIaHlCdAEkwhXgHTW0ACTbyPH/Y1Va/SsyMDVye7vcUldL/dp5HXXGaUWRR/Qrwxl55e8rXJTmOnX9ibtS5ydQ==
  dependencies:
-    "@abp/utils" "^4.1.0"
+    "@abp/utils" "^4.2.0-rc.1"

-"@abp/datatables.net-bs4@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.1.0.tgz#c28097b82f62b236d6f2578d7148128914eb5cd8"
-  integrity sha512-/fM/3Q/yXJaPsXGKIOZBgihxGLZ/T+n+6wguFeEypsAXCJ4MfpcRZ/eFPvVlBmmc/PVIdE8xtj5rnH9+/2KHWg==
+"@abp/datatables.net-bs4@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.0-rc.1.tgz#7f0c0dcb92f813d7a4d98d6f2c123092a84b5483"
+  integrity sha512-QaK9cSTeBTxeWrP/3g+jAAzGy9Jfkdbz0p7ycvHjbcSnHS3h4JRsUw9B3RNdmh3bnF1eVbRu97NiUgqJ3w6kQA==
  dependencies:
-    "@abp/datatables.net" "~4.1.0"
+    "@abp/datatables.net" "~4.2.0-rc.1"
    datatables.net-bs4 "^1.10.21"

-"@abp/datatables.net@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.1.0.tgz#a037fdae4beb9805e8eea71f086573eed4fd3c92"
-  integrity sha512-OZogC3UEvTSyas+VcxffggQ8U2fi399Ka+++4p+oXCPGykDLU1EKOSA/CToiu9uYNYJQ3125SjRZSOJD5h/ukg==
+"@abp/datatables.net@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.0-rc.1.tgz#9f9af39f23bd91cd1467b4a2de9aa743e5a6d693"
+  integrity sha512-un0DoikRJtrUAwDvG2En21Hz7IeGdfYufeeVIG5SPxzc2zxBi8h/8Cd6Zo0MJWFrU+gbW63ADB0wiuB6haC/fA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    datatables.net "^1.10.21"

-"@abp/font-awesome@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.1.0.tgz#a95f8df5f7e3695aaf05e3eab9f3087f4017d7e9"
-  integrity sha512-Zc4mPp740ACe10ollWez4qNg2QnM/AexDkF3pkxYNb1B9J4Fb8H7SefOOtMRdRgHK+sEe5vrPfIs8//gTf4xeQ==
+"@abp/font-awesome@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.0-rc.1.tgz#d1bfaa88fb9f76d0e71061c36493698cb50abbfa"
+  integrity sha512-e3bprerNY7kU26np7xSHUAkPrBr7+Nn0UvEiwWYgen1/TS0rs7usTkhIVtnF6w334bRIxjDcXLWDsZ3QswnVGA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    "@fortawesome/fontawesome-free" "^5.13.0"

-"@abp/highlight.js@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.1.0.tgz#46cfa70982203db5b96a9a3ffd89d46b822da111"
-  integrity sha512-3DV7/7P3OP13upSADUQNHIu2Q/LovEo4ia7jJyqSsNv8pD6CXb/pmvRlhiQ7NXI7NIGqYe4a35uxR1T2AEyLRQ==
+"@abp/highlight.js@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.2.0-rc.1.tgz#d0462aa10c8a8afaf256f4e15f163c15d38ade14"
+  integrity sha512-ZZmGrpX7D9/8kbnBDkEvyp1XPEMYZBMiUyK1an/NUWMdBYlMxda675ZD6xAacI3UAKmwPslEOlFA/dpfbpYXVA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"

-"@abp/jquery-form@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.1.0.tgz#b773c4f4619c3731c781993bba59a1cf38357918"
-  integrity sha512-7Mio+ehj7M2qt3oOyDBi97yNg1ip6BZiUpHkMtmPc/OxdnxpOZV9tZHyhbsoZFYTu1dUSmrpY6HKY0zibohyBQ==
+"@abp/jquery-form@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.0-rc.1.tgz#1625df5844564887836a698b9709c5ea58a87c07"
+  integrity sha512-JSC+xQmoPuSEdjm5gpVKpF9VS1X48uUxlRmAfeiWLHDorFZvzpiak3NhVU8XHfv5UG2SGYVqQmwnRxk5f9D4HA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-form "^4.3.0"

-"@abp/jquery-validation-unobtrusive@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.1.0.tgz#954ce53a46475c09056d789eba761568482ea8c9"
-  integrity sha512-diykqQiGzowYDpsG9PMd3ipeXFrilRQiHQX2mglBf+FNKMocp7LBAIeD2INkiObczZfIKkoqu7WCRqb1bl5uKg==
+"@abp/jquery-validation-unobtrusive@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.0-rc.1.tgz#0e30042735f8f1da831691ef0b67ff0efceb8cd8"
+  integrity sha512-dSWlUvKUj0hsJby8UP5gEVBPXL7TYTe8VskyoSxVCvMs7jMD0yuH67ZImP+2c5p6X5Pww+ImEZ5RUjr0hKh1WA==
  dependencies:
-    "@abp/jquery-validation" "~4.1.0"
+    "@abp/jquery-validation" "~4.2.0-rc.1"
    jquery-validation-unobtrusive "^3.2.11"

-"@abp/jquery-validation@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.1.0.tgz#29cffb21270c52758804cf0d3f5b6e83b327047d"
-  integrity sha512-JrDcejGKz33LeNMn3+DguzDd8XN6LXlceffMc8jz4zYvtb+NqwUn7NFvH3gnKfNKBc8V9cQIHxQpYQa8luYcsA==
+"@abp/jquery-validation@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.0-rc.1.tgz#b5e0b2b2b7c0826f9d11c1f9a93f300945769368"
+  integrity sha512-GxPE2+NOGGl4NZThMpLLexF65AwpF6oMVc3StvOVfgNstzl+VezhkJwjytiLVK4acr6zSTIUNbKsKjGIWLVG/A==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-validation "^1.19.2"

-"@abp/jquery@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.1.0.tgz#3c021d24eb5ef7fe198da8982657075556556701"
-  integrity sha512-1HLjkxj5EudcoxZ9CVqsP0tgKwLQBs5KI9vnnW9I9pco6fIf1Q2PT+TZZywOZ3ftkYfMp90PF+A5IL/JfovnpQ==
+"@abp/jquery@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.0-rc.1.tgz#7cdec9c3e5cd796c65bd0d7317025728b577ff14"
+  integrity sha512-/bIQVKQqDJn9pSlzv5pteYEef+bLw6iqPCwNamLsSjpMPCVMukgD6DuL+1bY1Yb/9fVORODnqctCsxXxl0W/iQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    jquery "~3.5.1"

-"@abp/lodash@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.1.0.tgz#e605644ba745813a2937b24f3b9d2ad86b20dec9"
-  integrity sha512-jUjua8iZIE5P/AELI/nffS09IorBRM/Jfq6agCOX6Qg7d8od66B9gV727mTuaMd9ZW65S1wW5+zMJhm5gy7Qpg==
+"@abp/lodash@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.0-rc.1.tgz#11ed50c96b85b129fd83224defd0c54627ea6ce4"
+  integrity sha512-RQLTOv4wRgeCMEFFi8bWnbLblYmk0p4U4NRaMEX+Y3Hxuh1ROCvxwl2jCxqfdAAx+Jpg1SFtyxTU+wMDYeR6IA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    lodash "^4.17.15"

-"@abp/luxon@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.1.0.tgz#12c9b6eb2a87e0ebe7df58bcbd5f38211ca62e81"
-  integrity sha512-gc8DAZHa+fcnDGWGQHmI8Tllr+QzHAZejrwoVSRiRX+Oebf67sCEDdbwB8yWeEHSa3MbpPtm7I1aTc/+dQI8Dg==
+"@abp/luxon@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.0-rc.1.tgz#7eabef77537651e13faf8be32030e382427d3f98"
+  integrity sha512-nRb7RvUdhVSfeSI+HEGVkhlW1VKJKSiwbDxKB0okubGE4L+siYUhN8FKCtRTCP4NjxNMLCS7v73XA2DxkyjcVg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    luxon "^1.24.1"

-"@abp/malihu-custom-scrollbar-plugin@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.1.0.tgz#a340fa3757eb01bd510d3dcb54331b5b0a93a63f"
-  integrity sha512-CMCIxQNwPNRmmg4WctusMWhg8evrCoq3frQ5Fxnc/fKaMrrzQKL5PY2cV2jY2m5Se+Y+S9EPa3cNOQ1/KYuQ9w==
+"@abp/malihu-custom-scrollbar-plugin@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.0-rc.1.tgz#b346aa9545fa157647f8932e04d3051ade63aeb5"
+  integrity sha512-CKXalT+pgeLVoX1k2J17ia5hjignsabaJZBRG81JAkAHI20JGxvNLL2cVXv+M1KdmQGla+Douf7/c6eNiaSheA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    malihu-custom-scrollbar-plugin "^3.1.5"

-"@abp/markdown-it@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.1.0.tgz#cd2804008fa53ad07134e3cfb2c55abc90be92f3"
-  integrity sha512-8pN6wkI7tHFTRZbVNHFqfHsc9n389C0gEuyBaCPE6AvJAHUiCShXmGp50qn7Ev23R8iX9x2boxXKEfeQ3PbTOw==
+"@abp/markdown-it@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.2.0-rc.1.tgz#6abbe865ada85b600312a93c2bdd520624575562"
+  integrity sha512-MP+mT/IM8ZHl42Cne2dzqaHfprLGXj79NbsCzgA3RjrhKDosSMDBEpfleuHI8m8zkYyhno+VKBzeqjm+3rQomA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    markdown-it "^11.0.0"

-"@abp/owl.carousel@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-4.1.0.tgz#67fb947682627f07fd27b2546dc218113cfb3236"
-  integrity sha512-RFznqVH+XIW7Pcxy9zZPqLwVuoJbWVn489PBL6kVDViFTqOSo38m4/wdMKCvUUCJPBiRNlAKO3IHkb3y4mc5fw==
+"@abp/owl.carousel@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-4.2.0-rc.1.tgz#b5ec191d4bd8f861edf21fd5a4bf85c8c76b37d3"
+  integrity sha512-a8auKT+pGwNQydEgx6OwBHfzmPBi4cKAXDvIHtWEexQXPa+a9wuBYjHc0Ba0x+0pt/vzm8lq2QvUW9Qa9S9ivg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    owl.carousel "^2.3.4"

-"@abp/prismjs@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.1.0.tgz#fde3454460013490f566fc3b27fbc1031251b98b"
-  integrity sha512-jXE8oS8JyLgZS/oXrVS2CxtIH09WEHoUPM4HfndzxSPzxmg3G+E8kzMXbPrHGGx7AhHgmSxNVFGuR2+1YFpSPQ==
+"@abp/prismjs@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.2.0-rc.1.tgz#4a091790900b23eea2390b016ae20b7fc3c57331"
+  integrity sha512-dYvcCJ9loOdgnMED0wid7zHK4wQu+3W+7p0nF/+yregZXQt87n8H7nZvAkxiq7PUSkgeJ+8kyutXfddY/Opgsw==
  dependencies:
-    "@abp/clipboard" "~4.1.0"
-    "@abp/core" "~4.1.0"
+    "@abp/clipboard" "~4.2.0-rc.1"
+    "@abp/core" "~4.2.0-rc.1"
    prismjs "^1.20.0"

-"@abp/select2@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.1.0.tgz#c1b8b7cca16bfe813d83e84f738acda8f8182159"
-  integrity sha512-p6atSzYTU5o36S4GHCHvi3wHf3fgg6wNJIxk4ohSxu1mOQnUbmyYbxKiDFxq+MOR2sOfVmAjqb4xvcIjexg6hA==
+"@abp/select2@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.0-rc.1.tgz#48a38319b4fb52ce3fa25d5c3647258dfceb42b5"
+  integrity sha512-8wB1DOkUotJxV3HE2ga8Nkb1I9t/VSQL6YsiK+EEfENuPuqOPD5N3mevLtQFOdy/c/i6s/Nx7Nb4VRT3cIBW5g==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    select2 "^4.0.13"

-"@abp/sweetalert@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.1.0.tgz#e5c8cb0c84435a0ca97be62c7b9204bbd05ae23d"
-  integrity sha512-VwIp7VD7zzkRMJw3yu7YOlWbIA/JbLYZeyEpNFMIDxAGYG936tVsmH+aQVTovHF/3+VsYf9Da1JjKymLVHkWRg==
+"@abp/sweetalert@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.0-rc.1.tgz#ca26dad346f79ec18c7a9b8d7a64f374f497cea4"
+  integrity sha512-N2agFY5TkJTozYlBOmzlnKJLfyJpNHDol5DyLRWF5zAkudUiDDaYJrvKVqmORsbZSDwJzKbgDcqwiuoPM14Fmg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    sweetalert "^2.1.2"

-"@abp/timeago@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.1.0.tgz#06df44618398cbec7bd174b7afd180907b67bb69"
-  integrity sha512-e1n9i8O0CaT4EIrnzMOur1HxSDpelgaVCLS9NWsTf4j4fIR3ojFqSNt76tpaPqVGBY9vRraGGu16XembYFF+jA==
+"@abp/timeago@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.0-rc.1.tgz#c001df75e78bf86ebb0a4b9de2361da4e0d04dd3"
+  integrity sha512-vHt7T+rW0HyqAwTRhTiBoDFEnb2b00MhBEUEU1u6v5uzmgco1erMD3+ae3EHuVHCQ+p5/mxrFTUnIpBxMEs7pg==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    timeago "^1.6.7"

-"@abp/toastr@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.1.0.tgz#eaa79a9e48638a2e86cb9573516e8614bfaf15a4"
-  integrity sha512-lA3pCdXgAWe1sVhC+/UNJa4T9AdxgN5ncW/3KW+9fg+IOieDwDibPIiuyornxrm+8G6uvrGxi//I3EeeqHABbg==
+"@abp/toastr@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.0-rc.1.tgz#66f34ab51d6c30666703f44ab2f0bccc26b2a1d7"
+  integrity sha512-BNYXnCPtFZtCemZ7yghi4/iYstqHTKUJZ+gkf1vXcHlLvE7JeM6SBMQYotyiiD/n1yKYrx8GRCKssf/gqO/VgQ==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    toastr "^2.1.4"

-"@abp/tui-editor@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.1.0.tgz#337c1fbe9a7325837e57db88fe0265259da7d463"
-  integrity sha512-KV1IexfjW8Hrni4CcSWzqshyvUSNNH3W14S+8JmoHurPw7iDPCkrIRDt5csJQAnDFu2e4YXHKnDwORKYqmOYsg==
+"@abp/tui-editor@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.2.0-rc.1.tgz#1d6a482566ee8a826e6ea57622b4606ea722f6cc"
+  integrity sha512-UAMkXa10tM03smyhaYpF00Xvw9JVRyRM2sgkZmpThlFwCWJVPG/lRAptIxnJK05cuo1DfBcYdonvlaAR9XBhEg==
  dependencies:
-    "@abp/codemirror" "~4.1.0"
-    "@abp/highlight.js" "~4.1.0"
-    "@abp/jquery" "~4.1.0"
-    "@abp/markdown-it" "~4.1.0"
+    "@abp/codemirror" "~4.2.0-rc.1"
+    "@abp/highlight.js" "~4.2.0-rc.1"
+    "@abp/jquery" "~4.2.0-rc.1"
+    "@abp/markdown-it" "~4.2.0-rc.1"
    tui-editor "^1.4.10"

-"@abp/utils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.1.0.tgz#1f5d8b4dc8a234c15d87869436485fd737f18b50"
-  integrity sha512-fksnKF1bsOab5AVe8qBs2HZmcRVjrnsMwXs23xaqSRdpWXpPgsLRuKCJHlD0usREyerDGPkpY5opUnXWggHvCg==
+"@abp/utils@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
+  integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
  dependencies:
    just-compare "^1.3.0"

--- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreModule.cs
+++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreModule.cs
@ -1,6 +1,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Modularity;
+using Volo.Blogging.Blogs;
+using Volo.Blogging.Comments;
+using Volo.Blogging.Posts;
+using Volo.Blogging.Tagging;
+using Volo.Blogging.Users;

 namespace Volo.Blogging.EntityFrameworkCore
 {
@ -11,7 +16,14 @@ namespace Volo.Blogging.EntityFrameworkCore
    {
        public override void ConfigureServices(ServiceConfigurationContext context)
        {
-            context.Services.AddAbpDbContext<BloggingDbContext>();
+            context.Services.AddAbpDbContext<BloggingDbContext>(options =>
+            {
+                options.AddRepository<Blog, EfCoreBlogRepository>();
+                options.AddRepository<BlogUser, EfCoreBlogUserRepository>();
+                options.AddRepository<Post, EfCorePostRepository>();
+                options.AddRepository<Tag, EfCoreTagRepository>();
+                options.AddRepository<Comment, EfCoreCommentRepository>();
+            });
        }
    }
 }
--- 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": "^4.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0-rc.1"
  }
 }
--- 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@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.1.0.tgz#ef1b31feb678fdf4ce6fa76fb1e9d091ca97c9a4"
-  integrity sha512-eAD39TaMVnXsEOVyKcChIggpzJw3TzDua8x/APlHfxWBQOuCb7C/PWLWH9DIN14kl8JsVpgRrUSlKsvvY8CIRA==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.1.0.tgz#40ef6d20a83a8e700179be7f3989c8d5135808d0"
-  integrity sha512-UdT3XCUMEKguB1w7qF4TO1ClayWn63oiP7wnOUmIg+O1EdKTHUBYfztle4Qb/aqtzjHoZBsOnMZH/KOyQKejDg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.1.0"
-    "@abp/bootstrap" "~4.1.0"
-    "@abp/bootstrap-datepicker" "~4.1.0"
-    "@abp/datatables.net-bs4" "~4.1.0"
-    "@abp/font-awesome" "~4.1.0"
-    "@abp/jquery-form" "~4.1.0"
-    "@abp/jquery-validation-unobtrusive" "~4.1.0"
-    "@abp/lodash" "~4.1.0"
-    "@abp/luxon" "~4.1.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.1.0"
-    "@abp/select2" "~4.1.0"
-    "@abp/sweetalert" "~4.1.0"
-    "@abp/timeago" "~4.1.0"
-    "@abp/toastr" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.1.0.tgz#c23ba554270a9534ac29a7e7ca8ab1ed0dc1cc7b"
-  integrity sha512-CaPVi8dKLD0/7zrsCdi3hA1alkUKVE3jVoUa2bl0mrBg30Xzu+IDAu6aIWFXOCnIX8YthejhA2Wtn4knbTOB4g==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.0-rc.1.tgz#42cda7aad84aea49cf6e9bba7a3bbb4709cbe5a9"
+  integrity sha512-tiERvctW+bcgH3pKqhMZrGXL1uCqw2W8LvjyxFoygJmjncTK9cjq5TEpwR0XXhlslfqPhr2DsglMeM1MOm+OVg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.0-rc.1.tgz#8b66c41ceb578b6187afa9cbba69fad36e6a7717"
+  integrity sha512-3rt9k6FYIZ5BmUOGLuixOIESNaJwskF+ySvufbI1Os8wyTeD/Q1HiYDIM1oJZ28qexAbKamdZuyKmWYmxqpqDQ==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~4.2.0-rc.1"
+    "@abp/bootstrap" "~4.2.0-rc.1"
+    "@abp/bootstrap-datepicker" "~4.2.0-rc.1"
+    "@abp/datatables.net-bs4" "~4.2.0-rc.1"
+    "@abp/font-awesome" "~4.2.0-rc.1"
+    "@abp/jquery-form" "~4.2.0-rc.1"
+    "@abp/jquery-validation-unobtrusive" "~4.2.0-rc.1"
+    "@abp/lodash" "~4.2.0-rc.1"
+    "@abp/luxon" "~4.2.0-rc.1"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.0-rc.1"
+    "@abp/select2" "~4.2.0-rc.1"
+    "@abp/sweetalert" "~4.2.0-rc.1"
+    "@abp/timeago" "~4.2.0-rc.1"
+    "@abp/toastr" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.0-rc.1.tgz#aae1153bf503cc5ce5443ce9f2efe5057af7314d"
+  integrity sha512-5EZlaHjdKYn6I+9kCXQWu/FjbNgyBSl2xW97nbF5Or3e9bUs+Ne6yLJMYypoLHzhcPUTzyemBozMf/VXX9oOhQ==
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -43,145 +43,145 @@
    micromatch "^4.0.2"
    path "^0.12.7"

-"@abp/bootstrap-datepicker@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.1.0.tgz#5c97fba78e56ba90820014a13e4c2d394d27332f"
-  integrity sha512-5XDW/Y2Gu1SgIm/tyRuo6vwcJdpFWIEnqDJ+0wjdOvWl3a+HnQTDya5g74mCmEBfYQgYDw8Wz8ovChOOzExh7Q==
+"@abp/bootstrap-datepicker@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.0-rc.1.tgz#1f49d714743453a83b76410e0f2b6ddc21378146"
+  integrity sha512-1zk19yIUgvy1aO9LnZ0qdLH/8f43qIGSwT5FYPc9Q9p/f3MquLEUq1i/A/BUVYqK9LJHJZFuZv0+XMopG7YJ2g==
  dependencies:
    bootstrap-datepicker "^1.9.0"

-"@abp/bootstrap@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.1.0.tgz#50ac670e319a60a985109e96302eed3e46d36afe"
-  integrity sha512-4lFrbaNPYRa45oH/D+fFUSmgD/OdSoCmHXvSdG2ye6+wyl6gy4JRfjjTOFmwpsyOWJdPMJSV6CARCSSsfeaItA==
+"@abp/bootstrap@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.0-rc.1.tgz#dd650bdc7c10fbb27d3e39d0081c80dd7b8bc077"
+  integrity sha512-oax5sp1MwqxNqhzo1/YnjcBhzztkHAceT9t5PfRfJvYr98idREGfo1G2yC5dOplIOnHM87DIbLQTW47m/Edrbw==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"

-"@abp/core@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.1.0.tgz#6bdfa378d44cbf8f611d52dddf0915e5bbc188d5"
-  integrity sha512-HXkKCfh8+Yc9iVBsZy7eSoQbkBSdV1QTRAF8+cPgbEpU4x4WlUOy61xqb2pSLFzX9nSma83WhdDyQkzWDBTRZQ==
+"@abp/core@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.0-rc.1.tgz#45d7961216709a9d4c57ee04a1e18d58150b29af"
+  integrity sha512-KIaHlCdAEkwhXgHTW0ACTbyPH/Y1Va/SsyMDVye7vcUldL/dp5HXXGaUWRR/Qrwxl55e8rXJTmOnX9ibtS5ydQ==
  dependencies:
-    "@abp/utils" "^4.1.0"
+    "@abp/utils" "^4.2.0-rc.1"

-"@abp/datatables.net-bs4@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.1.0.tgz#c28097b82f62b236d6f2578d7148128914eb5cd8"
-  integrity sha512-/fM/3Q/yXJaPsXGKIOZBgihxGLZ/T+n+6wguFeEypsAXCJ4MfpcRZ/eFPvVlBmmc/PVIdE8xtj5rnH9+/2KHWg==
+"@abp/datatables.net-bs4@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.0-rc.1.tgz#7f0c0dcb92f813d7a4d98d6f2c123092a84b5483"
+  integrity sha512-QaK9cSTeBTxeWrP/3g+jAAzGy9Jfkdbz0p7ycvHjbcSnHS3h4JRsUw9B3RNdmh3bnF1eVbRu97NiUgqJ3w6kQA==
  dependencies:
-    "@abp/datatables.net" "~4.1.0"
+    "@abp/datatables.net" "~4.2.0-rc.1"
    datatables.net-bs4 "^1.10.21"

-"@abp/datatables.net@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.1.0.tgz#a037fdae4beb9805e8eea71f086573eed4fd3c92"
-  integrity sha512-OZogC3UEvTSyas+VcxffggQ8U2fi399Ka+++4p+oXCPGykDLU1EKOSA/CToiu9uYNYJQ3125SjRZSOJD5h/ukg==
+"@abp/datatables.net@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.0-rc.1.tgz#9f9af39f23bd91cd1467b4a2de9aa743e5a6d693"
+  integrity sha512-un0DoikRJtrUAwDvG2En21Hz7IeGdfYufeeVIG5SPxzc2zxBi8h/8Cd6Zo0MJWFrU+gbW63ADB0wiuB6haC/fA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    datatables.net "^1.10.21"

-"@abp/font-awesome@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.1.0.tgz#a95f8df5f7e3695aaf05e3eab9f3087f4017d7e9"
-  integrity sha512-Zc4mPp740ACe10ollWez4qNg2QnM/AexDkF3pkxYNb1B9J4Fb8H7SefOOtMRdRgHK+sEe5vrPfIs8//gTf4xeQ==
+"@abp/font-awesome@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.0-rc.1.tgz#d1bfaa88fb9f76d0e71061c36493698cb50abbfa"
+  integrity sha512-e3bprerNY7kU26np7xSHUAkPrBr7+Nn0UvEiwWYgen1/TS0rs7usTkhIVtnF6w334bRIxjDcXLWDsZ3QswnVGA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    "@fortawesome/fontawesome-free" "^5.13.0"

-"@abp/jquery-form@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.1.0.tgz#b773c4f4619c3731c781993bba59a1cf38357918"
-  integrity sha512-7Mio+ehj7M2qt3oOyDBi97yNg1ip6BZiUpHkMtmPc/OxdnxpOZV9tZHyhbsoZFYTu1dUSmrpY6HKY0zibohyBQ==
+"@abp/jquery-form@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.0-rc.1.tgz#1625df5844564887836a698b9709c5ea58a87c07"
+  integrity sha512-JSC+xQmoPuSEdjm5gpVKpF9VS1X48uUxlRmAfeiWLHDorFZvzpiak3NhVU8XHfv5UG2SGYVqQmwnRxk5f9D4HA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-form "^4.3.0"

-"@abp/jquery-validation-unobtrusive@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.1.0.tgz#954ce53a46475c09056d789eba761568482ea8c9"
-  integrity sha512-diykqQiGzowYDpsG9PMd3ipeXFrilRQiHQX2mglBf+FNKMocp7LBAIeD2INkiObczZfIKkoqu7WCRqb1bl5uKg==
+"@abp/jquery-validation-unobtrusive@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.0-rc.1.tgz#0e30042735f8f1da831691ef0b67ff0efceb8cd8"
+  integrity sha512-dSWlUvKUj0hsJby8UP5gEVBPXL7TYTe8VskyoSxVCvMs7jMD0yuH67ZImP+2c5p6X5Pww+ImEZ5RUjr0hKh1WA==
  dependencies:
-    "@abp/jquery-validation" "~4.1.0"
+    "@abp/jquery-validation" "~4.2.0-rc.1"
    jquery-validation-unobtrusive "^3.2.11"

-"@abp/jquery-validation@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.1.0.tgz#29cffb21270c52758804cf0d3f5b6e83b327047d"
-  integrity sha512-JrDcejGKz33LeNMn3+DguzDd8XN6LXlceffMc8jz4zYvtb+NqwUn7NFvH3gnKfNKBc8V9cQIHxQpYQa8luYcsA==
+"@abp/jquery-validation@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.0-rc.1.tgz#b5e0b2b2b7c0826f9d11c1f9a93f300945769368"
+  integrity sha512-GxPE2+NOGGl4NZThMpLLexF65AwpF6oMVc3StvOVfgNstzl+VezhkJwjytiLVK4acr6zSTIUNbKsKjGIWLVG/A==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-validation "^1.19.2"

-"@abp/jquery@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.1.0.tgz#3c021d24eb5ef7fe198da8982657075556556701"
-  integrity sha512-1HLjkxj5EudcoxZ9CVqsP0tgKwLQBs5KI9vnnW9I9pco6fIf1Q2PT+TZZywOZ3ftkYfMp90PF+A5IL/JfovnpQ==
+"@abp/jquery@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.0-rc.1.tgz#7cdec9c3e5cd796c65bd0d7317025728b577ff14"
+  integrity sha512-/bIQVKQqDJn9pSlzv5pteYEef+bLw6iqPCwNamLsSjpMPCVMukgD6DuL+1bY1Yb/9fVORODnqctCsxXxl0W/iQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    jquery "~3.5.1"

-"@abp/lodash@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.1.0.tgz#e605644ba745813a2937b24f3b9d2ad86b20dec9"
-  integrity sha512-jUjua8iZIE5P/AELI/nffS09IorBRM/Jfq6agCOX6Qg7d8od66B9gV727mTuaMd9ZW65S1wW5+zMJhm5gy7Qpg==
+"@abp/lodash@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.0-rc.1.tgz#11ed50c96b85b129fd83224defd0c54627ea6ce4"
+  integrity sha512-RQLTOv4wRgeCMEFFi8bWnbLblYmk0p4U4NRaMEX+Y3Hxuh1ROCvxwl2jCxqfdAAx+Jpg1SFtyxTU+wMDYeR6IA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    lodash "^4.17.15"

-"@abp/luxon@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.1.0.tgz#12c9b6eb2a87e0ebe7df58bcbd5f38211ca62e81"
-  integrity sha512-gc8DAZHa+fcnDGWGQHmI8Tllr+QzHAZejrwoVSRiRX+Oebf67sCEDdbwB8yWeEHSa3MbpPtm7I1aTc/+dQI8Dg==
+"@abp/luxon@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.0-rc.1.tgz#7eabef77537651e13faf8be32030e382427d3f98"
+  integrity sha512-nRb7RvUdhVSfeSI+HEGVkhlW1VKJKSiwbDxKB0okubGE4L+siYUhN8FKCtRTCP4NjxNMLCS7v73XA2DxkyjcVg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    luxon "^1.24.1"

-"@abp/malihu-custom-scrollbar-plugin@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.1.0.tgz#a340fa3757eb01bd510d3dcb54331b5b0a93a63f"
-  integrity sha512-CMCIxQNwPNRmmg4WctusMWhg8evrCoq3frQ5Fxnc/fKaMrrzQKL5PY2cV2jY2m5Se+Y+S9EPa3cNOQ1/KYuQ9w==
+"@abp/malihu-custom-scrollbar-plugin@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.0-rc.1.tgz#b346aa9545fa157647f8932e04d3051ade63aeb5"
+  integrity sha512-CKXalT+pgeLVoX1k2J17ia5hjignsabaJZBRG81JAkAHI20JGxvNLL2cVXv+M1KdmQGla+Douf7/c6eNiaSheA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    malihu-custom-scrollbar-plugin "^3.1.5"

-"@abp/select2@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.1.0.tgz#c1b8b7cca16bfe813d83e84f738acda8f8182159"
-  integrity sha512-p6atSzYTU5o36S4GHCHvi3wHf3fgg6wNJIxk4ohSxu1mOQnUbmyYbxKiDFxq+MOR2sOfVmAjqb4xvcIjexg6hA==
+"@abp/select2@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.0-rc.1.tgz#48a38319b4fb52ce3fa25d5c3647258dfceb42b5"
+  integrity sha512-8wB1DOkUotJxV3HE2ga8Nkb1I9t/VSQL6YsiK+EEfENuPuqOPD5N3mevLtQFOdy/c/i6s/Nx7Nb4VRT3cIBW5g==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    select2 "^4.0.13"

-"@abp/sweetalert@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.1.0.tgz#e5c8cb0c84435a0ca97be62c7b9204bbd05ae23d"
-  integrity sha512-VwIp7VD7zzkRMJw3yu7YOlWbIA/JbLYZeyEpNFMIDxAGYG936tVsmH+aQVTovHF/3+VsYf9Da1JjKymLVHkWRg==
+"@abp/sweetalert@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.0-rc.1.tgz#ca26dad346f79ec18c7a9b8d7a64f374f497cea4"
+  integrity sha512-N2agFY5TkJTozYlBOmzlnKJLfyJpNHDol5DyLRWF5zAkudUiDDaYJrvKVqmORsbZSDwJzKbgDcqwiuoPM14Fmg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    sweetalert "^2.1.2"

-"@abp/timeago@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.1.0.tgz#06df44618398cbec7bd174b7afd180907b67bb69"
-  integrity sha512-e1n9i8O0CaT4EIrnzMOur1HxSDpelgaVCLS9NWsTf4j4fIR3ojFqSNt76tpaPqVGBY9vRraGGu16XembYFF+jA==
+"@abp/timeago@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.0-rc.1.tgz#c001df75e78bf86ebb0a4b9de2361da4e0d04dd3"
+  integrity sha512-vHt7T+rW0HyqAwTRhTiBoDFEnb2b00MhBEUEU1u6v5uzmgco1erMD3+ae3EHuVHCQ+p5/mxrFTUnIpBxMEs7pg==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    timeago "^1.6.7"

-"@abp/toastr@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.1.0.tgz#eaa79a9e48638a2e86cb9573516e8614bfaf15a4"
-  integrity sha512-lA3pCdXgAWe1sVhC+/UNJa4T9AdxgN5ncW/3KW+9fg+IOieDwDibPIiuyornxrm+8G6uvrGxi//I3EeeqHABbg==
+"@abp/toastr@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.0-rc.1.tgz#66f34ab51d6c30666703f44ab2f0bccc26b2a1d7"
+  integrity sha512-BNYXnCPtFZtCemZ7yghi4/iYstqHTKUJZ+gkf1vXcHlLvE7JeM6SBMQYotyiiD/n1yKYrx8GRCKssf/gqO/VgQ==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    toastr "^2.1.4"

-"@abp/utils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.1.0.tgz#1f5d8b4dc8a234c15d87869436485fd737f18b50"
-  integrity sha512-fksnKF1bsOab5AVe8qBs2HZmcRVjrnsMwXs23xaqSRdpWXpPgsLRuKCJHlD0usREyerDGPkpY5opUnXWggHvCg==
+"@abp/utils@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
+  integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
  dependencies:
    just-compare "^1.3.0"

--- a/modules/cms-kit/angular/package.json
+++ b/modules/cms-kit/angular/package.json
@ -16,10 +16,10 @@
  "private": true,
  "dependencies": {
    "@abp/ng.account": "~3.3.2",
-    "@abp/ng.identity": "~4.1.0",
-    "@abp/ng.setting-management": "~4.1.0",
-    "@abp/ng.tenant-management": "~4.1.0",
-    "@abp/ng.theme.basic": "~4.1.0",
+    "@abp/ng.identity": "~4.2.0-rc.1",
+    "@abp/ng.setting-management": "~4.2.0-rc.1",
+    "@abp/ng.tenant-management": "~4.2.0-rc.1",
+    "@abp/ng.theme.basic": "~4.2.0-rc.1",
    "@angular/animations": "~10.0.0",
    "@angular/common": "~10.0.0",
    "@angular/compiler": "~10.0.0",
--- 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": ">=4.1.0",
-    "@abp/ng.theme.shared": ">=4.1.0"
+    "@abp/ng.core": ">=4.2.0-rc.1",
+    "@abp/ng.theme.shared": ">=4.2.0-rc.1"
  },
  "dependencies": {
    "tslib": "^2.0.0"
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs
@ -22,6 +22,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
+using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.Caching;
 using Volo.Abp.Caching.StackExchangeRedis;
 using Volo.Abp.EntityFrameworkCore;
@ -47,7 +48,8 @@ namespace Volo.CmsKit
        typeof(AbpAuditLoggingEntityFrameworkCoreModule),
        typeof(AbpPermissionManagementEntityFrameworkCoreModule),
        typeof(AbpSettingManagementEntityFrameworkCoreModule),
-        typeof(AbpAspNetCoreSerilogModule)
+        typeof(AbpAspNetCoreSerilogModule),
+        typeof(BlobStoringDatabaseEntityFrameworkCoreModule)
        )]
    public class CmsKitHttpApiHostModule : AbpModule
    {
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/EntityFrameworkCore/CmsKitHttpApiHostMigrationsDbContext.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/EntityFrameworkCore/CmsKitHttpApiHostMigrationsDbContext.cs
@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;

 namespace Volo.CmsKit.EntityFrameworkCore
@ -16,6 +17,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
            base.OnModelCreating(modelBuilder);

            modelBuilder.ConfigureCmsKit();
+            modelBuilder.ConfigureBlobStoring();
        }
    }
 }
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Migrations/20201231111745_Initial.Designer.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Migrations/20201231111745_Initial.Designer.cs
@ -0,0 +1,531 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit.Migrations
+{
+    [DbContext(typeof(CmsKitHttpApiHostMigrationsDbContext))]
+    [Migration("20201231111745_Initial")]
+    partial class Initial
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .UseIdentityColumns()
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("ProductVersion", "5.0.1");
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContainerId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<byte[]>("Content")
+                        .HasMaxLength(2147483647)
+                        .HasColumnType("varbinary(max)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("TenantId", "ContainerId", "Name");
+
+                    b.ToTable("AbpBlobs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name");
+
+                    b.ToTable("AbpBlobContainers");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<Guid?>("RepliedCommentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "RepliedCommentId");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
+                    b.ToTable("CmsComments");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Contents.Content", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(2147483647)
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
+                    b.ToTable("CmsContents");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Pages.Page", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Url");
+
+                    b.ToTable("CmsPages");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<short>("StarCount")
+                        .HasColumnType("smallint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId");
+
+                    b.ToTable("CmsRatings");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("ReactionName")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("nvarchar(32)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId", "ReactionName");
+
+                    b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName");
+
+                    b.ToTable("CmsUserReactions");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Tags.EntityTag", b =>
+                {
+                    b.Property<string>("EntityId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("EntityId", "TagId");
+
+                    b.HasIndex("TenantId", "EntityId", "TagId");
+
+                    b.ToTable("CmsEntityTags");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Tags.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("nvarchar(32)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name");
+
+                    b.ToTable("CmsTags");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("Email");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("EmailConfirmed");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("Name");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("nvarchar(16)")
+                        .HasColumnName("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("PhoneNumberConfirmed");
+
+                    b.Property<string>("Surname")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("Surname");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Email");
+
+                    b.HasIndex("TenantId", "UserName");
+
+                    b.ToTable("CmsUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.HasOne("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", null)
+                        .WithMany()
+                        .HasForeignKey("ContainerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Migrations/20201231111745_Initial.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Migrations/20201231111745_Initial.cs
@ -0,0 +1,309 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.CmsKit.Migrations
+{
+    public partial class Initial : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AbpBlobContainers",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpBlobContainers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsComments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    EntityType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EntityId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Text = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: false),
+                    RepliedCommentId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsComments", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsContents",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    EntityType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EntityId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Value = table.Column<string>(type: "nvarchar(max)", maxLength: 2147483647, nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsContents", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsEntityTags",
+                columns: table => new
+                {
+                    TagId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    EntityId = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsEntityTags", x => new { x.EntityId, x.TagId });
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsPages",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Title = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Url = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Description = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsPages", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsRatings",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    EntityType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EntityId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    StarCount = table.Column<short>(type: "smallint", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsRatings", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsTags",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    EntityType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsTags", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsUserReactions",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    EntityType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EntityId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ReactionName = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsUserReactions", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CmsUsers",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Email = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Surname = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    EmailConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    PhoneNumber = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
+                    PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsUsers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpBlobs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ContainerId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Content = table.Column<byte[]>(type: "varbinary(max)", maxLength: 2147483647, nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpBlobs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AbpBlobs_AbpBlobContainers_ContainerId",
+                        column: x => x.ContainerId,
+                        principalTable: "AbpBlobContainers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobContainers_TenantId_Name",
+                table: "AbpBlobContainers",
+                columns: new[] { "TenantId", "Name" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobs_ContainerId",
+                table: "AbpBlobs",
+                column: "ContainerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobs_TenantId_ContainerId_Name",
+                table: "AbpBlobs",
+                columns: new[] { "TenantId", "ContainerId", "Name" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsComments_TenantId_EntityType_EntityId",
+                table: "CmsComments",
+                columns: new[] { "TenantId", "EntityType", "EntityId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsComments_TenantId_RepliedCommentId",
+                table: "CmsComments",
+                columns: new[] { "TenantId", "RepliedCommentId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsContents_TenantId_EntityType_EntityId",
+                table: "CmsContents",
+                columns: new[] { "TenantId", "EntityType", "EntityId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsEntityTags_TenantId_EntityId_TagId",
+                table: "CmsEntityTags",
+                columns: new[] { "TenantId", "EntityId", "TagId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsPages_TenantId_Url",
+                table: "CmsPages",
+                columns: new[] { "TenantId", "Url" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsRatings_TenantId_EntityType_EntityId_CreatorId",
+                table: "CmsRatings",
+                columns: new[] { "TenantId", "EntityType", "EntityId", "CreatorId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsTags_TenantId_Name",
+                table: "CmsTags",
+                columns: new[] { "TenantId", "Name" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsUserReactions_TenantId_CreatorId_EntityType_EntityId_ReactionName",
+                table: "CmsUserReactions",
+                columns: new[] { "TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsUserReactions_TenantId_EntityType_EntityId_ReactionName",
+                table: "CmsUserReactions",
+                columns: new[] { "TenantId", "EntityType", "EntityId", "ReactionName" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsUsers_TenantId_Email",
+                table: "CmsUsers",
+                columns: new[] { "TenantId", "Email" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsUsers_TenantId_UserName",
+                table: "CmsUsers",
+                columns: new[] { "TenantId", "UserName" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AbpBlobs");
+
+            migrationBuilder.DropTable(
+                name: "CmsComments");
+
+            migrationBuilder.DropTable(
+                name: "CmsContents");
+
+            migrationBuilder.DropTable(
+                name: "CmsEntityTags");
+
+            migrationBuilder.DropTable(
+                name: "CmsPages");
+
+            migrationBuilder.DropTable(
+                name: "CmsRatings");
+
+            migrationBuilder.DropTable(
+                name: "CmsTags");
+
+            migrationBuilder.DropTable(
+                name: "CmsUserReactions");
+
+            migrationBuilder.DropTable(
+                name: "CmsUsers");
+
+            migrationBuilder.DropTable(
+                name: "AbpBlobContainers");
+        }
+    }
+}
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Migrations/CmsKitHttpApiHostMigrationsDbContextModelSnapshot.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Migrations/CmsKitHttpApiHostMigrationsDbContextModelSnapshot.cs
@ -0,0 +1,529 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit.Migrations
+{
+    [DbContext(typeof(CmsKitHttpApiHostMigrationsDbContext))]
+    partial class CmsKitHttpApiHostMigrationsDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .UseIdentityColumns()
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("ProductVersion", "5.0.1");
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContainerId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<byte[]>("Content")
+                        .HasMaxLength(2147483647)
+                        .HasColumnType("varbinary(max)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("TenantId", "ContainerId", "Name");
+
+                    b.ToTable("AbpBlobs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name");
+
+                    b.ToTable("AbpBlobContainers");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<Guid?>("RepliedCommentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "RepliedCommentId");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
+                    b.ToTable("CmsComments");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Contents.Content", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(2147483647)
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
+                    b.ToTable("CmsContents");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Pages.Page", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Url");
+
+                    b.ToTable("CmsPages");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<short>("StarCount")
+                        .HasColumnType("smallint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId");
+
+                    b.ToTable("CmsRatings");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("ReactionName")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("nvarchar(32)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId", "ReactionName");
+
+                    b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName");
+
+                    b.ToTable("CmsUserReactions");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Tags.EntityTag", b =>
+                {
+                    b.Property<string>("EntityId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("EntityId", "TagId");
+
+                    b.HasIndex("TenantId", "EntityId", "TagId");
+
+                    b.ToTable("CmsEntityTags");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Tags.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("nvarchar(32)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name");
+
+                    b.ToTable("CmsTags");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("Email");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("EmailConfirmed");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("Name");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("nvarchar(16)")
+                        .HasColumnName("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("PhoneNumberConfirmed");
+
+                    b.Property<string>("Surname")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)")
+                        .HasColumnName("Surname");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Email");
+
+                    b.HasIndex("TenantId", "UserName");
+
+                    b.ToTable("CmsUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.HasOne("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", null)
+                        .WithMany()
+                        .HasForeignKey("ContainerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj
@ -24,6 +24,7 @@
    <ProjectReference Include="..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.EntityFrameworkCore\Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\blob-storing-database\src\Volo.Abp.BlobStoring.Database.EntityFrameworkCore\Volo.Abp.BlobStoring.Database.EntityFrameworkCore.csproj" />
  </ItemGroup>

  <ItemGroup>
--- 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": "^4.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0-rc.1"
  }
 }
--- 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@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.1.0.tgz#ef1b31feb678fdf4ce6fa76fb1e9d091ca97c9a4"
-  integrity sha512-eAD39TaMVnXsEOVyKcChIggpzJw3TzDua8x/APlHfxWBQOuCb7C/PWLWH9DIN14kl8JsVpgRrUSlKsvvY8CIRA==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.1.0.tgz#40ef6d20a83a8e700179be7f3989c8d5135808d0"
-  integrity sha512-UdT3XCUMEKguB1w7qF4TO1ClayWn63oiP7wnOUmIg+O1EdKTHUBYfztle4Qb/aqtzjHoZBsOnMZH/KOyQKejDg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.1.0"
-    "@abp/bootstrap" "~4.1.0"
-    "@abp/bootstrap-datepicker" "~4.1.0"
-    "@abp/datatables.net-bs4" "~4.1.0"
-    "@abp/font-awesome" "~4.1.0"
-    "@abp/jquery-form" "~4.1.0"
-    "@abp/jquery-validation-unobtrusive" "~4.1.0"
-    "@abp/lodash" "~4.1.0"
-    "@abp/luxon" "~4.1.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.1.0"
-    "@abp/select2" "~4.1.0"
-    "@abp/sweetalert" "~4.1.0"
-    "@abp/timeago" "~4.1.0"
-    "@abp/toastr" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.1.0.tgz#c23ba554270a9534ac29a7e7ca8ab1ed0dc1cc7b"
-  integrity sha512-CaPVi8dKLD0/7zrsCdi3hA1alkUKVE3jVoUa2bl0mrBg30Xzu+IDAu6aIWFXOCnIX8YthejhA2Wtn4knbTOB4g==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.0-rc.1.tgz#42cda7aad84aea49cf6e9bba7a3bbb4709cbe5a9"
+  integrity sha512-tiERvctW+bcgH3pKqhMZrGXL1uCqw2W8LvjyxFoygJmjncTK9cjq5TEpwR0XXhlslfqPhr2DsglMeM1MOm+OVg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.0-rc.1.tgz#8b66c41ceb578b6187afa9cbba69fad36e6a7717"
+  integrity sha512-3rt9k6FYIZ5BmUOGLuixOIESNaJwskF+ySvufbI1Os8wyTeD/Q1HiYDIM1oJZ28qexAbKamdZuyKmWYmxqpqDQ==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~4.2.0-rc.1"
+    "@abp/bootstrap" "~4.2.0-rc.1"
+    "@abp/bootstrap-datepicker" "~4.2.0-rc.1"
+    "@abp/datatables.net-bs4" "~4.2.0-rc.1"
+    "@abp/font-awesome" "~4.2.0-rc.1"
+    "@abp/jquery-form" "~4.2.0-rc.1"
+    "@abp/jquery-validation-unobtrusive" "~4.2.0-rc.1"
+    "@abp/lodash" "~4.2.0-rc.1"
+    "@abp/luxon" "~4.2.0-rc.1"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.0-rc.1"
+    "@abp/select2" "~4.2.0-rc.1"
+    "@abp/sweetalert" "~4.2.0-rc.1"
+    "@abp/timeago" "~4.2.0-rc.1"
+    "@abp/toastr" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.0-rc.1.tgz#aae1153bf503cc5ce5443ce9f2efe5057af7314d"
+  integrity sha512-5EZlaHjdKYn6I+9kCXQWu/FjbNgyBSl2xW97nbF5Or3e9bUs+Ne6yLJMYypoLHzhcPUTzyemBozMf/VXX9oOhQ==
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -43,145 +43,145 @@
    micromatch "^4.0.2"
    path "^0.12.7"

-"@abp/bootstrap-datepicker@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.1.0.tgz#5c97fba78e56ba90820014a13e4c2d394d27332f"
-  integrity sha512-5XDW/Y2Gu1SgIm/tyRuo6vwcJdpFWIEnqDJ+0wjdOvWl3a+HnQTDya5g74mCmEBfYQgYDw8Wz8ovChOOzExh7Q==
+"@abp/bootstrap-datepicker@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.0-rc.1.tgz#1f49d714743453a83b76410e0f2b6ddc21378146"
+  integrity sha512-1zk19yIUgvy1aO9LnZ0qdLH/8f43qIGSwT5FYPc9Q9p/f3MquLEUq1i/A/BUVYqK9LJHJZFuZv0+XMopG7YJ2g==
  dependencies:
    bootstrap-datepicker "^1.9.0"

-"@abp/bootstrap@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.1.0.tgz#50ac670e319a60a985109e96302eed3e46d36afe"
-  integrity sha512-4lFrbaNPYRa45oH/D+fFUSmgD/OdSoCmHXvSdG2ye6+wyl6gy4JRfjjTOFmwpsyOWJdPMJSV6CARCSSsfeaItA==
+"@abp/bootstrap@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.0-rc.1.tgz#dd650bdc7c10fbb27d3e39d0081c80dd7b8bc077"
+  integrity sha512-oax5sp1MwqxNqhzo1/YnjcBhzztkHAceT9t5PfRfJvYr98idREGfo1G2yC5dOplIOnHM87DIbLQTW47m/Edrbw==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"

-"@abp/core@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.1.0.tgz#6bdfa378d44cbf8f611d52dddf0915e5bbc188d5"
-  integrity sha512-HXkKCfh8+Yc9iVBsZy7eSoQbkBSdV1QTRAF8+cPgbEpU4x4WlUOy61xqb2pSLFzX9nSma83WhdDyQkzWDBTRZQ==
+"@abp/core@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.0-rc.1.tgz#45d7961216709a9d4c57ee04a1e18d58150b29af"
+  integrity sha512-KIaHlCdAEkwhXgHTW0ACTbyPH/Y1Va/SsyMDVye7vcUldL/dp5HXXGaUWRR/Qrwxl55e8rXJTmOnX9ibtS5ydQ==
  dependencies:
-    "@abp/utils" "^4.1.0"
+    "@abp/utils" "^4.2.0-rc.1"

-"@abp/datatables.net-bs4@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.1.0.tgz#c28097b82f62b236d6f2578d7148128914eb5cd8"
-  integrity sha512-/fM/3Q/yXJaPsXGKIOZBgihxGLZ/T+n+6wguFeEypsAXCJ4MfpcRZ/eFPvVlBmmc/PVIdE8xtj5rnH9+/2KHWg==
+"@abp/datatables.net-bs4@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.0-rc.1.tgz#7f0c0dcb92f813d7a4d98d6f2c123092a84b5483"
+  integrity sha512-QaK9cSTeBTxeWrP/3g+jAAzGy9Jfkdbz0p7ycvHjbcSnHS3h4JRsUw9B3RNdmh3bnF1eVbRu97NiUgqJ3w6kQA==
  dependencies:
-    "@abp/datatables.net" "~4.1.0"
+    "@abp/datatables.net" "~4.2.0-rc.1"
    datatables.net-bs4 "^1.10.21"

-"@abp/datatables.net@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.1.0.tgz#a037fdae4beb9805e8eea71f086573eed4fd3c92"
-  integrity sha512-OZogC3UEvTSyas+VcxffggQ8U2fi399Ka+++4p+oXCPGykDLU1EKOSA/CToiu9uYNYJQ3125SjRZSOJD5h/ukg==
+"@abp/datatables.net@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.0-rc.1.tgz#9f9af39f23bd91cd1467b4a2de9aa743e5a6d693"
+  integrity sha512-un0DoikRJtrUAwDvG2En21Hz7IeGdfYufeeVIG5SPxzc2zxBi8h/8Cd6Zo0MJWFrU+gbW63ADB0wiuB6haC/fA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    datatables.net "^1.10.21"

-"@abp/font-awesome@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.1.0.tgz#a95f8df5f7e3695aaf05e3eab9f3087f4017d7e9"
-  integrity sha512-Zc4mPp740ACe10ollWez4qNg2QnM/AexDkF3pkxYNb1B9J4Fb8H7SefOOtMRdRgHK+sEe5vrPfIs8//gTf4xeQ==
+"@abp/font-awesome@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.0-rc.1.tgz#d1bfaa88fb9f76d0e71061c36493698cb50abbfa"
+  integrity sha512-e3bprerNY7kU26np7xSHUAkPrBr7+Nn0UvEiwWYgen1/TS0rs7usTkhIVtnF6w334bRIxjDcXLWDsZ3QswnVGA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    "@fortawesome/fontawesome-free" "^5.13.0"

-"@abp/jquery-form@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.1.0.tgz#b773c4f4619c3731c781993bba59a1cf38357918"
-  integrity sha512-7Mio+ehj7M2qt3oOyDBi97yNg1ip6BZiUpHkMtmPc/OxdnxpOZV9tZHyhbsoZFYTu1dUSmrpY6HKY0zibohyBQ==
+"@abp/jquery-form@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.0-rc.1.tgz#1625df5844564887836a698b9709c5ea58a87c07"
+  integrity sha512-JSC+xQmoPuSEdjm5gpVKpF9VS1X48uUxlRmAfeiWLHDorFZvzpiak3NhVU8XHfv5UG2SGYVqQmwnRxk5f9D4HA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-form "^4.3.0"

-"@abp/jquery-validation-unobtrusive@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.1.0.tgz#954ce53a46475c09056d789eba761568482ea8c9"
-  integrity sha512-diykqQiGzowYDpsG9PMd3ipeXFrilRQiHQX2mglBf+FNKMocp7LBAIeD2INkiObczZfIKkoqu7WCRqb1bl5uKg==
+"@abp/jquery-validation-unobtrusive@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.0-rc.1.tgz#0e30042735f8f1da831691ef0b67ff0efceb8cd8"
+  integrity sha512-dSWlUvKUj0hsJby8UP5gEVBPXL7TYTe8VskyoSxVCvMs7jMD0yuH67ZImP+2c5p6X5Pww+ImEZ5RUjr0hKh1WA==
  dependencies:
-    "@abp/jquery-validation" "~4.1.0"
+    "@abp/jquery-validation" "~4.2.0-rc.1"
    jquery-validation-unobtrusive "^3.2.11"

-"@abp/jquery-validation@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.1.0.tgz#29cffb21270c52758804cf0d3f5b6e83b327047d"
-  integrity sha512-JrDcejGKz33LeNMn3+DguzDd8XN6LXlceffMc8jz4zYvtb+NqwUn7NFvH3gnKfNKBc8V9cQIHxQpYQa8luYcsA==
+"@abp/jquery-validation@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.0-rc.1.tgz#b5e0b2b2b7c0826f9d11c1f9a93f300945769368"
+  integrity sha512-GxPE2+NOGGl4NZThMpLLexF65AwpF6oMVc3StvOVfgNstzl+VezhkJwjytiLVK4acr6zSTIUNbKsKjGIWLVG/A==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-validation "^1.19.2"

-"@abp/jquery@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.1.0.tgz#3c021d24eb5ef7fe198da8982657075556556701"
-  integrity sha512-1HLjkxj5EudcoxZ9CVqsP0tgKwLQBs5KI9vnnW9I9pco6fIf1Q2PT+TZZywOZ3ftkYfMp90PF+A5IL/JfovnpQ==
+"@abp/jquery@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.0-rc.1.tgz#7cdec9c3e5cd796c65bd0d7317025728b577ff14"
+  integrity sha512-/bIQVKQqDJn9pSlzv5pteYEef+bLw6iqPCwNamLsSjpMPCVMukgD6DuL+1bY1Yb/9fVORODnqctCsxXxl0W/iQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    jquery "~3.5.1"

-"@abp/lodash@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.1.0.tgz#e605644ba745813a2937b24f3b9d2ad86b20dec9"
-  integrity sha512-jUjua8iZIE5P/AELI/nffS09IorBRM/Jfq6agCOX6Qg7d8od66B9gV727mTuaMd9ZW65S1wW5+zMJhm5gy7Qpg==
+"@abp/lodash@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.0-rc.1.tgz#11ed50c96b85b129fd83224defd0c54627ea6ce4"
+  integrity sha512-RQLTOv4wRgeCMEFFi8bWnbLblYmk0p4U4NRaMEX+Y3Hxuh1ROCvxwl2jCxqfdAAx+Jpg1SFtyxTU+wMDYeR6IA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    lodash "^4.17.15"

-"@abp/luxon@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.1.0.tgz#12c9b6eb2a87e0ebe7df58bcbd5f38211ca62e81"
-  integrity sha512-gc8DAZHa+fcnDGWGQHmI8Tllr+QzHAZejrwoVSRiRX+Oebf67sCEDdbwB8yWeEHSa3MbpPtm7I1aTc/+dQI8Dg==
+"@abp/luxon@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.0-rc.1.tgz#7eabef77537651e13faf8be32030e382427d3f98"
+  integrity sha512-nRb7RvUdhVSfeSI+HEGVkhlW1VKJKSiwbDxKB0okubGE4L+siYUhN8FKCtRTCP4NjxNMLCS7v73XA2DxkyjcVg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    luxon "^1.24.1"

-"@abp/malihu-custom-scrollbar-plugin@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.1.0.tgz#a340fa3757eb01bd510d3dcb54331b5b0a93a63f"
-  integrity sha512-CMCIxQNwPNRmmg4WctusMWhg8evrCoq3frQ5Fxnc/fKaMrrzQKL5PY2cV2jY2m5Se+Y+S9EPa3cNOQ1/KYuQ9w==
+"@abp/malihu-custom-scrollbar-plugin@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.0-rc.1.tgz#b346aa9545fa157647f8932e04d3051ade63aeb5"
+  integrity sha512-CKXalT+pgeLVoX1k2J17ia5hjignsabaJZBRG81JAkAHI20JGxvNLL2cVXv+M1KdmQGla+Douf7/c6eNiaSheA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    malihu-custom-scrollbar-plugin "^3.1.5"

-"@abp/select2@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.1.0.tgz#c1b8b7cca16bfe813d83e84f738acda8f8182159"
-  integrity sha512-p6atSzYTU5o36S4GHCHvi3wHf3fgg6wNJIxk4ohSxu1mOQnUbmyYbxKiDFxq+MOR2sOfVmAjqb4xvcIjexg6hA==
+"@abp/select2@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.0-rc.1.tgz#48a38319b4fb52ce3fa25d5c3647258dfceb42b5"
+  integrity sha512-8wB1DOkUotJxV3HE2ga8Nkb1I9t/VSQL6YsiK+EEfENuPuqOPD5N3mevLtQFOdy/c/i6s/Nx7Nb4VRT3cIBW5g==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    select2 "^4.0.13"

-"@abp/sweetalert@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.1.0.tgz#e5c8cb0c84435a0ca97be62c7b9204bbd05ae23d"
-  integrity sha512-VwIp7VD7zzkRMJw3yu7YOlWbIA/JbLYZeyEpNFMIDxAGYG936tVsmH+aQVTovHF/3+VsYf9Da1JjKymLVHkWRg==
+"@abp/sweetalert@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.0-rc.1.tgz#ca26dad346f79ec18c7a9b8d7a64f374f497cea4"
+  integrity sha512-N2agFY5TkJTozYlBOmzlnKJLfyJpNHDol5DyLRWF5zAkudUiDDaYJrvKVqmORsbZSDwJzKbgDcqwiuoPM14Fmg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    sweetalert "^2.1.2"

-"@abp/timeago@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.1.0.tgz#06df44618398cbec7bd174b7afd180907b67bb69"
-  integrity sha512-e1n9i8O0CaT4EIrnzMOur1HxSDpelgaVCLS9NWsTf4j4fIR3ojFqSNt76tpaPqVGBY9vRraGGu16XembYFF+jA==
+"@abp/timeago@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.0-rc.1.tgz#c001df75e78bf86ebb0a4b9de2361da4e0d04dd3"
+  integrity sha512-vHt7T+rW0HyqAwTRhTiBoDFEnb2b00MhBEUEU1u6v5uzmgco1erMD3+ae3EHuVHCQ+p5/mxrFTUnIpBxMEs7pg==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    timeago "^1.6.7"

-"@abp/toastr@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.1.0.tgz#eaa79a9e48638a2e86cb9573516e8614bfaf15a4"
-  integrity sha512-lA3pCdXgAWe1sVhC+/UNJa4T9AdxgN5ncW/3KW+9fg+IOieDwDibPIiuyornxrm+8G6uvrGxi//I3EeeqHABbg==
+"@abp/toastr@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.0-rc.1.tgz#66f34ab51d6c30666703f44ab2f0bccc26b2a1d7"
+  integrity sha512-BNYXnCPtFZtCemZ7yghi4/iYstqHTKUJZ+gkf1vXcHlLvE7JeM6SBMQYotyiiD/n1yKYrx8GRCKssf/gqO/VgQ==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    toastr "^2.1.4"

-"@abp/utils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.1.0.tgz#1f5d8b4dc8a234c15d87869436485fd737f18b50"
-  integrity sha512-fksnKF1bsOab5AVe8qBs2HZmcRVjrnsMwXs23xaqSRdpWXpPgsLRuKCJHlD0usREyerDGPkpY5opUnXWggHvCg==
+"@abp/utils@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
+  integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
  dependencies:
    just-compare "^1.3.0"

--- 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": "^4.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0-rc.1"
  }
 }
--- 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@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.1.0.tgz#ef1b31feb678fdf4ce6fa76fb1e9d091ca97c9a4"
-  integrity sha512-eAD39TaMVnXsEOVyKcChIggpzJw3TzDua8x/APlHfxWBQOuCb7C/PWLWH9DIN14kl8JsVpgRrUSlKsvvY8CIRA==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.1.0.tgz#40ef6d20a83a8e700179be7f3989c8d5135808d0"
-  integrity sha512-UdT3XCUMEKguB1w7qF4TO1ClayWn63oiP7wnOUmIg+O1EdKTHUBYfztle4Qb/aqtzjHoZBsOnMZH/KOyQKejDg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.1.0"
-    "@abp/bootstrap" "~4.1.0"
-    "@abp/bootstrap-datepicker" "~4.1.0"
-    "@abp/datatables.net-bs4" "~4.1.0"
-    "@abp/font-awesome" "~4.1.0"
-    "@abp/jquery-form" "~4.1.0"
-    "@abp/jquery-validation-unobtrusive" "~4.1.0"
-    "@abp/lodash" "~4.1.0"
-    "@abp/luxon" "~4.1.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.1.0"
-    "@abp/select2" "~4.1.0"
-    "@abp/sweetalert" "~4.1.0"
-    "@abp/timeago" "~4.1.0"
-    "@abp/toastr" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.1.0.tgz#c23ba554270a9534ac29a7e7ca8ab1ed0dc1cc7b"
-  integrity sha512-CaPVi8dKLD0/7zrsCdi3hA1alkUKVE3jVoUa2bl0mrBg30Xzu+IDAu6aIWFXOCnIX8YthejhA2Wtn4knbTOB4g==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.0-rc.1.tgz#42cda7aad84aea49cf6e9bba7a3bbb4709cbe5a9"
+  integrity sha512-tiERvctW+bcgH3pKqhMZrGXL1uCqw2W8LvjyxFoygJmjncTK9cjq5TEpwR0XXhlslfqPhr2DsglMeM1MOm+OVg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.0-rc.1.tgz#8b66c41ceb578b6187afa9cbba69fad36e6a7717"
+  integrity sha512-3rt9k6FYIZ5BmUOGLuixOIESNaJwskF+ySvufbI1Os8wyTeD/Q1HiYDIM1oJZ28qexAbKamdZuyKmWYmxqpqDQ==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~4.2.0-rc.1"
+    "@abp/bootstrap" "~4.2.0-rc.1"
+    "@abp/bootstrap-datepicker" "~4.2.0-rc.1"
+    "@abp/datatables.net-bs4" "~4.2.0-rc.1"
+    "@abp/font-awesome" "~4.2.0-rc.1"
+    "@abp/jquery-form" "~4.2.0-rc.1"
+    "@abp/jquery-validation-unobtrusive" "~4.2.0-rc.1"
+    "@abp/lodash" "~4.2.0-rc.1"
+    "@abp/luxon" "~4.2.0-rc.1"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.0-rc.1"
+    "@abp/select2" "~4.2.0-rc.1"
+    "@abp/sweetalert" "~4.2.0-rc.1"
+    "@abp/timeago" "~4.2.0-rc.1"
+    "@abp/toastr" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.0-rc.1.tgz#aae1153bf503cc5ce5443ce9f2efe5057af7314d"
+  integrity sha512-5EZlaHjdKYn6I+9kCXQWu/FjbNgyBSl2xW97nbF5Or3e9bUs+Ne6yLJMYypoLHzhcPUTzyemBozMf/VXX9oOhQ==
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -43,145 +43,145 @@
    micromatch "^4.0.2"
    path "^0.12.7"

-"@abp/bootstrap-datepicker@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.1.0.tgz#5c97fba78e56ba90820014a13e4c2d394d27332f"
-  integrity sha512-5XDW/Y2Gu1SgIm/tyRuo6vwcJdpFWIEnqDJ+0wjdOvWl3a+HnQTDya5g74mCmEBfYQgYDw8Wz8ovChOOzExh7Q==
+"@abp/bootstrap-datepicker@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.0-rc.1.tgz#1f49d714743453a83b76410e0f2b6ddc21378146"
+  integrity sha512-1zk19yIUgvy1aO9LnZ0qdLH/8f43qIGSwT5FYPc9Q9p/f3MquLEUq1i/A/BUVYqK9LJHJZFuZv0+XMopG7YJ2g==
  dependencies:
    bootstrap-datepicker "^1.9.0"

-"@abp/bootstrap@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.1.0.tgz#50ac670e319a60a985109e96302eed3e46d36afe"
-  integrity sha512-4lFrbaNPYRa45oH/D+fFUSmgD/OdSoCmHXvSdG2ye6+wyl6gy4JRfjjTOFmwpsyOWJdPMJSV6CARCSSsfeaItA==
+"@abp/bootstrap@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.0-rc.1.tgz#dd650bdc7c10fbb27d3e39d0081c80dd7b8bc077"
+  integrity sha512-oax5sp1MwqxNqhzo1/YnjcBhzztkHAceT9t5PfRfJvYr98idREGfo1G2yC5dOplIOnHM87DIbLQTW47m/Edrbw==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"

-"@abp/core@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.1.0.tgz#6bdfa378d44cbf8f611d52dddf0915e5bbc188d5"
-  integrity sha512-HXkKCfh8+Yc9iVBsZy7eSoQbkBSdV1QTRAF8+cPgbEpU4x4WlUOy61xqb2pSLFzX9nSma83WhdDyQkzWDBTRZQ==
+"@abp/core@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.0-rc.1.tgz#45d7961216709a9d4c57ee04a1e18d58150b29af"
+  integrity sha512-KIaHlCdAEkwhXgHTW0ACTbyPH/Y1Va/SsyMDVye7vcUldL/dp5HXXGaUWRR/Qrwxl55e8rXJTmOnX9ibtS5ydQ==
  dependencies:
-    "@abp/utils" "^4.1.0"
+    "@abp/utils" "^4.2.0-rc.1"

-"@abp/datatables.net-bs4@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.1.0.tgz#c28097b82f62b236d6f2578d7148128914eb5cd8"
-  integrity sha512-/fM/3Q/yXJaPsXGKIOZBgihxGLZ/T+n+6wguFeEypsAXCJ4MfpcRZ/eFPvVlBmmc/PVIdE8xtj5rnH9+/2KHWg==
+"@abp/datatables.net-bs4@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.0-rc.1.tgz#7f0c0dcb92f813d7a4d98d6f2c123092a84b5483"
+  integrity sha512-QaK9cSTeBTxeWrP/3g+jAAzGy9Jfkdbz0p7ycvHjbcSnHS3h4JRsUw9B3RNdmh3bnF1eVbRu97NiUgqJ3w6kQA==
  dependencies:
-    "@abp/datatables.net" "~4.1.0"
+    "@abp/datatables.net" "~4.2.0-rc.1"
    datatables.net-bs4 "^1.10.21"

-"@abp/datatables.net@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.1.0.tgz#a037fdae4beb9805e8eea71f086573eed4fd3c92"
-  integrity sha512-OZogC3UEvTSyas+VcxffggQ8U2fi399Ka+++4p+oXCPGykDLU1EKOSA/CToiu9uYNYJQ3125SjRZSOJD5h/ukg==
+"@abp/datatables.net@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.0-rc.1.tgz#9f9af39f23bd91cd1467b4a2de9aa743e5a6d693"
+  integrity sha512-un0DoikRJtrUAwDvG2En21Hz7IeGdfYufeeVIG5SPxzc2zxBi8h/8Cd6Zo0MJWFrU+gbW63ADB0wiuB6haC/fA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    datatables.net "^1.10.21"

-"@abp/font-awesome@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.1.0.tgz#a95f8df5f7e3695aaf05e3eab9f3087f4017d7e9"
-  integrity sha512-Zc4mPp740ACe10ollWez4qNg2QnM/AexDkF3pkxYNb1B9J4Fb8H7SefOOtMRdRgHK+sEe5vrPfIs8//gTf4xeQ==
+"@abp/font-awesome@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.0-rc.1.tgz#d1bfaa88fb9f76d0e71061c36493698cb50abbfa"
+  integrity sha512-e3bprerNY7kU26np7xSHUAkPrBr7+Nn0UvEiwWYgen1/TS0rs7usTkhIVtnF6w334bRIxjDcXLWDsZ3QswnVGA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    "@fortawesome/fontawesome-free" "^5.13.0"

-"@abp/jquery-form@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.1.0.tgz#b773c4f4619c3731c781993bba59a1cf38357918"
-  integrity sha512-7Mio+ehj7M2qt3oOyDBi97yNg1ip6BZiUpHkMtmPc/OxdnxpOZV9tZHyhbsoZFYTu1dUSmrpY6HKY0zibohyBQ==
+"@abp/jquery-form@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.0-rc.1.tgz#1625df5844564887836a698b9709c5ea58a87c07"
+  integrity sha512-JSC+xQmoPuSEdjm5gpVKpF9VS1X48uUxlRmAfeiWLHDorFZvzpiak3NhVU8XHfv5UG2SGYVqQmwnRxk5f9D4HA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-form "^4.3.0"

-"@abp/jquery-validation-unobtrusive@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.1.0.tgz#954ce53a46475c09056d789eba761568482ea8c9"
-  integrity sha512-diykqQiGzowYDpsG9PMd3ipeXFrilRQiHQX2mglBf+FNKMocp7LBAIeD2INkiObczZfIKkoqu7WCRqb1bl5uKg==
+"@abp/jquery-validation-unobtrusive@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.0-rc.1.tgz#0e30042735f8f1da831691ef0b67ff0efceb8cd8"
+  integrity sha512-dSWlUvKUj0hsJby8UP5gEVBPXL7TYTe8VskyoSxVCvMs7jMD0yuH67ZImP+2c5p6X5Pww+ImEZ5RUjr0hKh1WA==
  dependencies:
-    "@abp/jquery-validation" "~4.1.0"
+    "@abp/jquery-validation" "~4.2.0-rc.1"
    jquery-validation-unobtrusive "^3.2.11"

-"@abp/jquery-validation@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.1.0.tgz#29cffb21270c52758804cf0d3f5b6e83b327047d"
-  integrity sha512-JrDcejGKz33LeNMn3+DguzDd8XN6LXlceffMc8jz4zYvtb+NqwUn7NFvH3gnKfNKBc8V9cQIHxQpYQa8luYcsA==
+"@abp/jquery-validation@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.0-rc.1.tgz#b5e0b2b2b7c0826f9d11c1f9a93f300945769368"
+  integrity sha512-GxPE2+NOGGl4NZThMpLLexF65AwpF6oMVc3StvOVfgNstzl+VezhkJwjytiLVK4acr6zSTIUNbKsKjGIWLVG/A==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-validation "^1.19.2"

-"@abp/jquery@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.1.0.tgz#3c021d24eb5ef7fe198da8982657075556556701"
-  integrity sha512-1HLjkxj5EudcoxZ9CVqsP0tgKwLQBs5KI9vnnW9I9pco6fIf1Q2PT+TZZywOZ3ftkYfMp90PF+A5IL/JfovnpQ==
+"@abp/jquery@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.0-rc.1.tgz#7cdec9c3e5cd796c65bd0d7317025728b577ff14"
+  integrity sha512-/bIQVKQqDJn9pSlzv5pteYEef+bLw6iqPCwNamLsSjpMPCVMukgD6DuL+1bY1Yb/9fVORODnqctCsxXxl0W/iQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    jquery "~3.5.1"

-"@abp/lodash@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.1.0.tgz#e605644ba745813a2937b24f3b9d2ad86b20dec9"
-  integrity sha512-jUjua8iZIE5P/AELI/nffS09IorBRM/Jfq6agCOX6Qg7d8od66B9gV727mTuaMd9ZW65S1wW5+zMJhm5gy7Qpg==
+"@abp/lodash@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.0-rc.1.tgz#11ed50c96b85b129fd83224defd0c54627ea6ce4"
+  integrity sha512-RQLTOv4wRgeCMEFFi8bWnbLblYmk0p4U4NRaMEX+Y3Hxuh1ROCvxwl2jCxqfdAAx+Jpg1SFtyxTU+wMDYeR6IA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    lodash "^4.17.15"

-"@abp/luxon@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.1.0.tgz#12c9b6eb2a87e0ebe7df58bcbd5f38211ca62e81"
-  integrity sha512-gc8DAZHa+fcnDGWGQHmI8Tllr+QzHAZejrwoVSRiRX+Oebf67sCEDdbwB8yWeEHSa3MbpPtm7I1aTc/+dQI8Dg==
+"@abp/luxon@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.0-rc.1.tgz#7eabef77537651e13faf8be32030e382427d3f98"
+  integrity sha512-nRb7RvUdhVSfeSI+HEGVkhlW1VKJKSiwbDxKB0okubGE4L+siYUhN8FKCtRTCP4NjxNMLCS7v73XA2DxkyjcVg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    luxon "^1.24.1"

-"@abp/malihu-custom-scrollbar-plugin@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.1.0.tgz#a340fa3757eb01bd510d3dcb54331b5b0a93a63f"
-  integrity sha512-CMCIxQNwPNRmmg4WctusMWhg8evrCoq3frQ5Fxnc/fKaMrrzQKL5PY2cV2jY2m5Se+Y+S9EPa3cNOQ1/KYuQ9w==
+"@abp/malihu-custom-scrollbar-plugin@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.0-rc.1.tgz#b346aa9545fa157647f8932e04d3051ade63aeb5"
+  integrity sha512-CKXalT+pgeLVoX1k2J17ia5hjignsabaJZBRG81JAkAHI20JGxvNLL2cVXv+M1KdmQGla+Douf7/c6eNiaSheA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    malihu-custom-scrollbar-plugin "^3.1.5"

-"@abp/select2@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.1.0.tgz#c1b8b7cca16bfe813d83e84f738acda8f8182159"
-  integrity sha512-p6atSzYTU5o36S4GHCHvi3wHf3fgg6wNJIxk4ohSxu1mOQnUbmyYbxKiDFxq+MOR2sOfVmAjqb4xvcIjexg6hA==
+"@abp/select2@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.0-rc.1.tgz#48a38319b4fb52ce3fa25d5c3647258dfceb42b5"
+  integrity sha512-8wB1DOkUotJxV3HE2ga8Nkb1I9t/VSQL6YsiK+EEfENuPuqOPD5N3mevLtQFOdy/c/i6s/Nx7Nb4VRT3cIBW5g==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    select2 "^4.0.13"

-"@abp/sweetalert@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.1.0.tgz#e5c8cb0c84435a0ca97be62c7b9204bbd05ae23d"
-  integrity sha512-VwIp7VD7zzkRMJw3yu7YOlWbIA/JbLYZeyEpNFMIDxAGYG936tVsmH+aQVTovHF/3+VsYf9Da1JjKymLVHkWRg==
+"@abp/sweetalert@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.0-rc.1.tgz#ca26dad346f79ec18c7a9b8d7a64f374f497cea4"
+  integrity sha512-N2agFY5TkJTozYlBOmzlnKJLfyJpNHDol5DyLRWF5zAkudUiDDaYJrvKVqmORsbZSDwJzKbgDcqwiuoPM14Fmg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    sweetalert "^2.1.2"

-"@abp/timeago@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.1.0.tgz#06df44618398cbec7bd174b7afd180907b67bb69"
-  integrity sha512-e1n9i8O0CaT4EIrnzMOur1HxSDpelgaVCLS9NWsTf4j4fIR3ojFqSNt76tpaPqVGBY9vRraGGu16XembYFF+jA==
+"@abp/timeago@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.0-rc.1.tgz#c001df75e78bf86ebb0a4b9de2361da4e0d04dd3"
+  integrity sha512-vHt7T+rW0HyqAwTRhTiBoDFEnb2b00MhBEUEU1u6v5uzmgco1erMD3+ae3EHuVHCQ+p5/mxrFTUnIpBxMEs7pg==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    timeago "^1.6.7"

-"@abp/toastr@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.1.0.tgz#eaa79a9e48638a2e86cb9573516e8614bfaf15a4"
-  integrity sha512-lA3pCdXgAWe1sVhC+/UNJa4T9AdxgN5ncW/3KW+9fg+IOieDwDibPIiuyornxrm+8G6uvrGxi//I3EeeqHABbg==
+"@abp/toastr@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.0-rc.1.tgz#66f34ab51d6c30666703f44ab2f0bccc26b2a1d7"
+  integrity sha512-BNYXnCPtFZtCemZ7yghi4/iYstqHTKUJZ+gkf1vXcHlLvE7JeM6SBMQYotyiiD/n1yKYrx8GRCKssf/gqO/VgQ==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    toastr "^2.1.4"

-"@abp/utils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.1.0.tgz#1f5d8b4dc8a234c15d87869436485fd737f18b50"
-  integrity sha512-fksnKF1bsOab5AVe8qBs2HZmcRVjrnsMwXs23xaqSRdpWXpPgsLRuKCJHlD0usREyerDGPkpY5opUnXWggHvCg==
+"@abp/utils@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
+  integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
  dependencies:
    just-compare "^1.3.0"

--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
@ -15,6 +15,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
+using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.SqlServer;
@ -63,8 +64,9 @@ namespace Volo.CmsKit
        typeof(AbpTenantManagementApplicationModule),
        typeof(AbpTenantManagementEntityFrameworkCoreModule),
        typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-        typeof(AbpAspNetCoreSerilogModule)
-        )]
+        typeof(AbpAspNetCoreSerilogModule),
+        typeof(BlobStoringDatabaseEntityFrameworkCoreModule)
+    )]
    public class CmsKitWebUnifiedModule : AbpModule
    {
        public override void PreConfigureServices(ServiceConfigurationContext context)
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs
@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
+using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.FeatureManagement.EntityFrameworkCore;
 using Volo.Abp.Identity.EntityFrameworkCore;
@ -28,6 +29,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
            modelBuilder.ConfigureTenantManagement();
            modelBuilder.ConfigureFeatureManagement();
            modelBuilder.ConfigureCmsKit();
+            modelBuilder.ConfigureBlobStoring();
        }
    }
 }
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20201231111657_Added_Blob_Storing.Designer.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20201231111657_Added_Blob_Storing.Designer.cs
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20201231111657_Added_Blob_Storing.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20201231111657_Added_Blob_Storing.cs
@ -0,0 +1,95 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.CmsKit.Migrations
+{
+    public partial class Added_Blob_Storing : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Description",
+                table: "CmsPages",
+                type: "nvarchar(512)",
+                maxLength: 512,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(515)",
+                oldMaxLength: 515,
+                oldNullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "AbpBlobContainers",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpBlobContainers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpBlobs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ContainerId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Content = table.Column<byte[]>(type: "varbinary(max)", maxLength: 2147483647, nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpBlobs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AbpBlobs_AbpBlobContainers_ContainerId",
+                        column: x => x.ContainerId,
+                        principalTable: "AbpBlobContainers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobContainers_TenantId_Name",
+                table: "AbpBlobContainers",
+                columns: new[] { "TenantId", "Name" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobs_ContainerId",
+                table: "AbpBlobs",
+                column: "ContainerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobs_TenantId_ContainerId_Name",
+                table: "AbpBlobs",
+                columns: new[] { "TenantId", "ContainerId", "Name" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AbpBlobs");
+
+            migrationBuilder.DropTable(
+                name: "AbpBlobContainers");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Description",
+                table: "CmsPages",
+                type: "nvarchar(515)",
+                maxLength: 515,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(512)",
+                oldMaxLength: 512,
+                oldNullable: true);
+        }
+    }
+}
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
@ -273,6 +273,79 @@ namespace Volo.CmsKit.Migrations
                    b.ToTable("AbpEntityPropertyChanges");
                });

+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContainerId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<byte[]>("Content")
+                        .HasMaxLength(2147483647)
+                        .HasColumnType("varbinary(max)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("TenantId", "ContainerId", "Name");
+
+                    b.ToTable("AbpBlobs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name");
+
+                    b.ToTable("AbpBlobContainers");
+                });
+
            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
                {
                    b.Property<Guid>("Id")
@ -1197,8 +1270,8 @@ namespace Volo.CmsKit.Migrations
                        .HasColumnName("DeletionTime");

                    b.Property<string>("Description")
-                        .HasMaxLength(515)
-                        .HasColumnType("nvarchar(515)");
+                        .HasMaxLength(512)
+                        .HasColumnType("nvarchar(512)");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
@ -1499,6 +1572,15 @@ namespace Volo.CmsKit.Migrations
                        .IsRequired();
                });

+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.HasOne("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", null)
+                        .WithMany()
+                        .HasForeignKey("ContainerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                {
                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj
@ -32,6 +32,7 @@
    <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Application\Volo.Abp.TenantManagement.Application.csproj" />
    <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Web\Volo.Abp.TenantManagement.Web.csproj" />
    <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.EntityFrameworkCore\Volo.Abp.TenantManagement.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\blob-storing-database\src\Volo.Abp.BlobStoring.Database.EntityFrameworkCore\Volo.Abp.BlobStoring.Database.EntityFrameworkCore.csproj" />
  </ItemGroup>

  <ItemGroup>
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
@ -3,7 +3,7 @@
  "name": "my-app",
  "private": true,
  "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.1.0",
-    "@abp/cms-kit": "4.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0-rc.1",
+    "@abp/cms-kit": "4.2.0-rc.1"
  }
 }
--- 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@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.1.0.tgz#ef1b31feb678fdf4ce6fa76fb1e9d091ca97c9a4"
-  integrity sha512-eAD39TaMVnXsEOVyKcChIggpzJw3TzDua8x/APlHfxWBQOuCb7C/PWLWH9DIN14kl8JsVpgRrUSlKsvvY8CIRA==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.1.0.tgz#40ef6d20a83a8e700179be7f3989c8d5135808d0"
-  integrity sha512-UdT3XCUMEKguB1w7qF4TO1ClayWn63oiP7wnOUmIg+O1EdKTHUBYfztle4Qb/aqtzjHoZBsOnMZH/KOyQKejDg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.1.0"
-    "@abp/bootstrap" "~4.1.0"
-    "@abp/bootstrap-datepicker" "~4.1.0"
-    "@abp/datatables.net-bs4" "~4.1.0"
-    "@abp/font-awesome" "~4.1.0"
-    "@abp/jquery-form" "~4.1.0"
-    "@abp/jquery-validation-unobtrusive" "~4.1.0"
-    "@abp/lodash" "~4.1.0"
-    "@abp/luxon" "~4.1.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.1.0"
-    "@abp/select2" "~4.1.0"
-    "@abp/sweetalert" "~4.1.0"
-    "@abp/timeago" "~4.1.0"
-    "@abp/toastr" "~4.1.0"
-
-"@abp/aspnetcore.mvc.ui@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.1.0.tgz#c23ba554270a9534ac29a7e7ca8ab1ed0dc1cc7b"
-  integrity sha512-CaPVi8dKLD0/7zrsCdi3hA1alkUKVE3jVoUa2bl0mrBg30Xzu+IDAu6aIWFXOCnIX8YthejhA2Wtn4knbTOB4g==
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.0-rc.1.tgz#42cda7aad84aea49cf6e9bba7a3bbb4709cbe5a9"
+  integrity sha512-tiERvctW+bcgH3pKqhMZrGXL1uCqw2W8LvjyxFoygJmjncTK9cjq5TEpwR0XXhlslfqPhr2DsglMeM1MOm+OVg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.0-rc.1.tgz#8b66c41ceb578b6187afa9cbba69fad36e6a7717"
+  integrity sha512-3rt9k6FYIZ5BmUOGLuixOIESNaJwskF+ySvufbI1Os8wyTeD/Q1HiYDIM1oJZ28qexAbKamdZuyKmWYmxqpqDQ==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~4.2.0-rc.1"
+    "@abp/bootstrap" "~4.2.0-rc.1"
+    "@abp/bootstrap-datepicker" "~4.2.0-rc.1"
+    "@abp/datatables.net-bs4" "~4.2.0-rc.1"
+    "@abp/font-awesome" "~4.2.0-rc.1"
+    "@abp/jquery-form" "~4.2.0-rc.1"
+    "@abp/jquery-validation-unobtrusive" "~4.2.0-rc.1"
+    "@abp/lodash" "~4.2.0-rc.1"
+    "@abp/luxon" "~4.2.0-rc.1"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.0-rc.1"
+    "@abp/select2" "~4.2.0-rc.1"
+    "@abp/sweetalert" "~4.2.0-rc.1"
+    "@abp/timeago" "~4.2.0-rc.1"
+    "@abp/toastr" "~4.2.0-rc.1"
+
+"@abp/aspnetcore.mvc.ui@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.0-rc.1.tgz#aae1153bf503cc5ce5443ce9f2efe5057af7314d"
+  integrity sha512-5EZlaHjdKYn6I+9kCXQWu/FjbNgyBSl2xW97nbF5Or3e9bUs+Ne6yLJMYypoLHzhcPUTzyemBozMf/VXX9oOhQ==
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -43,161 +43,160 @@
    micromatch "^4.0.2"
    path "^0.12.7"

-"@abp/bootstrap-datepicker@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.1.0.tgz#5c97fba78e56ba90820014a13e4c2d394d27332f"
-  integrity sha512-5XDW/Y2Gu1SgIm/tyRuo6vwcJdpFWIEnqDJ+0wjdOvWl3a+HnQTDya5g74mCmEBfYQgYDw8Wz8ovChOOzExh7Q==
+"@abp/bootstrap-datepicker@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.0-rc.1.tgz#1f49d714743453a83b76410e0f2b6ddc21378146"
+  integrity sha512-1zk19yIUgvy1aO9LnZ0qdLH/8f43qIGSwT5FYPc9Q9p/f3MquLEUq1i/A/BUVYqK9LJHJZFuZv0+XMopG7YJ2g==
  dependencies:
    bootstrap-datepicker "^1.9.0"

-"@abp/bootstrap@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.1.0.tgz#50ac670e319a60a985109e96302eed3e46d36afe"
-  integrity sha512-4lFrbaNPYRa45oH/D+fFUSmgD/OdSoCmHXvSdG2ye6+wyl6gy4JRfjjTOFmwpsyOWJdPMJSV6CARCSSsfeaItA==
+"@abp/bootstrap@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.0-rc.1.tgz#dd650bdc7c10fbb27d3e39d0081c80dd7b8bc077"
+  integrity sha512-oax5sp1MwqxNqhzo1/YnjcBhzztkHAceT9t5PfRfJvYr98idREGfo1G2yC5dOplIOnHM87DIbLQTW47m/Edrbw==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"

-
-"@abp/cms-kit@4.1.0-rc.2":
-  version "4.1.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-4.1.0-rc.2.tgz#d2790dd3812214ab0c8eba6e9ad2b8019889e056"
-  integrity sha512-bS632Qp3tN+LHVj505lUgwtu2JVOhSf3W6VAXlYG0pSy8n1ltonDZHNKO6iwvnskdPaAA4wgJPWgqjXigChx0Q==
+"@abp/cms-kit@4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-4.2.0-rc.1.tgz#cacb8958a97d8d591960cecfc9074e0797ec522d"
+  integrity sha512-230HXRAQKWldq5h4f4kT0Ei9VRQloKBVmCtQNyFNttXU/eIf5ggsJEpbn7j5rByypInZGqUO1elfCVetmK64Qw==
  dependencies:
-    "@abp/star-rating-svg" "~4.1.0-rc.2"
+    "@abp/star-rating-svg" "~4.2.0-rc.1"

-"@abp/core@~4.1.0-rc.2":
-  version "4.1.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.1.0-rc.2.tgz#d306106a53fa56109751be0099785c94f43be56f"
-  integrity sha512-b0mOYSz8hNgZ/hBeYg8hkthJgE8CLyHNa2NcythPoIW8RR5qHmDtGoFnuFovLvLk7r+M4NWyxXRKEshSszIPyA==
+"@abp/core@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.0-rc.1.tgz#45d7961216709a9d4c57ee04a1e18d58150b29af"
+  integrity sha512-KIaHlCdAEkwhXgHTW0ACTbyPH/Y1Va/SsyMDVye7vcUldL/dp5HXXGaUWRR/Qrwxl55e8rXJTmOnX9ibtS5ydQ==
  dependencies:
-    "@abp/utils" "^4.1.0"
+    "@abp/utils" "^4.2.0-rc.1"

-"@abp/datatables.net-bs4@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.1.0.tgz#c28097b82f62b236d6f2578d7148128914eb5cd8"
-  integrity sha512-/fM/3Q/yXJaPsXGKIOZBgihxGLZ/T+n+6wguFeEypsAXCJ4MfpcRZ/eFPvVlBmmc/PVIdE8xtj5rnH9+/2KHWg==
+"@abp/datatables.net-bs4@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.0-rc.1.tgz#7f0c0dcb92f813d7a4d98d6f2c123092a84b5483"
+  integrity sha512-QaK9cSTeBTxeWrP/3g+jAAzGy9Jfkdbz0p7ycvHjbcSnHS3h4JRsUw9B3RNdmh3bnF1eVbRu97NiUgqJ3w6kQA==
  dependencies:
-    "@abp/datatables.net" "~4.1.0"
+    "@abp/datatables.net" "~4.2.0-rc.1"
    datatables.net-bs4 "^1.10.21"

-"@abp/datatables.net@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.1.0.tgz#a037fdae4beb9805e8eea71f086573eed4fd3c92"
-  integrity sha512-OZogC3UEvTSyas+VcxffggQ8U2fi399Ka+++4p+oXCPGykDLU1EKOSA/CToiu9uYNYJQ3125SjRZSOJD5h/ukg==
+"@abp/datatables.net@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.0-rc.1.tgz#9f9af39f23bd91cd1467b4a2de9aa743e5a6d693"
+  integrity sha512-un0DoikRJtrUAwDvG2En21Hz7IeGdfYufeeVIG5SPxzc2zxBi8h/8Cd6Zo0MJWFrU+gbW63ADB0wiuB6haC/fA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    datatables.net "^1.10.21"

-"@abp/font-awesome@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.1.0.tgz#a95f8df5f7e3695aaf05e3eab9f3087f4017d7e9"
-  integrity sha512-Zc4mPp740ACe10ollWez4qNg2QnM/AexDkF3pkxYNb1B9J4Fb8H7SefOOtMRdRgHK+sEe5vrPfIs8//gTf4xeQ==
+"@abp/font-awesome@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.0-rc.1.tgz#d1bfaa88fb9f76d0e71061c36493698cb50abbfa"
+  integrity sha512-e3bprerNY7kU26np7xSHUAkPrBr7+Nn0UvEiwWYgen1/TS0rs7usTkhIVtnF6w334bRIxjDcXLWDsZ3QswnVGA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    "@fortawesome/fontawesome-free" "^5.13.0"

-"@abp/jquery-form@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.1.0.tgz#b773c4f4619c3731c781993bba59a1cf38357918"
-  integrity sha512-7Mio+ehj7M2qt3oOyDBi97yNg1ip6BZiUpHkMtmPc/OxdnxpOZV9tZHyhbsoZFYTu1dUSmrpY6HKY0zibohyBQ==
+"@abp/jquery-form@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.0-rc.1.tgz#1625df5844564887836a698b9709c5ea58a87c07"
+  integrity sha512-JSC+xQmoPuSEdjm5gpVKpF9VS1X48uUxlRmAfeiWLHDorFZvzpiak3NhVU8XHfv5UG2SGYVqQmwnRxk5f9D4HA==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-form "^4.3.0"

-"@abp/jquery-validation-unobtrusive@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.1.0.tgz#954ce53a46475c09056d789eba761568482ea8c9"
-  integrity sha512-diykqQiGzowYDpsG9PMd3ipeXFrilRQiHQX2mglBf+FNKMocp7LBAIeD2INkiObczZfIKkoqu7WCRqb1bl5uKg==
+"@abp/jquery-validation-unobtrusive@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.0-rc.1.tgz#0e30042735f8f1da831691ef0b67ff0efceb8cd8"
+  integrity sha512-dSWlUvKUj0hsJby8UP5gEVBPXL7TYTe8VskyoSxVCvMs7jMD0yuH67ZImP+2c5p6X5Pww+ImEZ5RUjr0hKh1WA==
  dependencies:
-    "@abp/jquery-validation" "~4.1.0"
+    "@abp/jquery-validation" "~4.2.0-rc.1"
    jquery-validation-unobtrusive "^3.2.11"

-"@abp/jquery-validation@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.1.0.tgz#29cffb21270c52758804cf0d3f5b6e83b327047d"
-  integrity sha512-JrDcejGKz33LeNMn3+DguzDd8XN6LXlceffMc8jz4zYvtb+NqwUn7NFvH3gnKfNKBc8V9cQIHxQpYQa8luYcsA==
+"@abp/jquery-validation@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.0-rc.1.tgz#b5e0b2b2b7c0826f9d11c1f9a93f300945769368"
+  integrity sha512-GxPE2+NOGGl4NZThMpLLexF65AwpF6oMVc3StvOVfgNstzl+VezhkJwjytiLVK4acr6zSTIUNbKsKjGIWLVG/A==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    jquery-validation "^1.19.2"

-"@abp/jquery@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.1.0.tgz#3c021d24eb5ef7fe198da8982657075556556701"
-  integrity sha512-1HLjkxj5EudcoxZ9CVqsP0tgKwLQBs5KI9vnnW9I9pco6fIf1Q2PT+TZZywOZ3ftkYfMp90PF+A5IL/JfovnpQ==
+"@abp/jquery@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.0-rc.1.tgz#7cdec9c3e5cd796c65bd0d7317025728b577ff14"
+  integrity sha512-/bIQVKQqDJn9pSlzv5pteYEef+bLw6iqPCwNamLsSjpMPCVMukgD6DuL+1bY1Yb/9fVORODnqctCsxXxl0W/iQ==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    jquery "~3.5.1"

-"@abp/lodash@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.1.0.tgz#e605644ba745813a2937b24f3b9d2ad86b20dec9"
-  integrity sha512-jUjua8iZIE5P/AELI/nffS09IorBRM/Jfq6agCOX6Qg7d8od66B9gV727mTuaMd9ZW65S1wW5+zMJhm5gy7Qpg==
+"@abp/lodash@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.0-rc.1.tgz#11ed50c96b85b129fd83224defd0c54627ea6ce4"
+  integrity sha512-RQLTOv4wRgeCMEFFi8bWnbLblYmk0p4U4NRaMEX+Y3Hxuh1ROCvxwl2jCxqfdAAx+Jpg1SFtyxTU+wMDYeR6IA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    lodash "^4.17.15"

-"@abp/luxon@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.1.0.tgz#12c9b6eb2a87e0ebe7df58bcbd5f38211ca62e81"
-  integrity sha512-gc8DAZHa+fcnDGWGQHmI8Tllr+QzHAZejrwoVSRiRX+Oebf67sCEDdbwB8yWeEHSa3MbpPtm7I1aTc/+dQI8Dg==
+"@abp/luxon@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.0-rc.1.tgz#7eabef77537651e13faf8be32030e382427d3f98"
+  integrity sha512-nRb7RvUdhVSfeSI+HEGVkhlW1VKJKSiwbDxKB0okubGE4L+siYUhN8FKCtRTCP4NjxNMLCS7v73XA2DxkyjcVg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    luxon "^1.24.1"

-"@abp/malihu-custom-scrollbar-plugin@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.1.0.tgz#a340fa3757eb01bd510d3dcb54331b5b0a93a63f"
-  integrity sha512-CMCIxQNwPNRmmg4WctusMWhg8evrCoq3frQ5Fxnc/fKaMrrzQKL5PY2cV2jY2m5Se+Y+S9EPa3cNOQ1/KYuQ9w==
+"@abp/malihu-custom-scrollbar-plugin@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.0-rc.1.tgz#b346aa9545fa157647f8932e04d3051ade63aeb5"
+  integrity sha512-CKXalT+pgeLVoX1k2J17ia5hjignsabaJZBRG81JAkAHI20JGxvNLL2cVXv+M1KdmQGla+Douf7/c6eNiaSheA==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    malihu-custom-scrollbar-plugin "^3.1.5"

-"@abp/select2@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.1.0.tgz#c1b8b7cca16bfe813d83e84f738acda8f8182159"
-  integrity sha512-p6atSzYTU5o36S4GHCHvi3wHf3fgg6wNJIxk4ohSxu1mOQnUbmyYbxKiDFxq+MOR2sOfVmAjqb4xvcIjexg6hA==
+"@abp/select2@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.0-rc.1.tgz#48a38319b4fb52ce3fa25d5c3647258dfceb42b5"
+  integrity sha512-8wB1DOkUotJxV3HE2ga8Nkb1I9t/VSQL6YsiK+EEfENuPuqOPD5N3mevLtQFOdy/c/i6s/Nx7Nb4VRT3cIBW5g==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    select2 "^4.0.13"

-"@abp/star-rating-svg@~4.1.0-rc.2":
-  version "4.1.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-4.1.0-rc.2.tgz#558c681eb591847b3e8f114cbe610e4331f8a0a2"
-  integrity sha512-LNFCfytarGhqS+91lxYHQKMvlbHMDpjU0Knj8qyefNtQ+rbM2CEspWEtcducim+Qn4brqIHRudUvLI+eEC/0yQ==
+"@abp/star-rating-svg@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-4.2.0-rc.1.tgz#8a1c28a1dc4e20f05ba6199062563e9a18ac9312"
+  integrity sha512-vOZcK3c+92VTB6tsSPyi6+qsiN3Ke2ybqWAKCLOK7OyQ0n4HKn2FMhdsoWhI52ACSgJkxVkXEz9ULHqi7a18AQ==
  dependencies:
-    "@abp/jquery" "~4.1.0-rc.2"
+    "@abp/jquery" "~4.2.0-rc.1"
    star-rating-svg "^3.5.0"

-"@abp/sweetalert@~4.1.0-rc.2":
-  version "4.1.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.1.0-rc.2.tgz#cdcaf8e9a33cf218a687fd6a42cfe1c85d89c6b7"
-  integrity sha512-sjQd8TF9oUnaQ1OPTGdVyAfWqSZEk4bRbC/qw2CouEOfRLatzkC0JcmzFLN0f5N1am1RQwkFakpENKH7NqTCvg==
+"@abp/sweetalert@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.0-rc.1.tgz#ca26dad346f79ec18c7a9b8d7a64f374f497cea4"
+  integrity sha512-N2agFY5TkJTozYlBOmzlnKJLfyJpNHDol5DyLRWF5zAkudUiDDaYJrvKVqmORsbZSDwJzKbgDcqwiuoPM14Fmg==
  dependencies:
-    "@abp/core" "~4.1.0"
+    "@abp/core" "~4.2.0-rc.1"
    sweetalert "^2.1.2"

-"@abp/timeago@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.1.0.tgz#06df44618398cbec7bd174b7afd180907b67bb69"
-  integrity sha512-e1n9i8O0CaT4EIrnzMOur1HxSDpelgaVCLS9NWsTf4j4fIR3ojFqSNt76tpaPqVGBY9vRraGGu16XembYFF+jA==
+"@abp/timeago@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.0-rc.1.tgz#c001df75e78bf86ebb0a4b9de2361da4e0d04dd3"
+  integrity sha512-vHt7T+rW0HyqAwTRhTiBoDFEnb2b00MhBEUEU1u6v5uzmgco1erMD3+ae3EHuVHCQ+p5/mxrFTUnIpBxMEs7pg==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    timeago "^1.6.7"

-"@abp/toastr@~4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.1.0.tgz#eaa79a9e48638a2e86cb9573516e8614bfaf15a4"
-  integrity sha512-lA3pCdXgAWe1sVhC+/UNJa4T9AdxgN5ncW/3KW+9fg+IOieDwDibPIiuyornxrm+8G6uvrGxi//I3EeeqHABbg==
+"@abp/toastr@~4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.0-rc.1.tgz#66f34ab51d6c30666703f44ab2f0bccc26b2a1d7"
+  integrity sha512-BNYXnCPtFZtCemZ7yghi4/iYstqHTKUJZ+gkf1vXcHlLvE7JeM6SBMQYotyiiD/n1yKYrx8GRCKssf/gqO/VgQ==
  dependencies:
-    "@abp/jquery" "~4.1.0"
+    "@abp/jquery" "~4.2.0-rc.1"
    toastr "^2.1.4"

-"@abp/utils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.1.0.tgz#1f5d8b4dc8a234c15d87869436485fd737f18b50"
-  integrity sha512-fksnKF1bsOab5AVe8qBs2HZmcRVjrnsMwXs23xaqSRdpWXpPgsLRuKCJHlD0usREyerDGPkpY5opUnXWggHvCg==
+"@abp/utils@^4.2.0-rc.1":
+  version "4.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
+  integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
  dependencies:
    just-compare "^1.3.0"

--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CheckUrlInputDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CheckUrlInputDto.cs
@ -1,10 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Volo.CmsKit.Admin.Pages
-{
-    public class CheckUrlInputDto
-    {
-        [Required]
-        public string Url { get; set; }
-    }
-}
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs
@ -1,15 +1,21 @@
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Validation;
+using Volo.CmsKit.Contents;
+using Volo.CmsKit.Pages;

 namespace Volo.CmsKit.Admin.Pages
 {
    public class CreatePageInputDto
    {
        [Required]
+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxTitleLength))]
        public string Title { get; set; }

        [Required]
+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxUrlLength))]
        public string Url { get; set; }

+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxDescriptionLength))]
        public string Description { get; set; }
    }
 }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageWithContentInputDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageWithContentInputDto.cs
@ -1,18 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Volo.CmsKit.Admin.Pages
-{
-    public class CreatePageWithContentInputDto
-    {
-        [Required]
-        public string Title { get; set; }
-
-        [Required]
-        public string Url { get; set; }
-
-        public string Description { get; set; }
-        
-        [Required]
-        public string Content { get; set; }
-    }
-}
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/GetPagesInputDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/GetPagesInputDto.cs
@ -0,0 +1,9 @@
+using Volo.Abp.Application.Dtos;
+
+namespace Volo.CmsKit.Admin.Pages
+{
+    public class GetPagesInputDto : PagedAndSortedResultRequestDto
+    {
+        public string Filter { get; set; }
+    }
+}
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs
@ -1,22 +1,11 @@
 using System;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Content;

 namespace Volo.CmsKit.Admin.Pages
 {
-    public interface IPageAdminAppService
+    public interface IPageAdminAppService : ICrudAppService<PageDto, PageDto, Guid, GetPagesInputDto, CreatePageInputDto, UpdatePageInputDto>
    {
-        Task<PageDto> GetAsync(Guid id);
-        
-        Task<PageDto> CreatePageAsync(CreatePageInputDto input);
-
-        Task<PageDto> CreatePageWithContentAsync(CreatePageWithContentInputDto input);
-
-        Task<PageDto> UpdatePageAsync(Guid id, UpdatePageInputDto input);
-
-        Task<bool> DoesUrlExistAsync(CheckUrlInputDto input);
-        
-        Task UpdatePageContentAsync(Guid id, UpdatePageContentInputDto input);
-
-        Task DeleteAsync(Guid id);
    }
 }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageWithContentDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageWithContentDto.cs
@ -1,17 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-using Volo.CmsKit.Admin.Contents;
-
-namespace Volo.CmsKit.Admin.Pages
-{
-    public class PageWithContentDto : EntityDto<Guid>
-    {
-        public string Title { get; set; }
-
-        public string Url { get; set; }
-        
-        public string Description { get; set; }
-        
-        public ContentDto Content { get; set; }
-    }
-}
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageContentInputDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageContentInputDto.cs
@ -1,10 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Volo.CmsKit.Admin.Pages
-{
-    public class UpdatePageContentInputDto
-    {
-        [Required]
-        public string Content { get; set; }
-    }
-}
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs
@ -1,15 +1,21 @@
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Validation;
+using Volo.CmsKit.Contents;
+using Volo.CmsKit.Pages;

 namespace Volo.CmsKit.Admin.Pages
 {
    public class UpdatePageInputDto
    {
        [Required]
+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxTitleLength))]
        public string Title { get; set; }

        [Required]
+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxUrlLength))]
        public string Url { get; set; }

+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxDescriptionLength))]
        public string Description { get; set; }
    }
 }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
@ -27,6 +27,14 @@ namespace Volo.CmsKit.Permissions
                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Update, L("Permission:TagManagement.Update"));
                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Delete, L("Permission:TagManagement.Delete"));
            }
+
+            if (GlobalFeatureManager.Instance.IsEnabled<PagesFeature>())
+            {
+                var pageManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Pages.Default, L("Permission:PageManagement"));
+                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Create, L("Permission:PageManagement:Create"));
+                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Update, L("Permission:PageManagement:Update"));
+                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Delete, L("Permission:PageManagement:Delete"));
+            }
        }

        private static LocalizableString L(string name)
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs
@ -5,6 +5,7 @@ namespace Volo.CmsKit.Permissions
    public class CmsKitAdminPermissions
    {
        public const string GroupName = "CmsKit";
+        
        public static class Tags
        {
            public const string Default = GroupName + ".Tags";
@ -12,7 +13,7 @@ namespace Volo.CmsKit.Permissions
            public const string Update = Default + ".Update";
            public const string Delete = Default + ".Delete";
        }
-
+        
        public static class Contents
        {
            public const string Default = GroupName + ".Contents";
@ -20,5 +21,13 @@ namespace Volo.CmsKit.Permissions
            public const string Update = Default + ".Update";
            public const string Delete = Default + ".Delete";
        }
+
+        public static class Pages
+        {
+            public const string Default = GroupName + ".Pages";
+            public const string Create = Default + ".Create";
+            public const string Update = Default + ".Update";
+            public const string Delete = Default + ".Delete";
+        }
    }
 }