Merge branch 'dev' into auto-merge/rel-4-2/162

.gitignore

@@ -269,6 +269,7 @@ modules/blog/app/Volo.BlogTestApp/Logs/*.*
 modules/blogging/app/Volo.BloggingTestApp/Logs/*.*
 modules/blogging/app/Volo.BloggingTestApp/wwwroot/files/*.*
 modules/docs/app/VoloDocs.Web/Logs/*.*
+modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Logs/*.*
 templates/module/app/MyCompanyName.MyProjectName.DemoApp/Logs/*.*
 templates/mvc/src/MyCompanyName.MyProjectName.Web/Logs/*.*
 

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@@ -199,6 +199,21 @@
     "Language": "Language",
     "Optional": "Optional",
     "CreateArticleLanguageInfo": "The language in which the post is written",
-    "Enum:ContentSource:2": "Video Post"
+    "Enum:ContentSource:2": "Video Post",
+    "VideoPreview": "Video Preview",
+    "VideoPreviewErrorMessage": "Given video url couldn't retrieve from Youtube. This can be caused by either video is private or the given URL is not available.",
+    "DeleteCoverImage": "Delete Cover Image",
+    "DeleteCoverImageConfirmationMessage": "Are you sure you want to delete the cover image for \"{0}\"?",
+    "DeleteCoverImageSuccessMessage": "Cover image successfully deleted",
+    "PaymentsOf": "Payments of",
+    "ShowPaymentsOfOrganization": "Show payments",
+    "Date": "Date",
+    "Products": "Products",
+    "TotalAmount": "Total amount",
+    "Currency": "Currency",
+    "Gateway": "Gateway",
+    "State": "State",
+    "FailReason": "Fail reason"
+      
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json

@@ -159,6 +159,10 @@
     "UnlimitedQuestionCount": "Sınırsız soru sayısı",
     "Language": "Dil",
     "Optional": "Opsiyonel",
-    "CreateArticleLanguageInfo": "Makalenin yazıldığı dil"
+    "CreateArticleLanguageInfo": "Makalenin yazıldığı dil",
+    "Enum:ContentSource:2": "Video İçerik",
+    "DeleteCoverImage": "Kapak Fotoğrafını Sil",
+    "DeleteCoverImageConfirmationMessage": "Kapak fotoğrafını \"{0}\" isimli makale için silmek istediğinize emin misiniz?",
+    "DeleteCoverImageSuccessMessage": "Kapak fotoğrafı başarılı bir şekilde silinmiştir"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -34,6 +34,13 @@
     "JoinOurMarketingNewsletter": "Join our marketing newsletter",
     "WouldLikeToReceiveMarketingMaterials": "I would like to receive marketing materials like product deals & special offers.",
     "StartUsingYourLicenseNow": "Start using your license now!",
-    "WelcomePage": "Welcome Page"
+    "WelcomePage": "Welcome Page",
+    "UnsubscriptionExpireEmail": "Unsubscribe from license expire date reminder emails",
+    "UnsubscribeLicenseExpireEmailReminderMessage": "This email subscription only contains reminding your license expiration date.",
+    "UnsubscribeFromLicenseExpireEmails": "If you don't want to receive the emails about your license expiration date, you can unsubscribe at any time you want.",
+    "Unsubscribe": "Unsubscribe",
+    "NotOrganizationMember": "You are not member of any organization.",
+    "UnsubscribeLicenseExpirationEmailSuccessTitle": "Successfully unsubscribed",
+    "UnsubscribeLicenseExpirationEmailSuccessMessage": "You will not receive license expiration date reminder emails anymore."
    }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json

@@ -132,6 +132,10 @@
     "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."
+    "PostContentViaExternalSource": "I want to add the content I published on <span class=\"font-weight-bold\">another platform</span> here.",
+    "GitHubUserNameValidationMessage": "Your Github username can not include whitespace, please be sure your Github username is correct.",
+    "PersonalSiteUrlValidationMessage": "Your personal site URL can not include whitespace, please be sure your personal site URL is correct.",
+    "TwitterUserNameValidationMessage": "Your Twitter username can not include whitespace, please be sure your Twitter username is correct.",
+    "LinkedinUrlValidationMessage": "Your Linkedin URL can not include whitespace, please be sure your Linkedin URL is correct."
   }
 }

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <Version>4.2.1</Version>
+    <LangVersion>latest</LangVersion> 
+    <Version>4.3.0</Version>   
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>

docs/en/Blog-Posts/2021-01-14 v4_2_Preview/POST.md

@@ -0,0 +1,241 @@
+# 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.2` using a command line terminal:
+
+````bash
+dotnet tool update Volo.Abp.Cli -g --version 4.2.0-rc.2
+````
+
+**or install** if you haven't installed before:
+
+````bash
+dotnet tool install Volo.Abp.Cli -g --version 4.2.0-rc.2
+````
+
+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.
+
+One change related to this feature is that: Now, the startup template doesn't come with an **initial migration** file. This is because the database migrations are different based on your DBMS preference and should be re-created. However, when you first run the `.DbMigrator` application, it will create the initial migration and create the database just like before.
+
+> See The Initial Migration section in the [Getting Started](https://docs.abp.io/en/abp/4.2/Getting-Started-Running-Solution?DB=EF#database-migrations) document if you have problems on running the `.DbMigrator` application first time.
+
+### Swagger UI Login / Authorization
+
+Testing the swagger UI was requiring some additional work, especially your authentication server is separated from the application that hosts the Swagger UI.
+
+With the version 4.2, the startup templates come with the authorization pre-configured for you. An Authorize button is available when you open the Swagger UI:
+
+![swagger-authorize](swagger-authorize.png)
+
+When you click, it opens a modal to authorize:
+
+![swagger-authorize](swagger-authorize-modal.png)
+
+When you click to the Authorize button here, you are redirected to the login page to login with your username and password (default username is `admin` and password is `1q2w3E*`).
+
+> Remember to select the Scopes (typically **select all**) you want to use before clicking to the Authorize button.
+
+### 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](https://docs.abp.io/en/commercial/latest/samples/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 Suite supports the new microservice template creation, public website and DBMS selection options.
+* Swagger authorization and other features mentioned in the ABP Framework section are already implemented for the ABP Commercial too.
+
+## 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**.

docs/en/Blog-Posts/2021-01-28 v4_2_Release_Stable/POST.md

@@ -0,0 +1,53 @@
+# ABP.IO Platform 4.2 Final Has Been Released!
+
+[ABP Framework](https://abp.io/) and [ABP Commercial](https://commercial.abp.io/) 4.2 versions have been released today.
+
+## What's New With 4.2?
+
+Since all the new features are already explained in details with the [4.2 RC Announcement Post](https://blog.abp.io/abp/ABP-IO-Platform-v4-2-RC-Has-Been-Released), I will not repeat all the details again. See the [RC Blog Post](https://blog.abp.io/abp/ABP-IO-Platform-v4-2-RC-Has-Been-Released) for all the features and enhancements.
+
+## Creating New Solutions
+
+You can create a new solution with the ABP Framework version 4.2 by either using the `abp new` command or using the **direct download** tab on the [get started page](https://abp.io/get-started).
+
+> See the [getting started document](https://docs.abp.io/en/abp/latest/Getting-Started) for details.
+
+## How to Upgrade an Existing Solution
+
+### Install/Update the ABP CLI
+
+First of all, install the ABP CLI or upgrade to the latest version.
+
+If you haven't installed yet:
+
+```bash
+dotnet tool install -g Volo.Abp.Cli
+```
+
+To update an existing installation:
+
+```bash
+dotnet tool update -g Volo.Abp.Cli
+```
+
+### ABP UPDATE Command
+
+[ABP CLI](https://docs.abp.io/en/abp/latest/CLI) provides a handy command to update all the ABP related NuGet and NPM packages in your solution with a single command:
+
+```bash
+abp update
+```
+
+Run this command in the root folder of your solution.
+
+## Migration Guide
+
+Check [the migration guide](https://docs.abp.io/en/abp/latest/Migration-Guides/Abp-4_2) for the applications with the version 4.x upgrading to the version 4.2.
+
+> It is strongly recommended to check the migration guide for this version. Especially, the new `IRepository.GetQueryableAsync()` method is a core change should be considered after upgrading the solution.
+
+## About the Next Version
+
+The next feature version will be 4.3. 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.

docs/en/Caching.md

@@ -242,12 +242,15 @@ In addition, all of the `IDistributedCache<TCacheItem>` (and `IDistributedCache<
 
 ## Batch Operations
 
-ABP's distributed cache interfaces provide methods to perform batch get/set methods those improves the performance when you want to get or set multiple cache items in a single method call.
+ABP's distributed cache interfaces provide methods to perform batch methods those improves the performance when you want to batch operation multiple cache items in a single method call.
 
 * `SetManyAsync` and `SetMany` methods can be used to set multiple values to the cache.
 * `GetManyAsync` and `GetMany` methods can be used to retrieve multiple values from the cache.
+* `GetOrAddManyAsync` and `GetOrAddMany` methods can be used to retrieve multiple values and set missing values from the cache
+* `RefreshManyAsync` and `RefreshMany` methods can be used to resets the sliding expiration timeout of multiple values from the cache
+* `RemoveManyAsync` and `RemoveMany` methods can be used to remove multiple values from the cache
 
-> These are not standard methods of the ASP.NET Core caching. So, some providers may not support them. They are supported by the [ABP Redis Cache integration package](Redis-Cache.md). If the provider doesn't support, it fallbacks to `SetAsync` and `GetAsync` methods (called once for each item).
+> These are not standard methods of the ASP.NET Core caching. So, some providers may not support them. They are supported by the [ABP Redis Cache integration package](Redis-Cache.md). If the provider doesn't support, it fallbacks to `SetAsync` and `GetAsync` ... methods (called once for each item).
 
 ## Advanced Topics
 

docs/en/Community-Articles/2021-01-20-How-to-Integrate-the-MatBlazor-Blazor-Component/POST.md

@@ -0,0 +1,103 @@
+## Using MatBlazor UI Components With the ABP Framework
+
+Hi, in this step by step article, I will show you how to integrate [MatBlazor](https://www.matblazor.com/), a blazor UI components into ABP Framework-based applications.
+
+![example-result](example-result.png)
+
+*(A screenshot from the example application developed in this article)*
+
+## Create the Project
+
+> First thing is to create the project. ABP Framework offers startup templates to get into business faster.
+
+In this article, I will create a new startup template with EF Core as a database provider and Blazor for UI framework. But if you already have a project with Blazor UI, you don't need to create a new startup template, you can directly implement the following steps to your existing project.
+
+> If you already have a project with the Blazor UI, you can skip this section.
+
+* Before starting the development, we will create a new solution named `MatBlazorSample` (or whatever you want). We will create a new startup template with EF Core as a database provider and Blazor for UI framework by using [ABP CLI](https://docs.abp.io/en/abp/latest/CLI):
+
+````bash
+abp new MatBlazorSample -u blazor
+````
+
+This will create new project inside of `aspnet-core`, so:
+
+````bash
+cd aspnet-core
+````
+
+and
+
+````bash
+dotnet restore
+````
+
+* Our project boilerplate will be ready after the download is finished. Then, we can open the solution in the Visual Studio (or any other IDE) and run the `MatBlazorSample.DbMigrator` to create the database and seed initial data (which creates the admin user, admin role, permissions etc.)
+
+![initial-project](initial-project.png)
+
+* After database and initial data created,
+* Run the `MatBlazorSample.HttpApi.Host` to see our server side working and 
+* Run the `MatBlazorSample.Blazor` to see our UI working properly.
+
+> _Default login credentials for admin: username is **admin** and password is **1q2w3E\***_
+
+## Install MatBlazor
+
+You can follow [this documentation](https://www.matblazor.com/) to install MatBlazor packages into your computer.
+
+### Adding MatBlazor NuGet Packages
+
+```bash
+Install-Package MatBlazor
+```
+
+### Register MatBlazor Resources
+
+1. Add the following line to the HEAD section of the `wwwroot/index.html` file within the `MatBlazorSample.Blazor` project:
+
+   ```Razor
+   <head>
+       <!--...-->
+       <script src="_content/MatBlazor/dist/matBlazor.js"></script>
+       <link href="_content/MatBlazor/dist/matBlazor.css" rel="stylesheet" />
+   </head>
+   ```
+
+2. In the `MatBlazorSampleBlazorModule` class, call the `AddMatBlazor()` method from your project's `ConfigureServices()` method:
+
+   ```csharp
+   public override void ConfigureServices(ServiceConfigurationContext context)
+   {
+       var environment = context.Services.GetSingletonInstance<IWebAssemblyHostEnvironment>();
+       var builder = context.Services.GetSingletonInstance<WebAssemblyHostBuilder>();
+   	  // ...
+       builder.Services.AddMatBlazor();
+   }
+   ```
+
+3. Register the **MatBlazorSample.Blazor** namespace in the `_Imports.razor` file:
+
+   ```Razor
+   @using MatBlazor
+   ```
+
+## The Sample Application
+
+We have created a sample application with [Table](https://www.matblazor.com/Table) example.
+
+### The Source Code
+
+You can download the source code from [here](https://github.com/abpframework/abp-samples/tree/master/MatBlazorSample).
+
+The related files for this example are marked in the following screenshots.
+
+![table-app-contract](table-app-contract.png)
+
+![table-application](table-application.png)
+
+![table-web](table-web.png)
+
+## Conclusion
+
+In this article, I've explained how to use [MatBlazor](https://www.matblazor.com/) components in your application. ABP Framework is designed so that it can work with any UI library/framework.

docs/en/Community-Articles/2021-01-20-How-to-Use-PrimeNG-Components-with-the-ABP-Angular-UI/POST.md

@@ -0,0 +1,343 @@
+# How to Use PrimeNG Components with the ABP Angular UI
+
+## Introduction
+
+In this article, we will use components of the [PrimeNG](https://www.primefaces.org/primeng/) that is a popular UI component library for Angular with the ABP Framework Angular UI that will be generated via [ABP CLI](https://docs.abp.io/en/abp/latest/CLI).
+
+We will create an organization units page and use PrimeNG's [OrganizationChart](https://primefaces.org/primeng/showcase/#/organizationchart) and [Table](https://primefaces.org/primeng/showcase/#/table) components on the page.
+
+![Introduction](intro.gif)
+
+<small>The UI shown above contains many PrimeNG components. You can reach the source code of this rich UI. Take a look at the source code section below.</small>
+
+> This article does not cover any backend code. I used mock data to provide data source to the components.
+
+## Pre-Requirements
+
+The following tools should be installed on your development machine:
+
+* [.NET Core 5.0+](https://www.microsoft.com/net/download/dotnet-core/)
+* [Node v12 or v14](https://nodejs.org/)
+* [VS Code](https://code.visualstudio.com/) or another IDE
+
+## Source Code
+
+I have prepared a sample project that contains more PrimeNG components than described in this article. You can download the source code [on GitHub](https://github.com/abpframework/abp-samples/tree/master/PrimengSample).
+
+## Creating a New Solution
+
+In this step, we will create a new solution that contains Angular UI and backend startup templates. If you have a startup template with Angular UI, you can skip this step.
+
+Run the following command to install the ABP CLI:
+
+```bash
+dotnet tool install -g Volo.Abp.Cli
+```
+
+...or update:
+
+```bash
+dotnet tool update -g Volo.Abp.Cli
+```
+
+Create a new solution named `AbpPrimengSample` by running the following command:
+
+```bash
+abp new AbpPrimengSample -u angular -csf
+```
+
+See the [ABP CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all available options.
+
+You can also use the Direct Download tab on the [Get Started](https://abp.io/get-started) page.
+
+## Running the Solution
+
+You can run the solution as described in [here](https://docs.abp.io/en/abp/latest/Getting-Started-Running-Solution?UI=NG&DB=EF&Tiered=No).
+
+## PrimeNG Setup
+
+Open the `angular` folder and run the following command to install packages: 
+
+```bash
+npm install
+```
+
+Next, we need to install `primeng` and required packages (`primeicons` and `@angular/cdk`) for the library. Run the command below to install these packages:
+
+```bash
+npm install primeng primeicons @angular/cdk --save
+```
+
+The packages we have installed;
+ 
+ - `primeng` is the main package that is a component library.
+ - `primeicons` is an icon font library. Many PrimeNG components use this font internally. 
+ - `@angular/cdk` is a component dev kit created by the Angular team. Some PrimeNG modules depend on it.
+
+As the last step of the setup, we should add the required style files for the library to `angular.json`:
+
+```js
+//angular.json
+
+"projects": {
+    "AbpPrimengSample": {
+        //...
+        "styles": {
+            "node_modules/primeicons/primeicons.css",
+            "node_modules/primeng/resources/themes/saga-blue/theme.css",
+            "node_modules/primeng/resources/primeng.min.css",
+            //...other styles
+        }
+    }
+}
+```
+
+We have added the `primeng.min.css`, Saga Blue theme's `theme.css`, and `primeicons.css` files to the project. You can choose another theme instead of the Sage Blue. See available themes on the [Get Started](https://www.primefaces.org/primeng/showcase/#/setup) document of the PrimeNG.
+
+
+> You have to restart the running `ng serve` process to see the effect of the changes you made in the `angular.json`.
+
+
+## Creating the Organization Units Page
+
+Run the following command to create a new module named `OrganizationUnits`:
+
+```bash
+npm run ng -- generate module organization-units --route organization-units --module app.module
+```
+
+Then open the `src/route.provider.ts` and add a new route as an array element to add a navigation link labeled "Organization Units" to the menu:
+
+```js
+//route.provider.ts
+
+import { eThemeSharedRouteNames } from '@abp/ng.theme.shared';
+//...
+
+routesService.add([
+    //...
+    {
+    path: '/organization-units',
+    name: 'Organization Units',
+    parentName: eThemeSharedRouteNames.Administration,
+    iconClass: 'fas fa-sitemap',
+    layout: eLayoutType.application,
+    },
+]);
+```
+
+We have created a lazy-loadable module and defined a menu navigation link. We can navigate to the page as shown below:
+
+![organization units menu navigation item](organization-units-menu-item.jpg)
+
+##  Using the PrimeNG Components
+
+### Implementing the Organization Chart Component
+
+When you would like to use any component from PrimeNG, you have to import the component's module to your module. Since we will use the `OrganizationChart` on the organization units page, we need to import `OrganizationChartModule` into `OrganizationUnitsModule`.
+
+Open the `src/organization-units/organization-units.module.ts` and add the `OrganizationChartModule` to the imports array as shown below:
+
+```js
+import { OrganizationChartModule } from 'primeng/organizationchart';
+//...
+
+@NgModule({
+  //...
+  imports: [
+    //...
+    OrganizationChartModule
+  ],
+})
+export class OrganizationUnitsModule {}
+```
+
+> Since NGCC need to work in some cases, restarting the `ng serve` process would be good when you import any modules from `primeng` package to your module.
+
+Let's define a mock data source for the `OrganizationChartComponent` and add the component to the page.
+
+Open the `src/organization-units/organization-units.component.ts` and add two variables as shown below:
+
+```js
+//...
+import { TreeNode } from 'primeng/api';
+
+@Component(/* component metadata*/)
+export class OrganizationUnitsComponent implements OnInit {
+  //...
+
+  organizationUnits: TreeNode[] = [
+    {
+      label: 'Management',
+      expanded: true,
+      children: [
+        {
+          label: 'Selling',
+          expanded: true,
+          children: [
+            {
+              label: 'Customer Relations',
+            },
+            {
+              label: 'Marketing',
+            },
+          ],
+        },
+        {
+          label: 'Supporting',
+          expanded: true,
+          children: [
+            {
+              label: 'Buying',
+            },
+            {
+              label: 'Human Resources',
+            },
+          ],
+        },
+      ],
+    },
+  ];
+
+  selectedUnit: TreeNode;
+```
+
+- First variable is `organizationUnits`. It provides mock data source to `OrganizationChartComponent`.
+- Second variable is `selectedUnit`. It keeps chosen unit on the chart.
+
+Then, open the `src/organization-units/organization-units.component.html` and replace the file content with the following:
+
+```html
+<div class="card">
+  <div class="card-header">
+    <h5>Organization Units</h5>
+  </div>
+  <div class="card-body">
+    <p-organizationChart
+      [value]="organizationUnits"
+      selectionMode="single"
+      [(selection)]="selectedUnit"
+    ></p-organizationChart>
+  </div>
+</div>
+```
+
+We have implemented the `OrganizationChart`. The final UI looks like below:
+
+![organization chart](organization-chart.jpg)
+
+## Implementing the Table Component
+
+In order to use the `TableComponent`, we have to import the `TableModule` to the `OrganizationUnitsModule`.
+
+Open the `organization-units.module.ts` and add `TableModule` to the imports array as shown below:
+
+```js
+import { TableModule } from 'primeng/table';
+//...
+
+@NgModule({
+  //...
+  imports: [
+    //...
+    TableModule
+  ],
+})
+export class OrganizationUnitsModule {}
+```
+
+Open the `organization-units.component.ts` and add a variable named `members` with initial value and add a getter named `tableData` as shown below:
+
+```js
+//...
+export class OrganizationUnitsComponent implements OnInit {
+  //...
+
+  members = [
+  {
+    fullName: 'John Doe',
+    username: 'John.Doe',
+    phone: '+1-202-555-0125',
+    email: 'john.doe@example.com',
+    parent: 'Customer Relations',
+  },
+  {
+    fullName: 'Darrion Walter',
+    username: 'Darrion.Walter',
+    phone: '+1-262-155-0355',
+    email: 'Darrion_Walter@example.com',
+    parent: 'Marketing',
+  },
+  {
+    fullName: 'Rosa Labadie',
+    username: 'Rosa.Labadie',
+    phone: '+1-262-723-2255',
+    email: 'Rosa.Labadie@example.com',
+    parent: 'Marketing',
+  },
+  {
+    fullName: 'Adelle Hills',
+    username: 'Adelle.Hills',
+    phone: '+1-491-112-9011',
+    email: 'Adelle.Hills@example.com',
+    parent: 'Buying',
+  },
+  {
+    fullName: 'Brian Hane',
+    username: 'Brian.Hane',
+    phone: '+1-772-509-1823',
+    email: 'Brian.Hane@example.com',
+    parent: 'Human Resources',
+  },
+  ];
+
+  get tableData() {
+  return this.members.filter(user => user.parent === this.selectedUnit.label);
+  }
+```
+
+What we have done above?
+
+- We defined a variable named `members` to provide mock data to the table.
+- We have defined a getter named `tableData` to provide filtered data source to the table using `members` variable.
+
+We are now ready to add the table to the HTML template.
+
+Open the `organization-units.component.html`, find the `p-organizationChart` tag and place the following code to the bottom of this tag:
+
+```html
+<div class="p-3" *ngIf="selectedUnit">
+  <h6>Members of {{ selectedUnit.label }}</h6>
+
+  <p-table [value]="tableData">
+    <ng-template pTemplate="header">
+      <tr>
+        <th>Name</th>
+        <th>Username</th>
+        <th>Email</th>
+        <th>Phone</th>
+      </tr>
+    </ng-template>
+    <ng-template pTemplate="body" let-member>
+      <tr>
+        <td>{{ member.fullName }}</td>
+        <td>{{ member.username }}</td>
+        <td>{{ member.email }}</td>
+        <td>{{ member.phone }}</td>
+      </tr>
+    </ng-template>
+  </p-table>
+</div>
+```
+
+We have added a new `div` that contains the `TableComponent`. The table appears when an organization unit is selected.
+The table contains 4 columns which are name, username, email, and phone for displaying the members' information.
+
+After adding the table, the final UI looks like this:
+
+![PrimeNG TableComponent](table.gif)
+
+
+## Conclusion
+
+We have implemented the PrimeNG component library on the ABP Angular UI project and used two components on a page in a short time. You can use any PrimeNG components by following the documentation. The ABP Angular UI will not block you in any case.

docs/en/MongoDB.md

@@ -254,7 +254,7 @@ public async override Task DeleteAsync(
 
 ### Access to the MongoDB API
 
-In most cases, you want to hide MongoDB APIs behind a repository (this is the main purpose of the repository). However, if you want to access the MongoDB API over the repository, you can use `GetDatabaseAsync()` or `GetCollectionAsync()` extension methods. Example:
+In most cases, you want to hide MongoDB APIs behind a repository (this is the main purpose of the repository). However, if you want to access the MongoDB API over the repository, you can use `GetDatabaseAsync()`, `GetCollectionAsync()` or `GetAggregateAsync()` extension methods. Example:
 
 ```csharp
 public class BookService
@@ -270,6 +270,7 @@ public class BookService
     {
         IMongoDatabase database = await _bookRepository.GetDatabaseAsync();
         IMongoCollection<Book> books = await _bookRepository.GetCollectionAsync();
+        IAggregateFluent<Book> bookAggregate = await _bookRepository.GetAggregateAsync();
     }
 }
 ```

docs/en/Startup-Templates/Module.md

@@ -1,4 +1,4 @@
-# MVC Module Startup Template
+# Module Startup Template
 
 This template can be used to create a **reusable [application module](../Modules/Index.md)** based on the [module development best practices & conventions](../Best-Practices/Index.md). It is also suitable for creating **microservices** (with or without UI).
 
@@ -20,6 +20,20 @@ abp new Acme.IssueManagement -t module
 
 - `Acme.IssueManagement` is the solution name, like *YourCompany.YourProduct*. You can use single level, two-levels or three-levels naming.
 
+### Specify the UI Framework
+
+This template provides multiple UI frameworks:
+
+* `mvc`: ASP.NET Core MVC UI with Razor Pages (default)
+* `blazor`: Blazor UI
+* `angular`: Angular UI
+
+Use `-u` or `--ui` option to specify the UI framework:
+
+````bash
+abp new Acme.IssueManagement -t module -u angular
+````
+
 ### Without User Interface
 
 The template comes with an MVC UI by default. You can use `--no-ui` option to not include the UI layer.
@@ -160,3 +174,91 @@ You should run the application with the given order:
 - First, run the `.IdentityServer` since other applications depends on it.
 - Then run the `.HttpApi.Host` since it is used by the `.Web.Host` application.
 - Finally, you can run the `.Web.Host` project and login to the application using `admin` as the username and `1q2w3E*` as the password.
+
+## UI
+
+### Angular UI
+
+If you choose `Angular` as the UI framework (using the `-u angular` option), the solution will have a folder called `angular` in it. This is where the client-side code is located. When you open that folder in an IDE, the folder structure will look like below:
+
+![Folder structure of ABP Angular module project](../images/angular-module-folder-structure.png)
+
+* _angular/projects/issue-management_ folder contains the Angular module project.
+* _angular/projects/dev-app_ folder contains a development application that runs your module.
+
+The server-side is similar to the solution described above. `*.HttpApi.Host` project serves the API and the `Angular` demo application consumes it. You will not need to run the `.Web.Host` project though.
+
+#### How to Run the Angular Development App
+
+For module development, you will need the `dev-app` project up and running. So, here is how we can start the development server.
+
+First, we need to install dependencies:
+
+1. Open your terminal at the root folder, i.e. `angular`.
+2. Run `yarn` or `npm install`.
+
+The dependencies will be installed and some of them are ABP modules published as NPM packages. To see all ABP packages, you can run the following command in the `angular` folder:
+
+```bash
+yarn list --pattern abp
+```
+
+> There is no equivalent of this command in npm.
+
+The module you will develop depends on two of these ABP packages: _@abp/ng.core_ and _@abp/ng.theme.shared_. Rest of the ABP modules are included in _package.json_ because of the `dev-app` project.
+
+Once all dependencies are installed, follow the steps below to serve your development app:
+
+1. Make sure `.IdentityServer` and `*.HttpApi.Host` projects are up and running.
+2. Open your terminal at the root folder, i.e. `angular`.
+3. Run `yarn start` or `npm start`.
+
+![ABP Angular module dev-app project](../images/angular-module-dev-app-project.png)
+
+The issue management page is empty in the beginning. You may change the content in `IssueManagementComponent` at the _angular/projects/issue-management/src/lib/issue-management.component.ts_ path and observe that the view changes accordingly.
+
+Now, let's have a closer look at some key elements of your project.
+
+#### Main Module
+
+`IssueManagementModule` at the _angular/projects/issue-management/src/lib/issue-management.module.ts_ path is the main module of your module project. There are a few things worth mentioning in it:
+
+- Essential ABP modules, i.e. `CoreModule` and `ThemeSharedModule`, are imported.
+- `IssueManagementRoutingModule` is imported.
+- `IssueManagementComponent` is declared.
+- It is prepared for configurability. The `forLazy` static method enables [a configuration to be passed to the module when it is loaded by the router](https://volosoft.com/blog/how-to-configure-angular-modules-loaded-by-the-router).
+
+
+#### Main Routing Module
+
+`IssueManagementRoutingModule` at the _angular/projects/issue-management/src/lib/issue-management-routing.module.ts_ path is the main routing module of your module project. It currently does two things:
+
+- Loads `DynamicLayoutComponent` at base path it is given.
+- Loads `IssueManagementComponent` as child to the layout, again at the given base path.
+
+You can rearrange this module to load more than one component at different routes, but you need to update the route provider at _angular/projects/issue-management/config/src/providers/route.provider.ts_ to match the new routing structure with the routes in the menu. Please check [Modifying the Menu](../UI/Angular/Modifying-the-Menu.md) to see how route providers work.
+
+#### Config Module
+
+There is a config module at the _angular/projects/issue-management/config/src/issue-management-config.module.ts_ path. The static `forRoot` method of this module is supposed to be called at the route level. So, you may assume the following will take place:
+
+```js
+@NgModule({
+  imports: [
+    /* other imports */
+
+    IssueManagementConfigModule.forRoot(),
+  ],
+
+  /* rest of the module meta data */
+})
+export class AppModule {}
+```
+
+You can use this static method to configure an application that uses your module project. An example of such configuration is already implemented and the `ISSUE_MANAGEMENT_ROUTE_PROVIDERS` token is provided here. The method can take options which enables further configuration possibilities.
+
+The difference between the `forRoot` method of the config module and the `forLazy` method of the main module is that, for smallest bundle size, the former should only be used when you have to configure an app before your module is even loaded.
+
+#### Testing Angular UI
+
+Please see the [testing document](../UI/Angular/Testing.md).

docs/en/Tutorials/Part-1.md

@@ -189,6 +189,8 @@ Add-Migration "Created_Book_Entity"
 
 ![bookstore-pmc-add-book-migration](./images/bookstore-pmc-add-book-migration-v2.png)
 
+> If you get an error like "*Your startup project ... doesn't reference Microsoft.EntityFrameworkCore.Design. This package is required for the Entity Framework Core Tools to work*", right click to the `Acme.BookStore.EntityFrameworkCore.DbMigrations` project and **Set as the Startup Project** and try again.
+
 This will create a new migration class inside the `Migrations` folder of the `Acme.BookStore.EntityFrameworkCore.DbMigrations` project.
 
 Before updating the database, read the section below to learn how to seed some initial data to the database.

docs/en/Tutorials/Part-7.md

@@ -70,7 +70,7 @@ This is just like done for the `Book` entity before, so no need to explain again
 
 ## Create a new Database Migration
 
-Open the **Package Manager Console** on Visual Studio and ensure that the **Default project** is `Acme.BookStore.EntityFrameworkCore.DbMigrations` in the Package Manager Console, as shown on the picture below. Also, set the `Acme.BookStore.Web` (or `Acme.BookStore.HttpApi.Host`, depending on your solution) as the **startup project** (right click it on the solution explorer and click to "Set as Startup Project").
+Open the **Package Manager Console** on Visual Studio and ensure that the **Default project** is `Acme.BookStore.EntityFrameworkCore.DbMigrations` in the Package Manager Console, as shown on the picture below. Also, set this project as the **startup project** (right click it on the solution explorer and click to "Set as Startup Project").
 
 Run the following command to create a new database migration:
 

docs/en/UI/Angular/Ellipsis-Directive.md

@@ -0,0 +1,83 @@
+# Ellipsis
+
+Text inside an HTML element can be truncated easily with an ellipsis by using CSS. To make this even easier, you can use the `EllipsisDirective` which has been exposed by the `@abp/ng.theme.shared` package.
+
+
+## Getting Started
+
+In order to use the `EllipsisDirective` in an HTML template, the **`ThemeSharedModule`** should be imported into your module like this:
+
+```js
+// ...
+import { ThemeSharedModule } from '@abp/ng.theme.shared';
+
+@NgModule({
+  //...
+  imports: [..., ThemeSharedModule],
+})
+export class MyFeatureModule {}
+```
+
+or **if you would not like to import** the `ThemeSharedModule`, you can import the **`EllipsisModule`** as shown below:
+
+
+```js
+// ...
+import { EllipsisModule } from '@abp/ng.theme.shared';
+
+@NgModule({
+  //...
+  imports: [..., EllipsisModule],
+})
+export class MyFeatureModule {}
+```
+
+## Usage
+
+The `EllipsisDirective` is very easy to use. The directive's selector is **`abpEllipsis`**. By adding the `abpEllipsis` attribute to an HTML element, you can activate the `EllipsisDirective` for the HTML element.
+
+See an example usage:
+
+```html
+<p abpEllipsis>
+    Lorem ipsum dolor sit, amet consectetur adipisicing elit. Laboriosam commodi quae aspernatur,
+    corporis velit et suscipit id consequuntur amet minima expedita cum reiciendis dolorum
+    cupiditate? Voluptas eaque voluptatum odio deleniti quo vel illum nemo accusamus nulla ratione
+    impedit dolorum expedita necessitatibus fugiat ullam beatae, optio eum cupiditate ducimus
+    architecto.
+  </p>
+```
+
+The `abpEllipsis` attribute has been added to the `<p>` element that containing very long text inside to activate the `EllipsisDirective`.
+
+See the result:
+
+![Ellipsis directive result](./images/ellipsis-directive-result1.jpg)
+
+The long text has been truncated by using the directive.
+
+The UI before using the directive looks like this:
+
+![Before using the EllipsisDirective](./images/ellipsis-directive-before.jpg)
+
+### Specifying Max Width of an HTML Element
+
+An HTML element max width can be specified as shown below:
+
+```html
+<div [abpEllipsis]="'100px'">
+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Cumque, optio!
+</div>
+
+<div [abpEllipsis]="'15vw'">
+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Cumque, optio!
+</div>
+
+<div [abpEllipsis]="'50%'">
+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Cumque, optio!
+</div>
+```
+
+See the result:
+
+![Ellipsis directive result 2](./images/ellipsis-directive-result2.jpg)

docs/en/UI/Angular/Modal.md

@@ -0,0 +1,248 @@
+# Modal
+
+`ModalComponent` is a pre-built component exposed by `@abp/ng.theme.shared` package to show modals. The component uses the [`ng-bootstrap`](https://ng-bootstrap.github.io/)'s modal service inside to render a modal. 
+
+The `abp-modal` provides some additional benefits:
+ 
+ - It is **flexible**. You can pass header, body, footer templates easily by adding the templates to the `abp-modal` content. It can also be implemented quickly.
+ - Provides several inputs be able to customize the modal and several outputs be able to listen to some events.
+ - Automatically detects the close button which has a `#abpClose` template variable and closes the modal when pressed this button.
+ - Automatically detects the `abp-button` and triggers its loading spinner when the `busy` input value of the modal component is true.
+ - Automatically checks if the form inside the modal **has changed, but not saved**. It warns the user by displaying a [confirmation popup](Confirmation-Service) in this case when a user tries to close the modal or refresh/close the tab of the browser.
+
+
+> Note: A modal can also be rendered by using the `ng-bootstrap` modal. For further information, see [Modal doc](https://ng-bootstrap.github.io/#/components/modal) on the `ng-bootstrap` documentation.
+
+## Getting Started
+
+In order to use the `abp-modal` in an HTML template, the **`ThemeSharedModule`** should be imported into your module like this:
+
+```js
+// ...
+import { ThemeSharedModule } from '@abp/ng.theme.shared';
+
+@NgModule({
+  //...
+  imports: [..., ThemeSharedModule],
+})
+export class MyFeatureModule {}
+```
+
+## Usage
+
+You can add the `abp-modal` to your component very quickly. See an example:
+
+```html
+<!-- sample.component.html -->
+
+<button class="btn btn-primary" (click)="isModalOpen = true">Open modal</button>
+
+<abp-modal [(visible)]="isModalOpen">
+  <ng-template #abpHeader>
+    <h3>Modal Title</h3>
+  </ng-template>
+
+  <ng-template #abpBody>
+  <p>Modal content</p>
+  </ng-template>
+
+  <ng-template #abpFooter>
+    <button type="button" class="btn btn-secondary" #abpClose>Close</button>
+  </ng-template>
+</abp-modal>
+```
+
+```js
+// sample.component.ts
+
+@Component(/* component metadata */)
+export class SampleComponent {
+    isModelOpen = false
+}
+```
+
+![Example modal result](./images/modal-result-1.jpg)
+
+
+See an example form inside a modal:
+
+```html
+<!-- book.component.ts -->
+
+<abp-modal [(visible)]="isModalOpen" [busy]="inProgress">
+  <ng-template #abpHeader>
+    <h3>Book</h3>
+  </ng-template>
+
+  <ng-template #abpBody>
+    <form id="book-form" [formGroup]="form" (ngSubmit)="save()">
+      <div class="form-group">
+        <label for="book-name">Author</label><span> * </span>
+        <input type="text" id="author" class="form-control" formControlName="author" autofocus />
+      </div>
+
+      <div class="form-group">
+        <label for="book-name">Name</label><span> * </span>
+        <input type="text" id="book-name" class="form-control" formControlName="name" />
+      </div>
+
+      <div class="form-group">
+        <label for="book-price">Price</label><span> * </span>
+        <input type="number" id="book-price" class="form-control" formControlName="price" />
+      </div>
+
+      <div class="form-group">
+        <label for="book-type">Type</label><span> * </span>
+        <select class="form-control" id="book-type" formControlName="type">
+          <option [ngValue]="null">Select a book type</option>
+          <option [ngValue]="0">Undefined</option>
+          <option [ngValue]="1">Adventure</option>
+          <option [ngValue]="2">Biography</option>
+          <option [ngValue]="3">Fantastic</option>
+          <option [ngValue]="4">Science</option>
+        </select>
+      </div>
+
+      <div class="form-group">
+        <label for="book-publish-date">Publish date</label><span> * </span>
+        <input
+          id="book-publish-date"
+          formControlName="publishDate"
+          class="form-control"
+          type="date"
+        />
+      </div>
+    </form>
+  </ng-template>
+
+  <ng-template #abpFooter>
+    <button type="button" class="btn btn-secondary" #abpClose>
+      Cancel
+    </button>
+
+    <button form="book-form" class="btn btn-primary" [disabled]="form.invalid || form.pristine">
+      <i class="fa fa-check mr-1"></i>
+      Save
+    </button>
+  </ng-template>
+</abp-modal>
+```
+
+```ts
+// book.component.ts
+
+import { Component } from '@angular/core';
+import { FormBuilder, Validators } from '@angular/forms';
+
+@Component(/* component metadata */)
+export class BookComponent {
+ form = this.fb.group({
+    author: [null, [Validators.required]],
+    name: [null, [Validators.required]],
+    price: [null, [Validators.required, Validators.min(0)]],
+    type: [null, [Validators.required]],
+    publishDate: [null, [Validators.required]],
+  });
+
+  inProgress: boolean;
+
+  isModalOpen: boolean;
+
+  constructor(private fb: FormBuilder, private service: BookService) {}
+
+  save() {
+    if (this.form.invalid) return;
+
+    this.inProgress = true;
+
+    this.service.save(this.form.value).subscribe(() => {
+      this.inProgress = false;
+    });
+  }
+}
+```
+
+The modal with form looks like this:
+
+![Form example result](./images/modal-result-2.jpg)
+
+## API
+
+### Inputs
+
+#### visible
+
+```js
+@Input() visible: boolean
+```
+
+**`visible`** is a boolean input that determines whether the modal is open. It is also can be used two-way binding.
+
+#### busy
+
+```js
+@Input() busy: boolean
+```
+
+**`busy`** is a boolean input that determines whether the busy status of the modal is true. When `busy` is true, the modal cannot be closed and the `abp-button` loading spinner is triggered.
+
+
+#### options
+
+```js
+@Input() options: NgbModalOptions
+```
+
+**`options`** is an input typed [NgbModalOptions](https://ng-bootstrap.github.io/#/components/modal/api#NgbModalOptions). It is configuration for the `ng-bootstrap` modal.
+
+#### suppressUnsavedChangesWarning
+
+```js
+@Input() suppressUnsavedChangesWarning: boolean
+```
+
+**`suppressUnsavedChangesWarning`** is a boolean input that determines whether the confirmation popup triggering active or not. It can also be set globally as shown below:
+
+```ts
+//app.module.ts
+
+// app.module.ts
+
+import { SUPPRESS_UNSAVED_CHANGES_WARNING } from '@abp/ng.theme.shared';
+
+// ...
+
+@NgModule({
+  // ...
+  providers: [{provide: SUPPRESS_UNSAVED_CHANGES_WARNING, useValue: true}]
+})
+export class AppModule {}
+```
+
+Note: The `suppressUnsavedChangesWarning` input of `abp-modal` value overrides the `SUPPRESS_UNSAVED_CHANGES_WARNING` injection token value.
+
+### Outputs
+
+#### visibleChange
+
+```js
+@Output() readonly visibleChange = new EventEmitter<boolean>();
+```
+
+**`visibleChange`** is an event emitted when the modal visibility has changed. The event payload is a boolean.
+
+#### appear
+
+```js
+  @Output() readonly appear = new EventEmitter<void>();
+```
+
+**`appear`** is an event emitted when the modal has opened.
+
+#### disappear
+
+```js
+  @Output() readonly disappear = new EventEmitter<void>();
+```
+
+**`disappear`** is an event emitted when the modal has closed.

docs/en/UI/Angular/Router-Events.md

@@ -0,0 +1,146 @@
+# Router Events Simplified
+
+`RouterEvents` is a utility service to provide an easy implementation for one of the most frequent needs in Angular templates: `TrackByFunction`. Please see [this page in Angular docs](https://angular.io/guide/template-syntax#ngfor-with-trackby) for its purpose.
+
+
+
+
+## Benefit
+
+You can use router events directly and filter them as seen below:
+
+```js
+import {
+  NavigationEnd,
+  NavigationError,
+  NavigationCancel,
+  Router,
+} from '@angular/router';
+import { filter } from 'rxjs/operators';
+
+@Injectable()
+class SomeService {
+  navigationFinish$ = this.router.events.pipe(
+    filter(
+      event =>
+        event instanceof NavigationEnd ||
+        event instanceof NavigationError ||
+        event instanceof NavigationCancel,
+    ),
+  );
+  /* Observable<Event> */
+
+  constructor(private router: Router) {}
+}
+```
+
+However, `RouterEvents` makes filtering router events easier.
+
+```js
+import { RouterEvents } from '@abp/ng.core';
+
+@Injectable()
+class SomeService {
+  navigationFinish$ = this.routerEvents.getNavigationEvents('End', 'Error', 'Cancel');
+  /* Observable<NavigationCancel | NavigationEnd | NavigationError> */
+
+  constructor(private routerEvents: RouterEvents) {}
+}
+```
+
+`RouterEvents` also delivers improved type-safety. In the example above, `navigationFinish$` has inferred type of `Observable<NavigationCancel | NavigationEnd | NavigationError>` whereas it would have `Observable<Event>` when router events are filtered directly.
+
+
+
+
+## Usage
+
+You do not have to provide `RouterEvents` at the module or component level, because it is already **provided in root**. You can inject and start using it immediately in your components.
+
+
+### How to Get Specific Navigation Events
+
+You can use `getNavigationEvents` to get a stream of navigation events matching given event keys.
+
+```js
+import { RouterEvents } from '@abp/ng.core';
+import { merge } from 'rxjs';
+import { mapTo } from 'rxjs/operators';
+
+@Injectable()
+class SomeService {
+  navigationStart$ = this.routerEvents.getNavigationEvents('Start');
+  /* Observable<NavigationStart> */
+
+  navigationFinish$ = this.routerEvents.getNavigationEvents('End', 'Error', 'Cancel');
+  /* Observable<NavigationCancel | NavigationEnd | NavigationError> */
+
+  loading$ = merge(
+    this.navigationStart$.pipe(mapTo(true)),
+    this.navigationFinish$.pipe(mapTo(false)),
+  );
+  /* Observable<boolean> */
+
+  constructor(private routerEvents: RouterEvents) {}
+}
+```
+
+
+### How to Get All Navigation Events
+
+You can use `getAllNavigationEvents` to get a stream of all navigation events without passing any keys.
+
+```js
+import { RouterEvents, NavigationStart } from '@abp/ng.core';
+import { map } from 'rxjs/operators';
+
+@Injectable()
+class SomeService {
+  navigationEvent$ = this.routerEvents.getAllNavigationEvents();
+  /* Observable<NavigationCancel | NavigationEnd | NavigationError | NavigationStart> */
+
+  loading$ = this.navigationEvent$.pipe(
+    map(event => event instanceof NavigationStart),
+  );
+  /* Observable<boolean> */
+
+  constructor(private routerEvents: RouterEvents) {}
+}
+```
+
+
+### How to Get Specific Router Events
+
+You can use `getEvents` to get a stream of router events matching given event constructors.
+
+```js
+import { RouterEvents } from '@abp/ng.core';
+import { ActivationEnd, ChildActivationEnd } from '@angular/router';
+
+@Injectable()
+class SomeService {
+  moduleActivation$ = this.routerEvents.getEvents(ActivationEnd, ChildActivationEnd);
+  /* Observable<ActivationEnd | ChildActivationEnd> */
+
+  constructor(private routerEvents: RouterEvents) {}
+}
+```
+
+
+### How to Get All Router Events
+
+You can use `getEvents` to get a stream of all router events without passing any event constructors. This is nothing different from accessing `events` property of `Router` and is added to the service just for convenience.
+
+```js
+import { RouterEvents } from '@abp/ng.core';
+import { ActivationEnd, ChildActivationEnd } from '@angular/router';
+
+@Injectable()
+class SomeService {
+  routerEvent$ = this.routerEvents.getAllEvents();
+  /* Observable<Event> */
+
+  constructor(private routerEvents: RouterEvents) {}
+}
+```
+

docs/en/UI/AspNetCore/Bundling-Minification.md

@@ -165,7 +165,27 @@ public class MyWebExtensionModule : AbpModule
 }
 ````
 
-> It's not possible to configure unnamed bundle tag helpers by code, because their name are not known at the development time. It's suggested to always use a name for a bundle tag helper.
+You can also use the `ConfigureAll` method to configure all existing bundles:
+
+````C#
+[DependsOn(typeof(MyWebModule))]
+public class MyWebExtensionModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpBundlingOptions>(options =>
+        {
+            options
+                .ScriptBundles
+                .ConfigureAll(bundle => {
+                    bundle.AddFiles(
+                        "/scripts/my-extension-script.js"
+                    );
+                });
+        });
+    }
+}
+````
 
 ## Bundle Contributors
 

docs/en/UI/AspNetCore/Data-Tables.md

@@ -110,7 +110,7 @@ The `createAjax` also supports you to customize request parameters and handle th
 **Example:**
 
 ````csharp
-var inputAction = function () {
+var inputAction = function (requestData, dataTableSettings) {
     return {
         id: $('#Id').val(),
         name: $('#Name').val(),
@@ -131,6 +131,15 @@ var responseCallback = function(result) {
 ajax: abp.libs.datatables.createAjax(acme.bookStore.books.book.getList, inputAction, responseCallback)
 ````
 
+If you don't need access or modify the `requestData` or the `dataTableSettings`, you can specify a simple object as the second parameter. 
+
+````js
+ajax: abp.libs.datatables.createAjax(
+    acme.bookStore.books.book.getList, 
+    { id: $('#Id').val(), name: $('#Name').val() }
+)
+````
+
 ### Row Actions
 
 `rowAction` is an option defined by the ABP Framework to the column definitions to show a drop down button to take actions for a row in the table.

docs/en/docs-nav.json

@@ -807,6 +807,10 @@
                   "text": "Easy *ngFor trackBy",
                   "path": "UI/Angular/Track-By-Service.md"
                 },
+                {
+                  "text": "Router Events",
+                  "path": "UI/Angular/Router-Events.md"
+                },
                 {
                   "text": "Inserting Scripts & Styles to DOM",
                   "path": "UI/Angular/Dom-Insertion-Service.md"
@@ -819,6 +823,10 @@
                   "text": "Projecting Angular Content",
                   "path": "UI/Angular/Content-Projection-Service.md"
                 },
+                {
+                  "text": "Modal",
+                  "path": "UI/Angular/Modal.md"
+                },
                 {
                   "text": "Confirmation Popup",
                   "path": "UI/Angular/Confirmation-Service.md"
@@ -830,6 +838,10 @@
                 {
                   "text": "Page Alerts",
                   "path": "UI/Angular/Page-Alerts.md"
+                },
+                {
+                  "text": "Ellipsis",
+                  "path": "UI/Angular/Ellipsis-Directive.md"
                 }
               ]
             },

docs/zh-Hans/Best-Practices/Application-Services.md

@@ -199,7 +199,7 @@ Task<int> VoteAsync(Guid id, VoteType type);
 
 #### 查询数据
 
-* **不推荐** 在应用程序服务方法中使用linq/sql查询来自数据库的数据. 让仓储负责从数据源执行linq/sql查询.
+* **不推荐** 在应用服务方法中使用linq/sql查询来自数据库的数据. 让仓储负责从数据源执行linq/sql查询.
 
 #### 额外的属性
 
@@ -210,11 +210,16 @@ Task<int> VoteAsync(Guid id, VoteType type);
 * **推荐** 总是从数据库中获取所有的相关实体以对他们执行操作.
 * **推荐** 更新实体后调用存储的Update/UpdateAsync方法.因为并非所有数据库API都支持更改跟踪和自动更新.
 
+#### 处理文件
+
+* **不推荐** 在应用服务中使用任何web组件, 例如`IFormFile`和`Stream`. 如果你想接收一个文件, 可以使用`byte[]`.
+* **推荐** 使用`Controller`来处理文件上传, 然后将文件的`byte[]`传递给应用服务的方法。
+
 #### 使用其他应用服务
 
-* **不推荐** 使用相同 **模块/应用程序** 的其他应用服务. 相反;
+* **不推荐** 在同一个模块/应用中使用其他应用服务. 相反;
   * 使用领域层执行所需的任务.
-  * 提取新类并在应用程序服务之间共享, 在必要时代码重用. 但要小心不要结合两个用例. 它们在开始时可能看起来相似, 但可能会随时间演变为不同的方向. 请谨慎使用代码共享.
+  * 提取新类并在应用服务之间共享, 在必要时代码重用. 但要小心不要结合两个用例. 它们在开始时可能看起来相似, 但可能会随时间演变为不同的方向. 请谨慎使用代码共享.
 * **可以** 在以下情况下使用其他应用服务;
   * 它们是另一个模块/微服务的一部分.
-  * 当前模块仅引用已使用模块的application contracts.
+  * 当前模块仅引用已使用模块的application contracts.

docs/zh-Hans/Caching.md

@@ -192,6 +192,18 @@ public class BookService : ITransientDependency
 }
 ````
 
+## 批量操作
+
+ABP的分布式缓存接口定义了以下批量操作方法,当你需要在一个方法中调用多次缓存操作时,这些方法可以提高性能
+
+* `SetManyAsync` 和 `SetMany` 方法可以用来设置多个值.
+* `GetManyAsync` 和 `GetMany` 方法可以用来从缓存中获取多个值.
+* `GetOrAddManyAsync` 和 `GetOrAddMany` 方法可以用来从缓存中获取并添加缺少的值.
+* `RefreshManyAsync` 和 `RefreshMany` 方法可以来用重置多个值的滚动过期时间.
+* `RemoveManyAsync` 和 `RemoveMany` 方法呆以用来删除多个值.
+
+> 这些不是标准的ASP.NET Core缓存方法, 所以某些提供程序可能不支持. [ABP Redis集成包](Redis-Cache.md)实现了它们. 如果提供程序不支持,会回退到 `SetAsync` 和 `GetAsync` ... 方法(循环调用).
+
 ### DistributedCacheOptions
 
 TODO

docs/zh-Hans/Customizing-Application-Modules-Overriding-Services.md

@@ -243,7 +243,7 @@ ObjectExtensionManager.Instance
 
 这是定义实体属性的另一种方法( 有关 `ObjectExtensionManager` 更多信息,请参阅[文档](Object-Extensions.md)). 这次我们设置了 `CheckPairDefinitionOnMapping` 为false,在将实体映射到DTO时会跳过定义检查.
 
-如果你不喜欢这种方法,但想简单的向多个对象(DTO)添加单个属, `AddOrUpdateProperty` 可以使用类型数组添加额外的属性:
+如果你不喜欢这种方法,但想简单的向多个对象(DTO)添加单个属性, `AddOrUpdateProperty` 可以使用类型数组添加额外的属性:
 
 ````csharp
 ObjectExtensionManager.Instance

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,不同的**验证**和**授权**规则等.
 

docs/zh-Hans/MongoDB.md

@@ -211,7 +211,7 @@ public async override Task DeleteAsync(
 
 #### 访问MongoDB API
 
-大多数情况下,你想要将MongoDB API隐藏在仓储后面(这是仓储的主要目的).如果你想在仓储之上访问MongoDB API,你可以使用`GetDatabase()`或`GetCollection()`方法.例如:
+大多数情况下,你想要将MongoDB API隐藏在仓储后面(这是仓储的主要目的).如果你想在仓储之上访问MongoDB API,你可以使用`GetDatabaseAsync()`, `GetAggregateAsync()` 或`GetCollectionAsync()`方法.例如:
 
 ```csharp
 public class BookService
@@ -223,10 +223,11 @@ public class BookService
         _bookRepository = bookRepository;
     }
 
-    public void Foo()
+    public async Task FooAsync()
     {
-        IMongoDatabase database = _bookRepository.GetDatabase();
-        IMongoCollection<Book> books = _bookRepository.GetCollection();
+        IMongoDatabase database = await _bookRepository.GetDatabaseAsync();
+        IMongoCollection<Book> books = await _bookRepository.GetCollectionAsync();
+        IAggregateFluent<Book> bookAggregate = await _bookRepository.GetAggregateAsync();
     }
 }
 ```

docs/zh-Hans/PlugIn-Modules.md

@@ -0,0 +1,233 @@
+# 模块化插件
+
+可以将[模块](Module-Development-Basics.md)加载为插件.这意味着你可能不需要在解决方案中引用模块的程序集,就可以像其它模块一样在启动应用时加载该模块.
+
+## 基本用法
+
+`IServiceCollection.AddApplication<T>()` 扩展方法可以获取配置插件源的选项.
+
+**示例: 从文件夹加载插件**
+
+````csharp
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity.PlugIns;
+
+namespace MyPlugInDemo.Web
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddApplication<MyPlugInDemoWebModule>(options =>
+            {
+                options.PlugInSources.AddFolder(@"D:\Temp\MyPlugIns");
+            });
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.InitializeApplication();
+        }
+    }
+}
+````
+
+* 这是典型的ASP.NET Core应用程序的`Startup`类.
+* `PlugInSources.AddFolder`从指定的目录中加载程序集(通常为dll).
+
+就这样.ABP将在这个目录中发现这些模块,像其它常规一样配置和初始化它们.
+
+### 插件源
+
+`options.PlugInSources`类实际上是`IPlugInSource`接口的一系列实现并且 `AddFolder`方法仅仅是以下表达式的便捷方法：
+
+````csharp
+options.PlugInSources.Add(new FolderPlugInSource(@"D:\Temp\MyPlugIns"));
+````
+
+> `AddFolder()`方法仅在给定目录下查找程序集文件,而不在子目录中查找.你可以传递一个`SearchOption.AllDirectories`参数作为第二个参数,来递归地查找它的子目录.
+
+这里有两个内置插件源的示例：
+
+* `PlugInSources.AddFiles()`方法获取程序集(通常是dll)文件列表.这是使用`FilePlugInSource`类的快捷方式.
+* `PlugInSources.AddTypes()`方法获取模块类类型的列表.如果实用化此方法,则需要自己加载模块的程序集,但是在需要时它提供了灵活性.这是使用`TypePlugInSource`类的快捷方式.
+
+如果需要,你可以创建自己的`IPlugInSource`的接口实现,并像其它方法一样添加到`options.PlugInSources`中.
+
+## 示例：创建一个简单的插件
+
+在一个解决方案中创建一个简单的**类库项目**
+
+![简单插件库](images/simple-plugin-library.png)
+
+你可以在模块中添加需要使用的ABP框架包.至少,你应该为这个项目添加包`Volo.Abp.Core`：
+
+````
+Install-Package Volo.Abp.Core
+````
+
+每个[模块](Module-Development-Basics.md)必须声明为一个继承自`AbpModule`的类.这里是一个简单的模块类,用于解析一个服务并在应用启动时对其初始化：
+
+````csharp
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+using Volo.Abp.Modularity;
+
+namespace MyPlugIn
+{
+    public class MyPlungInModule : AbpModule
+    {
+        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            var myService = context.ServiceProvider
+                .GetRequiredService<MyService>();
+            
+            myService.Initialize();
+        }
+    }
+}
+````
+
+`MyService`可以是注册在[依赖注入](Dependency-Injection.md)系统中的任意类,如下所示:
+
+````csharp
+using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
+
+namespace MyPlugIn
+{
+    public class MyService : ITransientDependency
+    {
+        private readonly ILogger<MyService> _logger;
+
+        public MyService(ILogger<MyService> logger)
+        {
+            _logger = logger;
+        }
+
+        public void Initialize()
+        {
+            _logger.LogInformation("MyService has been initialized");
+        }
+    }
+}
+````
+
+编译这个项目,打开build目录,找到`MyPlugIn.dll`：
+
+![简单dll插件](images/simple-plug-in-dll-file.png)
+
+将`MyPlugIn.dll`复制到到插件目录中(此实例为`D:\Temp\MyPlugIns`).
+
+如果你已经按照上述方式配置了主应用程序(参见“基础用法”部分),那么在应用程序启动时,你可以看到“MyService has been initialized(MyService已经初始化)的日志.
+
+## 示例：创建一个Razor Pages插件
+
+创建内部带视图的插件需要更多的注意.
+
+> 这个示例假设你已经使用应用程序启动模板和MVC / Razor Pages UI[创建了一个新的Web应用程序](https://abp.io/get-started).
+
+在解决方案中创建一个新的**类库**项目：
+
+![简单razor插件](images/simple-razor-plugin.png)
+
+编辑这个`.csproj`文件内容：
+
+````xml
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <OutputType>Library</OutputType>
+        <IsPackable>true</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="4.0.1" />
+    </ItemGroup>
+
+</Project>
+````
+
+* 将`Sdk`修改为`Microsoft.NET.Sdk.Web`.
+* 添加了`OutputType`和`IsPackable`属性.
+* 添加了`Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared`NuGet包.
+
+> 不需要[Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared) 包.你可以引用更基础的程序包,例如[Volo.Abp.AspNetCore.Mvc](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc/). 但是,如果需要构建一个UI视图/组件,建议参考[Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared)程序包,因为它是最高级的程序包,不依赖于特定[theme](UI/AspNetCore/Theming.md).如果依赖特定主题没有问题,则可以直接引用该主题的程序包,以便能够使用插件中特定于主题的功能.
+
+接下来在插件中创建模块类：
+
+````csharp
+using System.IO;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.Modularity;
+
+namespace MyMvcUIPlugIn
+{
+    [DependsOn(typeof(AbpAspNetCoreMvcUiThemeSharedModule))]
+    public class MyMvcUIPlugInModule : AbpModule
+    {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            PreConfigure<IMvcBuilder>(mvcBuilder =>
+            {
+                // 添加插件程序集
+                mvcBuilder.PartManager.ApplicationParts.Add(new AssemblyPart(typeof(MyMvcUIPlugInModule).Assembly));
+
+                // 添加视图程序集
+                var viewDllPath = Path.Combine(Path.GetDirectoryName(typeof(MyMvcUIPlugInModule).Assembly.Location), "MyMvcUIPlugIn.Views.dll");
+                var viewAssembly = new CompiledRazorAssemblyPart(Assembly.LoadFrom(viewDllPath));
+                mvcBuilder.PartManager.ApplicationParts.Add(viewAssembly);
+            });
+        }
+    }
+}
+````
+
+* 由于我们添加了相关的NuGet包,因此取决于`AbpAspNetCoreMvcUiThemeSharedModule`.
+* 添加插件程序集到ASP.NET Core MVC的`PartManager`中.这是ASP.NET Core所必需的.否则,你插件中的控制器将无法正常工作.
+* 添加插件的视图程序集到ASP.NET Core MVC的`PartManager`中.这是ASP.NET Core所必需的.否则,你在插件中的视图将不起作用.
+
+现在,你可以在`Pages`目录下添加一个razor页面,例如`MyPlugInPage.cshtml`：
+
+````html
+@page
+@model MyMvcUIPlugIn.Pages.MyPlugInPage
+<h1>Welcome to my plug-in page</h1>
+<p>This page is located inside a plug-in module! :)</p>
+````
+
+现在,你可以构建插件项目.它将产生以下输出：
+
+![simple-razor-plug-in-dll-file](images/simple-razor-plug-in-dll-file.png)
+
+将`MyMvcUIPlugIn.dll`和`MyMvcUIPlugIn.Views.dll`复制到到插件目录下(此示例中为`D:\Temp\MyPlugIns`).
+
+如果你已经按照上述方式配置了主应用程序(参见“基础用法”部分),那么在应用程序启动的时候,你应该能够访问`/MyPlugInPage`URL：
+
+![simple-plugin-output](images/simple-plugin-output.png)
+
+## 讨论
+
+在现实世界中,你的插件可能具有一些外部依赖性.另外,你的应用程序可能被设计为支持插件.所有这些都是你自己的系统要求.ABP做的仅仅是在应用程序启动时加载模块.你在这些模块中执行什么操作由你决定.
+
+但是,我们可以为一些常见情况提供一些建议.
+
+### 库依赖
+
+对于包/dll依赖,你可以将相关的dll复制到插件目录下.ABP会自动将所有程序集加载到该目录下,并且你的插件将按预期工作.
+
+> 请参见[Microsoft文档](https://docs.microsoft.com/zh-cn/dotnet/core/tutorials/creating-app-with-plugin-support#plugin-with-library-dependencies).
+
+### 数据库模式
+
+如果你的模块使用关系型数据库和[Entity Framework Core](Entity-Framework-Core.md), 那么它需要在数据库中提供表.有多种不同的方法可确保在应用程序使用插件时创建表.一些例子；
+
+1. 插件可以检查数据库表是否存在,并在应用程序启动时创建表,或者如果插件已更新且需要进行某些架构更改时,则会迁移它们.你可以使用EF Core的迁移API来做到这一点.
+2. 你可以改进`DbMigrator`应用程序,用于查找插件的迁移并执行它们.
+
+可能还有其它解决方案.例如,如果你的数据库管理员不允许你在应用程序代码中更改数据库模式,则可能需要手动将SQL文件发送给数据库管理员,以将其应用于数据库.

docs/zh-Hans/Redis-Cache.md

@@ -0,0 +1 @@
+TODO...

docs/zh-Hans/UI/AspNetCore/Bundling-Minification.md

@@ -167,7 +167,27 @@ public class MyWebExtensionModule : AbpModule
 }
 ````
 
-> 无法通过代码配置未命名的bundle tag helpers, 因为它们的名称在开发时是未知的. 建议始终使用bundle tag helper的名称.
+你也可以使用 `ConfigureAll` 方法配置所有现有的捆绑包:
+
+````C#
+[DependsOn(typeof(MyWebModule))]
+public class MyWebExtensionModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpBundlingOptions>(options =>
+        {
+            options
+                .ScriptBundles
+                .ConfigureAll(bundle => {
+                    bundle.AddFiles(
+                        "/scripts/my-extension-script.js"
+                    );
+                });
+        });
+    }
+}
+````
 
 ### Bundle 贡献者
 

docs/zh-Hans/docs-nav.json

@@ -313,7 +313,8 @@
               "path": "Module-Development-Basics.md"
             },
             {
-              "text": "模块插件"
+              "text": "模块插件",
+              "path": "PlugIn-Modules.md"
             },
             {
               "text": "自定义应用模块",

framework/Volo.Abp.sln

@@ -359,6 +359,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Json.Tests", "test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Tests", "test\Volo.Abp.Http.Tests\Volo.Abp.Http.Tests.csproj", "{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Abstractions", "src\Volo.Abp.EventBus.Abstractions\Volo.Abp.EventBus.Abstractions.csproj", "{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1069,6 +1071,10 @@ Global
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1250,6 +1256,7 @@ Global
 		{DD9519E0-5A68-48DC-A051-7BF2AC922F3E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{00D07595-993C-40FC-BD90-0DD6331414D3} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs

@@ -9,11 +9,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
     {
         private readonly ConcurrentDictionary<string, BundleConfiguration> _bundles;
         private readonly ConcurrentDictionary<string, List<Action<BundleConfiguration>>> _lazyBundleConfigurationActions;
+        private readonly List<Action<BundleConfiguration>> _lazyAllBundleConfigurationActions;
 
         public BundleConfigurationCollection()
         {
             _bundles = new ConcurrentDictionary<string, BundleConfiguration>();
             _lazyBundleConfigurationActions = new ConcurrentDictionary<string, List<Action<BundleConfiguration>>>();
+            _lazyAllBundleConfigurationActions = new List<Action<BundleConfiguration>>();
         }
 
         /// <summary>
@@ -90,6 +92,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
                 }
             }
 
+            lock (_lazyAllBundleConfigurationActions)
+            {
+                _lazyAllBundleConfigurationActions.ForEach(c => c.Invoke(bundle));
+            }
+
+
             return bundle;
         }
 
@@ -123,6 +131,29 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
             return this;
         }
 
+         /// <summary>
+        /// Configures all bundles.
+        /// This method also works for lazy bundles (those are created using razor tag helpers).
+        /// </summary>
+        /// <param name="configureAction">Configure action</param>
+        /// <returns>Returns this object for chained calls.</returns>
+        public BundleConfigurationCollection ConfigureAll([NotNull] Action<BundleConfiguration> configureAction)
+        {
+            Check.NotNull(configureAction, nameof(configureAction));
+
+            foreach (var bundle in _bundles)
+            {
+                configureAction.Invoke(bundle.Value);
+            }
+
+            lock (_lazyAllBundleConfigurationActions)
+            {
+                _lazyAllBundleConfigurationActions.Add(configureAction);
+            }
+
+            return this;
+        }
+
         /// <summary>
         /// Gets a bundle.
         /// </summary>
@@ -140,4 +171,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
             return bundle;
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js

@@ -159,7 +159,7 @@
 
     abp.dom.initializers.initializeDatepickers = function ($rootElement) {
         $rootElement
-            .findWithSelf('input.datepicker,input[type=date]')
+            .findWithSelf('input.datepicker,input[type=date][abp-data-datepicker!=false]')
             .each(function () {
                 var $input = $(this);
                 $input

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

@@ -334,7 +334,10 @@
                 };
             }
             return function (requestData, callback, settings) {
-                var input = inputAction ? inputAction(requestData, settings) : {};
+                var input = typeof inputAction === 'function'
+                    ? inputAction(requestData, settings)
+                    : typeof inputAction === 'object'
+                        ? inputAction : {};
 
                 //Paging
                 if (settings.oInit.paging) {

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs

@@ -27,6 +27,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.RazorPages
     {
         public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
 
+        [Obsolete("Use LazyServiceProvider instead.")]
         public IServiceProvider ServiceProvider { get; set; }
 
         protected IClock Clock => LazyServiceProvider.LazyGetRequiredService<IClock>();

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs

@@ -25,6 +25,7 @@ namespace Volo.Abp.AspNetCore.Mvc
     {
         public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
 
+        [Obsolete("Use LazyServiceProvider instead.")]
         public IServiceProvider ServiceProvider { get; set; }
 
         protected IUnitOfWorkManager UnitOfWorkManager => LazyServiceProvider.LazyGetRequiredService<IUnitOfWorkManager>();

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Auditing;
-using Volo.Abp.AspNetCore.Mvc.Content;
+using Volo.Abp.AspNetCore.Mvc.ContentFormatters;
 using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Mvc.Features;

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpViewComponent.cs

@@ -10,6 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc
     {
         public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
 
+        [Obsolete("Use LazyServiceProvider instead.")]
         public IServiceProvider ServiceProvider { get; set; }
 
         protected Type ObjectMapperContext { get; set; }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs

@@ -25,17 +25,20 @@ namespace Volo.Abp.AspNetCore.Mvc
     {
         public ILogger<AspNetCoreApiDescriptionModelProvider> Logger { get; set; }
 
+        private readonly AspNetCoreApiDescriptionModelProviderOptions _options;
         private readonly IApiDescriptionGroupCollectionProvider _descriptionProvider;
-        private readonly AbpAspNetCoreMvcOptions _options;
+        private readonly AbpAspNetCoreMvcOptions _abpAspNetCoreMvcOptions;
         private readonly AbpApiDescriptionModelOptions _modelOptions;
 
         public AspNetCoreApiDescriptionModelProvider(
+            IOptions<AspNetCoreApiDescriptionModelProviderOptions> options,
             IApiDescriptionGroupCollectionProvider descriptionProvider,
-            IOptions<AbpAspNetCoreMvcOptions> options,
+            IOptions<AbpAspNetCoreMvcOptions> abpAspNetCoreMvcOptions,
             IOptions<AbpApiDescriptionModelOptions> modelOptions)
         {
-            _descriptionProvider = descriptionProvider;
             _options = options.Value;
+            _descriptionProvider = descriptionProvider;
+            _abpAspNetCoreMvcOptions = abpAspNetCoreMvcOptions.Value;
             _modelOptions = modelOptions.Value;
 
             Logger = NullLogger<AspNetCoreApiDescriptionModelProvider>.Instance;
@@ -82,14 +85,14 @@ namespace Volo.Abp.AspNetCore.Mvc
 
             var controllerModel = moduleModel.GetOrAddController(
                 controllerType.FullName,
-                CalculateControllerName(controllerType, setting),
+                _options.ControllerNameGenerator(controllerType, setting),
                 controllerType,
                 _modelOptions.IgnoredInterfaces
             );
 
             var method = apiDescription.ActionDescriptor.GetMethodInfo();
 
-            var uniqueMethodName = GetUniqueActionName(method);
+            var uniqueMethodName = _options.ActionNameGenerator(method);
             if (controllerModel.Actions.ContainsKey(uniqueMethodName))
             {
                 Logger.LogWarning(
@@ -119,44 +122,6 @@ namespace Volo.Abp.AspNetCore.Mvc
             AddParameterDescriptionsToModel(actionModel, method, apiDescription);
         }
 
-        private static string CalculateControllerName(Type controllerType, ConventionalControllerSetting setting)
-        {
-            var controllerName = controllerType.Name.RemovePostFix("Controller")
-                .RemovePostFix(ApplicationService.CommonPostfixes);
-
-            if (setting?.UrlControllerNameNormalizer != null)
-            {
-                controllerName =
-                    setting.UrlControllerNameNormalizer(
-                        new UrlControllerNameNormalizerContext(setting.RootPath, controllerName));
-            }
-
-            return controllerName;
-        }
-
-        private static string GetUniqueActionName(MethodInfo method)
-        {
-            var methodNameBuilder = new StringBuilder(method.Name);
-
-            var parameters = method.GetParameters();
-            if (parameters.Any())
-            {
-                methodNameBuilder.Append("By");
-
-                for (var i = 0; i < parameters.Length; i++)
-                {
-                    if (i > 0)
-                    {
-                        methodNameBuilder.Append("And");
-                    }
-
-                    methodNameBuilder.Append(parameters[i].Name.ToPascalCase());
-                }
-            }
-
-            return methodNameBuilder.ToString();
-        }
-
         private static List<string> GetSupportedVersions(Type controllerType, MethodInfo method,
             ConventionalControllerSetting setting)
         {
@@ -377,7 +342,7 @@ namespace Volo.Abp.AspNetCore.Mvc
         [CanBeNull]
         private ConventionalControllerSetting FindSetting(Type controllerType)
         {
-            foreach (var controllerSetting in _options.ConventionalControllers.ConventionalControllerSettings)
+            foreach (var controllerSetting in _abpAspNetCoreMvcOptions.ConventionalControllers.ConventionalControllerSettings)
             {
                 if (controllerSetting.ControllerTypes.Contains(controllerType))
                 {

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProviderOptions.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using Volo.Abp.Application.Services;
+using Volo.Abp.AspNetCore.Mvc.Conventions;
+
+namespace Volo.Abp.AspNetCore.Mvc
+{
+    public class AspNetCoreApiDescriptionModelProviderOptions
+    {
+        public Func<Type, ConventionalControllerSetting, string> ControllerNameGenerator { get; set; }
+
+        public Func<MethodInfo, string> ActionNameGenerator { get; set; }
+
+        public AspNetCoreApiDescriptionModelProviderOptions()
+        {
+            ControllerNameGenerator = (controllerType, setting) =>
+            {
+                var controllerName = controllerType.Name.RemovePostFix("Controller")
+                    .RemovePostFix(ApplicationService.CommonPostfixes);
+
+                if (setting?.UrlControllerNameNormalizer != null)
+                {
+                    controllerName =
+                        setting.UrlControllerNameNormalizer(
+                            new UrlControllerNameNormalizerContext(setting.RootPath, controllerName));
+                }
+
+                return controllerName;
+            };
+
+            ActionNameGenerator = (method) =>
+            {
+                var methodNameBuilder = new StringBuilder(method.Name);
+
+                var parameters = method.GetParameters();
+                if (parameters.Any())
+                {
+                    methodNameBuilder.Append("By");
+
+                    for (var i = 0; i < parameters.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            methodNameBuilder.Append("And");
+                        }
+
+                        methodNameBuilder.Append(parameters[i].Name.ToPascalCase());
+                    }
+                }
+
+                return methodNameBuilder.ToString();
+            };
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Content/InternalRemoteStreamContent.cs

@@ -1,25 +0,0 @@
-using System.IO;
-using Microsoft.AspNetCore.Http;
-using Volo.Abp.Content;
-
-namespace Volo.Abp.AspNetCore.Mvc.Content
-{
-    internal class InternalRemoteStreamContent : IRemoteStreamContent
-    {
-        private readonly HttpContext _httpContext;
-        
-        public InternalRemoteStreamContent(HttpContext httpContext)
-        {
-            _httpContext = httpContext;
-        }
-
-        public string ContentType => _httpContext.Request.ContentType;
-
-        public long? ContentLength => _httpContext.Request.ContentLength;
-
-        public Stream GetStream()
-        {
-            return _httpContext.Request.Body;
-        }
-    }
-}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Content/RemoteStreamContentInputFormatter.cs → framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentInputFormatter.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.Net.Http.Headers;
 using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
 using Volo.Abp.Content;
 
-namespace Volo.Abp.AspNetCore.Mvc.Content
+namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters
 {
     public class RemoteStreamContentInputFormatter : InputFormatter
     {
@@ -20,9 +20,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Content
 
         public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context)
         {
-            return InputFormatterResult.SuccessAsync(
-                new InternalRemoteStreamContent(context.HttpContext)
-            );
+            return InputFormatterResult.SuccessAsync(new RemoteStreamContent(context.HttpContext.Request.Body)
+            {
+                ContentType = context.HttpContext.Request.ContentType
+            });
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Content/RemoteStreamContentOutputFormatter.cs → framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentOutputFormatter.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 using Volo.Abp.Content;
 
-namespace Volo.Abp.AspNetCore.Mvc.Content
+namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters
 {
     public class RemoteStreamContentOutputFormatter : OutputFormatter
     {
@@ -21,9 +21,16 @@ namespace Volo.Abp.AspNetCore.Mvc.Content
         public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
         {
             var remoteStream = (IRemoteStreamContent)context.Object;
-            using (var stream = remoteStream.GetStream())
+
+            if (remoteStream != null)
             {
-                await stream.CopyToAsync(context.HttpContext.Response.Body);
+                context.HttpContext.Response.ContentType = remoteStream.ContentType;
+
+                using (var stream = remoteStream.GetStream())
+                {
+                    stream.Position = 0;
+                    await stream.CopyToAsync(context.HttpContext.Response.Body);
+                }
             }
         }
     }

framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpHub.cs

@@ -17,6 +17,7 @@ namespace Volo.Abp.AspNetCore.SignalR
     {
         public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
 
+        [Obsolete("Use LazyServiceProvider instead.")]
         public IServiceProvider ServiceProvider { get; set; }
 
         protected ILoggerFactory LoggerFactory => LazyServiceProvider.LazyGetService<ILoggerFactory>();

framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,67 +0,0 @@
-// This software is part of the Autofac IoC container
-// Copyright © 2017 Autofac Contributors
-// http://autofac.org
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace Autofac.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Extension methods on <see cref="IServiceCollection"/> to register the <see cref="IServiceProviderFactory{TContainerBuilder}"/>.
-    /// </summary>
-    public static class ServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds the <see cref="AutofacServiceProviderFactory"/> to the service collection.
-        /// </summary>
-        /// <param name="services">The service collection to add the factory to.</param>
-        /// <param name="configurationAction">Action on a <see cref="ContainerBuilder"/> that adds component registrations to the container.</param>
-        /// <returns>The service collection.</returns>
-        public static IServiceCollection AddAutofac(this IServiceCollection services, Action<ContainerBuilder> configurationAction = null)
-        {
-            return services
-                .ClearServiceProviderFactories()
-                .AddSingleton<IServiceProviderFactory<ContainerBuilder>>(new AutofacServiceProviderFactory(configurationAction));
-        }
-
-        private static IServiceCollection ClearServiceProviderFactories([NotNull] this IServiceCollection services)
-        {
-            Check.NotNull(services, nameof(services));
-
-            services.RemoveAll(
-                service => service.ImplementationInstance?
-                               .GetType()
-                               .GetInterfaces()
-                               .Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IServiceProviderFactory<>)) == true
-            );
-
-            return services;
-        }
-    }
-}

framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

@@ -269,7 +269,7 @@ namespace Volo.Abp.BlazoriseUI
 
             await GetEntitiesAsync();
 
-            StateHasChanged();
+            await InvokeAsync(StateHasChanged);
         }
 
         protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs<TListViewModel> e)
@@ -282,7 +282,7 @@ namespace Volo.Abp.BlazoriseUI
 
             await GetEntitiesAsync();
 
-            StateHasChanged();
+            await InvokeAsync(StateHasChanged);
         }
 
         protected virtual async Task OpenCreateModalAsync()
@@ -295,7 +295,7 @@ namespace Volo.Abp.BlazoriseUI
 
             // Mapper will not notify Blazor that binded values are changed
             // so we need to notify it manually by calling StateHasChanged
-            await InvokeAsync(() => StateHasChanged());
+            await InvokeAsync(StateHasChanged);
 
             CreateModal.Show();
         }
@@ -317,7 +317,7 @@ namespace Volo.Abp.BlazoriseUI
             EditingEntityId = entity.Id;
             EditingEntity = MapToEditingEntity(entityDto);
 
-            await InvokeAsync(() => StateHasChanged());
+            await InvokeAsync(StateHasChanged);
 
             EditModal.Show();
         }
@@ -362,11 +362,8 @@ namespace Volo.Abp.BlazoriseUI
                 await CheckCreatePolicyAsync();
                 var createInput = MapToCreateInput(NewEntity);
                 await AppService.CreateAsync(createInput);
-                await GetEntitiesAsync();
 
                 await OnCreatedEntityAsync();
-
-                CreateModal.Hide();
             }
         }
 
@@ -375,9 +372,11 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual Task OnCreatedEntityAsync()
+        protected virtual async Task OnCreatedEntityAsync()
         {
-            return Task.CompletedTask;
+            await GetEntitiesAsync();
+
+            CreateModal.Hide();
         }
 
         protected virtual async Task UpdateEntityAsync()
@@ -389,11 +388,8 @@ namespace Volo.Abp.BlazoriseUI
                 await CheckUpdatePolicyAsync();
                 var updateInput = MapToUpdateInput(EditingEntity);
                 await AppService.UpdateAsync(EditingEntityId, updateInput);
-                await GetEntitiesAsync();
 
                 await OnUpdatedEntityAsync();
-
-                EditModal.Hide();
             }
         }
 
@@ -402,9 +398,11 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual Task OnUpdatedEntityAsync()
+        protected virtual async Task OnUpdatedEntityAsync()
         {
-            return Task.CompletedTask;
+            await GetEntitiesAsync();
+
+            EditModal.Hide();
         }
 
         protected virtual async Task DeleteEntityAsync(TListViewModel entity)

framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj

@@ -12,9 +12,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <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" />
+        <PackageReference Include="Blazorise" Version="0.9.3-preview8" />
+        <PackageReference Include="Blazorise.DataGrid" Version="0.9.3-preview8" />
+        <PackageReference Include="Blazorise.Snackbar" Version="0.9.3-preview8" />
     </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs

@@ -45,19 +45,26 @@ namespace Volo.Abp.Caching.StackExchangeRedis
 
             MapMetadataMethod = type.GetMethod("MapMetadata", BindingFlags.Instance | BindingFlags.NonPublic);
 
-            GetAbsoluteExpirationMethod = type.GetMethod("GetAbsoluteExpiration", BindingFlags.Static | BindingFlags.NonPublic);
+            GetAbsoluteExpirationMethod =
+                type.GetMethod("GetAbsoluteExpiration", BindingFlags.Static | BindingFlags.NonPublic);
 
-            GetExpirationInSecondsMethod = type.GetMethod("GetExpirationInSeconds", BindingFlags.Static | BindingFlags.NonPublic);
+            GetExpirationInSecondsMethod =
+                type.GetMethod("GetExpirationInSeconds", BindingFlags.Static | BindingFlags.NonPublic);
 
-            SetScript = type.GetField("SetScript", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null).ToString();
+            SetScript = type.GetField("SetScript", BindingFlags.Static | BindingFlags.NonPublic)?.GetValue(null)
+                .ToString();
 
-            AbsoluteExpirationKey = type.GetField("AbsoluteExpirationKey", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null).ToString();
+            AbsoluteExpirationKey = type.GetField("AbsoluteExpirationKey", BindingFlags.Static | BindingFlags.NonPublic)
+                ?.GetValue(null).ToString();
 
-            SlidingExpirationKey = type.GetField("SlidingExpirationKey", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null).ToString();
+            SlidingExpirationKey = type.GetField("SlidingExpirationKey", BindingFlags.Static | BindingFlags.NonPublic)
+                ?.GetValue(null).ToString();
 
-            DataKey = type.GetField("DataKey", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null).ToString();
+            DataKey = type.GetField("DataKey", BindingFlags.Static | BindingFlags.NonPublic)?.GetValue(null).ToString();
 
-            NotPresent = type.GetField("NotPresent", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null).To<int>();
+            // ReSharper disable once PossibleNullReferenceException
+            NotPresent = type.GetField("NotPresent", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null)
+                .To<int>();
         }
 
         public AbpRedisCache(IOptions<RedisCacheOptions> optionsAccessor)
@@ -124,6 +131,42 @@ namespace Volo.Abp.Caching.StackExchangeRedis
             await Task.WhenAll(PipelineSetMany(items, options));
         }
 
+        public void RefreshMany(
+            IEnumerable<string> keys)
+        {
+            keys = Check.NotNull(keys, nameof(keys));
+
+            GetAndRefreshMany(keys, false);
+        }
+
+        public async Task RefreshManyAsync(
+            IEnumerable<string> keys,
+            CancellationToken token = default)
+        {
+            keys = Check.NotNull(keys, nameof(keys));
+
+            await GetAndRefreshManyAsync(keys, false, token);
+        }
+
+        public void RemoveMany(IEnumerable<string> keys)
+        {
+            keys = Check.NotNull(keys, nameof(keys));
+
+            Connect();
+
+            RedisDatabase.KeyDelete(keys.Select(key => (RedisKey)(Instance + key)).ToArray());
+        }
+
+        public async Task RemoveManyAsync(IEnumerable<string> keys, CancellationToken token = default)
+        {
+            keys = Check.NotNull(keys, nameof(keys));
+
+            token.ThrowIfCancellationRequested();
+            await ConnectAsync(token);
+
+            await RedisDatabase.KeyDeleteAsync(keys.Select(key => (RedisKey)(Instance + key)).ToArray());
+        }
+
         protected virtual byte[][] GetAndRefreshMany(
             IEnumerable<string> keys,
             bool getData)

framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs

@@ -527,6 +527,198 @@ namespace Volo.Abp.Caching
             return value;
         }
 
+        public KeyValuePair<TCacheKey, TCacheItem>[] GetOrAddMany(
+            IEnumerable<TCacheKey> keys,
+            Func<IEnumerable<TCacheKey>, List<KeyValuePair<TCacheKey, TCacheItem>>> factory,
+            Func<DistributedCacheEntryOptions> optionsFactory = null,
+            bool? hideErrors = null,
+            bool considerUow = false)
+        {
+
+            KeyValuePair<TCacheKey, TCacheItem>[] result;
+            var keyArray = keys.ToArray();
+
+            var cacheSupportsMultipleItems = Cache as ICacheSupportsMultipleItems;
+            if (cacheSupportsMultipleItems == null)
+            {
+                result = GetManyFallback(
+                    keyArray,
+                    hideErrors,
+                    considerUow
+                );
+            }
+            else
+            {
+                var notCachedKeys = new List<TCacheKey>();
+                var cachedValues = new List<KeyValuePair<TCacheKey, TCacheItem>>();
+                if (ShouldConsiderUow(considerUow))
+                {
+                    var uowCache = GetUnitOfWorkCache();
+                    foreach (var key in keyArray)
+                    {
+                        var value = uowCache.GetOrDefault(key)?.GetUnRemovedValueOrNull();
+                        if (value != null)
+                        {
+                            cachedValues.Add(new KeyValuePair<TCacheKey, TCacheItem>(key, value));
+                        }
+                    }
+
+                    notCachedKeys = keyArray.Except(cachedValues.Select(x => x.Key)).ToList();
+                    if (!notCachedKeys.Any())
+                    {
+                        return cachedValues.ToArray();
+                    }
+                }
+
+                hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
+                byte[][] cachedBytes;
+
+                var readKeys = notCachedKeys.Any() ? notCachedKeys.ToArray() : keyArray;
+                try
+                {
+                    cachedBytes = cacheSupportsMultipleItems.GetMany(readKeys.Select(NormalizeKey));
+                }
+                catch (Exception ex)
+                {
+                    if (hideErrors == true)
+                    {
+                        HandleException(ex);
+                        return ToCacheItemsWithDefaultValues(keyArray);
+                    }
+
+                    throw;
+                }
+
+                result = cachedValues.Concat(ToCacheItems(cachedBytes, readKeys)).ToArray();
+            }
+
+            if (result.All(x => x.Value != null))
+            {
+                return result;
+            }
+
+            var missingKeys = new List<TCacheKey>();
+            var missingValuesIndex = new List<int>();
+            for (var i = 0; i < keyArray.Length; i++)
+            {
+                if (result[i].Value != null)
+                {
+                    continue;
+                }
+
+                missingKeys.Add(keyArray[i]);
+                missingValuesIndex.Add(i);
+            }
+
+            var missingValues = factory.Invoke(missingKeys).ToArray();
+            var valueQueue = new Queue<KeyValuePair<TCacheKey, TCacheItem>>(missingValues);
+
+            SetMany(missingValues, optionsFactory?.Invoke(), hideErrors, considerUow);
+
+            foreach (var index in missingValuesIndex)
+            {
+                result[index] = valueQueue.Dequeue();
+            }
+
+            return result;
+        }
+
+
+        public async Task<KeyValuePair<TCacheKey, TCacheItem>[]> GetOrAddManyAsync(
+            IEnumerable<TCacheKey> keys,
+            Func<IEnumerable<TCacheKey>, Task<List<KeyValuePair<TCacheKey, TCacheItem>>>> factory,
+            Func<DistributedCacheEntryOptions> optionsFactory = null,
+            bool? hideErrors = null,
+            bool considerUow = false,
+            CancellationToken token = default)
+        {
+            KeyValuePair<TCacheKey, TCacheItem>[] result;
+            var keyArray = keys.ToArray();
+
+            var cacheSupportsMultipleItems = Cache as ICacheSupportsMultipleItems;
+            if (cacheSupportsMultipleItems == null)
+            {
+                result = await GetManyFallbackAsync(
+                    keyArray,
+                    hideErrors,
+                    considerUow, token);
+            }
+            else
+            {
+                var notCachedKeys = new List<TCacheKey>();
+                var cachedValues = new List<KeyValuePair<TCacheKey, TCacheItem>>();
+                if (ShouldConsiderUow(considerUow))
+                {
+                    var uowCache = GetUnitOfWorkCache();
+                    foreach (var key in keyArray)
+                    {
+                        var value = uowCache.GetOrDefault(key)?.GetUnRemovedValueOrNull();
+                        if (value != null)
+                        {
+                            cachedValues.Add(new KeyValuePair<TCacheKey, TCacheItem>(key, value));
+                        }
+                    }
+
+                    notCachedKeys = keyArray.Except(cachedValues.Select(x => x.Key)).ToList();
+                    if (!notCachedKeys.Any())
+                    {
+                        return cachedValues.ToArray();
+                    }
+                }
+
+                hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
+                byte[][] cachedBytes;
+
+                var readKeys = notCachedKeys.Any() ? notCachedKeys.ToArray() : keyArray;
+                try
+                {
+                    cachedBytes = await cacheSupportsMultipleItems.GetManyAsync(readKeys.Select(NormalizeKey), token);
+                }
+                catch (Exception ex)
+                {
+                    if (hideErrors == true)
+                    {
+                        await HandleExceptionAsync(ex);
+                        return ToCacheItemsWithDefaultValues(keyArray);
+                    }
+
+                    throw;
+                }
+
+                result = cachedValues.Concat(ToCacheItems(cachedBytes, readKeys)).ToArray();
+            }
+
+            if (result.All(x => x.Value != null))
+            {
+                return result;
+            }
+
+            var missingKeys = new List<TCacheKey>();
+            var missingValuesIndex = new List<int>();
+            for (var i = 0; i < keyArray.Length; i++)
+            {
+                if (result[i].Value != null)
+                {
+                    continue;
+                }
+
+                missingKeys.Add(keyArray[i]);
+                missingValuesIndex.Add(i);
+            }
+
+            var missingValues = (await factory.Invoke(missingKeys)).ToArray();
+            var valueQueue = new Queue<KeyValuePair<TCacheKey, TCacheItem>>(missingValues);
+
+            await SetManyAsync(missingValues, optionsFactory?.Invoke(), hideErrors, considerUow, token);
+
+            foreach (var index in missingValuesIndex)
+            {
+                result[index] = valueQueue.Dequeue();
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// Sets the cache item value for the provided key.
         /// </summary>
@@ -924,6 +1116,71 @@ namespace Volo.Abp.Caching
             }
         }
 
+        public virtual void RefreshMany(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null)
+        {
+            hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
+
+            try
+            {
+                if (Cache is ICacheSupportsMultipleItems cacheSupportsMultipleItems)
+                {
+                    cacheSupportsMultipleItems.RefreshMany(keys.Select(NormalizeKey));
+                }
+                else
+                {
+                    foreach (var key in keys)
+                    {
+                        Cache.Refresh(NormalizeKey(key));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                if (hideErrors == true)
+                {
+                    HandleException(ex);
+                    return;
+                }
+
+                throw;
+            }
+        }
+
+        public virtual async Task RefreshManyAsync(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null,
+            CancellationToken token = default)
+        {
+            hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
+
+            try
+            {
+                if (Cache is ICacheSupportsMultipleItems cacheSupportsMultipleItems)
+                {
+                    await cacheSupportsMultipleItems.RefreshManyAsync(keys.Select(NormalizeKey), token);
+                }
+                else
+                {
+                    foreach (var key in keys)
+                    {
+                        await Cache.RefreshAsync(NormalizeKey(key), token);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                if (hideErrors == true)
+                {
+                    await HandleExceptionAsync(ex);
+                    return;
+                }
+
+                throw;
+            }
+        }
+
         /// <summary>
         /// Removes the cache item for given key from cache.
         /// </summary>
@@ -1027,6 +1284,130 @@ namespace Volo.Abp.Caching
             }
         }
 
+        public void RemoveMany(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null,
+            bool considerUow = false)
+        {
+            var keyArray = keys.ToArray();
+
+            if (Cache is ICacheSupportsMultipleItems cacheSupportsMultipleItems)
+            {
+                void RemoveRealCache()
+                {
+                    hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
+
+                    try
+                    {
+                        cacheSupportsMultipleItems.RemoveMany(
+                            keyArray.Select(NormalizeKey)
+                        );
+                    }
+                    catch (Exception ex)
+                    {
+                        if (hideErrors == true)
+                        {
+                            HandleException(ex);
+                            return;
+                        }
+
+                        throw;
+                    }
+                }
+
+                if (ShouldConsiderUow(considerUow))
+                {
+                    var uowCache = GetUnitOfWorkCache();
+
+                    foreach (var key in keyArray)
+                    {
+                        if (uowCache.TryGetValue(key, out _))
+                        {
+                            uowCache[key].RemoveValue();
+                        }
+                    }
+
+                    // ReSharper disable once PossibleNullReferenceException
+                    UnitOfWorkManager.Current.OnCompleted(() =>
+                    {
+                        RemoveRealCache();
+                        return Task.CompletedTask;
+                    });
+                }
+                else
+                {
+                    RemoveRealCache();
+                }
+            }
+            else
+            {
+                foreach (var key in keyArray)
+                {
+                    Remove(key, hideErrors, considerUow);
+                }
+            }
+        }
+
+        public async Task RemoveManyAsync(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null,
+            bool considerUow = false,
+            CancellationToken token = default)
+        {
+            var keyArray = keys.ToArray();
+
+            if (Cache is ICacheSupportsMultipleItems cacheSupportsMultipleItems)
+            {
+                async Task RemoveRealCache()
+                {
+                    hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
+
+                    try
+                    {
+                        await cacheSupportsMultipleItems.RemoveManyAsync(
+                            keyArray.Select(NormalizeKey), token);
+                    }
+                    catch (Exception ex)
+                    {
+                        if (hideErrors == true)
+                        {
+                            await HandleExceptionAsync(ex);
+                            return;
+                        }
+
+                        throw;
+                    }
+                }
+
+                if (ShouldConsiderUow(considerUow))
+                {
+                    var uowCache = GetUnitOfWorkCache();
+
+                    foreach (var key in keyArray)
+                    {
+                        if (uowCache.TryGetValue(key, out _))
+                        {
+                            uowCache[key].RemoveValue();
+                        }
+                    }
+
+                    // ReSharper disable once PossibleNullReferenceException
+                    UnitOfWorkManager.Current.OnCompleted(RemoveRealCache);
+                }
+                else
+                {
+                    await RemoveRealCache();
+                }
+            }
+            else
+            {
+                foreach (var key in keyArray)
+                {
+                    await RemoveAsync(key, hideErrors, considerUow, token);
+                }
+            }
+        }
+
         protected virtual void HandleException(Exception ex)
         {
             _ = HandleExceptionAsync(ex);

framework/src/Volo.Abp.Caching/Volo/Abp/Caching/ICacheSupportsMultipleItems.cs

@@ -25,6 +25,24 @@ namespace Volo.Abp.Caching
             IEnumerable<KeyValuePair<string, byte[]>> items,
             DistributedCacheEntryOptions options,
             CancellationToken token = default
-        ); 
+        );
+
+        void RefreshMany(
+            IEnumerable<string> keys
+        );
+
+        Task RefreshManyAsync(
+            IEnumerable<string> keys,
+            CancellationToken token = default
+        );
+
+        void RemoveMany(
+            IEnumerable<string> keys
+        );
+
+        Task RemoveManyAsync(
+            IEnumerable<string> keys,
+            CancellationToken token = default
+        );
     }
-}
+}

framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs

@@ -14,8 +14,8 @@ namespace Volo.Abp.Caching
     public interface IDistributedCache<TCacheItem> : IDistributedCache<TCacheItem, string>
         where TCacheItem : class
     {
-
     }
+
     /// <summary>
     /// Represents a distributed cache of <typeparamref name="TCacheItem" /> type.
     /// Uses a generic cache key type of <typeparamref name="TCacheKey" /> type.
@@ -128,6 +128,44 @@ namespace Volo.Abp.Caching
             CancellationToken token = default
         );
 
+        /// <summary>
+        /// Gets or Adds multiple cache items with the given keys. If any cache items not found for the given keys then adds cache items
+        /// provided by <paramref name="factory" /> delegate and returns the provided cache items.
+        /// </summary>
+        /// <param name="keys">The keys of cached items to be retrieved from the cache.</param>
+        /// <param name="factory">The factory delegate is used to provide the cache items when no cache items are found for the given <paramref name="keys" />.</param>
+        /// <param name="optionsFactory">The cache options for the factory delegate.</param>
+        /// <param name="hideErrors">Indicates to throw or hide the exceptions for the distributed cache.</param>
+        /// <param name="considerUow">This will store the cache in the current unit of work until the end of the current unit of work does not really affect the cache.</param>
+        /// <returns>The cache items.</returns>
+        KeyValuePair<TCacheKey, TCacheItem>[] GetOrAddMany(
+            IEnumerable<TCacheKey> keys,
+            Func<IEnumerable<TCacheKey>, List<KeyValuePair<TCacheKey, TCacheItem>>> factory,
+            Func<DistributedCacheEntryOptions> optionsFactory = null,
+            bool? hideErrors = null,
+            bool considerUow = false
+        );
+
+        /// <summary>
+        /// Gets or Adds multiple cache items with the given keys. If any cache items not found for the given keys then adds cache items
+        /// provided by <paramref name="factory" /> delegate and returns the provided cache items.
+        /// </summary>
+        /// <param name="keys">The keys of cached items to be retrieved from the cache.</param>
+        /// <param name="factory">The factory delegate is used to provide the cache items when no cache items are found for the given <paramref name="keys" />.</param>
+        /// <param name="optionsFactory">The cache options for the factory delegate.</param>
+        /// <param name="hideErrors">Indicates to throw or hide the exceptions for the distributed cache.</param>
+        /// <param name="considerUow">This will store the cache in the current unit of work until the end of the current unit of work does not really affect the cache.</param>
+        /// <param name="token">The <see cref="T:System.Threading.CancellationToken" /> for the task.</param>
+        /// <returns>The cache items.</returns>
+        Task<KeyValuePair<TCacheKey, TCacheItem>[]> GetOrAddManyAsync(
+            IEnumerable<TCacheKey> keys,
+            Func<IEnumerable<TCacheKey>, Task<List<KeyValuePair<TCacheKey, TCacheItem>>>> factory,
+            Func<DistributedCacheEntryOptions> optionsFactory = null,
+            bool? hideErrors = null,
+            bool considerUow = false,
+            CancellationToken token = default
+        );
+
         /// <summary>
         /// Sets the cache item value for the provided key.
         /// </summary>
@@ -219,6 +257,29 @@ namespace Volo.Abp.Caching
             CancellationToken token = default
         );
 
+        /// <summary>
+        /// Refreshes the cache value of the given keys, and resets their sliding expiration timeout.
+        /// Based on the implementation, this can be more efficient than setting multiple items individually.
+        /// </summary>
+        /// <param name="keys">The keys of cached items to be retrieved from the cache.</param>
+        /// <param name="hideErrors">Indicates to throw or hide the exceptions for the distributed cache.</param>
+        void RefreshMany(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null);
+
+        /// <summary>
+        /// Refreshes the cache value of the given keys, and resets their sliding expiration timeout.
+        /// Based on the implementation, this can be more efficient than setting multiple items individually.
+        /// </summary>
+        /// <param name="keys">The keys of cached items to be retrieved from the cache.</param>
+        /// <param name="hideErrors">Indicates to throw or hide the exceptions for the distributed cache.</param>
+        /// <param name="token">The <see cref="T:System.Threading.CancellationToken" /> for the task.</param>
+        /// <returns>The <see cref="T:System.Threading.Tasks.Task" /> indicating that the operation is asynchronous.</returns>
+        Task RefreshManyAsync(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null,
+            CancellationToken token = default);
+
         /// <summary>
         /// Removes the cache item for given key from cache.
         /// </summary>
@@ -245,5 +306,32 @@ namespace Volo.Abp.Caching
             bool considerUow = false,
             CancellationToken token = default
         );
+
+        /// <summary>
+        /// Removes the cache items for given keys from cache.
+        /// </summary>
+        /// <param name="keys">The keys of cached items to be retrieved from the cache.</param>
+        /// <param name="hideErrors">Indicates to throw or hide the exceptions for the distributed cache.</param>
+        /// <param name="considerUow">This will store the cache in the current unit of work until the end of the current unit of work does not really affect the cache.</param>
+        void RemoveMany(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null,
+            bool considerUow = false
+        );
+
+        /// <summary>
+        /// Removes the cache items for given keys from cache.
+        /// </summary>
+        /// <param name="keys">The keys of cached items to be retrieved from the cache.</param>
+        /// <param name="hideErrors">Indicates to throw or hide the exceptions for the distributed cache.</param>
+        /// <param name="considerUow">This will store the cache in the current unit of work until the end of the current unit of work does not really affect the cache.</param>
+        /// <param name="token">The <see cref="T:System.Threading.CancellationToken" /> for the task.</param>
+        /// <returns>The <see cref="T:System.Threading.Tasks.Task" /> indicating that the operation is asynchronous.</returns>
+        Task RemoveManyAsync(
+            IEnumerable<TCacheKey> keys,
+            bool? hideErrors = null,
+            bool considerUow = false,
+            CancellationToken token = default
+        );
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs

@@ -1,5 +1,7 @@
 using System.Text;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Cli.Commands;
+using Volo.Abp.Cli.Http;
 using Volo.Abp.Domain;
 using Volo.Abp.IdentityModel;
 using Volo.Abp.Json;
@@ -18,6 +20,9 @@ namespace Volo.Abp.Cli
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddHttpClient(CliConsts.HttpClientName)
+                .ConfigurePrimaryHttpMessageHandler(() => new CliHttpClientHandler());
+
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
             Configure<AbpCliOptions>(options =>

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs

@@ -22,7 +22,7 @@ namespace Volo.Abp.Cli.Auth
         {
             var configuration = new IdentityClientConfiguration(
                 CliUrls.AccountAbpIo,
-                "role email abpio abpio_www abpio_commercial offline_access", 
+                "role email abpio abpio_www abpio_commercial offline_access",
                 "abp-cli",
                 "1q2w3e*",
                 OidcConstants.GrantTypes.Password,
@@ -43,6 +43,7 @@ namespace Volo.Abp.Cli.Auth
         public Task LogoutAsync()
         {
             FileHelper.DeleteIfExists(CliPaths.AccessToken);
+            FileHelper.DeleteIfExists(CliPaths.Lic);
             return Task.CompletedTask;
         }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliConsts.cs

@@ -7,5 +7,7 @@
         public const string BranchPrefix = "branch@";
 
         public const string DocsLink = "https://docs.abp.io";
+
+        public const string HttpClientName = "AbpHttpClient";
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text;
 
 namespace Volo.Abp.Cli
 {
@@ -10,7 +11,8 @@ namespace Volo.Abp.Cli
         public static string Root => Path.Combine(AbpRootPath, "cli");
         public static string AccessToken => Path.Combine(AbpRootPath, "cli", "access-token.bin");
         public static string Build => Path.Combine(AbpRootPath, "build");
-        
+        public static string Lic => Path.Combine(Path.GetTempPath(), Encoding.ASCII.GetString(new byte[] { 65, 98, 112, 76, 105, 99, 101, 110, 115, 101, 46, 98, 105, 110 }));
+
         private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp");
     }
-}   
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs

@@ -22,13 +22,17 @@ namespace Volo.Abp.Cli.Commands
         public ICancellationTokenProvider CancellationTokenProvider { get; }
         public IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
 
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
+
         public LoginCommand(AuthService authService,
             ICancellationTokenProvider cancellationTokenProvider,
-            IRemoteServiceExceptionHandler remoteServiceExceptionHandler)
+            IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
+            CliHttpClientFactory cliHttpClientFactory)
         {
             AuthService = authService;
             CancellationTokenProvider = cancellationTokenProvider;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
+            _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<LoginCommand>.Instance;
         }
 
@@ -79,20 +83,19 @@ namespace Volo.Abp.Cli.Commands
         {
             var url = $"{CliUrls.WwwAbpIo}api/license/check-multiple-organizations?username={username}";
 
-            using (var client = new CliHttpClient())
+            var client = _cliHttpClientFactory.CreateClient();
+
+            using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
             {
-                using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
+                if (!response.IsSuccessStatusCode)
                 {
-                    if (!response.IsSuccessStatusCode)
-                    {
-                        throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
-                    }
+                    throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+                }
 
-                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
 
-                    var responseContent = await response.Content.ReadAsStringAsync();
-                    return JsonSerializer.Deserialize<bool>(responseContent);
-                }
+                var responseContent = await response.Content.ReadAsStringAsync();
+                return JsonSerializer.Deserialize<bool>(responseContent);
             }
         }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -12,6 +12,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Cli.Args;
 using Volo.Abp.Cli.Auth;
+using Volo.Abp.Cli.Commands.Services;
 using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.ProjectBuilding;
 using Volo.Abp.Cli.ProjectBuilding.Building;
@@ -32,14 +33,17 @@ namespace Volo.Abp.Cli.Commands
 
         protected TemplateProjectBuilder TemplateProjectBuilder { get; }
         public ITemplateInfoProvider TemplateInfoProvider { get; }
+        public ConnectionStringProvider ConnectionStringProvider { get; }
 
         public NewCommand(TemplateProjectBuilder templateProjectBuilder
             , ITemplateInfoProvider templateInfoProvider,
-            EfCoreMigrationManager efCoreMigrationManager)
+            EfCoreMigrationManager efCoreMigrationManager,
+            ConnectionStringProvider connectionStringProvider)
         {
             _efCoreMigrationManager = efCoreMigrationManager;
             TemplateProjectBuilder = templateProjectBuilder;
             TemplateInfoProvider = templateInfoProvider;
+            ConnectionStringProvider = connectionStringProvider;
 
             Logger = NullLogger<NewCommand>.Instance;
         }
@@ -165,7 +169,7 @@ namespace Volo.Abp.Cli.Commands
                 databaseManagementSystem != DatabaseManagementSystem.NotSpecified &&
                 databaseManagementSystem != DatabaseManagementSystem.SQLServer)
             {
-                connectionString = GetNewConnectionStringByDbms(databaseManagementSystem, outputFolder);
+                connectionString = ConnectionStringProvider.GetByDbms(databaseManagementSystem, outputFolder);
             }
 
             commandLineArgs.Options.Add(CliConsts.Command, commandLineArgs.Command);
@@ -241,24 +245,6 @@ namespace Volo.Abp.Cli.Commands
             }
         }
 
-        private string GetNewConnectionStringByDbms(DatabaseManagementSystem databaseManagementSystem, string outputFolder)
-        {
-            switch (databaseManagementSystem)
-            {
-                case DatabaseManagementSystem.MySQL:
-                    return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;";
-                case DatabaseManagementSystem.PostgreSQL:
-                    return "User ID=root;Password=myPassword;Host=localhost;Port=5432;Database=MyProjectName;Pooling=true;Min Pool Size=0;Max Pool Size=100;Connection Lifetime=0;";
-                //case DatabaseManagementSystem.Oracle:
-                case DatabaseManagementSystem.OracleDevart:
-                    return "Data Source=MyProjectName;Integrated Security=yes;";
-                case DatabaseManagementSystem.SQLite:
-                    return $"Data Source={Path.Combine(outputFolder , "MyProjectName.db")};".Replace("\\", "\\\\");
-                default:
-                    return null;
-            }
-        }
-
         private void OpenThanksPage(UiFramework uiFramework, DatabaseProvider databaseProvider, bool tiered, bool commercial)
         {
             uiFramework = uiFramework == UiFramework.NotSpecified || uiFramework == UiFramework.None ? UiFramework.Mvc : uiFramework;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs

@@ -0,0 +1,30 @@
+using System.IO;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Commands.Services
+{
+    public class ConnectionStringProvider : ITransientDependency
+    {
+        public string GetByDbms(DatabaseManagementSystem databaseManagementSystem, string outputFolder = "")
+        {
+            switch (databaseManagementSystem)
+            {
+                case DatabaseManagementSystem.NotSpecified:
+                case DatabaseManagementSystem.SQLServer:
+                    return "Server=localhost;Database=MyProjectName;Trusted_Connection=True";
+                case DatabaseManagementSystem.MySQL:
+                    return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;";
+                case DatabaseManagementSystem.PostgreSQL:
+                    return "Host=localhost;Port=5432;Database=MyProjectName;User ID=root;Password=myPassword;Pooling=true;MinimumPoolSize=0;MaximumPoolSize=100;Connection Lifetime=0;";
+                //case DatabaseManagementSystem.Oracle:
+                case DatabaseManagementSystem.OracleDevart:
+                    return "Data Source=MyProjectName;Integrated Security=yes;";
+                case DatabaseManagementSystem.SQLite:
+                    return $"Data Source={Path.Combine(outputFolder , "MyProjectName.db")};".Replace("\\", "\\\\");
+                default:
+                    return null;
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClientExtensions.cs

@@ -13,29 +13,9 @@ using Microsoft.Extensions.Logging;
 
 namespace Volo.Abp.Cli.Http
 {
-    public class CliHttpClient : HttpClient
+    public static class CliHttpClientExtensions
     {
-        public static TimeSpan DefaultTimeout { get; set; } = TimeSpan.FromMinutes(1);
-
-        public CliHttpClient(TimeSpan? timeout = null)
-            : base(new CliHttpClientHandler())
-        {
-            Timeout = timeout ?? DefaultTimeout;
-
-            AddAuthentication(this);
-        }
-
-        public CliHttpClient(bool setBearerToken) : base(new CliHttpClientHandler())
-        {
-            Timeout = DefaultTimeout;
-
-            if (setBearerToken)
-            {
-                AddAuthentication(this);
-            }
-        }
-
-        private static void AddAuthentication(HttpClient client)
+        public static void AddAbpAuthenticationToken(this HttpClient httpClient)
         {
             if (!AuthService.IsLoggedIn())
             {
@@ -45,12 +25,13 @@ namespace Volo.Abp.Cli.Http
             var accessToken = File.ReadAllText(CliPaths.AccessToken, Encoding.UTF8);
             if (!accessToken.IsNullOrEmpty())
             {
-                client.SetBearerToken(accessToken);
+                httpClient.SetBearerToken(accessToken);
             }
         }
 
-        public async Task<HttpResponseMessage> GetHttpResponseMessageWithRetryAsync<T>
+        public static async Task<HttpResponseMessage> GetHttpResponseMessageWithRetryAsync<T>
         (
+            this HttpClient httpClient,
             string url,
             CancellationToken? cancellationToken = null,
             ILogger<T> logger = null,
@@ -67,7 +48,12 @@ namespace Volo.Abp.Cli.Http
                 };
             }
 
-            cancellationToken ??= CancellationToken.None;
+            if (cancellationToken == null)
+            {
+                var cancellationTokenSource = new CancellationTokenSource();
+                cancellationTokenSource.CancelAfter(httpClient.Timeout);
+                cancellationToken = cancellationTokenSource.Token;
+            }
 
             return await HttpPolicyExtensions
                 .HandleTransientHttpError()
@@ -92,8 +78,7 @@ namespace Volo.Abp.Cli.Http
                                 $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
                         }
                     })
-                .ExecuteAsync(async () => await this.GetAsync(url, cancellationToken.Value));
+                .ExecuteAsync(async () => await httpClient.GetAsync(url, cancellationToken.Value));
         }
-
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClientFactory.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.Cli.Http
+{
+    public class CliHttpClientFactory : ISingletonDependency
+    {
+        public static readonly TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
+
+        private readonly IHttpClientFactory _clientFactory;
+        private readonly ICancellationTokenProvider _cancellationTokenProvider;
+
+        public CliHttpClientFactory(IHttpClientFactory clientFactory, ICancellationTokenProvider cancellationTokenProvider)
+        {
+            _clientFactory = clientFactory;
+            _cancellationTokenProvider = cancellationTokenProvider;
+        }
+
+        public HttpClient CreateClient(bool needsAuthentication = true, TimeSpan? timeout = null)
+        {
+            var httpClient = _clientFactory.CreateClient(CliConsts.HttpClientName);
+            httpClient.Timeout = timeout ?? DefaultTimeout;
+
+            if (needsAuthentication)
+            {
+                httpClient.AddAbpAuthenticationToken();
+            }
+
+            return httpClient;
+        }
+
+        public CancellationToken GetCancellationToken(TimeSpan? timeout = null)
+        {
+            if (timeout == null)
+            {
+                if (_cancellationTokenProvider == null)
+                {
+                    var cancellationTokenSource = new CancellationTokenSource();
+                    cancellationTokenSource.CancelAfter(DefaultTimeout);
+                    return cancellationTokenSource.Token;
+                }
+                else
+                {
+                    return _cancellationTokenProvider.Token;
+                }
+            }
+            else
+            {
+                var cancellationTokenSource = new CancellationTokenSource();
+                cancellationTokenSource.CancelAfter(Convert.ToInt32(timeout.Value.TotalMilliseconds));
+                return cancellationTokenSource.Token;
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs

@@ -25,16 +25,19 @@ namespace Volo.Abp.Cli.Licensing
 
         private readonly ILogger<AbpIoApiKeyService> _logger;
         private DeveloperApiKeyResult _apiKeyResult = null;
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
 
         public AbpIoApiKeyService(
             IJsonSerializer jsonSerializer,
             ICancellationTokenProvider cancellationTokenProvider,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
-            ILogger<AbpIoApiKeyService> logger)
+            ILogger<AbpIoApiKeyService> logger, 
+            CliHttpClientFactory cliHttpClientFactory)
         {
             JsonSerializer = jsonSerializer;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
             _logger = logger;
+            _cliHttpClientFactory = cliHttpClientFactory;
             CancellationTokenProvider = cancellationTokenProvider;
         }
 
@@ -56,22 +59,21 @@ namespace Volo.Abp.Cli.Licensing
             }
 
             var url = $"{CliUrls.WwwAbpIo}api/license/api-key";
+            var client = _cliHttpClientFactory.CreateClient();
 
-            using (var client = new CliHttpClient())
+            using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, _logger))
             {
-                using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, _logger))
+                if (!response.IsSuccessStatusCode)
                 {
-                    if (!response.IsSuccessStatusCode)
-                    {
-                        throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
-                    }
+                    throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+                }
 
-                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
 
-                    var responseContent = await response.Content.ReadAsStringAsync();
-                    return JsonSerializer.Deserialize<DeveloperApiKeyResult>(responseContent);
-                }
+                var responseContent = await response.Content.ReadAsStringAsync();
+                return JsonSerializer.Deserialize<DeveloperApiKeyResult>(responseContent);
             }
+
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs

@@ -23,6 +23,7 @@ namespace Volo.Abp.Cli.NuGet
         protected ICancellationTokenProvider CancellationTokenProvider { get; }
         protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
         private readonly IApiKeyService _apiKeyService;
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
         private List<string> _proPackageList;
         private DeveloperApiKeyResult _apiKeyResult;
 
@@ -30,12 +31,14 @@ namespace Volo.Abp.Cli.NuGet
             IJsonSerializer jsonSerializer,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
             ICancellationTokenProvider cancellationTokenProvider,
-            IApiKeyService apiKeyService)
+            IApiKeyService apiKeyService,
+            CliHttpClientFactory cliHttpClientFactory)
         {
             JsonSerializer = jsonSerializer;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
             CancellationTokenProvider = cancellationTokenProvider;
             _apiKeyService = apiKeyService;
+            _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<VoloNugetPackagesVersionUpdater>.Instance;
         }
 
@@ -93,18 +96,17 @@ namespace Volo.Abp.Cli.NuGet
                 url = $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json";
             }
 
-            using (var client = new CliHttpClient(setBearerToken: false))
+            var client = _cliHttpClientFactory.CreateClient(needsAuthentication: false);
+
+            using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
+                url,
+                cancellationToken: CancellationTokenProvider.Token,
+                logger: Logger
+            ))
             {
-                using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
-                    url,
-                    cancellationToken: CancellationTokenProvider.Token,
-                    logger: Logger
-                ))
-                {
-                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
-                    var responseContent = await responseMessage.Content.ReadAsStringAsync();
-                    return JsonSerializer.Deserialize<NuGetVersionResultDto>(responseContent).Versions;
-                }
+                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
+                var responseContent = await responseMessage.Content.ReadAsStringAsync();
+                return JsonSerializer.Deserialize<NuGetVersionResultDto>(responseContent).Versions;
             }
         }
 
@@ -120,9 +122,8 @@ namespace Volo.Abp.Cli.NuGet
 
         private async Task<List<string>> GetProPackageListAsync()
         {
-            using var client = new CliHttpClient();
-
             var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/proPackageNames";
+            var client = _cliHttpClientFactory.CreateClient(needsAuthentication: true);
 
             using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
                 url: url,

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@@ -9,6 +9,7 @@ using System.Net.Http;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.ProjectBuilding.Templates.App;
@@ -28,22 +29,23 @@ namespace Volo.Abp.Cli.ProjectBuilding
         public ILogger<AbpIoSourceCodeStore> Logger { get; set; }
 
         protected AbpCliOptions Options { get; }
-
         protected IJsonSerializer JsonSerializer { get; }
-
         protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
-
         protected ICancellationTokenProvider CancellationTokenProvider { get; }
 
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
+
         public AbpIoSourceCodeStore(
             IOptions<AbpCliOptions> options,
             IJsonSerializer jsonSerializer,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
-            ICancellationTokenProvider cancellationTokenProvider)
+            ICancellationTokenProvider cancellationTokenProvider,
+            CliHttpClientFactory cliHttpClientFactory)
         {
             JsonSerializer = jsonSerializer;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
             CancellationTokenProvider = cancellationTokenProvider;
+            _cliHttpClientFactory = cliHttpClientFactory;
             Options = options.Value;
 
             Logger = NullLogger<AbpIoSourceCodeStore>.Instance;
@@ -134,24 +136,17 @@ namespace Volo.Abp.Cli.ProjectBuilding
 
             try
             {
-                using (var client = new CliHttpClient(TimeSpan.FromMinutes(10)))
+                var client = _cliHttpClientFactory.CreateClient();
+                var stringContent = new StringContent(
+                    JsonSerializer.Serialize(new GetLatestSourceCodeVersionDto { Name = name, IncludePreReleases = includePreReleases }),
+                    Encoding.UTF8,
+                    MimeTypes.Application.Json
+                );
+
+                using (var response = await client.PostAsync(url, stringContent, _cliHttpClientFactory.GetCancellationToken(TimeSpan.FromMinutes(10))))
                 {
-                    var response = await client.PostAsync(
-                        url,
-                        new StringContent(
-                            JsonSerializer.Serialize(
-                                new GetLatestSourceCodeVersionDto { Name = name, IncludePreReleases = includePreReleases }
-                            ),
-                            Encoding.UTF8,
-                            MimeTypes.Application.Json
-                        ),
-                        CancellationTokenProvider.Token
-                    );
-
                     await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
-
                     var result = await response.Content.ReadAsStringAsync();
-
                     return JsonSerializer.Deserialize<GetVersionResultDto>(result).Version;
                 }
             }
@@ -164,32 +159,25 @@ namespace Volo.Abp.Cli.ProjectBuilding
 
         private async Task<string> GetTemplateNugetVersionAsync(string name, string type, string version)
         {
-            var url = $"{CliUrls.WwwAbpIo}api/download/{type}/get-nuget-version/";
-
             try
             {
-                using (var client = new CliHttpClient(TimeSpan.FromMinutes(10)))
-                {
-                    var response = await client.PostAsync(
-                        url,
-                        new StringContent(
-                            JsonSerializer.Serialize(
-                                new GetTemplateNugetVersionDto { Name = name, Version = version}
-                            ),
-                            Encoding.UTF8,
-                            MimeTypes.Application.Json
-                        ),
-                        CancellationTokenProvider.Token
-                    );
+                var url = $"{CliUrls.WwwAbpIo}api/download/{type}/get-nuget-version/";
+                var client = _cliHttpClientFactory.CreateClient();
 
-                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+                var stringContent = new StringContent(
+                    JsonSerializer.Serialize(new GetTemplateNugetVersionDto { Name = name, Version = version }),
+                    Encoding.UTF8,
+                    MimeTypes.Application.Json
+                );
 
+                using (var response = await client.PostAsync(url, stringContent, _cliHttpClientFactory.GetCancellationToken(TimeSpan.FromMinutes(10))))
+                {
+                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
                     var result = await response.Content.ReadAsStringAsync();
-
                     return JsonSerializer.Deserialize<GetVersionResultDto>(result).Version;
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return null;
             }
@@ -199,38 +187,39 @@ namespace Volo.Abp.Cli.ProjectBuilding
         {
             var url = $"{CliUrls.WwwAbpIo}api/download/{input.Type}/";
 
+            HttpResponseMessage responseMessage = null;
+
             try
             {
-                using (var client = new CliHttpClient(TimeSpan.FromMinutes(10)))
-                {
-                    HttpResponseMessage responseMessage;
+                var client = _cliHttpClientFactory.CreateClient();
 
-                    if (input.TemplateSource.IsNullOrWhiteSpace())
-                    {
-                        responseMessage = await client.PostAsync(
-                            url,
-                            new StringContent(JsonSerializer.Serialize(input), Encoding.UTF8, MimeTypes.Application.Json),
-                            CancellationTokenProvider.Token
-                        );
-                    }
-                    else
-                    {
-                        responseMessage = await client.GetAsync(input.TemplateSource, CancellationTokenProvider.Token);
-                    }
+                if (input.TemplateSource.IsNullOrWhiteSpace())
+                {
+                    responseMessage = await client.PostAsync(
+                        url,
+                        new StringContent(JsonSerializer.Serialize(input), Encoding.UTF8, MimeTypes.Application.Json),
+                       _cliHttpClientFactory.GetCancellationToken(TimeSpan.FromMinutes(10))
+                    );
+                }
+                else
+                {
+                    responseMessage = await client.GetAsync(input.TemplateSource, _cliHttpClientFactory.GetCancellationToken());
+                }
 
-                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
+                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
+                var resultAsBytes = await responseMessage.Content.ReadAsByteArrayAsync();
+                responseMessage.Dispose();
 
-                    return await responseMessage.Content.ReadAsByteArrayAsync();
-                }
+                return resultAsBytes;
             }
             catch (Exception ex)
             {
-                Console.WriteLine("Error occured while downloading source-code from {0} : {1}", url, ex.Message);
+                Console.WriteLine("Error occured while downloading source-code from {0} : {1}{2}{3}", url, responseMessage?.ToString(), Environment.NewLine, ex.Message);
                 throw;
             }
         }
 
-        private bool IsNetworkSource(string source)
+        private static bool IsNetworkSource(string source)
         {
             return source.ToLower().StartsWith("http");
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Analyticses/CliAnalyticsCollect.cs

@@ -18,15 +18,18 @@ namespace Volo.Abp.Cli.ProjectBuilding.Analyticses
         private readonly IJsonSerializer _jsonSerializer;
         private readonly ILogger<CliAnalyticsCollect> _logger;
         private readonly IRemoteServiceExceptionHandler _remoteServiceExceptionHandler;
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
 
         public CliAnalyticsCollect(
             ICancellationTokenProvider cancellationTokenProvider,
             IJsonSerializer jsonSerializer,
-            IRemoteServiceExceptionHandler remoteServiceExceptionHandler)
+            IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
+            CliHttpClientFactory cliHttpClientFactory)
         {
             _cancellationTokenProvider = cancellationTokenProvider;
             _jsonSerializer = jsonSerializer;
             _remoteServiceExceptionHandler = remoteServiceExceptionHandler;
+            _cliHttpClientFactory = cliHttpClientFactory;
             _logger = NullLogger<CliAnalyticsCollect>.Instance;
         }
 
@@ -34,32 +37,31 @@ namespace Volo.Abp.Cli.ProjectBuilding.Analyticses
         {
             var postData = _jsonSerializer.Serialize(input);
             var url = $"{CliUrls.WwwAbpIo}api/clianalytics/collect";
-            
+
             try
             {
-                using (var client = new CliHttpClient())
-                {
-                    var responseMessage = await client.PostAsync(
-                        url,
-                        new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json),
-                        _cancellationTokenProvider.Token
-                    );
+                var client = _cliHttpClientFactory.CreateClient();
 
-                    if (!responseMessage.IsSuccessStatusCode)
-                    {
-                        var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
-                        var remoteServiceErrorMessage = await _remoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+                var responseMessage = await client.PostAsync(
+                    url,
+                    new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json),
+                    _cancellationTokenProvider.Token
+                );
 
-                        if (remoteServiceErrorMessage != null)
-                        {
-                            exceptionMessage += remoteServiceErrorMessage;
-                        }
+                if (!responseMessage.IsSuccessStatusCode)
+                {
+                    var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
+                    var remoteServiceErrorMessage = await _remoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
 
-                        _logger.LogInformation(exceptionMessage);
+                    if (remoteServiceErrorMessage != null)
+                    {
+                        exceptionMessage += remoteServiceErrorMessage;
                     }
+
+                    _logger.LogInformation(exceptionMessage);
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 // ignored
             }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs

@@ -55,11 +55,13 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
                     {
                         RenameHelper.RenameAll(_entries, _companyNamePlaceHolder, _companyName);
                         RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase(), _companyName.ToCamelCase());
+                        RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToKebabCase(), _companyName.ToKebabCase());
                     }
                     else
                     {
                         RenameHelper.RenameAll(_entries, _companyNamePlaceHolder + "." + _projectNamePlaceHolder, _projectNamePlaceHolder);
                         RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase() + "." + _projectNamePlaceHolder.ToCamelCase(), _projectNamePlaceHolder.ToCamelCase());
+                        RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToKebabCase() + "/" + _projectNamePlaceHolder.ToKebabCase(), _projectNamePlaceHolder.ToKebabCase());
                     }
                 }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleInfoProvider.cs

@@ -16,14 +16,18 @@ namespace Volo.Abp.Cli.ProjectBuilding
         public ICancellationTokenProvider CancellationTokenProvider { get; }
         public IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
 
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
+
         public ModuleInfoProvider(
             IJsonSerializer jsonSerializer,
             ICancellationTokenProvider cancellationTokenProvider,
-            IRemoteServiceExceptionHandler remoteServiceExceptionHandler)
+            IRemoteServiceExceptionHandler remoteServiceExceptionHandler, 
+            CliHttpClientFactory cliHttpClientFactory)
         {
             JsonSerializer = jsonSerializer;
             CancellationTokenProvider = cancellationTokenProvider;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
+            _cliHttpClientFactory = cliHttpClientFactory;
         }
 
         public async Task<ModuleInfo> GetAsync(string name)
@@ -47,17 +51,16 @@ namespace Volo.Abp.Cli.ProjectBuilding
 
         private async Task<List<ModuleInfo>> GetModuleListInternalAsync()
         {
-            using (var client = new CliHttpClient())
+            var client = _cliHttpClientFactory.CreateClient();
+
+            using (var responseMessage = await client.GetAsync(
+                $"{CliUrls.WwwAbpIo}api/download/modules/",
+                CancellationTokenProvider.Token
+            ))
             {
-                using (var responseMessage = await client.GetAsync(
-                    $"{CliUrls.WwwAbpIo}api/download/modules/",
-                    CancellationTokenProvider.Token
-                ))
-                {
-                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
-                    var result = await responseMessage.Content.ReadAsStringAsync();
-                    return JsonSerializer.Deserialize<List<ModuleInfo>>(result);
-                }
+                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
+                var result = await responseMessage.Content.ReadAsStringAsync();
+                return JsonSerializer.Deserialize<List<ModuleInfo>>(result);
             }
         }
     }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs

@@ -24,13 +24,17 @@ namespace Volo.Abp.Cli.ProjectBuilding
         public IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
         public AuthService AuthService { get; }
 
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
+
         public TemplateInfoProvider(ICancellationTokenProvider cancellationTokenProvider,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
-            AuthService authService)
+            AuthService authService, 
+            CliHttpClientFactory cliHttpClientFactory)
         {
             CancellationTokenProvider = cancellationTokenProvider;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
             AuthService = authService;
+            _cliHttpClientFactory = cliHttpClientFactory;
 
             Logger = NullLogger<TemplateInfoProvider>.Instance;
         }
@@ -76,21 +80,19 @@ namespace Volo.Abp.Cli.ProjectBuilding
             try
             {
                 var url = $"{CliUrls.WwwAbpIo}api/license/check-user";
+                var client = _cliHttpClientFactory.CreateClient();
 
-                using (var client = new CliHttpClient())
+                using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
                 {
-                    using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
+                    if (!response.IsSuccessStatusCode)
                     {
-                        if (!response.IsSuccessStatusCode)
-                        {
-                            throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
-                        }
+                        throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+                    }
 
-                        await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
 
-                        var responseContent = await response.Content.ReadAsStringAsync();
-                        return JsonSerializer.Deserialize<bool>(responseContent);
-                    }
+                    var responseContent = await response.Content.ReadAsStringAsync();
+                    return JsonSerializer.Deserialize<bool>(responseContent);
                 }
             }
             catch (Exception)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetPackageListFinder.cs

@@ -6,17 +6,23 @@ using Microsoft.Extensions.Logging.Abstractions;
 using Newtonsoft.Json;
 using Volo.Abp.Cli.Http;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.Cli.ProjectModification
 {
     public class MyGetPackageListFinder : ISingletonDependency
     {
-        private MyGetApiResponse _response;
-
         public ILogger<MyGetPackageListFinder> Logger { get; set; }
 
-        public MyGetPackageListFinder()
+        private MyGetApiResponse _response;
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
+
+        public MyGetPackageListFinder(CliHttpClientFactory cliHttpClientFactory,
+            ICancellationTokenProvider cancellationTokenProvider)
         {
+            _cliHttpClientFactory = cliHttpClientFactory;
+            CancellationTokenProvider = cancellationTokenProvider;
             Logger = NullLogger<MyGetPackageListFinder>.Instance;
         }
 
@@ -29,18 +35,20 @@ namespace Volo.Abp.Cli.ProjectModification
 
             try
             {
-                using (var client = new CliHttpClient(TimeSpan.FromMinutes(10)))
+                var client = _cliHttpClientFactory.CreateClient();
+
+                using (var responseMessage = await client.GetAsync(
+                    $"{CliUrls.WwwAbpIo}api/myget/packages/",
+                    _cliHttpClientFactory.GetCancellationToken(TimeSpan.FromMinutes(10))))
                 {
-                    var responseMessage = await client.GetAsync(
-                        $"{CliUrls.WwwAbpIo}api/myget/packages/"
+                    _response = JsonConvert.DeserializeObject<MyGetApiResponse>(
+                        Encoding.Default.GetString(await responseMessage.Content.ReadAsByteArrayAsync())
                     );
-
-                    _response = JsonConvert.DeserializeObject<MyGetApiResponse>(Encoding.Default.GetString(await responseMessage.Content.ReadAsByteArrayAsync()));
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                Logger.LogError("Unable to get latest preview version.");
+                Logger.LogError("Unable to get latest preview version. Error: " + ex.Message);
                 throw;
             }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs

@@ -27,15 +27,18 @@ namespace Volo.Abp.Cli.ProjectModification
         private readonly PackageJsonFileFinder _packageJsonFileFinder;
         private readonly NpmGlobalPackagesChecker _npmGlobalPackagesChecker;
         private readonly Dictionary<string, string> _fileVersionStorage = new Dictionary<string, string>();
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
 
         public NpmPackagesUpdater(
             PackageJsonFileFinder packageJsonFileFinder,
             NpmGlobalPackagesChecker npmGlobalPackagesChecker,
-            ICancellationTokenProvider cancellationTokenProvider)
+            ICancellationTokenProvider cancellationTokenProvider,
+            CliHttpClientFactory cliHttpClientFactory)
         {
             _packageJsonFileFinder = packageJsonFileFinder;
             _npmGlobalPackagesChecker = npmGlobalPackagesChecker;
             CancellationTokenProvider = cancellationTokenProvider;
+            _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<NpmPackagesUpdater>.Instance;
         }
 
@@ -151,16 +154,14 @@ namespace Volo.Abp.Cli.ProjectModification
         {
             try
             {
-                using (var client = new CliHttpClient(TimeSpan.FromMinutes(1)))
+                var client = _cliHttpClientFactory.CreateClient();
+                using (var response = await client.GetHttpResponseMessageWithRetryAsync(
+                    url: $"{CliUrls.WwwAbpIo}api/myget/apikey/",
+                    cancellationToken: CancellationTokenProvider.Token,
+                    logger: Logger
+                ))
                 {
-                    using (var response = await client.GetHttpResponseMessageWithRetryAsync(
-                        url: $"{CliUrls.WwwAbpIo}api/myget/apikey/",
-                        cancellationToken: CancellationTokenProvider.Token,
-                        logger: Logger
-                    ))
-                    {
-                        return Encoding.Default.GetString(await response.Content.ReadAsByteArrayAsync());
-                    }
+                    return Encoding.Default.GetString(await response.Content.ReadAsByteArrayAsync());
                 }
             }
             catch (Exception)
@@ -356,7 +357,7 @@ namespace Volo.Abp.Cli.ProjectModification
         protected virtual string ExtractVersions(string output)
         {
             var arrayStart = output.IndexOf('[');
-            return output.Substring(arrayStart,  output.IndexOf(']') - arrayStart + 1);
+            return output.Substring(arrayStart, output.IndexOf(']') - arrayStart + 1);
         }
 
         protected virtual bool SpecifiedVersionExists(string version, JProperty package)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs

@@ -21,13 +21,15 @@ namespace Volo.Abp.Cli.ProjectModification
     public class ProjectNugetPackageAdder : ITransientDependency
     {
         public ILogger<ProjectNugetPackageAdder> Logger { get; set; }
+        public BundleCommand BundleCommand { get; }
 
         protected IJsonSerializer JsonSerializer { get; }
         protected ProjectNpmPackageAdder NpmPackageAdder { get; }
         protected DerivedClassFinder ModuleClassFinder { get; }
         protected ModuleClassDependcyAdder ModuleClassDependcyAdder { get; }
         protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
-        public BundleCommand BundleCommand { get; }
+
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
 
         public ProjectNugetPackageAdder(
             IJsonSerializer jsonSerializer,
@@ -35,7 +37,8 @@ namespace Volo.Abp.Cli.ProjectModification
             DerivedClassFinder moduleClassFinder,
             ModuleClassDependcyAdder moduleClassDependcyAdder,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
-            BundleCommand bundleCommand)
+            BundleCommand bundleCommand, 
+            CliHttpClientFactory cliHttpClientFactory)
         {
             JsonSerializer = jsonSerializer;
             NpmPackageAdder = npmPackageAdder;
@@ -43,6 +46,7 @@ namespace Volo.Abp.Cli.ProjectModification
             ModuleClassDependcyAdder = moduleClassDependcyAdder;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
             BundleCommand = bundleCommand;
+            _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<ProjectNugetPackageAdder>.Instance;
         }
 
@@ -121,7 +125,7 @@ namespace Volo.Abp.Cli.ProjectModification
         private Task AddToCsprojManuallyAsync(string projectFile, NugetPackageInfo package, string version = null)
         {
             var projectFileContent = File.ReadAllText(projectFile);
-            var doc = new XmlDocument() {PreserveWhitespace = true};
+            var doc = new XmlDocument() { PreserveWhitespace = true };
             doc.Load(StreamHelper.GenerateStreamFromString(projectFileContent));
 
             var itemGroupNodes = doc.SelectNodes("/Project/ItemGroup");
@@ -162,7 +166,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
         private string GetAbpVersionOrNull(string projectFileContent)
         {
-            var doc = new XmlDocument() {PreserveWhitespace = true};
+            var doc = new XmlDocument() { PreserveWhitespace = true };
 
             doc.Load(StreamHelper.GenerateStreamFromString(projectFileContent));
 
@@ -173,12 +177,11 @@ namespace Volo.Abp.Cli.ProjectModification
 
         protected virtual async Task<NugetPackageInfo> FindNugetPackageInfoAsync(string packageName)
         {
-            using (var client = new CliHttpClient())
-            {
-                var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/byName/?name=" + packageName;
-
-                var response = await client.GetAsync(url);
+            var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/byName/?name=" + packageName;
+            var client = _cliHttpClientFactory.CreateClient();
 
+            using (var response = await client.GetAsync(url, _cliHttpClientFactory.GetCancellationToken()))
+            {
                 if (!response.IsSuccessStatusCode)
                 {
                     if (response.StatusCode == HttpStatusCode.NotFound)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Volo.Abp.Cli.Args;
-using Volo.Abp.Cli.Bundling;
 using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.Commands.Services;
 using Volo.Abp.Cli.Http;
@@ -22,6 +21,12 @@ namespace Volo.Abp.Cli.ProjectModification
     public class SolutionModuleAdder : ITransientDependency
     {
         public ILogger<SolutionModuleAdder> Logger { get; set; }
+        public SourceCodeDownloadService SourceCodeDownloadService { get; }
+        public SolutionFileModifier SolutionFileModifier { get; }
+        public NugetPackageToLocalReferenceConverter NugetPackageToLocalReferenceConverter { get; }
+        public AngularModuleSourceCodeAdder AngularModuleSourceCodeAdder { get; }
+        public NewCommand NewCommand { get; }
+        public BundleCommand BundleCommand { get; }
 
         protected IJsonSerializer JsonSerializer { get; }
         protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; }
@@ -31,12 +36,9 @@ namespace Volo.Abp.Cli.ProjectModification
         protected ProjectNpmPackageAdder ProjectNpmPackageAdder { get; }
         protected NpmGlobalPackagesChecker NpmGlobalPackagesChecker { get; }
         protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
-        public SourceCodeDownloadService SourceCodeDownloadService { get; }
-        public SolutionFileModifier SolutionFileModifier { get; }
-        public NugetPackageToLocalReferenceConverter NugetPackageToLocalReferenceConverter { get; }
-        public AngularModuleSourceCodeAdder AngularModuleSourceCodeAdder { get; }
-        public NewCommand NewCommand { get; }
-        public BundleCommand BundleCommand { get; }
+
+        private readonly CliHttpClientFactory _cliHttpClientFactory;
+
 
         public SolutionModuleAdder(
             IJsonSerializer jsonSerializer,
@@ -52,7 +54,8 @@ namespace Volo.Abp.Cli.ProjectModification
             NugetPackageToLocalReferenceConverter nugetPackageToLocalReferenceConverter,
             AngularModuleSourceCodeAdder angularModuleSourceCodeAdder,
             NewCommand newCommand,
-            BundleCommand bundleCommand)
+            BundleCommand bundleCommand,
+            CliHttpClientFactory cliHttpClientFactory)
         {
             JsonSerializer = jsonSerializer;
             ProjectNugetPackageAdder = projectNugetPackageAdder;
@@ -68,6 +71,7 @@ namespace Volo.Abp.Cli.ProjectModification
             AngularModuleSourceCodeAdder = angularModuleSourceCodeAdder;
             NewCommand = newCommand;
             BundleCommand = bundleCommand;
+            _cliHttpClientFactory = cliHttpClientFactory;
             Logger = NullLogger<SolutionModuleAdder>.Instance;
         }
 
@@ -131,7 +135,7 @@ namespace Volo.Abp.Cli.ProjectModification
         {
             var blazorProject = projectFiles.FirstOrDefault(f => f.EndsWith(".Blazor.csproj"));
 
-            if (blazorProject == null || !module.NugetPackages.Any(np=> np.Target == NuGetPackageTarget.Blazor))
+            if (blazorProject == null || !module.NugetPackages.Any(np => np.Target == NuGetPackageTarget.Blazor))
             {
                 return;
             }
@@ -171,7 +175,7 @@ namespace Volo.Abp.Cli.ProjectModification
             {
                 await RemoveProjectByTarget(module, moduleSolutionFile, NuGetPackageTarget.EntityFrameworkCore, isProjectTiered);
                 await RemoveProjectByPostFix(module, moduleSolutionFile, "test", ".EntityFrameworkCore.Tests");
-                await ChangeDomainTestReferenceToMongoDB(module, moduleSolutionFile);
+                ChangeDomainTestReferenceToMongoDB(module, moduleSolutionFile);
             }
         }
 
@@ -211,7 +215,7 @@ namespace Volo.Abp.Cli.ProjectModification
                 return;
             }
 
-            var projectFolderPath = Directory.GetDirectories(srcPath).FirstOrDefault(d=> d.EndsWith(postFix));
+            var projectFolderPath = Directory.GetDirectories(srcPath).FirstOrDefault(d => d.EndsWith(postFix));
 
             if (projectFolderPath == null)
             {
@@ -226,7 +230,7 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
-        private async Task ChangeDomainTestReferenceToMongoDB(ModuleWithMastersInfo module, string moduleSolutionFile)
+        private void ChangeDomainTestReferenceToMongoDB(ModuleWithMastersInfo module, string moduleSolutionFile)
         {
             var testPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), "test");
 
@@ -235,7 +239,7 @@ namespace Volo.Abp.Cli.ProjectModification
                 return;
             }
 
-            var projectFolderPath = Directory.GetDirectories(testPath).FirstOrDefault(d=> d.EndsWith("Domain.Tests"));
+            var projectFolderPath = Directory.GetDirectories(testPath).FirstOrDefault(d => d.EndsWith("Domain.Tests"));
 
             if (projectFolderPath == null)
             {
@@ -250,10 +254,10 @@ namespace Volo.Abp.Cli.ProjectModification
                 return;
             }
 
-            File.WriteAllText(csprojFile, File.ReadAllText(csprojFile).Replace("EntityFrameworkCore","MongoDB"));
+            File.WriteAllText(csprojFile, File.ReadAllText(csprojFile).Replace("EntityFrameworkCore", "MongoDB"));
             File.WriteAllText(moduleFile, File.ReadAllText(moduleFile)
-                .Replace(".EntityFrameworkCore;",".MongoDB;")
-                .Replace("EntityFrameworkCoreTestModule","MongoDbTestModule"));
+                .Replace(".EntityFrameworkCore;", ".MongoDB;")
+                .Replace("EntityFrameworkCoreTestModule", "MongoDbTestModule"));
         }
 
         private async Task AddAngularPackages(string solutionFilePath, ModuleWithMastersInfo module)
@@ -355,9 +359,9 @@ namespace Volo.Abp.Cli.ProjectModification
                 );
             }
 
-            await DeleteRedundantHostProjects(targetModuleFolder,"app");
-            await DeleteRedundantHostProjects(targetModuleFolder,"demo");
-            await DeleteRedundantHostProjects(targetModuleFolder,"host");
+            await DeleteRedundantHostProjects(targetModuleFolder, "app");
+            await DeleteRedundantHostProjects(targetModuleFolder, "demo");
+            await DeleteRedundantHostProjects(targetModuleFolder, "host");
 
             if (module.MasterModuleInfos == null)
             {
@@ -501,7 +505,7 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
-        protected virtual async Task RunMigrator(string[] projectFiles)
+        protected virtual void RunMigrator(string[] projectFiles)
         {
             var dbMigratorProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrator.csproj"));
 
@@ -516,15 +520,14 @@ namespace Volo.Abp.Cli.ProjectModification
         {
             if (newTemplate || newProTemplate)
             {
-                return await GetEmptyModuleProjectInfoAsync(moduleName, newProTemplate);
+                return GetEmptyModuleProjectInfo(moduleName, newProTemplate);
             }
 
-            using (var client = new CliHttpClient())
-            {
-                var url = $"{CliUrls.WwwAbpIo}api/app/module/byNameWithDetails/?name=" + moduleName;
-
-                var response = await client.GetAsync(url);
+            var url = $"{CliUrls.WwwAbpIo}api/app/module/byNameWithDetails/?name=" + moduleName;
+            var client = _cliHttpClientFactory.CreateClient();
 
+            using (var response = await client.GetAsync(url, _cliHttpClientFactory.GetCancellationToken()))
+            {
                 if (!response.IsSuccessStatusCode)
                 {
                     if (response.StatusCode == HttpStatusCode.NotFound)
@@ -540,7 +543,7 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
-        private async Task<ModuleWithMastersInfo> GetEmptyModuleProjectInfoAsync(string moduleName,
+        private ModuleWithMastersInfo GetEmptyModuleProjectInfo(string moduleName,
             bool newProTemplate = false)
         {
             var module = new ModuleWithMastersInfo
@@ -625,7 +628,7 @@ namespace Volo.Abp.Cli.ProjectModification
         protected virtual async Task<bool> IsProjectTiered(string[] projectFiles)
         {
             return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
-                .Any(p =>p.EndsWith(".HttpApi.Host"))
+                .Any(p => p.EndsWith(".HttpApi.Host"))
                 && projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
                 .Any(p => p.EndsWith(".IdentityServer"));
         }

framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.Uow;
@@ -27,6 +28,14 @@ namespace Volo.Abp.Data
             context.Services.AddSingleton(typeof(IDataFilter<>), typeof(DataFilter<>));
         }
 
+        public override void PostConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpDbConnectionOptions>(options =>
+            {
+                options.Databases.RefreshIndexes();
+            });
+        }
+
         private static void AutoAddDataSeedContributors(IServiceCollection services)
         {
             var contributors = new List<Type>();

framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDatabaseInfo.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Data
+{
+    public class AbpDatabaseInfo
+    {
+        public string DatabaseName { get; set; }
+        
+        /// <summary>
+        /// List of connection names mapped to this database.
+        /// </summary>
+        public HashSet<string> MappedConnections { get; }
+        
+        /// <summary>
+        /// Is this database used by tenants. Set this to true if this database
+        /// can't owned by tenants.
+        /// 
+        /// Default: true.
+        /// </summary>
+        public bool IsUsedByTenants { get; set; } = true;
+        
+        internal AbpDatabaseInfo(string databaseName)
+        {
+            DatabaseName = databaseName;
+            MappedConnections = new HashSet<string>();
+        }
+    }
+}

framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDatabaseInfoDictionary.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Data
+{
+    public class AbpDatabaseInfoDictionary : Dictionary<string, AbpDatabaseInfo>
+    {
+        private Dictionary<string, AbpDatabaseInfo> ConnectionIndex { get; set; }
+
+        public AbpDatabaseInfoDictionary()
+        {
+            ConnectionIndex = new Dictionary<string, AbpDatabaseInfo>();
+        }
+        
+        [CanBeNull]
+        public AbpDatabaseInfo GetMappedDatabaseOrNull(string connectionStringName)
+        {
+            return ConnectionIndex.GetOrDefault(connectionStringName);
+        }
+
+        public AbpDatabaseInfoDictionary Configure(string databaseName, Action<AbpDatabaseInfo> configureAction)
+        {
+            var databaseInfo = this.GetOrAdd(
+                databaseName,
+                () => new AbpDatabaseInfo(databaseName)
+            );
+            
+            configureAction(databaseInfo);
+            
+            return this;
+        }
+
+        /// <summary>
+        /// This method should be called if this dictionary changes.
+        /// It refreshes indexes for quick access to the connection informations.
+        /// </summary>
+        public void RefreshIndexes()
+        {
+            ConnectionIndex = new Dictionary<string, AbpDatabaseInfo>();
+            
+            foreach (var databaseInfo in Values)
+            {
+                foreach (var mappedConnection in databaseInfo.MappedConnections)
+                {
+                    if (ConnectionIndex.ContainsKey(mappedConnection))
+                    {
+                        throw new AbpException(
+                            $"A connection name can not map to multiple databases: {mappedConnection}."
+                        );
+                    }
+
+                    ConnectionIndex[mappedConnection] = databaseInfo;
+                }
+            }
+        }
+    }
+}