Merge branch 'abpframework:dev' into patch-22

.github/workflows/auto-pr.yml

@@ -1,10 +1,10 @@
-name: Merge branch dev with rel-5.2
+name: Merge branch dev with rel-5.3
 on:
   push:
     branches:
-      - rel-5.2
+      - rel-5.3
 jobs:
-  merge-dev-with-rel-5-2:
+  merge-rel-5-3-with-rel-5-2:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -12,13 +12,13 @@ jobs:
           ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-5.2:rel-5.2
-          git reset --hard rel-5.2
+          git fetch origin rel-5.3:rel-5.3
+          git reset --hard rel-5.3
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-5-2/${{github.run_number}}
-          title: Merge branch dev with rel-5.2
-          body: This PR generated automatically to merge dev with rel-5.2. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-5-3/${{github.run_number}}
+          title: Merge branch dev with rel-5.3
+          body: This PR generated automatically to merge dev with rel-5.3. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: ${{github.actor}}
           token: ${{ github.token }}

README.md

@@ -7,7 +7,9 @@
 [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds)
 [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core)
 
-ABP Framework is a complete **infrastructure** based on the **ASP.NET Core** to create **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**.
+[![ABP Discord server](https://img.shields.io/discord/951497912645476422?label=Discord)](https://discord.gg/abp)
+
+ABP Framework is a complete **infrastructure** based on the **ASP.NET Core** to create **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**. Check out https://abp.io
 
 ## Getting Started
 

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

@@ -393,6 +393,7 @@
     "StartTime": "Start Time",
     "EndTime": "End Time",
     "CreateABookDiscount": "Create a book discount",
-    "BookDiscountDeletionConfirmationMessage": "Are you sure you want to delete this book discount?"
+    "BookDiscountDeletionConfirmationMessage": "Are you sure you want to delete this book discount?",
+    "CustomPaymentFlexSwitchDescription": "With license"
   }
 }

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

@@ -26,6 +26,8 @@
     "Volo.AbpIo.Domain:030009": "User not found!",
     "Volo.AbpIo.Domain:030010": "To purchase the trial license, you first need to activate your trial license!",
     "Volo.AbpIo.Domain:030011": "You cannot delete a trial license when it is purchased!",
+    "Volo.AbpIo.Domain:070000": "The organization name can only contain latin letters, numbers, dots and hyphens!",
+    "Volo.AbpIo.Domain:070001": "The company name can only contain latin letters, numbers, dots, space and hyphens!",
     "WantToLearn?": "Want to learn?",
     "ReadyToGetStarted?": "Ready to get started?",
     "JoinOurCommunity": "Join our community",

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

@@ -379,8 +379,6 @@
     "TaxNoValidationMessage": "TAX/VAT No is too long!",
     "NotesValidationMessage": "Notes field is too long!",
     "CheckYourBillingInfo": "You can create your invoice only once! Check your billing information before creating your invoice.",
-    "Volo.AbpIo.Commercial:030000": "You already used your trial period.",
-    "Volo.AbpIo.Commercial:030001": "This organization name already exists.",
     "StartYourFreeTrial": "Start your free trial",
     "TrialLicenseModelInvalidErrorMessage": "One of the following fields is invalid: Country Name, Company Size, Industry or Purpose Of Usage.",
     "Trial": "Trial",
@@ -488,10 +486,8 @@
     "BackOfficeApplicationExplanation": "The actual web application of your system, with multiple UI framework options. You can create any kind of business application.",
     "LandingWebsite": "Landing Website",
     "LandingWebsiteExplanation": "A generic landing/public website that can be used for several purposes, like introducing your company, selling your products, etc.",
-    "ABPFrameworkEBook": "E-Book: Mastering ABP Framework",
+    "ABPFrameworkEBook": "Mastering ABP Framework e-book",
     "MasteringAbpFrameworkEBookDescription": "Included within your ABP Commercial license",
-    "Volo.AbpIo.Domain:070000": "The organization name can only contain latin letters, numbers, dots and hyphens!",
-    "Volo.AbpIo.Domain:070001": "The company name can only contain latin letters, numbers, dots, space and hyphens!",
     "FullName": "Full Name",
     "LicenseTypeNotCorrect": "The license type is not correct!",
     "Trainings": "Trainings",
@@ -502,12 +498,38 @@
     "ForMoreInformationClickHere": "For more information, click <a href='{0}'>here.</a>",
     "IsGetOnboardingTraining": "Would you like to get onboarding & web application development training?",
     "OnboardingWebApplicationDevelopmentTrainingMessage": "To schedule your training calendar, please contact {0} after creating the organization",
+    "CustomPurchaseMessage": "For the next step, click {0} to contact us.",
     "Note": "Note",
     "AdditionalNote": "Additional Note",
     "OnboardingTrainingFaqTitle": "Do you have ABP onboarding training?",
     "OnboardingTrainingFaqExplanation": "Yes, we have ABP Training Services to help you get your ABP project started fast. You will learn about ABP from an ABP core team member and you will get the skills to begin your ABP project. In the onboarding training, we will explain how to set up your development environment, install the required tools, create a fully functional CRUD page. The training will be live and the Zoom application will be used, and we are open to using other online meeting platforms. The language of the training will be English. You can also ask your questions about ABP during the sessions. A convenient time and date will be planned for both parties. To get more information, contact us at <a href=\"mailto:info@abp.io\">info@abp.io</a>.",
     "AddBasket": "Add to Basket",
     "SendTrainingRequest": "Send Training Request",
-    "OnlyEnglishVersionOfThisDocumentIsTheRecentAndValid": "* The English version of this document is the most up-to-date and the English version will prevail in any dispute."
+    "OnlyEnglishVersionOfThisDocumentIsTheRecentAndValid": "* The English version of this document is the most up-to-date and the English version will prevail in any dispute.",
+    "Pricing_Page_Title": "Plans & Pricing",
+    "Pricing_Page_Description": "Choose the features and functionality your business needs today. Buy an ABP Commercial license and create unlimited projects.",
+    "Pricing_Page_HurryUp": "Hurry Up!",
+    "Pricing_Page_BuyLicense": "Buy a license at <strong>2021 prices</strong> until January 16!",
+    "Pricing_Page_ValidForExistingCustomers": "Also valid for existing customers and license renewals.",
+    "Pricing_Page_Hint1": "The license price includes a certain number of developer seats. If you have more developers, you can always purchase additional seats.",
+    "Pricing_Page_Hint2": "You can purchase more developer licenses now or in the future. Licenses are seat based, so you can transfer a seat from a developer to another.",
+    "Pricing_Page_Hint3": "You can develop unlimited count of different products with your license.",
+    "Pricing_Page_Hint4": "ABP Suite is a tool to assist your development to improve your productivity. It supports generating CRUD pages and creating new projects.",
+    "Pricing_Page_Hint5": "You can use all the pre-built modules in your applications.",
+    "Pricing_Page_Hint6": "You can use all the pre-built themes in your applications.",
+    "Pricing_Page_Hint7": "A startup template is a Visual Studio solution to make you jump-start to your project. All fundamental modules are added and pre-configured for you.",
+    "Pricing_Page_Hint8": "Mastering ABP Framework e-book explains how to implement .NET solutions with best practices. It is sold on Amazon.com and you can download the book for free within your license.",
+    "Pricing_Page_Hint9": "You can download the source-code of any module. You may want to add the source code to your solution to make radical changes or just keep it for yourself for security reasons.",
+    "Pricing_Page_Hint10": "Licenses are for lifetime. That means you can continue to develop your application forever. Accessing to the latest version and getting support are granted within the license period (1 year unless you renew it).",
+    "Pricing_Page_Hint11": "No restrictions on deployment! You can deploy to as many servers as you want, including the cloud services or on-premises.",
+    "Pricing_Page_Hint12": "You can update the modules, themes and tools to the latest version within your active license period. After your license expires, you need to renew it, to continue to get updates for bug fixes, new features and enhancements.",
+    "Pricing_Page_Hint13": "You can get the premium support for one year (you can renew your license to extend it).",
+    "Pricing_Page_Hint14": "Team and Business licenses have incident/question count limit. If you buy additional developer licenses, your incident limit increases by {0} (for the Team License) or {1} (for the Business License) per developer.",
+    "Pricing_Page_Hint15": "Only Enterprise License includes private support. You can send e-mail directly to the ABP Team or ask questions on support.abp.io with private ticket option. The private tickets are not visible to the public.",
+    "Pricing_Page_Hint16": "You can download the source-code of all ABP themes. You may want to add the source code to your solution to make radical changes or just keep it for yourself for security reasons.",
+    "Pricing_Page_Testimonial_1": "ABP Commercial allowed SC Ventures to deliver a bank-grade multi-tenant silo-database SaaS platform in 9 months to support the accounts receivable / accounts payable supply chain financing of significant value invoices from multiple integrated anchors. The modularity of ABP made it possible for the team to deliver in record time, pass all VAPT, and deploy the containerized micro-services stack via full CI/CD and pipelines into production.",
+    "Pricing_Page_Testimonial_2": "We are seeing the value of using ABP Commercial to reduce the overhead of custom development projects. And the team is able to unify the code pattern in different project streams. We see more potential in the framework for us to build new features faster than before. We trust we will be constantly seeing the value of leveraging ABP Commercial.",
+    "Pricing_Page_Testimonial_3": "We love ABP. We don't have to write everything from scratch. We start from out-of-the-box features and just focus on what we really need to write. Also, ABP is well-architected and the code is high quality with fewer bugs. If we would have to write everything we needed on our own, we might have to spend years. Once more things we like is that the new version, or issue fixing, or improvement come out very soon every other week. We don't wait too long.",
+    "Pricing_Page_Testimonial_4": "ABP Commercial is a fantastic product would recommend. Commercial products to market for our customers in a single configurable platform. The jump start that the framework and tooling provide any team is worth every cent. ABP Commercial was the best fit for our needs."
   }
 }

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

@@ -102,6 +102,7 @@
     "PostRequestMessageBody": "Here is the list of the requested posts by the Community. Do you want to write a requested post? Please click on the request and join the discussion.",
     "Language": "Language",
     "CreatePostLanguageInfo": "Language of the post",
-    "SeeMore": "See More"
+    "SeeMore": "See More",
+    "MemberNotPublishedPostYet": "This member hasn't published any posts yet."
   }
 }

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

@@ -165,6 +165,7 @@
     "SortBy": "Sort by",
     "NoPublishedEventsYet": "No published events yet.",
     "SubscribeYoutubeChannel": "Subscribe to the Youtube Channel",
-    "Enum:EventType:0": "Talks"
+    "Enum:EventType:0": "Talks",
+    "MemberNotPublishedPostYet": "This member hasn't published any posts yet."
   }
 }

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

@@ -142,6 +142,7 @@
     "MinimumSearchContent": "En az 3 karakter girmelisiniz!",
     "Volo.AbpIo.Domain:060001": "Kaynak URL (\"{PostUrl}\") Github URL'si değil",
     "Volo.AbpIo.Domain:060002": "Makale İçeriği Github(\"{PostUrl}\") kaynağında mevcut değil.",
-    "Volo.AbpIo.Domain:060003": "Makale içeriği bulunamadı!"
+    "Volo.AbpIo.Domain:060003": "Makale içeriği bulunamadı!",
+    "MemberNotPublishedPostYet": "Bu üye henüz bir gönderi yayınlamadı."
   }
 }

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

@@ -174,6 +174,7 @@
     "CreateProjectWizard": "This wizard creates a new project from the startup template which is properly configured to jump start your project.",
     "TieredOption": "Creates a tiered solution where Web and Http API layers are physically separated. If not checked, creates a layered solution which is less complex and suitable for most scenarios.",
     "SeparateIdentityServerOption": "Separates the server side into two applications: The first one is for the identity server and the second one is for your server side HTTP API.",
+    "ProgressiveWebApplicationOption": "Specifies the project as Progressive Web Application",
     "UseslatestPreVersion": "Uses the latest pre-release version",
     "ReadTheDocumentation": "Read The Documentation",
     "Documentation": "Documentation",
@@ -296,6 +297,7 @@
     "EnterYouEmailToGetNews": "Enter your email to get the latest news about the ABP Framework",
     "Tiered": "Tiered",
     "SeparateIdentityServer": "Separate Identity Server",
+    "ProgressiveWebApplication": "Progressive Web Application",
     "Preview": "Preview",
     "CreateANewSolution": "Create a new solution",
     "ABPFrameworkFeatures": "ABP Framework <span class=\"gradient-framework\">Features</span>",

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

@@ -174,6 +174,8 @@
     "CreateProjectWizard": "Bu sihirbaz, projenize atlamak için uygun şekilde yapılandırılmış başlangıç şablonundan yeni bir proje oluşturur.",
     "TieredOption": "Web ve Http API katmanlarının fiziksel olarak ayrıldığı katmanlı bir çözüm oluşturur. İşaretlenmezse, daha az karmaşık olan ve çoğu senaryo için uygun olan katmanlı bir çözüm oluşturur.",
     "SeparateIdentityServerOption": "Sunucu tarafını iki uygulamaya ayırır: Birincisi kimlik sunucusu için, ikincisi ise sunucu tarafı HTTP API'niz içindir.",
+    "ProgressiveWebApplicationOption": "Projeyi Progresif Web Uygulaması olarak ayarlayın.",
+    "ProgressiveWebApplication": "Progresif Web Uygulaması",
     "UseslatestPreVersion": "En son yayın öncesi sürümünü kullanır",
     "ReadTheDocumentation": "<span class=\"text-primary\">Belgeleri okuyun</span><span class=\"text-success\"></span>",
     "Documentation": "belgeler",

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.3.0</Version>
+    <Version>5.4.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/2022-05-09 v5_3_Preview/POST.md

@@ -0,0 +1,258 @@
+# ABP.IO Platform 5.3 RC Has Been Released
+
+Today, we are happy to release the [ABP Framework](https://abp.io/) and  [ABP Commercial](https://commercial.abp.io/) version **5.3 RC** (Release Candidate). This blog post introduces the new features and important changes in this new version.
+
+> **The planned release date for the [5.3.0 Stable](https://github.com/abpframework/abp/milestone/69) version is May 31, 2022**.
+
+Please try this version and provide feedback for a more stable ABP version 5.3! Thank you all.
+
+## Get Started with the 5.3 RC
+
+Follow the steps below to try version 5.3.0 RC today:
+
+1) **Upgrade** the ABP CLI to version `5.3.0-rc.1` using a command line terminal:
+
+````bash
+dotnet tool update Volo.Abp.Cli -g --version 5.3.0-rc.1
+````
+
+**or install** it if you haven't before:
+
+````bash
+dotnet tool install Volo.Abp.Cli -g --version 5.3.0-rc.1
+````
+
+2) Create a **new application** with the `--preview` option:
+
+````bash
+abp new BookStore --preview
+````
+
+See the [ABP CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all the available options.
+
+> You can also use the *Direct Download* tab on the [Get Started](https://abp.io/get-started) page by selecting the **Preview checkbox**.
+
+You can use any IDE that supports .NET 6.x, like **[Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)**.
+
+## Migration Notes
+
+There is a change in this version that may effect your applications:
+
+* Upgraded the [AutoMapper](https://github.com/AutoMapper/AutoMapper) library to **v11.0.1**. So, you need to change your project's target SDK that use the **AutoMapper** library (typically your `*.Application` project). You can change it from `netstandard2.0` to `netstandard2.1` or `net6` if needed. You can write to [#12189](https://github.com/abpframework/abp/pull/12189) if you need any help.
+
+## What's New with ABP Framework 5.3?
+
+In this section, I will introduce some major features released with this version. Here is a brief list of titles explained in the next sections:
+
+* Single-layer option added to the [*Get Started*](https://abp.io/get-started) page
+* PWA Support for Startup Templates
+* Introduced the `Volo.Abp.Gdpr.Abstractions` package
+* Batch Publish Events from Outbox to the Event Bus
+* Improvements on **eShopOnAbp** Project & E-Book Announcement
+* LeptonX Lite Documentations & Project Status & Roadmap
+* OpenIddict Module & Keycloack Integration
+* Deployment Documentations
+* Other News
+
+### Single-layer Option on *Get Started* Page
+
+We've created a new startup template named `app-nolayers` and [announced](https://blog.abp.io/abp/ABP.IO-Platform-5-2-RC-Has-Been-Published) it in the previous version. In this version, we've also added this startup template option to the *Get Started* page.
+
+*You can examine the screenshot below to see how to create an `app-nolayers` template from the ["Get Started"](https://abp.io/get-started) page:*
+
+![](./app-nolayers-get-started.png)
+
+### PWA Support for Startup Templates
+
+ABP v5.3 application startup template now supports PWA for Blazor WASM & Angular UIs. To create a startup template with the PWA support, you can use the `--pwa` parameter.
+
+Example:
+
+```bash
+abp new MyProgressiveWebApp -t app -u blazor --pwa
+```
+
+### Introducing the `Volo.Abp.Gdpr.Abstractions` Package
+
+A new `Volo.Abp.Gdpr.Abstractions` package has been added to the framework. This is an abstraction package, so doesn't contain any actual GDPR implementation. It defines some classes and interfaces to put a standard for who want to implement a GDPR module that can run in a modular or microservice system.
+
+At that point, we are introducing the **GDPR Module** for the ABP Commercial customers and this module does the GDPR-related operations on behalf of you, such as *"Download/Delete Personal Data"*. I'll describe the **GDPR Module** later in this blog post. 
+
+> Please see the **GDPR Module** section below to learn more about this module.
+
+### Batch Publish Events from Outbox to the Event Bus
+
+We introduced the "Transactional Outbox & Inbox Patterns" in [**ABP v5.0**](https://blog.abp.io/abp/ABP-IO-Platform-5.0-RC-1-Has-Been-Released), it was one of the most awaited features by several software developers.
+
+We've made some optimizations for the **Batch Event Publishing** in this version, you can examine the related development from [here](https://github.com/abpframework/abp/pull/11243). After the optimization, the results are impressive. It is enabled by default (if you have configured [event outbox](https://docs.abp.io/en/abp/latest/Distributed-Event-Bus#outbox-inbox-for-transactional-events)), so you don't need to any manual configuration.
+
+### Improvements on eShopOnAbp Project & E-Book Announcement
+
+There are some developments on the [eShopOnAbp project](https://github.com/abpframework/eShopOnAbp) made in this version. You can see the brief descriptions of some of the improvements below:
+
+* Local certificates have been created to use while working in Kubernetes and also Helm Charts have been updated. See [#107](https://github.com/abpframework/eShopOnAbp/pull/107).
+* The Order Management page has been created. See [#92](https://github.com/abpframework/eShopOnAbp/pull/92).
+* Database migration event handlers have been removed and "Distributed Locking" is now used for database migrations. See [#85](https://github.com/abpframework/eShopOnAbp/pull/85) and [#102](https://github.com/abpframework/eShopOnAbp/pull/102).
+* Switched from Ocelot to YARP as the gateway. See [#97](https://github.com/abpframework/eShopOnAbp/pull/97).
+
+We have exciting news to share with the community, we're working on an "ABP Microservice Development" e-book. In this book, we're using the eShopOnAbp project as a reference microservice solution and we're trying to explain our experiences during the microservice application development process through this project.
+
+We're planning to create this book in nine chapters and make it available after the third chapter is written. After that, you will be able to download this free e-book from the [abp.io](https://abp.io/) website.
+
+### LeptonX Lite Documentations & Project Status & Roadmap
+
+It is finally here, we've released the **1.0.0-beta.1** version for the **LeptonX Lite**.
+
+![](./leptonx-lite-documentations.png)
+
+Lepton X Lite documents have been written for the three UI types within this version. You can see the related documentation from the screenshot above. You can follow these documents and try the new **LeptonX Lite Theme**.
+
+We don't suggest using the **beta.1** version on production, we highly demand you to test **LeptonX Lite** and provide feedback to us. It's really important for us to be able to release a more stable version. Thanks in advance.
+
+For the following versions (beta.2 and RC versions), we will focus on:
+
+* Fixing the reported bugs from the community
+* Providing documentations as much as possible
+* Adding new custom pages to the demo
+
+### OpenIddict Module & Keycloack Integration
+
+We have [announced the plan of replacing the IdentityServer](https://github.com/abpframework/abp/issues/11989). ABP currently uses **IdentityServer4** to add **OAuth** features as built-in on the server-side. However, since *IdentityServer4's support ends at the end of the year 2022*. Its replacement is Duende IdentityServer, which is not a free software anymore. (see [more](https://blog.duendesoftware.com/posts/20220111_fair_trade/))
+
+Therefore, we've decided to completely drop the **IdentityServer4** from the ABP platform and implement the [OpenIddict](https://github.com/openiddict/openiddict-core) and install onto the startup templates. 
+
+We've implemented both open source and commercial OpenIddict modules, we plan to remove Identity Server and replace it with OpenIddict for template projects in **ABP v5.4**. Please check [#12084](https://github.com/abpframework/abp/pull/12084) to see the development made on the open-source side.
+
+We're creating the documentation for the OpenIddict Module, if you want to have general knowledge about this module, you can check the documentation from [here](https://github.com/abpframework/abp/blob/dev/docs/en/Modules/OpenIddict.md). Currently, this is a draft documentation but it gives overall knowledge about the OpenIddict Module, we'll complete this documentation in ABP v5.4 and you'll be able to read it completely.
+
+Currently, we are also working on Keycloak integration possibilities in parallel to the OpenIddict integration research and we've prepared some samples that you can examine. You can see [#154](https://github.com/abpframework/abp-samples/pull/154) and [#158](https://github.com/abpframework/abp-samples/pull/158).
+
+### Deployment Documentations
+
+Deploying an ABP-based application is not so different than deploying any .NET or ASP.NET Core application. You can deploy it to a cloud provider (e.g. Azure, AWS, Google Could) or on-premise server, IIS or any other web server. However, we wanted to prepare a "Deployment Guide" to mention the important points and considerations.
+
+![](./deployment-documentation.png)
+
+In the [Deploying to a Clustered Environment](https://docs.abp.io/en/abp/5.3/Deployment/Clustered-Environment) documentation, we've documented the topics that you should consider when you are developing your application to a clustered environment and explained how you can deal with these topics in your ABP-based application. 
+
+### Other News
+
+* Global Features were only accessible from the C# code. From this version and on, Global Features can be also provided from application configurations. See [#12043](https://github.com/abpframework/abp/pull/12043).
+* Getting the user's detailed information (name, surname and phone number) from external login. See [#12085](https://github.com/abpframework/abp/pull/12085).
+* Date Pipes for Angular. See [#11909](https://github.com/abpframework/abp/issues/11909).
+
+If you want to see more details, you can check [the release on GitHub](https://github.com/abpframework/abp/releases/tag/5.3.0-rc.1), which contains a list of all the issues and pull requests closed with this version.
+
+## What's New with ABP Commercial 5.3?
+
+### GDPR Module
+
+> **GDPR (General Data Protection Regulation)** is a regulation in EU law on data protection and known as the toughest privacy and security law in the world. GDPR applies to any organization operating within the EU, as well as any organizations outside of the EU which offer goods or services to customers or businesses in the EU.
+
+With this version, we are introducing the new **GDPR Module**. This was one of the most awaited features, so we've prioritized it and implemented it in this version.
+
+The GDPR Module is pre-installed in the [startup templates](https://docs.abp.io/en/commercial/5.3/startup-templates/index) for MVC. So, no need to manually install it. When you create a new startup template, you can directly use this module. We'll also implement this module for the other UI types as soon as possible and also add extra functionality such as "Cookie Consent" and more. 
+
+Currently, there are two main functions of this module and they are "Download Personal Data" and "Delete Personal Data".
+
+![](./gdpr-user-menu.png)
+
+There is a "Personal Data" section in the user menu as in the screenshot above and when you click on this section, you'll be redirected to the "Personal Data" page. On that page, you can either request to "Download Personal Data" or "Delete Personal Data". 
+
+![](./gdpr-personal-data-page.png)
+
+After you've requested to download "Personal Data", you need to wait for 1 hour by default (you can configure the related option). Because the GDPR module is developed by considering the distributed systems and therefore a specific time should be passed to ensure all the published events are handled and all personal data is collected.
+
+### CMS Kit Pro - Polling Feature
+
+We've added a **Polling** feature to the **CMS Kit Pro** module. This feature allows you to use a questionnaire/voting system in your application easily. You can create a question, define some options for it and the poll will be created for you. You can see the example poll in the screenshot below:
+
+![](./poll-question-example.png)
+
+Also, there is an admin side of the Polling Feature. You can easily manage your polls in your admin (back-office) project. You can create, update, delete and show the results of the poll on the Polls page:
+
+![](./poll-questions.png)
+
+### OAuth Resource Owner Password as External Login Provider
+
+> The Resource Owner Password flow allows for the exchanging of the username and password of a user for an access token. When using the resource owner password credentials grant, the user provides the credentials (username and password) directly to the application.
+
+Now, you can login by entering a username and password from an OAuth server.
+
+Example: Use OAuth external login provider with Keycloak:
+
+![](./oauth-external-provider.gif)
+
+### Suite New Features & Enhancements
+
+In this version, there are some enhancements and new features in **Suite** and they are listed briefly below:
+
+* It's now possible to create an **app-nolayers (Application - single layer)** template via Suite and also code-generation is supported for the **app-nolayers** template with this version.
+* Suite now allows users to see and download its logs.
+* Suite now allows generating code via CLI. If you have a JSON file that contains code blocks, like entity configurations, you can use the `abp suite generate` command to generate CRUD pages based on it.
+
+Example:
+
+```bash
+abp suite generate -e C:\Users\.suite\entities\Country.json -s C:\Users\my-proj\SuiteProj\SuiteProj.sln
+```
+
+### Suite Webinar: Take a closer look at the code generation
+
+![](./webinar.png)
+
+We've organized a webinar for Suite and in this webinar, we've talked about ABP Suite's capabilities, important features and more...
+
+You can watch the event from [here](https://www.youtube.com/watch?v=RFArBh60RSA&t=3s), if you haven't watched it yet.
+
+### Docker Compose Configurations for Single Layer Startup Template
+
+Dockerfiles, docker-compose files and build script files have been added to the Single Layer Startup Template (app-nolayers) with this version.
+
+And this way, applications created with this template now can be deployed more easily.
+
+### Microservice Solution Enhancements
+
+There are some enhancements made in the Microservice Solution. You can see the list of these enhancements:
+
+* Initial migration on the template has been updated with the small improvement that was made in the **Language Management** module.
+* Database migration event handlers have been removed and "Distributed Locking" is now used for the database migrations.
+
+### PWA Support for the Application Pro Template
+
+Application Pro template also supports the PWA for Blazor WASM & Angular UIS. To create a startup template with the PWA support, you can use the `--pwa` parameter.
+Example:
+
+```bash
+abp new MyProgressiveWebApp -t app-pro -u blazor --pwa
+```
+
+## Community News
+
+### New ABP Community Posts
+
+* [Anto Subash](https://twitter.com/antosubash) created a series named ["Microservice with ABP"](https://blog.antosubash.com/posts/abp-microservice-series) and shared a couple of video posts about the ABP Microservice solution.
+* [Francisco Kadzi](https://github.com/CiscoNinja) has created his first ABP Community article that shows how to ["Customize ABP Angular Application UI with AdminLTE"](https://community.abp.io/posts/customize-abp-angular-application-ui-with-adminlte.-7qu1m67s).
+* [Jack Fistelmann](https://github.com/nebula2) has created an article to introduce a helpful project extension to speed up development on Visual Studio. You can read the article [here](https://community.abp.io/posts/using-switch-startup-project-extension-for-visual-studio-52yyw27v).
+* [Jack Fistelmann](https://github.com/nebula2) has also created an article to show how you can generate PDF files with the `Sycyber.Core` package in ABP-based applications. You can read it [here](https://community.abp.io/posts/generate-pdfs-in-an-abp-framework-project-using-scryber.core-x9yh1vfa).
+* [Halil Ibrahim Kalkan](https://twitter.com/hibrahimkalkan) has created an article to show ["Dealing with Multiple Implementations of a Service in ASP.NET Core & ABP Dependency Injection"](https://community.abp.io/posts/dealing-with-multiple-implementations-of-a-service-in-asp.net-core-abp-dependency-injection-ysfp4ho2) with examples.
+* [Manoj Kumar](https://community.abp.io/members/manojkumar.t@shloklabs.com) submitted a new article about how to use "ABP authentication in a Flutter application". It was a frequently asked topic, which you can read [here](https://community.abp.io/posts/flutter-web-authentication-from-abp-mp6l2ehx).
+* [Engincan Veske](https://twitter.com/EngincanVeske) created a new Community Article to show "Concurrency Check/Control in ABP". You can read it [here](https://community.abp.io/posts/handle-concurrency-with-ef-core-in-an-abp-framework-project-with-asp.net-core-mvc-jlkc3w8f).
+
+### ABP Community Talks 2022.4: How can you contribute to the open source ABP Framework? (May 10, 2022 - 17:00 UTC)
+
+![](./community-talks-2022.4.png)
+
+We've [asked you to pick the topic of the next Community Talks](https://twitter.com/abpframework/status/1514567683072745474?s=20&t=rJfHrB3DYDNsk2EXS8zBBQ) and you've chosen the "How to contribute to open source ABP Framework?" for the next talk topic. So, in this Community Talk, we will be talking about "How to contribute to ABP Framework" with one of the top contributors of the ABP Framework, [Ismail Yılmaz](https://github.com/iyilm4z). The event will be on **May 10, 2022, at 17:00 (UTC)** on YouTube.
+
+> You can register for the event from [here](https://kommunity.com/volosoft/events/abp-community-talks-20224-how-to-contribute-to-the-open-source-abp-framework-d9b50664), if you haven't registered yet.
+
+You can also [subscribe to the Volosoft channel](https://www.youtube.com/channel/UCO3XKlpvq8CA5MQNVS6b3dQ) to be informed about future ABP events and videos.
+
+### Discord Server
+
+We've created an official ABP Discord server so the ABP Community can interact with each other and created a blog-post to introduce it. You can read the [ABP Discord Server announcement post](https://blog.abp.io/abp/Official-ABP-Discord-Server-is-Here) to learn more about the ABP Discord Server. 
+
+Thanks to the ABP Community, **700+** people joined our Discord Server so far and it grows every day.
+
+You can join our Discord Server from [here](https://discord.gg/abp), if you haven't yet.

docs/en/CLI.md

@@ -92,8 +92,10 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
         * `--tiered`: Creates a tiered solution where Web and Http API layers are physically separated. If not specified, it creates a layered solution which is less complex and suitable for most scenarios.
       * `angular`: Angular UI. There are some additional options for this template:
         * `--separate-identity-server`: The Identity Server project comes as a separate project and runs at a different endpoint. It separates the Identity Server from the API Host application. If not specified, you will have a single endpoint in the server side.
+        * `--pwa`: Specifies the project as Progressive Web Application.
       * `blazor`: Blazor UI. There are some additional options for this template:
         * `--separate-identity-server`The Identity Server project comes as a separate project and runs at a different endpoint. It separates the Identity Server from the API Host application. If not specified, you will have a single endpoint in the server side.
+        * `--pwa`: Specifies the project as Progressive Web Application.
       * `blazor-server`: Blazor Server UI. There are some additional options for this template:
         * `--tiered`: The Identity Server and the API Host project comes as separate projects and run at different endpoints. It has 3 startup projects: *HttpApi.Host*, *IdentityServer* and *Blazor* and and each runs on different endpoints. If not specified, you will have a single endpoint for your web project.
       * `none`: Without UI. No front-end layer will be created. There are some additional options for this template:
@@ -115,7 +117,6 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
     * `--database-provider` or `-d`: Specifies the database provider. Default provider is `ef`. Available providers:
         * `ef`: Entity Framework Core.
         * `mongodb`: MongoDB.
-    * `--pwa`: Specifies to Configure Angular or Blazor WebAssembly project as Progressive Web Application.
 * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory.
 * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version.
 * `--preview`: Use latest preview version.

docs/en/Contribution/How-to-Contribute-abp.io-as-a-frontend-developer.md

@@ -0,0 +1,54 @@
+# How to contribute to abp.io as a frontend developer
+
+## How to setup development environment
+
+### Pre-requirements
+
+- Dotnet core SDK https://dotnet.microsoft.com/en-us/download
+- Nodejs LTS https://nodejs.org/en/
+- Docker https://docs.docker.com/engine/install
+- Angular CLI. https://angular.io/guide/what-is-angular#angular-cli
+- Abp CLI https://docs.abp.io/en/abp/latest/cli
+- A code editor
+
+Note: This arcticle prepare Windows OS. You may change the path type of your OS. an Example
+
+Windows: `templates\app\aspnet-core\src\MyCompanyName.MyProjectName.DbMigrator\appsettings.json`
+
+Unix: `templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json`
+
+### Sample docker commands
+
+You need to install SQL Server and Redis. You can install these programs without docker, but my example uses docker containers. Your computer should have Docker Engine. Then open the terminal en execute the commands one by one.
+For the Sql Server
+
+docker run -v sqlvolume:/var/opt/mssql -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=yourpassword -p 1433:1433 -d mcr.microsoft.com/mssql/server:2019-CU3-ubuntu-18.04
+
+For the Redis
+
+docker run -p 6379:6379 -d redis
+
+Then we are ready to download and execute the code.
+
+## Folder Structure
+
+The app has a backend written in .net core (c#) and an angular app. It would help if you ran both of them.
+
+### Running Backend App
+
+The path of the Backend app is “templates\app\aspnet-core.” If you want to work with dockerized SQL Server, you should change connection strings for running with docker. The path of the connection string is
+`templates\app\aspnet-core\src\MyCompanyName.MyProjectName.DbMigrator\appsettings.json`.
+
+Before running the backend, you should run the Db migrator project. The DbMigrator created initial tables and values. The path of DbMigrator is `templates\app\aspnet-core\src\MyCompanyName.MyProjectName.DbMigrator`. Open a terminal in the path and execute the command `dotnet run` in terminal
+
+One last step before the running the backend is installing client-side libraries. Go to `templates\app\aspnet-core`. Open a terminal in the path and execute the command `abp install-libs` in terminal
+
+Next step you should go to path of backend host project. The path is `templates\app\aspnet-core\src\MyCompanyName.MyProjectName.HttpApi.HostWithIds`. Open a terminal in the path and execute the command `dotnet run` in terminal
+
+Your backend should be running successfully
+
+### Running Frontend App
+
+There is a demo app. The path of the demo app is `npm\ng-packs\apps\dev-app`. The demo app is connected to the packages with local references. Open the terminal in `npm\ng-packs\apps\dev-app` and execute `yarn` or `npm i` in terminal. After the package installed run `npm start` or `yarn start`.
+
+The repo uses Nx and packages connected with `local references`. The packages path is `”npm\ng-packs\packages`

docs/en/Contribution/Index.md

@@ -70,3 +70,7 @@ If you want to make a change on a specific resource file, you can find the file
 ## Bug Report
 
 If you find any bug, please [create an issue on the Github repository](https://github.com/abpframework/abp/issues/new).
+
+## Setup Frontend Development Environment
+
+[How to contribute to abp.io as a frontend developer](How-to-Contribute-abp.io-as-a-frontend-developer.md)

docs/en/Dependency-Injection.md

@@ -131,7 +131,7 @@ public class TaxCalculator: ICalculator, ITaxCalculator, ICanCalculate, ITransie
 If you do not specify which services to expose, ABP expose services by convention. So taking the ``TaxCalculator`` defined above:
 
 * The class itself is exposed by default. That means you can inject it by ``TaxCalculator`` class.
-* Default interfaces are exposed by default. Default interfaces are determined by naming convention. In this example, ``ICalculator`` and ``ITaxCalculator`` are default interfaces of ``TaxCalculator``, but ``ICanCalculate`` is not.
+* Default interfaces are exposed by default. Default interfaces are determined by naming convention. In this example, ``ICalculator`` and ``ITaxCalculator`` are default interfaces of ``TaxCalculator``, but ``ICanCalculate`` is not. A generic interface (e.g. `ICalculator<string>`) is also considered as a default interface if the naming convention is satisfied.
 
 ### Combining All Together
 

docs/en/Distributed-Event-Bus.md

@@ -20,7 +20,7 @@ For example, [pre-built application modules](Modules/Index.md) is designed to wo
 
 There are two ways of publishing distributed events explained in the following sections.
 
-### IDistributedEventBus
+### Using IDistributedEventBus to Publish Events
 
 `IDistributedEventBus` can be [injected](Dependency-Injection.md) and used to publish a distributed event.
 
@@ -57,7 +57,7 @@ namespace AbpDemo
 }
 ````
 
-`PublishAsync` method gets a single parameter: the event object, which is responsible to hold the data related to the event. It is a simple plain class:
+`PublishAsync` method gets the event object, which is responsible to hold the data related to the event. It is a simple plain class:
 
 ````csharp
 using System;
@@ -80,15 +80,15 @@ Even if you don't need to transfer any data, you need to create a class (which i
 
 #### Event Name
 
-`EventName` attribute is optional, but suggested. If you don't declare it, the event name will be the full name of the event class, `AbpDemo.StockCountChangedEto` in this case.
+`EventName` attribute is optional, but suggested. If you don't declare it for an event type (ETO class), the event name will be the full name of the event class, `AbpDemo.StockCountChangedEto` in this case.
 
 #### About Serialization for the Event Objects
 
-Event transfer objects **must be serializable** since they will be serialized/deserialized to JSON or other format when it is transferred to out of the process.
+Event transfer objects (ETOs) **must be serializable** since they will be serialized/deserialized to JSON or other format when it is transferred to out of the process.
 
 Avoid circular references, polymorphism, private setters and provide default (empty) constructors if you have any other constructor as a good practice (while some serializers may tolerate it), just like the DTOs.
 
-### Inside Entity / Aggregate Root Classes
+### Publishing Events Inside Entity / Aggregate Root Classes
 
 [Entities](Entities.md) can not inject services via dependency injection, but it is very common to publish distributed events inside entity / aggregate root classes.
 
@@ -294,4 +294,211 @@ This example;
 * Adds a selector to allow to publish the create, update and delete events for the `Product` entity.
 * Configure to use the `ProductEto` as the event transfer object to publish for the `Product` related events.
 
-> Distributed event system use the [object to object mapping](Object-To-Object-Mapping.md) system to map `Product` objects to `ProductEto` objects. So, you need to configure the object mapping (`Product` -> `ProductEto`) too. You can check the [object to object mapping document](Object-To-Object-Mapping.md) to learn how to do it.
+> Distributed event system use the [object to object mapping](Object-To-Object-Mapping.md) system to map `Product` objects to `ProductEto` objects. So, you need to configure the object mapping (`Product` -> `ProductEto`) too. You can check the [object to object mapping document](Object-To-Object-Mapping.md) to learn how to do it.
+
+## Transaction and Exception Handling
+
+Distributed event bus works in-process (since default implementation is `LocalDistributedEventBus`) unless you configure an actual provider (e.g. [Kafka](Distributed-Event-Bus-Kafka-Integration.md) or [Redis](Distributed-Event-Bus-RabbitMQ-Integration.md)). In-process event bus always executes event handlers in the same [unit of work](Unit-Of-Work.md) scope that you publishes the events in. That means, if an event handler throws an exception, then the related unit of work (the database transaction) is rolled back. In this way, your application logic and event handling logic becomes transactional (atomic) and consistent. If you want to ignore errors in an event handler, you must use a `try-catch` block in your handler and shouldn't re-throw the exception.
+
+When you switch to an actual distributed event bus provider (e.g. [Kafka](Distributed-Event-Bus-Kafka-Integration.md) or [Redis](Distributed-Event-Bus-RabbitMQ-Integration.md)), then the event handlers will be executed in different processes/applications as their purpose is to create distributed systems. In this case, the only way to implement transactional event publishing is to use the outbox/inbox patterns as explained in the *Outbox / Inbox for Transactional Events* section.
+
+If you don't configure outbox/inbox pattern or use the `LocalDistributedEventBus`, then events are published at the end of the unit of work by default, just before the unit of work is completed (that means throwing exception in an event handler still rollbacks the unit of work), even if you publish them in the middle of unit of work. If you want to immediately publish the event, you can set `onUnitOfWorkComplete` to `false` while using `IDistributedEventBus.PublishAsync` method.
+
+> Keeping the default behavior is recommended unless you don't have a unique requirement. `onUnitOfWorkComplete` option is not available when you publish events inside entity / aggregate root classes (see the *Publishing Events Inside Entity / Aggregate Root Classes* section).
+
+## Outbox / Inbox for Transactional Events
+
+The **[transactional outbox pattern](https://microservices.io/patterns/data/transactional-outbox.html)** is used to publishing distributed events within the **same transaction** that manipulates the application's database. When you enable outbox, distributed events are saved into the database inside the same transaction with your data changes, then sent to the actual message broker by a separate [background worker](Background-Workers.md) with a re-try system. In this way, it ensures the consistency between your database state and the published events.
+
+The **transactional inbox pattern**, on the other hand, saves incoming events into database first. Then (in a [background worker](Background-Workers.md)) executes the event handler in a transactional manner and removes the event from the inbox queue in the same transaction. It ensures that the event is only executed one time by keeping the processed messages for a while and discarding the duplicate events received from the message broker.
+
+Enabling the event outbox and inbox systems require a few manual steps for your application. Please apply  the instructions in the following sections to make them running.
+
+> Outbox and Inbox can be separately enabled and configured, so you may only use one of them if you want.
+
+### Pre-requirements
+
+* The outbox/inbox system uses the distributed lock system to handle concurrency when you run multiple instances of your application/service. So, you should **configure the distributed lock system** with one of the providers as [explained in this document](Distributed-Locking.md).
+* The outbox/inbox system supports [Entity Framework Core](Entity-Framework-Core.md) (EF Core) and [MongoDB](MongoDB.md) **database providers** out of the box. So, your applications should use one of these database providers. For other database providers, see the *Implementing a Custom Database Provider* section.
+
+> If you are using MongoDB, be sure that you enabled multi-document database transactions  that was introduced in MongoDB version 4.0. See the *Transactions* section of the [MongoDB](MongoDB.md) document.
+
+### Enabling event outbox
+
+Open your `DbContext` class (EF Core or MongoDB), implement the `IHasEventOutbox` interface. You should end up by adding a `DbSet` property into your `DbContext` class:
+
+```csharp
+public DbSet<OutgoingEventRecord> OutgoingEvents { get; set; }
+```
+
+Add the following lines inside the `OnModelCreating` method of your `DbContext` class (only for EF Core):
+
+```csharp
+builder.ConfigureEventOutbox();
+```
+
+For EF Core, use the standard `Add-Migration` and `Update-Database` commands to apply changes into your database (you can skip this step for MongoDB). If you want to use the command-line terminal, run the following commands in the root directory of the database integration project:
+
+```bash
+dotnet ef migrations add "Added_Event_Outbox"
+dotnet ef database update
+```
+
+Finally, write the following configuration code inside the `ConfigureServices` method of your [module class](Module-Development-Basics.md) (replace `YourDbContext` with your own `DbContext` class):
+
+````csharp
+Configure<AbpDistributedEventBusOptions>(options =>
+{
+    options.Outboxes.Configure(config =>
+    {
+        config.UseDbContext<YourDbContext>();
+    });
+});
+````
+
+### Enabling event inbox
+
+Open your `DbContext` class (EF Core or MongoDB), implement the `IHasEventInbox` interface. You should end up by adding a `DbSet` property into your `DbContext` class:
+
+```csharp
+public DbSet<IncomingEventRecord> IncomingEvents { get; set; }
+```
+
+Add the following lines inside the `OnModelCreating` method of your `DbContext` class (only for EF Core):
+
+```csharp
+builder.ConfigureEventInbox();
+```
+
+For EF Core, use the standard `Add-Migration` and `Update-Database` commands to apply changes into your database (you can skip this step for MongoDB). If you want to use the command-line terminal, run the following commands in the root directory of the database integration project:
+
+```bash
+dotnet ef migrations add "Added_Event_Inbox"
+dotnet ef database update
+```
+
+Finally, write the following configuration code inside the `ConfigureServices` method of your [module class](Module-Development-Basics.md) (replace `YourDbContext` with your own `DbContext` class):
+
+````csharp
+Configure<AbpDistributedEventBusOptions>(options =>
+{
+    options.Inboxes.Configure(config =>
+    {
+        config.UseDbContext<YourDbContext>();
+    });
+});
+````
+
+### Additional Configuration
+
+> The default configuration will be enough for most cases. However, there are some options you may want to set for outbox and inbox.
+
+#### Outbox configuration
+
+Remember how outboxes are configured:
+
+````csharp
+Configure<AbpDistributedEventBusOptions>(options =>
+{
+    options.Outboxes.Configure(config =>
+    {
+        // TODO: Set options
+    });
+});
+````
+
+Here, the following properties are available on the `config` object:
+
+* `IsSendingEnabled` (default: `true`): You can set to `false` to disable sending outbox events to the actual event bus. If you disable this, events can still be added to outbox, but not sent. This can be helpful if you have multiple applications (or application instances) writing to outbox, but use one of them to send the events.
+* `Selector`: A predicate to filter the event (ETO) types to be used for this configuration. Should return `true` to select the event. It selects all the events by default. This is especially useful if you want to ignore some ETO types from the outbox, or want to define named outbox configurations and group events within these configurations. See the *Named Configurations* section.
+* `ImplementationType`: Type of the class that implements the database operations for the outbox. This is normally set when you call `UseDbContext` as shown before. See *Implementing a Custom Outbox/Inbox Database Provider* section for advanced usages.
+
+#### Inbox configuration
+
+Remember how inboxes are configured:
+
+````csharp
+Configure<AbpDistributedEventBusOptions>(options =>
+{
+    options.Inboxes.Configure(config =>
+    {
+        // TODO: Set options
+    });
+});
+````
+
+Here, the following properties are available on the `config` object:
+
+* `IsProcessingEnabled` (default: `true`): You can set to `false` to disable processing (handling) events in the inbox. If you disable this, events can still be received, but not executed. This can be helpful if you have multiple applications (or application instances), but use one of them to execute the event handlers.
+* `EventSelector`: A predicate to filter the event (ETO) types to be used for this configuration. This is especially useful if you want to ignore some ETO types from the inbox, or want to define named inbox configurations and group events within these configurations. See the *Named Configurations* section.
+* `HandlerSelector`: A predicate to filter the event handled types (classes implementing the `IDistributedEventHandler<TEvent>` interface) to be used for this configuration. This is especially useful if you want to ignore some event handler types from inbox processing, or want to define named inbox configurations and group event handlers within these configurations. See the *Named Configurations* section.
+* `ImplementationType`: Type of the class that implements the database operations for the inbox. This is normally set when you call `UseDbContext` as shown before. See *Implementing a Custom Outbox/Inbox Database Provider* section for advanced usages.
+
+### Skipping Outbox
+
+`IDistributedEventBus.PublishAsync` method provides an optional parameter, `useOutbox`, which is set to `true` by default. If you bypass outbox and immediately publish an event, you can set it to `false` for a specific event publishing operation.
+
+### Advanced Topics
+
+#### Named Configurations
+
+> All the concepts explained in this section is also valid for inbox configurations. We will show examples only for outbox to keep the document shorter.
+
+See the following outbox configuration code:
+
+````csharp
+Configure<AbpDistributedEventBusOptions>(options =>
+{
+    options.Outboxes.Configure(config =>
+    {
+        //TODO
+    });
+});
+````
+
+This is equivalent of the following code:
+
+````csharp
+Configure<AbpDistributedEventBusOptions>(options =>
+{
+    options.Outboxes.Configure("Default", config =>
+    {
+        //TODO
+    });
+});
+````
+
+`Default` is this code indicates the configuration name. If you don't specify it (like in the previous code block), `Default` is used as the configuration name.
+
+That means you can define more than one configuration for outbox (also for inbox) with different names. ABP runs all the configured outboxes.
+
+Multiple outboxes can be needed if your application have more than one database and you want to run different outbox queues for different databases. In this case, you can use the `Selector` option to decide the events should be handled by an outbox. See the *Additional Configurations* section above.
+
+#### Implementing a Custom Outbox/Inbox Database Provider
+
+If your application or service is using a database provider other than [EF Core](Entity-Framework-Core.md) and [MongoDB](MongoDB.md), you should manually integrate outbox/inbox system with your database provider.
+
+> Outbox and Inbox table/data must be stored in the same database with your application's data (since we want to create a single database transaction that includes application's database operations and outbox/inbox table operations). Otherwise, you should care about distributed (multi-database) transaction support which is not provided by most of the vendors and may require additional configuration.
+
+ABP provides `IEventOutbox` and `IEventInbox` abstractions as extension point for the outbox/inbox system. You can create classes by implementing these interfaces and register them to [dependency injection](Dependency-Injection.md).
+
+Once you implement your custom event boxes, you can configure `AbpDistributedEventBusOptions` to use your event box classes:
+
+````csharp
+Configure<AbpDistributedEventBusOptions>(options =>
+{
+    options.Outboxes.Configure(config =>
+    {
+        config.ImplementationType = typeof(MyOutbox); //Your Outbox class
+    });
+    
+    options.Inboxes.Configure(config =>
+    {
+        config.ImplementationType = typeof(MyInbox); //Your Inbox class
+    });
+});
+````
+
+## See Also
+
+* [Local Event Bus](Local-Event-Bus.md)

docs/en/Local-Event-Bus.md

@@ -6,7 +6,7 @@ The Local Event Bus allows services to publish and subscribe to **in-process eve
 
 There are two ways of publishing local events explained in the following sections.
 
-### ILocalEventBus
+### Publishing Events Using the ILocalEventBus
 
 `ILocalEventBus` can be [injected](Dependency-Injection.md) and used to publish a local event.
 
@@ -64,7 +64,7 @@ namespace AbpDemo
 
 Even if you don't need to transfer any data, you need to create a class (which is an empty class in this case).
 
-### Inside Entity / Aggregate Root Classes
+### Publishing Events Inside Entity / Aggregate Root Classes
 
 [Entities](Entities.md) can not inject services via dependency injection, but it is very common to publish local events inside entity / aggregate root classes.
 
@@ -109,7 +109,7 @@ namespace AbpDemo
 
 `AggregateRoot` class defines the `AddLocalEvent` to add a new local event, that is published when the aggregate root object is saved (created, updated or deleted) into the database.
 
-> If an entity publishes such an event, it is a good practice to change the related properties in a controlled manner, just like the example above - `StockCount` can only be changed by the `ChangeStockCount` method which guarantees publishing the event.
+> Tip: If an entity publishes such an event, it is a good practice to change the related properties in a controlled manner, just like the example above - `StockCount` can only be changed by the `ChangeStockCount` method which guarantees publishing the event.
 
 #### IGeneratesDomainEvents Interface
 
@@ -149,10 +149,10 @@ namespace AbpDemo
 }
 ````
 
-That's all. `MyHandler` is **automatically discovered** by the ABP Framework and `HandleEventAsync` is called whenever a `StockCountChangedEvent` occurs.  You can inject any service and perform any required logic here.
+That's all. `MyHandler` is **automatically discovered** by the ABP Framework and `HandleEventAsync` is called whenever a `StockCountChangedEvent` occurs.  You can inject any service and perform any required logic in your handler class.
 
-* **Zero or more handlers** can subscribe to the same event.
-* A single event handler class can **subscribe to multiple events** but implementing the `ILocalEventHandler<TEvent>` interface for each event type.
+* **One or more handlers** can subscribe to the same event.
+* A single event handler class can **subscribe to multiple events** by implementing the `ILocalEventHandler<TEvent>` interface for each event type.
 
 If you perform **database operations** and use the [repositories](Repositories.md) inside the event handler, you may need to create a [unit of work](Unit-Of-Work.md), because some repository methods need to work inside an **active unit of work**. Make the handle method `virtual` and add a `[UnitOfWork]` attribute for the method, or manually use the `IUnitOfWorkManager` to create a unit of work scope.
 
@@ -160,10 +160,11 @@ If you perform **database operations** and use the [repositories](Repositories.m
 
 ### Transaction & Exception Behavior
 
-When an event published, subscribed event handlers are immediately executed. So;
+Event handlers are always executed in the same [unit of work](Unit-Of-Work.md) scope, that means in the same database transaction with the code that published the event. If an event handler throws an exception, the unit of work (database transaction) is rolled back. So, **use try-catch yourself** in the event handler if you want to hide the error.
 
-* If a handler **throws an exception**, it effects the code that published the event. That means it gets the exception on the `PublishAsync` call. So, **use try-catch yourself** in the event handler if you want to hide the error.
-* If the event publishing code is being executed inside a [Unit Of Work](Unit-Of-Work.md) scope, the event handlers also covered by the unit of work. That means if your UOW is transactional and a handler throws an exception, the transaction is rolled back.
+When you call `ILocalEventBus.PublishAsync`, the event handlers are not immediately executed. Instead, they are executed just before the current unit of work completed (an unhandled exception in the handler still rollbacks the current unit of work). If you want to immediately execute the handlers, set the optional `onUnitOfWorkComplete` parameter to `false`.
+
+> Keeping the default behavior is recommended unless you don't have a unique requirement. `onUnitOfWorkComplete` option is not available when you publish events inside entity / aggregate root classes (see the *Publishing Events Inside Entity / Aggregate Root Classes* section).
 
 ## Pre-Built Events
 
@@ -195,35 +196,22 @@ namespace AbpDemo
 }
 ````
 
-This class subscribes to the `EntityCreatedEventData<IdentityUser>`, which is published just after a user was created. You may want to send a "Welcome" email to the new user.
-
-There are two types of these events: events with past tense and events with continuous tense.
-
-### Events with Past Tense
+This class subscribes to the `EntityCreatedEventData<IdentityUser>`, which is published just after a user was created (but before the current transaction is completed). For example, you may want to send a "Welcome" email to the new user.
 
-Events with past tense are published when the related unit of work completed and the entity change successfully saved to the database. If you throw an exception on these event handlers, it **can not rollback** the transaction since it was already committed.
-
-The event types are;
+The pre-built event types are;
 
 * `EntityCreatedEventData<T>` is published just after an entity was successfully created.
 * `EntityUpdatedEventData<T>` is published just after an entity was successfully updated.
 * `EntityDeletedEventData<T>` is published just after an entity was successfully deleted.
 * `EntityChangedEventData<T>` is published just after an entity was successfully created, updated or deleted. It can be a shortcut if you need to listen any type of change - instead of subscribing to the individual events.
 
-### Events with Continuous Tense
-
-Events with continuous tense are published before completing the transaction (if database transaction is supported by the database provider being used). If you throw an exception on these event handlers, it **can rollback** the transaction since it is not completed yet and the change is not saved to the database.
-
-The event types are;
-
-* `EntityCreatingEventData<T>` is published just before saving a new entity to the database.
-* `EntityUpdatingEventData<T>` is published just before an existing entity is being updated.
-* `EntityDeletingEventData<T>` is published just before an entity is being deleted.
-* `EntityChangingEventData<T>` is published just before an entity is being created, updated or deleted. It can be a shortcut if you need to listen any type of change - instead of subscribing to the individual events.
-
 #### How It Was Implemented?
 
 Pre-build events are published when you save changes to the database;
 
 * For EF Core, they are published on `DbContext.SaveChanges`.
 * For MongoDB, they are published when you call repository's `InsertAsync`, `UpdateAsync` or `DeleteAsync` methods (since MongoDB has not a change tracking system).
+
+## See Also
+
+* [Distributed Event Bus](Distributed-Event-Bus.md)

docs/en/Microservice-Architecture.md

@@ -23,8 +23,8 @@ One common advise to start a new solution is **always to start with a monolith**
 
 However, developing such a well-modular application can be a problem since it is **hard to keep modules isolated** from each other as you would do it for microservices (see [Stefan Tilkov's article](https://martinfowler.com/articles/dont-start-monolith.html) about that). Microservice architecture naturally forces you to develop well isolated services, but in a modular monolithic application it's easy to tight couple modules to each other and design **weak module boundaries** and API contracts.
 
-ABP can help you in that point by offerring a **microservice-compatible, strict module architecture** where your module is splitted into multiple layers/projects and developed in its own VS solution completely isolated and independent from other modules. Such a developed module is a natural microservice yet it can be easily plugged-in a monolithic application. See the [module development best practice guide](Best-Practices/Index.md) that offers a **microservice-first module design**. All [standard ABP modules](https://github.com/abpframework/abp/tree/master/modules) are developed based on this guide. So, you can use these modules by embedding into your monolithic solution or deploy them separately and use via remote APIs. They can share a single database or can have their own database based on your simple configuration.
+ABP can help you in that point by offering a **microservice-compatible, strict module architecture** where your module is split into multiple layers/projects and developed in its own VS solution completely isolated and independent from other modules. Such a developed module is a natural microservice yet it can be easily plugged-in a monolithic application. See the [module development best practice guide](Best-Practices/Index.md) that offers a **microservice-first module design**. All [standard ABP modules](https://github.com/abpframework/abp/tree/master/modules) are developed based on this guide. So, you can use these modules by embedding into your monolithic solution or deploy them separately and use via remote APIs. They can share a single database or can have their own database based on your simple configuration.
 
-## Microservice Demo Solution
+## Microservice Demo Solution: eShopOnAbp
 
-The [sample microservice solution](Samples/Microservice-Demo.md) demonstrates a complete microservice solution based on the ABP framework.
+The [eShopOnAbp project](https://github.com/abpframework/eShopOnAbp) demonstrates a complete microservice solution based on the ABP framework.

docs/en/Migration-Guides/Abp-5_3.md

@@ -0,0 +1,11 @@
+# ABP Version 5.3 Migration Guide
+
+This document is a guide for upgrading ABP v5.2 solutions to ABP v5.3. There is a change in this version that may effect your applications, please read it carefully and apply the necessary changes to your application.
+
+## AutoMapper Upgraded to v11.0.1
+
+AutoMapper library upgraded to **v11.0.1** in this version. So, you need to change your project's target SDK that use the **AutoMapper** library (typically your `*.Application` project). You can change it from `netstandard2.0` to `netstandard2.1` or `net6` if needed. Please see [#12189](https://github.com/abpframework/abp/pull/12189) for more info.
+
+## See Also
+
+* [Official blog post for the 5.3 release](https://blog.abp.io/abp/ABP.IO-Platform-5.3-RC-Has-Been-Published)

docs/en/Migration-Guides/Index.md

@@ -2,6 +2,7 @@
 
 The following documents explain how to migrate your existing ABP applications. We write migration documents only if you need to take an action while upgrading your solution. Otherwise, you can easily upgrade your solution using the [abp update command](../Upgrading.md).
 
+- [5.2 to 5.3](Abp-5_3.md)
 - [5.1 to 5.2](Abp-5_2.md)
 - [4.x to 5.0](Abp-5_0.md)
 - [4.2 to 4.3](Abp-4_3.md)

docs/en/Modules/OpenIddict.md

@@ -81,7 +81,7 @@ PreConfigure<OpenIddictServerBuilder>(builder =>
 });
 ```
 
-#### AbpOpenIddictOptions
+#### AbpOpenIddictAspNetCoreOptions
 
 `UpdateAbpClaimTypes(default: true)`:  Updates AbpClaimTypes to be compatible with identity server claims.
 `AddDevelopmentEncryptionAndSigningCertificate(default: true)`:  Registers (and generates if necessary) a user-specific development encryption/development signing certificate.

docs/en/Repositories.md

@@ -164,6 +164,10 @@ If your entity is a soft-delete entity, you can use the `HardDeleteAsync` method
 
 > See the [Data Filtering](Data-Filtering.md) documentation for more about soft-delete.
 
+### Ensure Entities Exists
+
+The `EnsureExistsAsync` extension method accepts entity id or entities query expression to ensure entities exist, otherwise, it will throw `EntityNotFoundException`.
+
 ## Other Generic Repository Types
 
 Standard `IRepository<TEntity, TKey>` interface exposes the standard `IQueryable<TEntity>` and you can freely query using the standard LINQ methods. This is fine for most of the applications. However, some ORM providers or database systems may not support standard `IQueryable` interface. If you want to use such providers, you can't rely on the `IQueryable`.

docs/en/Road-Map.md

@@ -4,15 +4,18 @@ This document provides a road map, release schedule and planned features for the
 
 ## Next Versions
 
-### v5.3
+### v5.4
 
-In [5.3 milestone](https://github.com/abpframework/abp/milestone/65), we will be mostly working on the following topics:
+In [5.4 milestone](https://github.com/abpframework/abp/milestone/67), we will be mostly working on the following topics:
 
+* Providing an OpenIddict integration to replace current IdentityServer4 integration.
 * Maturing and documenting the [eShopOnAbp](https://github.com/abpframework/eShopOnAbp) project, writing a free e-book that explains the solution.
 * Working on the [LeptonX](https://blog.abp.io/abp/LeptonX-Theme-for-ABP-Framework-Alpha-Release) theme and making it as the default theme for the ABP Framework UI options.
-* Working on more examples and guides.
+* Improvements on the existing features and providing more guides.
 
-The planned release date for v5.3 is **May, 2022**.
+The planned release date for v5.4 is **July, 2022**.
+
+> After the version 5.4, we will be working for 6.0 which will be released in the end of 2022 based on .NET 7.0.
 
 ## Backlog Items
 
@@ -20,8 +23,8 @@ The *Next Versions* section above shows the main focus of the planned versions.
 
 Here, a list of major items in the backlog we are considering to work on in the next versions.
 
-* [#7221](https://github.com/abpframework/abp/issues/7221) / Alternative to IdentityServer4
 * [#2183](https://github.com/abpframework/abp/issues/2183) / Dapr integration
+* [#6655](https://github.com/abpframework/abp/pull/6655) / Use Typescript for the MVC UI
 * [#236](https://github.com/abpframework/abp/issues/236) / Resource based authorization system
 * [#2882](https://github.com/abpframework/abp/issues/2882) / Providing a gRPC integration infrastructure (while it is [already possible](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) to create or consume gRPC endpoints for your application, we plan to create endpoints for the [standard application modules](https://docs.abp.io/en/abp/latest/Modules/Index))
 * [#1754](https://github.com/abpframework/abp/issues/1754) / Multi-lingual entities
@@ -31,7 +34,6 @@ Here, a list of major items in the backlog we are considering to work on in the
 * [#4223](https://github.com/abpframework/abp/issues/4223) / WebHook system
 * [#162](https://github.com/abpframework/abp/issues/162) / Azure ElasticDB Integration for multitenancy
 * [#2296](https://github.com/abpframework/abp/issues/2296) / Feature toggling infrastructure
-* [#6655](https://github.com/abpframework/abp/pull/6655) / Use Typescript for the MVC UI
 
 You can always check the milestone planning and the prioritized backlog issues on [the GitHub repository](https://github.com/abpframework/abp/milestones) for a detailed road map. The backlog items are subject to change. We are adding new items and changing priorities based on the community feedbacks and goals of the project.
 

docs/en/Samples/Index.md

@@ -2,15 +2,19 @@
 
 Here, a list of official samples built with the ABP Framework. Most of these samples are located under the [abpframework/abp-samples](https://github.com/abpframework/abp-samples) GitHub repository.
 
-### Microservice Demo
+## eShopOnAbp
 
-A complete solution to demonstrate how to build systems based on the microservice architecture.
+Reference microservice solution built with the ABP Framework and .NET.
 
-* [The complete documentation for this sample](Microservice-Demo.md)
-* [Source code](https://github.com/abpframework/abp-samples/tree/master/MicroserviceDemo)
-* [Microservice architecture document](../Microservice-Architecture.md)
+* [Source code](https://github.com/abpframework/eShopOnAbp)
 
-### Book Store
+## EventHub
+
+This is a reference application built with the ABP Framework. It implements the Domain Driven Design with multiple application layers.
+
+* [Source code](https://github.com/abpframework/eventhub)
+
+## Book Store
 
 A simple CRUD application to show basic principles of developing an application with the ABP Framework. The same sample was implemented with different technologies:
 
@@ -28,7 +32,7 @@ A simple CRUD application to show basic principles of developing an application
 
 While there is no Razor Pages & MongoDB combination, you can check both documents to understand it since DB & UI selection don't effect each other.
 
-### Other Samples
+## Other Samples
 
 * **Event Organizer**: A sample application to create events (meetups) and allow others to register the events. Developed using EF Core and Blazor UI.
   * [Source code](https://github.com/abpframework/abp-samples/tree/master/EventOrganizer)

docs/en/Samples/Microservice-Demo.md

@@ -1,5 +1,7 @@
 # Microservice Demo Solution
 
+> This solution is no longer maintained. See [the eShopOnAbp project](https://github.com/abpframework/eShopOnAbp) for the replacement solution.
+
 *"Microservices are a software development technique—a variant of the **service-oriented architecture** (SOA) architectural style that structures an application as a collection of **loosely coupled services**. In a microservices architecture, services are **fine-grained** and the protocols are **lightweight**. The benefit of decomposing an application into different smaller services is that it improves **modularity**. This makes the application easier to understand, develop, test, and become more resilient to architecture erosion. It **parallelizes development** by enabling small autonomous teams to **develop, deploy and scale** their respective services independently. It also allows the architecture of an individual service to emerge through **continuous refactoring**. Microservices-based architectures enable **continuous delivery and deployment**."*
 
 — [Wikipedia](https://en.wikipedia.org/wiki/Microservices)

docs/en/Startup-Templates/Application.md

@@ -13,7 +13,7 @@ This document explains **the solution structure** and projects in details. If yo
 
 You can use the [ABP CLI](../CLI.md) to create a new project using this startup template. Alternatively, you can directly create & download from the [Get Started](https://abp.io/get-started) page. CLI approach is used here.
 
-First, install the ABP CLI if you haven't installed before:
+First, install the ABP CLI if you haven't installed it before:
 
 ````bash
 dotnet tool install -g Volo.Abp.Cli
@@ -25,8 +25,8 @@ Then use the `abp new` command in an empty folder to create a new solution:
 abp new Acme.BookStore -t app
 ````
 
-* `Acme.BookStore` is the solution name, like *YourCompany.YourProduct*. You can use single level, two-levels or three-levels naming.
-* This example specified the template name (`-t` or `--template` option). However, `app` is already the default template if you don't specify it.
+* `Acme.BookStore` is the solution name, like *YourCompany.YourProduct*. You can use single-level, two-level or three-level naming.
+* This example specified the template name (`-t` or `--template` option). However, `app` is already the default template if you didn't specify it.
 
 ### Specify the UI Framework
 
@@ -36,7 +36,7 @@ This template provides multiple UI frameworks:
 * `blazor`: Blazor UI
 * `angular`: Angular UI
 
-Use `-u` or `--ui` option to specify the UI framework:
+Use the `-u` or `--ui` option to specify the UI framework:
 
 ````bash
 abp new Acme.BookStore -u angular
@@ -61,7 +61,7 @@ This template supports the following mobile application frameworks:
 
 - `react-native`: React Native
 
-Use `-m` (or `--mobile`) option to specify the mobile application framework:
+Use the `-m` (or `--mobile`) option to specify the mobile application framework:
 
 ````bash
 abp new Acme.BookStore -m react-native
@@ -75,7 +75,7 @@ Based on the options you've specified, you will get a slightly different solutio
 
 ### Default Structure
 
-If you don't specify any additional option, you will have a solution like shown below:
+If you don't specify any additional options, you will have a solution as shown below:
 
 ![bookstore-visual-studio-solution-v3](../images/bookstore-visual-studio-solution-v3.png)
 
@@ -93,7 +93,7 @@ This project contains constants, enums and other objects these are actually a pa
 
 A `BookType` enum and a `BookConsts` class (which may have some constant fields for the `Book` entity, like `MaxNameLength`) are good candidates for this project.
 
-* This project has no dependency to other projects in the solution. All other projects depend on this directly or indirectly.
+* This project has no dependency on other projects in the solution. All other projects depend on this one directly or indirectly.
 
 #### .Domain Project
 
@@ -105,7 +105,7 @@ A `Book` entity, a `BookManager` domain service and an `IBookRepository` interfa
 
 #### .Application.Contracts Project
 
-This project mainly contains [application service](../Application-Services.md) **interfaces** and [Data Transfer Objects](../Data-Transfer-Objects.md) (DTO) of the application layer. It does exists to separate interface & implementation of the application layer. In this way, the interface project can be shared to the clients as a contract package.
+This project mainly contains [application service](../Application-Services.md) **interfaces** and [Data Transfer Objects](../Data-Transfer-Objects.md) (DTO) of the application layer. It exists to separate the interface & implementation of the application layer. In this way, the interface project can be shared to the clients as a contract package.
 
 An `IBookAppService` interface and a `BookCreationDto` class are good candidates for this project.
 
@@ -130,7 +130,7 @@ This is the integration project for the EF Core. It defines the `DbContext` and
 
 #### .DbMigrator Project
 
-This is a console application which simplifies to execute database migrations on development and production environments. When you run this application, it;
+This is a console application that simplifies the execution of database migrations on development and production environments. When you run this application, it:
 
 * Creates the database if necessary.
 * Applies the pending database migrations.
@@ -140,24 +140,24 @@ This is a console application which simplifies to execute database migrations on
 
 Especially, seeding initial data is important at this point. ABP has a modular data seed infrastructure. See [its documentation](../Data-Seeding.md) for more about the data seeding.
 
-While creating database & applying migrations seems only necessary for relational databases, this projects comes even if you choose a NoSQL database provider (like MongoDB). In that case, it still seeds initial data which is necessary for the application.
+While creating database & applying migrations seem only necessary for relational databases, this project comes even if you choose a NoSQL database provider (like MongoDB). In that case, it still seeds the initial data which is necessary for the application.
 
 * Depends on the `.EntityFrameworkCore` project (for EF Core) since it needs to access to the migrations.
-* Depends on the `.Application.Contracts` project to be able to access permission definitions, because initial data seeder grants all permissions for the admin role by default.
+* Depends on the `.Application.Contracts` project to be able to access permission definitions, because the initial data seeder grants all permissions to the admin role by default.
 
 #### .HttpApi Project
 
 This project is used to define your API Controllers.
 
-Most of time you don't need to manually define API Controllers since ABP's [Auto API Controllers](../API/Auto-API-Controllers.md) feature creates them automagically based on your application layer. However, in case of you need to write API controllers, this is the best place to do it.
+Most of the time you don't need to manually define API Controllers since ABP's [Auto API Controllers](../API/Auto-API-Controllers.md) feature creates them automagically based on your application layer. However, in case of you need to write API controllers, this is the best place to do it.
 
 * Depends on the `.Application.Contracts` project to be able to inject the application service interfaces.
 
 #### .HttpApi.Client Project
 
-This is a project that defines C# client proxies to use the HTTP APIs of the solution. You can share this library to 3rd-party clients, so they can easily consume your HTTP APIs in their Dotnet applications (For other type of applications, they can still use your APIs, either manually or using a tool in their own platform)
+This is a project that defines C# client proxies to use the HTTP APIs of the solution. You can share this library to 3rd-party clients, so they can easily consume your HTTP APIs in their Dotnet applications (For other types of applications, they can still use your APIs, either manually or using a tool in their own platform)
 
-Most of time you don't need to manually create C# client proxies, thanks to ABP's [Dynamic C# API Clients](../API/Dynamic-CSharp-API-Clients.md) feature.
+Most of the time you don't need to manually create C# client proxies, thanks to ABP's [Dynamic C# API Clients](../API/Dynamic-CSharp-API-Clients.md) feature.
 
 `.HttpApi.Client.ConsoleTestApp` project is a console application created to demonstrate the usage of the client proxies.
 
@@ -169,17 +169,17 @@ Most of time you don't need to manually create C# client proxies, thanks to ABP'
 
 This project contains the User Interface (UI) of the application if you are using ASP.NET Core MVC UI. It contains Razor pages, JavaScript files, CSS files, images and so on...
 
-This project contains the main `appsettings.json` file that contains the connection string and other configuration of the application.
+This project contains the main `appsettings.json` file that contains the connection string and other configurations of the application.
 
-* Depends on the `.HttpApi` since UI layer needs to use APIs and application service interfaces of the solution.
+* Depends on the `.HttpApi` project since the UI layer needs to use APIs and the application service interfaces of the solution.
 
 > If you check the source code of the `.Web.csproj` file, you will see the references to the `.Application` and the `.EntityFrameworkCore` projects.
 >
-> These references are actually not needed while coding your UI layer, because UI layer normally doesn't depend on the EF Core or the Application layer's implementation. This startup templates are ready for the tiered deployment, where API layer is hosted in a separate server than the UI layer.
+> These references are actually not needed while coding your UI layer, because the UI layer normally doesn't depend on the EF Core or the Application layer's implementation. These startup templates are ready for tiered deployment, where the API layer is hosted on a separate server than the UI layer.
 >
 > However, if you don't choose the `--tiered` option, these references will be in the .Web project to be able to host the Web, API and application layers in a single application endpoint.
 >
-> This gives you to ability to use domain entities & repositories in your presentation layer. However, this is considered as a bad practice according to the DDD.
+> This gives you the ability to use domain entities & repositories in your presentation layer. However, this is considered as a bad practice according to DDD.
 
 #### Test Projects
 
@@ -195,32 +195,32 @@ In addition, `.HttpApi.Client.ConsoleTestApp` is a console application (not an a
 
 Test projects are prepared for integration testing;
 
-* It is fully integrated to ABP framework and all services in your application.
+* It is fully integrated into the ABP framework and all services in your application.
 * It uses SQLite in-memory database for EF Core. For MongoDB, it uses the [Mongo2Go](https://github.com/Mongo2Go/Mongo2Go) library.
 * Authorization is disabled, so any application service can be easily used in tests.
 
-You can still create unit tests for your classes which will be harder to write (because you will need to prepare mock/fake objects), but faster to run (because it only tests a single class and skips all initialization process).
+You can still create unit tests for your classes which will be harder to write (because you will need to prepare mock/fake objects), but faster to run (because it only tests a single class and skips all the initialization processes).
 
 #### How to Run?
 
-Set `.Web` as the startup project and run the application. Default username is `admin` and password is `1q2w3E*`.
+Set `.Web` as the startup project and run the application. The default username is `admin` and the password is `1q2w3E*`.
 
 See [Getting Started With the ASP.NET Core MVC Template](../Getting-Started-AspNetCore-MVC-Template.md) for more information.
 
 ### Tiered Structure
 
-If you have selected the ASP.NET Core UI and specified the `--tiered` option, the solution created will be a tiered solution. The purpose of the tiered structure is to be able to **deploy Web application and HTTP API to different servers**:
+If you have selected the ASP.NET Core UI and specified the `--tiered` option, the solution created will be a tiered solution. The purpose of the tiered structure is to be able to **deploy Web applications and HTTP API to different servers**:
 
 ![bookstore-visual-studio-solution-v3](../images/tiered-solution-servers.png)
 
 * Browser runs your UI by executing HTML, CSS & JavaScript.
-* Web servers hosts static UI files (CSS, JavaScript, image... etc.) & dynamic components (e.g. Razor pages). It performs HTTP requests to the API server to execute the business logic of the application.
-* API Server hosts the HTTP APIs which then use application & domain layers of the application to perform the business logic.
+* Web servers host static UI files (CSS, JavaScript, image... etc.) & dynamic components (e.g. Razor pages). It performs HTTP requests to the API server to execute the business logic of the application.
+* The API Server hosts the HTTP APIs which then use the application & domain layers of the application to perform the business logic.
 * Finally, database server hosts your database.
 
 So, the resulting solution allows a 4-tiered deployment, by comparing to 3-tiered deployment of the default structure explained before.
 
-> Unless you actually need to such a 4-tiered deployment, its suggested to go with the default structure which is simpler to develop, deploy and maintain.
+> Unless you actually need such a 4-tiered deployment, it's suggested to go with the default structure which is simpler to develop, deploy and maintain.
 
 The solution structure is shown below:
 
@@ -246,17 +246,17 @@ This project is an application that hosts the API of the solution. It has its ow
 
 Just like the default structure, this project contains the User Interface (UI) of the application. It contains razor pages, JavaScript files, style files, images and so on...
 
-This project contains an `appsettings.json` file, but this time it does not have a connection string because it never connects to the database. Instead, it mainly contains endpoint of the remote API server and the authentication server.
+This project contains an `appsettings.json` file, but this time it does not have a connection string because it never connects to the database. Instead, it mainly contains the endpoint of the remote API server and the authentication server.
 
 #### Pre-requirements
 
-* [Redis](https://redis.io/): The applications use Redis as as distributed cache. So, you need to have Redis installed & running.
+* [Redis](https://redis.io/): The applications use Redis as a distributed cache. So, you need to have Redis installed & running.
 
 #### How to Run?
 
 You should run the application with the given order:
 
-* First, run the `.IdentityServer` since other applications depends on it.
+* First, run the `.IdentityServer` since other applications depend on it.
 * Then run the `.HttpApi.Host` since it is used by the `.Web` application.
 * Finally, you can run the `.Web` project and login to the application (using `admin` as the username and `1q2w3E*` as the password).
 
@@ -286,9 +286,9 @@ Angular application module structure:
 
 #### AppModule
 
-`AppModule` is the root module of the application. Some of ABP modules and some essential modules imported to the `AppModule`.
+`AppModule` is the root module of the application. Some of the ABP modules and some essential modules are imported to `AppModule`.
 
-ABP Config modules also have imported to `AppModule`  for initially requirements of lazy-loadable ABP modules.
+ABP Config modules have also been imported to `AppModule` for initial requirements of the lazy-loadable ABP modules.
 
 #### AppRoutingModule
 
@@ -315,22 +315,22 @@ You should add `routes` property in the `data` object to add a link on the menu
 ```
 In the above example;
 *  If the user is not logged in, AuthGuard blocks access and redirects to the login page.
-*  PermissionGuard checks the user's permission with `requiredPolicy` property of the `rotues` object. If the user is not authorized to access the page, the 403 page appears.
-*  `name` property of `routes` is the menu link label. A localization key can be defined .
-*  `iconClass` property of `routes` object is the menu link icon class.
-*  `requiredPolicy` property of `routes` object is the required policy key to access the page.
+*  PermissionGuard checks the user's permission with the `requiredPolicy` property of the `routes` object. If the user is not authorized to access the page, the 403 page appears.
+*  The `name` property of `routes` is the menu link label. A localization key can be defined.
+*  The `iconClass` property of the `routes` object is the menu link icon class.
+*  The `requiredPolicy` property of the `routes` object is the required policy key to access the page.
 
 After the above `routes` definition, if the user is authorized, the dashboard link will appear on the menu.
 
 #### Shared Module
 
-The modules that may be required for all modules have imported to the `SharedModule`. You should import the `SharedModule` to all modules.
+The modules that may be required for all modules have been imported to the `SharedModule`. You should import `SharedModule` to all modules.
 
 See the [Sharing Modules](https://angular.io/guide/sharing-ngmodules) document.
 
 #### Environments
 
-The files under the `src/environments` folder has the essential configuration of the application.
+The files under the `src/environments` folder have the essential configuration of the application.
 
 #### Home Module
 
@@ -338,11 +338,11 @@ Home module is an example lazy-loadable module that loads on the root address of
 
 #### Styles
 
-The required style files added to `styles` array in the `angular.json`. `AppComponent` loads some style files lazily via `LazyLoadService` after the main bundle is loaded to shorten the first rendering time.
+The required style files are added to the `styles` array in `angular.json`. `AppComponent` loads some style files lazily via `LazyLoadService` after the main bundle is loaded to shorten the first rendering time.
 
 #### Testing
 
-You should create your tests in the same folder as the file file you want to test.
+You should create your tests in the same folder as the file you want to test.
 
 See the [testing document](https://angular.io/guide/testing).
 
@@ -356,7 +356,7 @@ See the [testing document](https://angular.io/guide/testing).
 
 ### React Native
 
-if `-m react-native` option is spesified in new project command, the solution includes the [React Native](https://reactnative.dev/) application in the `react-native` folder.
+If the `-m react-native` option is specified in the new project command, the solution includes the [React Native](https://reactnative.dev/) application in the `react-native` folder.
 
 The server-side is similar to the solution described above. `*.HttpApi.Host` project serves the API, so the React Native application consumes it.
 
@@ -366,17 +366,17 @@ React Native application folder structure as like below:
 
 ![react-native-folder-structure](../images/react-native-folder-structure.png)
 
-* `App.js` is bootstrap component of the application.
-* `Environment.js` file has the essential configuration of the application. `prod` and `dev` configurations defined in this file. 
+* `App.js` is the bootstrap component of the application.
+* `Environment.js` file has the essential configuration of the application. `prod` and `dev` configurations are defined in this file. 
 * [Contexts](https://reactjs.org/docs/context.html) are created in the `src/contexts` folder.
-* [Higher order components](https://reactjs.org/docs/higher-order-components.html) are created in the`src/hocs` folder.
-* [Custom hooks](https://reactjs.org/docs/hooks-custom.html#extracting-a-custom-hook) are created in the`src/hooks`.
+* [Higher order components](https://reactjs.org/docs/higher-order-components.html) are created in the `src/hocs` folder.
+* [Custom hooks](https://reactjs.org/docs/hooks-custom.html#extracting-a-custom-hook) are created in `src/hooks`.
 * [Axios interceptors](https://github.com/axios/axios#interceptors) are created in the `src/interceptors` folder.
 * Utility functions are exported from `src/utils` folder.
 
 #### Components
 
-Components that can be used on all screens are created in the `src/components` folder. All components have created as a function that able to use [hooks](https://reactjs.org/docs/hooks-intro.html).
+Components that can be used on all screens are created in the `src/components` folder. All components have been created as a function that is able to use [hooks](https://reactjs.org/docs/hooks-intro.html).
 
 #### Screens
 
@@ -388,13 +388,13 @@ Each screen is used in a navigator in the `src/navigators` folder.
 
 #### Navigation
 
-[React Navigation](https://reactnavigation.org/) is used as a navigation library. Navigators are created in the `src/navigators`. A [drawer](https://reactnavigation.org/docs/drawer-based-navigation/) navigator and several [stack](https://reactnavigation.org/docs/hello-react-navigation/#installing-the-stack-navigator-library) navigators have created in this folder. See the [above diagram](#screens) for navigation structure.
+[React Navigation](https://reactnavigation.org/) is used as a navigation library. Navigators are created in the `src/navigators`. A [drawer](https://reactnavigation.org/docs/drawer-based-navigation/) navigator and several [stack](https://reactnavigation.org/docs/hello-react-navigation/#installing-the-stack-navigator-library) navigators have been created in this folder. See the [above diagram](#screens) for the navigation structure.
 
 #### State Management
 
-[Redux](https://redux.js.org/) is used as state management library. [Redux Toolkit](https://redux-toolkit.js.org/) library is used as a toolset for efficient Redux development.
+[Redux](https://redux.js.org/) is used as a state management library. [Redux Toolkit](https://redux-toolkit.js.org/) library is used as a toolset for efficient Redux development.
 
-Actions, reducers, sagas, selectors are created in the `src/store` folder. Store folder as like below:
+Actions, reducers, sagas and selectors are created in the `src/store` folder. Store folder is as below:
 
 ![react-native-store-folder](../images/react-native-store-folder.png)
 
@@ -426,11 +426,11 @@ See the [Testing Overview](https://reactjs.org/docs/testing.html) document.
 
 * [Native Base](https://nativebase.io/) is used as UI components library.
 * [React Navigation](https://reactnavigation.org/) is used as navigation library.
-* [Axios](https://github.com/axios/axios) is used as HTTP client library.
+* [Axios](https://github.com/axios/axios) is used as an HTTP client library.
 * [Redux](https://redux.js.org/) is used as state management library.
 * [Redux Toolkit](https://redux-toolkit.js.org/) library is used as a toolset for efficient Redux development.
 * [Redux-Saga](https://redux-saga.js.org/) is used to manage asynchronous processes.
-* [Redux Persist](https://github.com/rt2zz/redux-persist) is used as state persistance.
+* [Redux Persist](https://github.com/rt2zz/redux-persist) is used as state persistence.
 * [Reselect](https://github.com/reduxjs/reselect) is used to create memoized selectors.
 * [i18n-js](https://github.com/fnando/i18n-js) is used as i18n library.
 * [expo-font](https://docs.expo.io/versions/latest/sdk/font/) library allows loading fonts easily.

docs/en/Themes/LeptonXLite/blazor.md

@@ -23,12 +23,17 @@ LeptonX Lite has implementation for the ABP Framework Blazor WebAssembly & Blazo
   dotnet add package Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme
   ```
 
+- Remove **Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme** reference from the project since it's not necessary after switching to LeptonX Lite.
+
 - Remove the old theme from the **DependsOn** attribute in your module class and add the **AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule** type to the **DependsOn** attribute.
 
 ```diff
 [DependsOn(
+     // Remove BasicTheme module from DependsOn attribute
 -    typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
-+    typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule)
+
+    // Add LeptonX Lite module to DependsOn attribute
++    typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule),
 )]
 ```
 
@@ -53,19 +58,27 @@ builder.RootComponents.Add<App>("#ApplicationContainer");
   dotnet add package Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme
   ```
 
-- Remove old theme from the **DependsOn** attribute in your module class and add the **AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule** type to the **DependsOn** attribute.
+- Remove **Volo.Abp.AspNetCore.Components.Server.BasicTheme** reference from the project since it's not necessary after switching to LeptonX Lite.
+
+
+- Remove old theme from the **DependsOn** attribute in your module class and add the **AbpAspNetCoreComponentsServerLeptonXLiteThemeModule** type to the **DependsOn** attribute.
 
   ```diff
   [DependsOn(
+      // Remove BasicTheme module from DependsOn attribute
   -    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
+
+      // Add LeptonX Lite module to DependsOn attribute
   +    typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule)
   )]
   ```
 
-- Update AbpBundlingOptions
+- Replace `BlazorBasicThemeBundles` with `BlazorLeptonXLiteThemeBundles` in `AbpBundlingOptions`:
   ```diff
   options.StyleBundles.Configure(
+    // Remove following line
   - BlazorBasicThemeBundles.Styles.Global,
+    // Add following line instead
   + BlazorLeptonXLiteThemeBundles.Styles.Global,
     bundle =>
     {
@@ -84,12 +97,16 @@ builder.RootComponents.Add<App>("#ApplicationContainer");
     ```
   - Then replace script & style bundles as following:
     ```diff
+    // Remove following line
     - <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    // Add following line instead
     + <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global" />
     ```
 
     ```diff
+    // Remove following line
     - <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
+    // Add following line instead
     + <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
     ```
 

docs/en/Themes/LeptonXLite/mvc.md

@@ -10,25 +10,32 @@ LeptonX Lite has implementation for the ABP Framework Razor Pages. It's a simpli
 - Add **Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite** package to your **Web** application.
 
 ```bash
-abp add-package Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite
+dotnet add package Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite --prerelease
 ```
 
+- Remove **Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic** reference from the project since it's not necessary after switching to LeptonX Lite.
+
 - Make sure the old theme is removed and LeptonX is added in your Module class.
 
 ```diff
 [DependsOn(
+     // Remove BasicTheme module from DependsOn attribute
 -    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule)
+     
+     // Add LeptonX Lite module to DependsOn attribute
++    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
 )]
 ```
 
-- Update AbpBundlingOptions
+- Replace `BasicThemeBundles` with `LeptonXLiteThemeBundles` in AbpBundlingOptions
 
 ```diff
 Configure<AbpBundlingOptions>(options =>
 {
     options.StyleBundles.Configure(
+        // Remove following line
 -       BasicThemeBundles.Styles.Global,
+        // Add following line instead
 +       LeptonXLiteThemeBundles.Styles.Global
         bundle =>
         {

docs/en/Tutorials/Todo/Index.md

@@ -96,13 +96,7 @@ Ensure that the `TodoApp.HttpApi.Host` project is the startup project, then run
 
 You can explore and test your HTTP API with this UI. If it works, we can run the Angular client application.
 
-First, run the following command to restore the NPM packages;
-
-````bash
-npm install
-````
-
-It will take some time to install all the packages. Then you can run the application using the following command:
+You can run the application using the following command:
 
 ````bash
 npm start

docs/en/UI/AspNetCore/JavaScript-API/GlobalFeatures.md

@@ -0,0 +1,24 @@
+# ASP.NET Core MVC / Razor Pages UI: JavaScript Global Features API
+
+`abp.globalFeatures` API allows you to get the enabled features of the [Global Features](../../../Global-Features.md) in the client side.
+
+> This document only explains the JavaScript API. See the [Global Features](../../../Global-Features.md) document to understand the ABP Global Features system.
+
+## Usage
+
+````js
+//Gets all enabled global features.
+> abp.globalFeatures.enabledFeatures
+
+[ 'Shopping.Payment', 'Ecommerce.Subscription' ]
+
+
+//Check the global feature is enabled
+> abp.globalFeatures.isEnabled('Ecommerce.Subscription')
+
+true
+
+> abp.globalFeatures.isEnabled('My.Subscription')
+
+false
+````

docs/en/UI/AspNetCore/JavaScript-API/Index.md

@@ -10,6 +10,7 @@ ABP provides a set of JavaScript APIs for ASP.NET Core MVC / Razor Pages applica
 * [DOM](DOM.md)
 * [Events](Events.md)
 * [Features](Features.md)
+* [Global Features](GlobalFeatures.md)
 * [Localization](Localization.md)
 * [Logging](Logging.md)
 * [ResourceLoader](ResourceLoader.md)

docs/en/UI/AspNetCore/Theming.md

@@ -122,9 +122,13 @@ The empty layout provides an empty page. It typically includes the following par
 
 ## Implementing a Theme
 
-### The Easy Way
+### The Easiest Way
 
-The easiest way to create a new theme is to copy the [Basic Theme Source Code](https://github.com/abpframework/abp/blob/dev/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic) and customize it. Once you get a copy of the theme in your solution, remove the `Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic` NuGet package and reference to the local project.
+The easiest way of creating a new theme is adding [Basic Theme Source Code](https://github.com/abpframework/abp/tree/dev/modules/basic-theme) module with source codes and customizing it. 
+
+```bash
+abp add-package Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic --with-source-code --add-to-solution-file
+```
 
 ### The ITheme Interface
 

docs/en/UI/Blazor/Authentication.md

@@ -1,11 +1,28 @@
 # Blazor UI: Authentication
 
-The [application startup template](../../Startup-Templates/Application.md) is properly configured to use OpenId Connect to authenticate the user through the server side login form;
+````json
+//[doc-params]
+{
+    "UI": ["Blazor", "BlazorServer"]
+}
+````
 
+The [application startup template](../../Startup-Templates/Application.md) is properly configured to use OpenId Connect to authenticate the user;
+
+{{if UI == "BlazorServer"}}
+The Blazor Server application UI is actually a hybrid application that is combined with the MVC UI, and uses the login page provided by the MVC UI. When users enter a page that requires login, they are redirected to the `/Account/Login` page. Once they complete the login process, they are returned back to the application's UI. The login page also contains features like registration, password recovery, etc.
+
+{{end}}
+
+{{if UI == "Blazor"}}
 * When the Blazor application needs to authenticate, it is redirected to the server side.
-* Users can enter username & password to login if they already have an account. If not, they can use the register form to create a new user. They can also use forgot password and other features. The server side uses IdentityServer4 to handle the authentication.
+* Users can enter username & password to login if they already have an account. If not, they can use the register form to create a new user. They can also use forgot password and other features.,
+
 * Finally, they are redirected back to the Blazor application to complete the login process.
 
 This is a typical and recommended approach to implement authentication in Single-Page Applications. The client side configuration is done in the startup template, so you can change it.
 
-See the [Blazor Security document](https://docs.microsoft.com/en-us/aspnet/core/blazor/security) to understand and customize the authentication process.
+
+See the [Blazor Security document](https://docs.microsoft.com/en-us/aspnet/core/blazor/security) to understand and customize the authentication process.
+
+{{end}}

docs/en/UI/Blazor/Basic-Theme.md

@@ -1,5 +1,12 @@
 # Blazor UI: Basic Theme
 
+````json
+//[doc-params]
+{
+    "UI": ["Blazor", "BlazorServer"]
+}
+````
+
 The Basic Theme is a theme implementation for the Blazor UI. It is a minimalist theme that doesn't add any styling on top of the plain [Bootstrap](https://getbootstrap.com/). You can take the Basic Theme as the **base theme** and build your own theme or styling on top of it. See the *Customization* section.
 
 > If you are looking for a professional, enterprise ready theme, you can check the [Lepton Theme](https://commercial.abp.io/themes), which is a part of the [ABP Commercial](https://commercial.abp.io/).
@@ -10,16 +17,46 @@ The Basic Theme is a theme implementation for the Blazor UI. It is a minimalist
 
 **This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below:
 
+{{if UI == "Blazor"}}
+
 * Install the [Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme) NuGet package to your web project.
 * Add `AbpAspNetCoreComponentsWebAssemblyBasicThemeModule` into the `[DependsOn(...)]` attribute for your [module class](../../Module-Development-Basics.md) in the your Blazor UI project.
 * Use `Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic.App` as the root component of your application in the `ConfigureServices` method of your module:
 
-````csharp
-var builder = context.Services.GetSingletonInstance<WebAssemblyHostBuilder>();
-builder.RootComponents.Add<App>("#ApplicationContainer");
-````
+    ```csharp
+    var builder = context.Services.GetSingletonInstance<WebAssemblyHostBuilder>();
+    builder.RootComponents.Add<App>("#ApplicationContainer");
+    ```
+    `#ApplicationContainer` is a selector (like `<div id="ApplicationContainer">Loading...</div>`) in the `index.html`.
+
+* Execute `abp bundle` command under blazor project once.
+
+{{end}}
+
+{{if UI == "BlazorServer"}}
+
+* Make sure [AspNetCore Basic Theme](../AspNetCore/Basic-Theme.md) installation steps are completed. 
+
+* Install the [Volo.Abp.AspNetCore.Components.Server.BasicTheme](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Components.Server.BasicTheme) NuGet package to your web project.
+
+* Add `AbpAspNetCoreComponentsServerBasicThemeModule` into the `[DependsOn(...)]` attribute for your [module class](../../Module-Development-Basics.md) in the your Blazor UI project.
+
+* Perform following changes in `Pages/_Host.cshtml` file
+  * Add usings at the top of the page.
+    ```html
+    @using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
+    @using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+    ```
+  * Add Basic theme style bundles between `<head>` tags.
+    ```html
+    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    ```
+  * Add `App` component of Basic Theme in the body section of page.
+    ```html
+    <component type="typeof(App)" render-mode="Server" />
+    ```
 
-`#ApplicationContainer` is a selector (like `<div id="ApplicationContainer">Loading...</div>`) in the `index.html`.
+{{end}}
 
 ## The Layout
 
@@ -52,15 +89,37 @@ See the [Customization / Overriding Components](Customization-Overriding-Compone
 
 You can run the following [ABP CLI](../../CLI.md) command in **Blazor WebAssembly** project directory to copy the source code to your solution:
 
+{{if UI == "Blazor"}}
+
 `abp add-package Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme --with-source-code --add-to-solution-file`
 
 Then, navigate to downloaded `Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme` project directory and run:
 
 `abp add-package Volo.Abp.AspNetCore.Components.Web.BasicTheme --with-source-code --add-to-solution-file`
 
+{{end}}
+
+{{if UI == "BlazorServer"}}
+
+`abp add-package Volo.Abp.AspNetCore.Components.Server.BasicTheme --with-source-code --add-to-solution-file`
+
+Then, navigate to downloaded `Volo.Abp.AspNetCore.Components.Server.BasicTheme` project directory and run:
+
+`abp add-package Volo.Abp.AspNetCore.Components.Web.BasicTheme --with-source-code --add-to-solution-file`
+
+{{end}}
+
 ----
 
-Or, you can download the [source code](https://github.com/abpframework/abp/blob/dev/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme) of the Basic Theme, manually copy the project content into your solution, re-arrange the package/module dependencies (see the Installation section above to understand how it was installed to the project) and freely customize the theme based on your application requirements.
+Or, you can download the source code of the Basic Theme, manually copy the project content into your solution, re-arrange the package/module dependencies (see the Installation section above to understand how it was installed to the project) and freely customize the theme based on your application requirements.
+
+{{if UI == "Blazor"}}
+- [Basic Theme Source Code](https://github.com/abpframework/abp/blob/dev/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme)
+{{end}}
+
+{{if UI == "BlazorServer"}}
+- [Basic Theme Source Code](https://github.com/abpframework/abp/blob/dev/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme)
+{{end}}
 
 ## See Also
 

docs/en/UI/Blazor/Customization-Overriding-Components.md

@@ -1,5 +1,12 @@
 # Blazor UI: Customization / Overriding Components
 
+````json
+//[doc-params]
+{
+    "UI": ["Blazor", "BlazorServer"]
+}
+````
+
 This document explains how to override the user interface of a depended [application module](../../Modules/Index.md) or [theme](Theming.md) for Blazor applications.
 
 ## Overriding a Razor Component
@@ -26,9 +33,16 @@ The next step is to create a razor component, like `MyBranding.razor`, in your a
 
 The content of the `MyBranding.razor` is shown below:
 
+
 ````html
 @using Volo.Abp.DependencyInjection
+{{if UI == "BlazorServer"}}
+@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic
+{{end}}
+{{if UI == "Blazor"}}
 @using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+{{end}}
+
 @inherits Branding
 @attribute [ExposeServices(typeof(Branding))]
 @attribute [Dependency(ReplaceServices = true)]
@@ -39,7 +53,7 @@ The content of the `MyBranding.razor` is shown below:
 
 Let's explain the code:
 
-* `@inherits Branding` line inherits the Branding component defined by the [Basic Theme](Basic-Theme.md) (in the `Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic` namespace).
+* `@inherits Branding` line inherits the Branding component defined by the [Basic Theme](Basic-Theme.md) (in the {{if UI == "BlazorServer"}}`Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic`{{end}} {{if UI == "Blazor"}}`Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic`{{end}} namespace).
 * `@attribute [ExposeServices(typeof(Branding))]` registers this service (component) to [dependency injection](../../Dependency-Injection.md) for the `Branding` service (component).
 * `@attribute [Dependency(ReplaceServices = true)]` replaces the `Branding` class (component) with this new `MyBranding` class (component).
 * The rest of the code is related the content and styling of the component.
@@ -57,7 +71,12 @@ If you prefer to use code-behind file for the C# code of your component, you can
 **MyBlazor.razor**
 
 ````html
+{{if UI == "BlazorServer"}}
+@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic
+{{end}}
+{{if UI == "Blazor"}}
 @using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+{{end}}
 @inherits Branding
 <a href="/">
     <img src="bookstore-logo.png" width="250" height="60"/>
@@ -67,7 +86,13 @@ If you prefer to use code-behind file for the C# code of your component, you can
 **MyBlazor.razor.cs**
 
 ````csharp
+{{if UI == "BlazorServer"}}
+using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic;
+{{end}}
+{{if UI == "Blazor"}}
 using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic;
+{{end}}
+
 using Volo.Abp.DependencyInjection;
 
 namespace MyProject.Blazor.Components

docs/en/UI/Blazor/Error-Handling.md

@@ -1,5 +1,12 @@
 # Blazor UI: Error Handling
 
+````json
+//[doc-params]
+{
+    "UI": ["Blazor", "BlazorServer"]
+}
+````
+
 Blazor, by default, shows a yellow line at the bottom of the page if any unhandled exception occurs. However, this is not useful in a real application.
 
 ABP provides an automatic error handling system for the Blazor UI.
@@ -20,6 +27,8 @@ There are different type of `Exception` classes handled differently by the ABP F
 
 **Example**
 
+{{if UI == "BlazorServer"}}
+
 ````csharp
 @page "/"
 @using Volo.Abp
@@ -28,13 +37,6 @@ There are different type of `Exception` classes handled differently by the ABP F
 
 @code
 {
-    //for Blazor WASM
-    private void TestException()
-    {
-        throw new UserFriendlyException("A user friendly error message!");
-    }
-
-    //for Blazor Server
     private async Task TestException()
     {
         try 
@@ -49,6 +51,26 @@ There are different type of `Exception` classes handled differently by the ABP F
 }
 ````
 
+{{end}}
+
+{{if UI == "Blazor"}}
+
+````csharp
+@page "/"
+@using Volo.Abp
+
+<Button Clicked="TestException">Throw test exception</Button>
+
+@code
+{
+    private void TestException()
+    {
+        throw new UserFriendlyException("A user friendly error message!");
+    }
+}
+````
+{{end}}
+
 ABP automatically handle the exception and show an error message to the user:
 
 ![blazor-user-friendly-exception](../../images/blazor-user-friendly-exception.png)

docs/en/UI/Blazor/Theming.md

@@ -1,5 +1,12 @@
 # Blazor UI: Theming
 
+````json
+//[doc-params]
+{
+    "UI": ["Blazor", "BlazorServer"]
+}
+````
+
 ## Introduction
 
 ABP Framework provides a complete **UI Theming** system with the following goals:
@@ -16,17 +23,28 @@ In order to accomplish these goals, ABP Framework;
 
 ### Current Themes
 
-Currently, two themes are **officially provided**:
+Currently, three themes are **officially provided**:
 
 * The [Basic Theme](Basic-Theme.md) is the minimalist theme with the plain Bootstrap style. It is **open source and free**.
 * The [Lepton Theme](https://commercial.abp.io/themes) is a **commercial** theme developed by the core ABP team and is a part of the [ABP Commercial](https://commercial.abp.io/) license.
+* The [LeptonX Theme](https://x.leptontheme.com/) is a theme that has a [commercial](https://docs.abp.io/en/commercial/latest/themes/lepton-x/commercial/blazor) and a [lite](../../Themes/LeptonXLite/blazor.md) version. 
 
 ## Overall
 
 ### The Base Libraries
 
+{{if UI == "Blazor"}}
+
 All the themes must depend on the [Volo.Abp.AspNetCore.Components.WebAssembly.Theming](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Components.WebAssembly.Theming) NuGet package, so they are indirectly depending on the following libraries:
 
+{{end}}
+
+{{if UI == "BlazorServer"}}
+
+All the themes must depend on the [Volo.Abp.AspNetCore.Components.Server.Theming](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Components.Server.Theming) NuGet package, so they are indirectly depending on the following libraries:
+
+{{end}}
+
 * [Twitter Bootstrap](https://getbootstrap.com/) as the fundamental HTML/CSS framework.
 * [Blazorise](https://github.com/stsrki/Blazorise) as a component library that supports the Bootstrap and adds extra components like Data Grid and Tree.
 * [FontAwesome](https://fontawesome.com/) as the fundamental CSS font library.
@@ -61,9 +79,21 @@ The application layout typically includes the following parts;
 
 A theme is simply a Razor Class Library.
 
-### The Easy Way
+### The Easiest Way
 
-The easiest way to create a new theme is to copy the [Basic Theme Source Code](https://github.com/abpframework/abp/blob/dev/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme) and customize it. Once you get a copy of the theme in your solution, remove the `Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme` NuGet package and reference to the local project.
+The easiest way of creating a new theme is adding [Basic Theme Source Code](https://github.com/abpframework/abp/tree/dev/modules/basic-theme) module with source codes and customizing it. 
+
+{{if UI == "Blazor"}}
+```bash
+abp add-package Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme --with-source-code --add-to-solution-file
+```
+{{end}}
+
+{{if UI == "BlazorServer"}}
+```bash
+abp add-package Volo.Abp.AspNetCore.Components.Server.BasicTheme --with-source-code --add-to-solution-file
+```
+{{end}}
 
 ### Global Styles / Scripts
 
@@ -165,6 +195,9 @@ Configure<AbpToolbarOptions>(options =>
 
 Language Selection toolbar item is generally a dropdown that is used to switch between languages. `ILanguageProvider` is used to get the list of available languages and `CultureInfo.CurrentUICulture` is used to learn the current language.
 
+
+{{if UI == "Blazor"}}
+
 Local Storage is used to get and set the current language with the `Abp.SelectedLanguage` key.
 
 **Example: Get the currently selected language**
@@ -192,6 +225,31 @@ The theme should reload the page after changing the language:
 await JsRuntime.InvokeVoidAsync("location.reload");
 ````
 
+{{end}}
+
+{{if UI == "BlazorServer"}}
+Localization works on Server side in Blazor Server. So, regular AspNetCore localization middleware is used.
+
+**Example: Get the currently selected language**
+
+````csharp
+var selectedLanguageName = CultureInfo.CurrentCulture.Name;
+````
+
+**Example: Set the selected language**
+
+````csharp
+// Get current url.
+var relativeUrl = NavigationManager.Uri.RemovePreFix(NavigationManager.BaseUri).EnsureStartsWith('/');
+
+// Redirect to ABP language switch endpoint.
+NavigationManager.NavigateTo(
+    $"/Abp/Languages/Switch?culture={newLanguage.CultureName}&uiCulture={newLanguage.UiCultureName}&returnUrl={relativeUrl}",
+    forceLoad: true
+);
+````
+{{end}}
+
 ##### User Menu
 
 User menu includes links related to the user account. `IMenuManager` is used just like the Main Menu, but this time with `StandardMenus.User` parameter like shown below:

docs/en/UI/Blazor/Toolbars.md

@@ -34,23 +34,16 @@ This sample simply shows a message. In real life, you probably want to call an H
 Now, we can create a class implementing the `IToolbarContributor` interface:
 
 ````csharp
-using System.Threading.Tasks;
-using MyCompanyName.MyProjectName.Blazor.Components;
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Toolbars;
-
-namespace MyCompanyName.MyProjectName.Blazor
+public class MyToolbarContributor : IToolbarContributor
 {
-    public class MyToolbarContributor : IToolbarContributor
+    public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
     {
-        public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
+        if (context.Toolbar.Name == StandardToolbars.Main)
         {
-            if (context.Toolbar.Name == StandardToolbars.Main)
-            {
-                context.Toolbar.Items.Insert(0, new ToolbarItem(typeof(Notification)));
-            }
-
-            return Task.CompletedTask;
+            context.Toolbar.Items.Insert(0, new ToolbarItem(typeof(Notification)));
         }
+
+        return Task.CompletedTask;
     }
 }
 ````

docs/en/docs-nav.json

@@ -822,7 +822,7 @@
                   "path": "UI/Blazor/Basic-Theme.md"
                 },
                 {
-                  "text": "The Basic Theme",
+                  "text": "LeptonX Lite",
                   "path": "Themes/LeptonXLite/blazor.md"
                 },
                 {
@@ -1320,11 +1320,32 @@
           "path": "Samples/Index.md"
         },
         {
-          "text": "Microservice Demo",
+          "text": "eShopOnAbp",
+          "path": "https://github.com/abpframework/eShopOnAbp"
+        },
+        {
+          "text": "EventHub",
+          "path": "https://github.com/abpframework/eventhub"
+        },
+        {
+          "text": "Microservice Demo (legacy)",
           "path": "Samples/Microservice-Demo.md"
         }
       ]
     },
+    {
+      "text": "Books",
+      "items": [
+        {
+          "text": "Mastering ABP Framework",
+          "path": "https://abp.io/books/mastering-abp-framework"
+        },
+        {
+          "text": "Implementing Domain Driven Design",
+          "path": "https://abp.io/books/implementing-domain-driven-design"
+        }
+      ]
+    },
     {
       "text": "Release Information",
       "items": [

docs/zh-Hans/Application-Services.md

@@ -87,7 +87,7 @@ public class CreateBookDto
 }
 ```
 
-有关DTO更的教程,请参见[数据传输对象文档](Entities.md)
+有关DTO更多的教程,请参见[数据传输对象文档](Entities.md)
 
 ### BookAppService(实现)
 
@@ -330,7 +330,7 @@ public class BookAppService :
 }
 ````
 
-`CrudAppService`实现了`ICrudAppService`接口中声明的所有方法. 然后,你可以添加自己的自定义方法或覆盖和自定义实现.
+`CrudAppService`实现了`ICrudAppService`接口中声明的所有方法. 然后,你可以添加自己的自定义方法或重写和自定义实现.
 
 > `CrudAppService` 有不同数量泛型参数的版本,你可以选择适合的使用.
 
@@ -380,4 +380,4 @@ public class DistrictKey
 
 ### 生命周期
 
-应用服务的生命周期是[transient](Dependency-Injection)的,它们会自动注册到依赖注入系统.
+应用服务的生命周期是[transient](Dependency-Injection)的,它们会自动注册到依赖注入系统.

docs/zh-Hans/Distributed-Event-Bus-Kafka-Integration.md

@@ -20,7 +20,7 @@
 
 这是配置Kafka设置最简单的方法. 它也非常强大,因为你可以使用[由AspNet Core支持](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/)的任何其他配置源(如环境变量).
 
-**示例：最小化配置与默认配置连接到本地的Kafka服务器**
+**示例：使用默认配置连接到本地Kafka服务器的最小配置**
 
 
 ````json

docs/zh-Hans/Distributed-Event-Bus-Rebus-Integration.md

@@ -1,7 +1,9 @@
 # 分布式事件总线Rebus集成
 
+
 > 本文解释了 **如何配置[Rebus](http://mookid.dk/category/rebus/)** 做为分布式总线提供程序. 参阅[分布式事件总线文档](Distributed-Event-Bus.md)了解如何使用分布式事件总线系统.
 
+
 ## 安装
 
 使用ABP CLI添加[Volo.Abp.EventBus.Rebus](https://www.nuget.org/packages/Volo.Abp.EventBus.Rebus)NuGet包到你的项目:

docs/zh-Hans/Distributed-Event-Bus.md

@@ -84,7 +84,7 @@ namespace AbpDemo
 
 #### 关于序列化的事件对象
 
-事件传输对象**必须是可序列化**的,因为将其传输到流程外时，它们将被序列化/反序列化为JSON或其他格式.
+事件传输对象**必须是可序列化**的,因为将其传输到进程外时，它们将被序列化/反序列化为JSON或其他格式.
 
 避免循环引用,多态,私有setter,并提供默认(空)构造函数,如果你有其他的构造函数.(虽然某些序列化器可能会正常工作),就像DTO一样.
 

docs/zh-Hans/Domain-Services.md

@@ -116,7 +116,6 @@ namespace MyProject.Issues
 
 ## 应用程序服务与领域服务
 
-虽然应用服务和领域服务都实现了业务规则,但存在根本的逻辑和形式差异；
 虽然 [应用服务](Application-Services.md) 和领域服务都实现了业务规则,但存在根本的逻辑和形式差异:
 
 * 应用程序服务实现应用程序的 **用例** (典型 Web 应用程序中的用户交互), 而领域服务实现 **核心的、用例独立的领域逻辑**.

docs/zh-Hans/Emailing.md

@@ -22,8 +22,9 @@ abp add-package Volo.Abp.Emailing
 
 ### IEmailSender
 
-[Inject](Dependency-Injection.md) 将 `IEmailSender` 注入任何服务并使用 `SendAsync` 方法发送电子邮件。
-**Example**
+[注入](Dependency-Injection.md) `IEmailSender` 到任何服务并使用 `SendAsync` 方法发送电子邮件。
+
+**示例**
 
 ````csharp
 using System.Threading.Tasks;

docs/zh-Hans/Entities.md

@@ -70,7 +70,7 @@ public class BookAppService : ApplicationService, IBookAppService
 }
 ````
 
-* `BookAppService` 注入图书实体的默认[仓库](Repositories.md),使用`InsertAsync`方法插入 `Book` 到数据库中.
+* `BookAppService` 注入图书实体的默认[仓储](Repositories.md),使用`InsertAsync`方法插入 `Book` 到数据库中.
 * `GuidGenerator`类型是 `IGuidGenerator`,它是在`ApplicationService`基类中定义的属性. ABP将这样常用属性预注入,所以不需要手动[注入](Dependency-Injection.md).
 * 如果你想遵循DDD最佳实践,请参阅下面的*聚合示例*部分.
 
@@ -373,7 +373,7 @@ public static class IdentityUserExtensions
 
 * 对于 [Entity Framework Core](Entity-Framework-Core.md),这是两种类型的配置;
     * 默认它以 `JSON` 字符串形式存储在 `ExtraProperties` 字段中. 序列化到 `JSON` 和反序列化到 `JSON` 由ABP使用EF Core的[值转换](https://docs.microsoft.com/zh-cn/ef/core/modeling/value-conversions)系统自动完成.
-    * 如果需要,你可以使用 `ObjectExtensionManager` 为所需的额外属性定义一个单独的数据库字段. 那些使用 `ObjectExtensionManager` 配置的属性继续使用单个 `JSON` 字段. 当你使用预构建的[应用模块](Modules/Index.md)并且想要[扩展模块的实体](Customizing-Application-Modules-Extending-Entities.md). 参阅[EF Core迁移文档](Entity-Framework-Core.md)了解如何使用 `ObjectExtensionManager`.
+    * 如果需要,你可以使用 `ObjectExtensionManager` 为所需的额外属性定义一个单独的数据库字段. 未使用 `ObjectExtensionManager` 配置的属性继续使用单个 `JSON` 字段. 当你使用预构建的[应用模块](Modules/Index.md)并且想要[扩展模块的实体](Customizing-Application-Modules-Extending-Entities.md). 参阅[EF Core迁移文档](Entity-Framework-Core.md)了解如何使用 `ObjectExtensionManager`.
 * 对于 [MongoDB](MongoDB.md), 它以 **常规字段** 存储, 因为 MongoDB 天生支持这种 [额外](https://mongodb.github.io/mongo-csharp-driver/1.11/serialization/#supporting-extra-elements) 系统.
 
 ### 讨论额外的属性

docs/zh-Hans/Module-Development-Basics.md

@@ -49,7 +49,7 @@ public class BlogModule : AbpModule
     }
 }
 ````
-有关配置系统的更多信息,请参阅配置（TODO:link）文档.
+有关配置系统的更多信息,请参阅[配置](Configuration.md)文档.
 
 ##### 配置服务前和后
 

docs/zh-Hans/Text-Templating-Razor.md

@@ -0,0 +1,570 @@
+# Razor 集成
+
+Razor模板是标准的C#类, 所以你可以使用任何C#的功能, 例如`依赖注入`, 使用`LINQ`, 自定义方法甚至使用`仓储`
+
+## 安装
+
+建议使用[ABP CLI](CLI.md)安装此包．
+
+### 使用ABP CLI
+
+在项目文件夹(.csproj 文件)中打开命令行窗口并输入以下命令:
+
+````bash
+abp add-package Volo.Abp.TextTemplating.Razor
+````
+
+### 手动安装
+
+如果你想要手动安装:
+
+1. 添加 [Volo.Abp.TextTemplating.Razor](https://www.nuget.org/packages/Volo.Abp.TextTemplating.Razor) NuGet 包到你的项目:
+
+````
+Install-Package Volo.Abp.TextTemplating.Razor
+````
+
+2.添加 `AbpTextTemplatingRazorModule` 到你的模块的依赖列表:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpTextTemplatingRazorModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+}
+````
+
+## 添加 MetadataReference到CSharpCompilerOptions
+
+你需要将添加`MetadataReference`模板中使用的类型添加到 `CSharpCompilerOptions` 的 `References`.
+
+```csharp
+public override void ConfigureServices(ServiceConfigurationContext context)
+{
+    Configure<AbpRazorTemplateCSharpCompilerOptions>(options =>
+    {
+        options.References.Add(MetadataReference.CreateFromFile(typeof(YourModule).Assembly.Location));
+    });
+}
+```
+
+## 添加MetadataReference到模板
+
+你可以添加一些`MetadataReference`到模板
+
+```csharp
+public override void ConfigureServices(ServiceConfigurationContext context)
+{
+    services.Configure<AbpCompiledViewProviderOptions>(options =>
+    {
+        //Hello is template name.
+        options.TemplateReferences.Add("Hello", new List<Assembly>()
+            {
+                Assembly.Load("Microsoft.Extensions.Logging.Abstractions"),
+                Assembly.Load("Microsoft.Extensions.Logging")
+            }
+            .Select(x => MetadataReference.CreateFromFile(x.Location))
+            .ToList());
+    });
+}
+```
+
+## 定义模板
+
+在渲染模板之前,需要定义它. 创建一个继承自 `TemplateDefinitionProvider` 的类:
+
+````csharp
+public class DemoTemplateDefinitionProvider : TemplateDefinitionProvider
+{
+    public override void Define(ITemplateDefinitionContext context)
+    {
+        context.Add(
+            new TemplateDefinition("Hello") //template name: "Hello"
+                .WithRazorEngine()
+                .WithVirtualFilePath(
+                    "/Demos/Hello/Hello.cshtml", //template content path
+                    isInlineLocalized: true
+                )
+        );
+    }
+}
+````
+
+* `context` 对象用于添加新模板或获取依赖模块定义的模板. 使用 `context.Add(...)` 定义新模板.
+* `TemplateDefinition` 是代表模板的类,每个模板必须有唯一的名称(在渲染模板时使用).
+* `/Demos/Hello/Hello.cshtml` 是模板文件的路径.
+* `isInlineLocalized` 声明针对所有语言使用一个模板(`true` 还是针对每种语言使用不同的模板(`false`). 更多内容参阅下面的本地化部分.
+* `WithRenderEngine` 方法为模板设置渲染引擎.
+
+### 模板基类
+
+每个 `cshtml` 模板页面都需要继承`RazorTemplatePageBase` 或 `RazorTemplatePageBase<Model>`. 基类提供了一些使用实用的属性可以在模板中使用. 例如: `Localizer`, `ServiceProvider`.
+
+### 模板内容
+
+`WithVirtualFilePath` 表示我们使用[虚拟文件系统](Virtual-File-System.md)存储模板内容. 在项目内创建一个 `Hello.cshtml` 文件,并在属性窗口中将其标记为"**嵌入式资源**":
+
+![hello-template-razor](images/hello-template-razor.png)
+
+示例 `Hello.cshtml` 内容如下所示:
+
+```csharp
+namespace HelloModelNamespace
+{
+    public class HelloModel
+    {
+        public string Name { get; set; }
+    }
+}
+```
+
+[虚拟文件系统](Virtual-File-System.md) 需要在[模块](Module-Development-Basics.md)类的 `ConfigureServices` 方法添加你的文件:
+
+````csharp
+Configure<AbpVirtualFileSystemOptions>(options =>
+{
+    options.FileSets.AddEmbedded<TextTemplateDemoModule>("TextTemplateDemo");
+});
+````
+
+* `TextTemplateDemoModule`是模块类.
+* `TextTemplateDemo` 是你的项目的根命名空间.
+
+## 渲染模板
+
+`ITemplateRenderer` 服务用于渲染模板内容.
+
+### 示例: 渲染一个简单的模板
+
+````csharp
+public class HelloDemo : ITransientDependency
+{
+    private readonly ITemplateRenderer _templateRenderer;
+
+    public HelloDemo(ITemplateRenderer templateRenderer)
+    {
+        _templateRenderer = templateRenderer;
+    }
+
+    public async Task RunAsync()
+    {
+        var result = await _templateRenderer.RenderAsync(
+            "Hello", //the template name
+            new HelloModel
+            {
+                Name = "John"
+            }
+        );
+
+        Console.WriteLine(result);
+    }
+}
+````
+
+* `HelloDemo` 是一个简单的类,在构造函数注入了 `ITemplateRenderer` 并在 `RunAsync` 方法中使用它.
+* `RenderAsync` 有两个基本参数:
+  * `templateName`: 要渲染的模板名称 (本示例中是 `Hello`).
+  * `model`: 在模板内部用做 `model` 的对象 (本示例中是 `HelloModel` 对象).
+
+示例会返回以下结果:
+
+````csharp
+Hello John :)
+````
+
+## 本地化
+
+可以基于当前文化对模板内容进行本地化. 以下部分描述了两种类型的本地化选项.
+
+### 内联本地化
+
+内联本地化使用[本地化系统](Localization.md)本地化模板内的文本.
+
+#### 示例: 重置密码链接
+
+假设你需要向用户发送电子邮件重置密码. 模板内容:
+
+```csharp
+namespace ResetMyPasswordModelNamespace
+{
+    public class ResetMyPasswordModel
+    {
+        public string Link { get; set; }
+
+        public string Name { get; set; }
+    }
+}
+```
+
+```csharp
+@inherits Volo.Abp.TextTemplating.Razor.RazorTemplatePageBase<ResetMyPasswordModelNamespace.ResetMyPasswordModel>
+<a title="@Localizer["ResetMyPasswordTitle"]" href="@Model.Link">@Localizer["ResetMyPassword", Model.Name]</a>
+```
+
+`Localizer` 函数用于根据当前用户的文化来定位给定的Key,你需要在本地化文件中定义 `ResetMyPassword` 键:
+
+````json
+"ResetMyPasswordTitle": "Reset my password",
+"ResetMyPassword": "Hi {0}, Click here to reset your password"
+````
+
+你还需要在模板定义提供程序类中声明要与此模板一起使用的本地化资源:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+            "PasswordReset", //Template name
+            typeof(DemoResource) //LOCALIZATION RESOURCE
+        )
+        .WithRazorEngine()
+        .WithVirtualFilePath(
+            "/Demos/PasswordReset/PasswordReset.cshtml", //template content path
+            isInlineLocalized: true
+        )
+);
+````
+
+当你这样渲染模板时:
+
+````csharp
+var result = await _templateRenderer.RenderAsync(
+    "PasswordReset", //the template name
+    new PasswordResetModel
+    {
+        Name = "john",
+        Link = "https://abp.io/example-link?userId=123&token=ABC"
+    }
+);
+````
+
+你可以看到以下本地化结果:
+
+````csharp
+<a title="Reset my password" href="https://abp.io/example-link?userId=123&token=ABC">Hi john, Click here to reset your password</a>
+````
+
+> 如果你为应用程序定义了 [默认本地化资源](Localization.md), 则无需声明模板定义的资源类型.
+
+### 多个内容本地化
+
+你可能希望为每种语言创建不同的模板文件,而不是使用本地化系统本地化单个模板. 如果模板对于特定的文化(而不是简单的文本本地化)应该是完全不同的,则可能需要使用它.
+
+#### 示例: 欢迎电子邮件模板
+
+假设你要发送电子邮件欢迎用户,但要定义基于用户的文化完全不同的模板.
+
+首先创建一个文件夹,将模板放在里面，像 `en.cshtml`, `tr.cshtml` 每一个你支持的文化:
+
+![multiple-file-template-razor](images/multiple-file-template-razor.png)
+
+然后在模板定义提供程序类中添加模板定义:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+            name: "WelcomeEmail",
+            defaultCultureName: "en"
+        )
+        .WithRazorEngine()
+        .WithVirtualFilePath(
+            "/Demos/WelcomeEmail/Templates", //template content folder
+            isInlineLocalized: false
+        )
+);
+````
+
+* 设置 **默认文化名称**, 当没有所需的文化模板,回退到缺省文化.
+* 指定 **模板文件夹** 而不是单个模板文件.
+* 设置 `isInlineLocalized` 为 `false`.
+
+就这些,你可以渲染当前文化的模板:
+
+````csharp
+var result = await _templateRenderer.RenderAsync("WelcomeEmail");
+````
+
+> 为了简单我们跳过了模型,但是你可以使用前面所述的模型.
+
+### 指定文化
+
+`ITemplateRenderer` 服务如果没有指定则使用当前文化 (`CultureInfo.CurrentUICulture`). 如果你需要你可以使用 `cultureName` 参数指定文化.
+
+````csharp
+var result = await _templateRenderer.RenderAsync(
+    "WelcomeEmail",
+    cultureName: "en"
+);
+````
+
+## 布局模板
+
+布局模板用于在其他模板之间创建共享布局. 它类似于ASP.NET Core MVC / Razor Pages中的布局系统.
+
+### 示例: 邮件HTML布局模板
+
+例如,你想为所有电子邮件模板创建一个布局.
+
+首先像之前一样创建一个模板文件:
+
+```csharp
+@inherits Volo.Abp.TextTemplating.Razor.RazorTemplatePageBase
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    @Body
+</body>
+</html>
+```
+
+* 布局模板必须具有 **Body** 部分作为渲染的子内容的占位符.
+
+在模板定义提供程序中注册模板:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+        "EmailLayout",
+        isLayout: true //SET isLayout!
+    )
+    .WithRazorEngine()
+    .WithVirtualFilePath(
+        "/Demos/EmailLayout/EmailLayout.cshtml",
+        isInlineLocalized: true
+    )
+);
+````
+
+现在你可以将此模板用作任何其他模板的布局:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+            name: "WelcomeEmail",
+            defaultCultureName: "en",
+            layout: "EmailLayout" //Set the LAYOUT
+        )
+        .WithRazorEngine()
+        .WithVirtualFilePath(
+            "/Demos/WelcomeEmail/Templates",
+            isInlineLocalized: false
+        )
+);
+````
+
+## 全局上下文
+
+ABP传递 `model`,可用于访问模板内的模型. 如果需要,可以传递更多的全局变量.
+
+示例模板内容:
+
+````csharp
+@inherits Volo.Abp.TextTemplating.Razor.RazorTemplatePageBase
+A global object value: @GlobalContext["myGlobalObject"]
+````
+
+模板假定它渲染上下文中的 `myGlobalObject` 对象. 你可以如下所示提供它:
+
+````csharp
+var result = await _templateRenderer.RenderAsync(
+    "GlobalContextUsage",
+    globalContext: new Dictionary<string, object>
+    {
+        {"myGlobalObject", "TEST VALUE"}
+    }
+);
+````
+
+渲染的结果将是:
+
+````
+A global object value: TEST VALUE
+````
+
+## 替换存在的模板
+
+通过替换应用程序中使用的模块定义的模板. 这样你可以根据自己的需求自定义模板,而无需更改模块代码.
+
+### 选项-1: 使用虚拟文件系统
+
+[虚拟文件系统](Virtual-File-System.md)允许你通过将相同文件放入项目中的相同路径来覆盖任何文件.
+
+#### 示例: 替换标准电子邮件布局模板
+
+ABP框架提供了一个[邮件发送系统](Emailing.md), 它在内部使用文本模板来渲染邮件内容. 它在 `/Volo/Abp/Emailing/Templates/Layout.cshtml` 路径定义了一个标准邮件布局模板. 模板的唯一名称是 `Abp.StandardEmailTemplates.Layout` 并且这个字符中`Volo.Abp.Emailing.Templates.StandardEmailTemplates`静态类上定义为常量.
+
+执行以下步骤将替换模板替换成你自定义的;
+
+**1)** 在你的项目中相同的路径添加一个新文件 (`/Volo/Abp/Emailing/Templates/Layout.cshtml`):
+
+![replace-email-layout-razor](images/replace-email-layout-razor.png)
+
+**2)** 准备你的邮件布局模板:
+
+````html
+@inherits Volo.Abp.TextTemplating.Razor.RazorTemplatePageBase
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    <h1>This my header</h1>
+
+    @Body
+
+    <footer>
+      This is my footer...
+    </footer>
+</body>
+</html>
+````
+
+此示例只是向模板添加页眉和页脚并呈现它们之间的内容(请参阅上面的布局模板部分).
+
+
+**3)** 在`.csproj`文件配置嵌入式资源e
+
+* 添加 [Microsoft.Extensions.FileProviders.Embedded](https://www.nuget.org/packages/Microsoft.Extensions.FileProviders.Embedded) NuGet 包到你的项目.
+* 在  `.csproj` 中添加 `<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>` 到 `<PropertyGroup>...</PropertyGroup>` 部分.
+* 添加以下代码到你的 `.csproj` 文件:
+
+````xml
+<ItemGroup>
+  <None Remove="Volo\Abp\Emailing\Templates\*.cshtml" />
+  <EmbeddedResource Include="Volo\Abp\Emailing\Templates\*.cshtml" />
+</ItemGroup>
+````
+
+这将模板文件做为"嵌入式资源".
+
+**4)** 配置虚拟文件系统
+
+在[模块](Module-Development-Basics.md)  `ConfigureServices` 方法配置 `AbpVirtualFileSystemOptions` 将嵌入的文件添加到虚拟文件系统中:
+
+```csharp
+Configure<AbpVirtualFileSystemOptions>(options =>
+{
+    options.FileSets.AddEmbedded<BookStoreDomainModule>();
+});
+```
+
+`BookStoreDomainModule` 应该是你的模块名称
+
+> 确保你的模块(支持或间接)[依赖](Module-Development-Basics.md) `AbpEmailingModule`. 因为VFS可以基于依赖顺序覆盖文件.
+
+现在渲染邮件布局模板时会使用你的模板.
+
+### 选项-2: 使用模板定义提供者
+
+你可以创建一个模板定义提供者类来获取邮件布局模板来更改它的虚拟文件路径.
+
+**示例: 使用 `/MyTemplates/EmailLayout.cshtml` 文件而不是标准模板**
+
+```csharp
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Emailing.Templates;
+using Volo.Abp.TextTemplating;
+
+namespace MyProject
+{
+    public class MyTemplateDefinitionProvider
+        : TemplateDefinitionProvider, ITransientDependency
+    {
+        public override void Define(ITemplateDefinitionContext context)
+        {
+            var emailLayoutTemplate = context.GetOrNull(StandardEmailTemplates.Layout);
+
+            emailLayoutTemplate
+                .WithVirtualFilePath(
+                    "/MyTemplates/EmailLayout.cshtml",
+                    isInlineLocalized: true
+                );
+        }
+    }
+}
+```
+
+你依然应该添加 `/MyTemplates/EmailLayout.cshtml` 到虚拟文件系统. 这种方法允许你在任何文件夹中找到模板,而不是在依赖模块定义的文件夹中.
+
+除了模板内容之外你还可以操作模板定义属性, 例如`DisplayName`, `Layout`或`LocalizationSource`.
+
+## 高级功能
+
+本节介绍文本模板系统的一些内部知识和高级用法.
+
+### 模板内容Provider
+
+`TemplateRenderer` 用于渲染模板,这是大多数情况下所需的模板. 但是你可以使用 `ITemplateContentProvider` 获取原始(未渲染的)模板内容.
+
+> `ITemplateRenderer` 内部使用 `ITemplateContentProvider` 获取原始模板内容.
+
+示例:
+
+````csharp
+public class TemplateContentDemo : ITransientDependency
+{
+    private readonly ITemplateContentProvider _templateContentProvider;
+
+    public TemplateContentDemo(ITemplateContentProvider templateContentProvider)
+    {
+        _templateContentProvider = templateContentProvider;
+    }
+
+    public async Task RunAsync()
+    {
+        var result = await _templateContentProvider
+            .GetContentOrNullAsync("Hello");
+
+        Console.WriteLine(result);
+    }
+}
+````
+
+结果是原始模板内容:
+
+````
+@inherits Volo.Abp.TextTemplating.Razor.RazorTemplatePageBase<HelloModelNamespace.HelloModel>
+Hello @Model.Name
+````
+
+* `GetContentOrNullAsync` 如果没有为请求的模板定义任何内容,则返回 `null`.
+* 它可以获取 `cultureName` 参数,如果模板针对不同的文化具有不同的文件,则可以使用该参数(请参见上面的"多内容本地化"部分).
+
+### 模板内容贡献者
+
+`ITemplateContentProvider` 服务使用 `ITemplateContentContributor` 实现来查找模板内容. 有一个预实现的内容贡献者 `VirtualFileTemplateContentContributor`,它从上面描述的虚拟文件系统中获取模板内容.
+
+你可以实现 `ITemplateContentContributor` 从另一个源读取原始模板内容.
+
+示例:
+
+````csharp
+public class MyTemplateContentProvider
+    : ITemplateContentContributor, ITransientDependency
+{
+    public async Task<string> GetOrNullAsync(TemplateContentContributorContext context)
+    {
+        var templateName = context.TemplateDefinition.Name;
+
+        //TODO: Try to find content from another source
+        return null;
+    }
+}
+````
+
+如果源无法找到内容, 则返回 `null`, `ITemplateContentProvider` 将回退到下一个贡献者.
+
+### Template Definition Manager
+
+`ITemplateDefinitionManager` 服务可用于获取模板定义(由模板定义提供程序创建).
+
+## 另请参阅
+
+* 本文开发和引用的[应用程序示例源码](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo).
+* [本地化系统](Localization.md).
+* [虚拟文件系统](Virtual-File-System.md).

docs/zh-Hans/Text-Templating-Scriban.md

@@ -0,0 +1,527 @@
+# Scriban 集成
+
+## 安装
+
+建议使用[ABP CLI](CLI.md)安装此包．
+
+### 使用ABP CLI
+
+在项目文件夹(.csproj 文件)中打开命令行窗口并输入以下命令:
+
+````bash
+abp add-package Volo.Abp.TextTemplating.Scriban
+````
+
+### 手动安装
+
+如果你想要手动安装:
+
+1. 添加 [Volo.Abp.TextTemplating.Scriban](https://www.nuget.org/packages/Volo.Abp.TextTemplating.Scriban) NuGet 包到你的项目:
+
+````
+Install-Package Volo.Abp.TextTemplating.Scriban
+````
+
+2.添加 `AbpTextTemplatingScribanModule` 到你的模块的依赖列表:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpTextTemplatingScribanModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+}
+````
+
+## 定义模板
+
+在渲染模板之前,需要定义它. 创建一个继承自 `TemplateDefinitionProvider` 的类:
+
+````csharp
+public class DemoTemplateDefinitionProvider : TemplateDefinitionProvider
+{
+    public override void Define(ITemplateDefinitionContext context)
+    {
+        context.Add(
+            new TemplateDefinition("Hello") //template name: "Hello"
+                .WithVirtualFilePath(
+                    "/Demos/Hello/Hello.tpl", //template content path
+                    isInlineLocalized: true
+                )
+                .WithScribanEngine()
+        );
+    }
+}
+````
+
+* `context` 对象用于添加新模板或获取依赖模块定义的模板. 使用 `context.Add(...)` 定义新模板.
+* `TemplateDefinition` 是代表模板的类,每个模板必须有唯一的名称(在渲染模板时使用).
+* `/Demos/Hello/Hello.tpl` 是模板文件的路径.
+* `isInlineLocalized` 声明针对所有语言使用一个模板(`true` 还是针对每种语言使用不同的模板(`false`). 更多内容参阅下面的本地化部分.
+* `WithScribanEngine` 方法为模板设置渲染引擎.
+
+### 模板内容
+
+`WithVirtualFilePath` 表示我们使用[虚拟文件系统](Virtual-File-System.md)存储模板内容. 在项目内创建一个 `Hello.tpl` 文件,并在属性窗口中将其标记为"**嵌入式资源**":
+
+![hello-template](images/hello-template.png)
+
+示例 `Hello.tpl` 内容如下所示:
+
+````
+Hello {%{{{model.name}}}%} :)
+````
+
+[虚拟文件系统](Virtual-File-System.md) 需要在[模块](Module-Development-Basics.md)类的 `ConfigureServices` 方法添加你的文件:
+
+````csharp
+Configure<AbpVirtualFileSystemOptions>(options =>
+{
+    options.FileSets.AddEmbedded<TextTemplateDemoModule>("TextTemplateDemo");
+});
+````
+
+* `TextTemplateDemoModule`是模块类.
+* `TextTemplateDemo` 是你的项目的根命名空间.
+
+## 渲染模板
+
+`ITemplateRenderer` 服务用于渲染模板内容.
+
+### 示例: 渲染一个简单的模板
+
+````csharp
+public class HelloDemo : ITransientDependency
+{
+    private readonly ITemplateRenderer _templateRenderer;
+
+    public HelloDemo(ITemplateRenderer templateRenderer)
+    {
+        _templateRenderer = templateRenderer;
+    }
+
+    public async Task RunAsync()
+    {
+        var result = await _templateRenderer.RenderAsync(
+            "Hello", //the template name
+            new HelloModel
+            {
+                Name = "John"
+            }
+        );
+
+        Console.WriteLine(result);
+    }
+}
+````
+
+* `HelloDemo` 是一个简单的类,在构造函数注入了 `ITemplateRenderer` 并在 `RunAsync` 方法中使用它.
+* `RenderAsync` 有两个基本参数:
+  * `templateName`: 要渲染的模板名称 (本示例中是 `Hello`).
+  * `model`: 在模板内部用做 `model` 的对象 (本示例中是 `HelloModel` 对象).
+
+示例会返回以下结果:
+
+````csharp
+Hello John :)
+````
+
+### 匿名模型
+
+虽然建议为模板创建模型类,但在简单情况下使用匿名对象也是可行的:
+
+````csharp
+var result = await _templateRenderer.RenderAsync(
+    "Hello",
+    new
+    {
+        Name = "John"
+    }
+);
+````
+
+示例中我们并没有创建模型类,但是创建了一个匿名对象模型.
+
+### PascalCase 与 snake_case
+
+PascalCase 属性名(如 `UserName`) 在模板中使用蛇形命名(如 `user_name`).
+
+## 本地化
+
+可以基于当前文化对模板内容进行本地化. 以下部分描述了两种类型的本地化选项.
+
+### 内联本地化
+
+内联本地化使用[本地化系统](Localization.md)本地化模板内的文本.
+
+#### 示例: 重置密码链接
+
+假设你需要向用户发送电子邮件重置密码. 模板内容:
+
+````
+<a title="{%{{{L "ResetMyPasswordTitle"}}}%}" href="{%{{{model.link}}}%}">{%{{{L "ResetMyPassword" model.name}}}%}</a>
+````
+
+`L` 函数用于根据当前用户的文化来定位给定的Key,你需要在本地化文件中定义 `ResetMyPassword` 键:
+
+````json
+"ResetMyPasswordTitle": "Reset my password",
+"ResetMyPassword": "Hi {0}, Click here to reset your password"
+````
+
+你还需要在模板定义提供程序类中声明要与此模板一起使用的本地化资源:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+            "PasswordReset", //Template name
+            typeof(DemoResource) //LOCALIZATION RESOURCE
+        )
+        .WithScribanEngine()
+        .WithVirtualFilePath(
+            "/Demos/PasswordReset/PasswordReset.tpl", //template content path
+            isInlineLocalized: true
+        )
+);
+````
+
+当你这样渲染模板时:
+
+````csharp
+var result = await _templateRenderer.RenderAsync(
+    "PasswordReset", //the template name
+    new PasswordResetModel
+    {
+        Name = "john",
+        Link = "https://abp.io/example-link?userId=123&token=ABC"
+    }
+);
+````
+
+你可以看到以下本地化结果:
+
+````csharp
+<a title="Reset my password" href="https://abp.io/example-link?userId=123&token=ABC">Hi john, Click here to reset your password</a>
+````
+
+> 如果你为应用程序定义了 [默认本地化资源](Localization.md), 则无需声明模板定义的资源类型.
+
+### 多个内容本地化
+
+你可能希望为每种语言创建不同的模板文件,而不是使用本地化系统本地化单个模板. 如果模板对于特定的文化(而不是简单的文本本地化)应该是完全不同的,则可能需要使用它.
+
+#### 示例: 欢迎电子邮件模板
+
+假设你要发送电子邮件欢迎用户,但要定义基于用户的文化完全不同的模板.
+
+首先创建一个文件夹,将模板放在里面，像 `en.tpl`, `tr.tpl` 每一个你支持的文化:
+
+![multiple-file-template](images/multiple-file-template.png)
+
+然后在模板定义提供程序类中添加模板定义:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+            name: "WelcomeEmail",
+            defaultCultureName: "en"
+        )
+        .WithScribanEngine()
+        .WithVirtualFilePath(
+            "/Demos/WelcomeEmail/Templates", //template content folder
+            isInlineLocalized: false
+        )
+);
+````
+
+* 设置 **默认文化名称**, 当没有所需的文化模板,回退到缺省文化.
+* 指定 **模板文件夹** 而不是单个模板文件.
+* 设置 `isInlineLocalized` 为 `false`.
+
+就这些,你可以渲染当前文化的模板:
+
+````csharp
+var result = await _templateRenderer.RenderAsync("WelcomeEmail");
+````
+
+> 为了简单我们跳过了模型,但是你可以使用前面所述的模型.
+
+### 指定文化
+
+`ITemplateRenderer` 服务如果没有指定则使用当前文化 (`CultureInfo.CurrentUICulture`). 如果你需要你可以使用 `cultureName` 参数指定文化.
+
+````csharp
+var result = await _templateRenderer.RenderAsync(
+    "WelcomeEmail",
+    cultureName: "en"
+);
+````
+
+## 布局模板
+
+布局模板用于在其他模板之间创建共享布局. 它类似于ASP.NET Core MVC / Razor Pages中的布局系统.
+
+### 示例: 邮件HTML布局模板
+
+例如,你想为所有电子邮件模板创建一个布局.
+
+首先像之前一样创建一个模板文件:
+
+````xml
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    {%{{{content}}}%}
+</body>
+</html>
+````
+
+* 布局模板必须具有 **{%{{{content}}}%}** 部分作为渲染的子内容的占位符.
+
+在模板定义提供程序中注册模板:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+        "EmailLayout",
+        isLayout: true //SET isLayout!
+    )
+    .WithScribanEngine()
+    .WithVirtualFilePath(
+        "/Demos/EmailLayout/EmailLayout.tpl",
+        isInlineLocalized: true
+    )
+);
+````
+
+现在你可以将此模板用作任何其他模板的布局:
+
+````csharp
+context.Add(
+    new TemplateDefinition(
+            name: "WelcomeEmail",
+            defaultCultureName: "en",
+            layout: "EmailLayout" //Set the LAYOUT
+        )
+        .WithScribanEngine()
+        .WithVirtualFilePath(
+            "/Demos/WelcomeEmail/Templates",
+            isInlineLocalized: false
+        )
+);
+````
+
+## 全局上下文
+
+ABP传递 `model`,可用于访问模板内的模型. 如果需要,可以传递更多的全局变量.
+
+示例模板内容:
+
+````
+A global object value: {%{{{myGlobalObject}}}%}
+````
+
+模板假定它渲染上下文中的 `myGlobalObject` 对象. 你可以如下所示提供它:
+
+````csharp
+var result = await _templateRenderer.RenderAsync(
+    "GlobalContextUsage",
+    globalContext: new Dictionary<string, object>
+    {
+        {"myGlobalObject", "TEST VALUE"}
+    }
+);
+````
+
+渲染的结果将是:
+
+````
+A global object value: TEST VALUE
+````
+
+## 替换存在的模板
+
+通过替换应用程序中使用的模块定义的模板. 这样你可以根据自己的需求自定义模板,而无需更改模块代码.
+
+### 选项-1: 使用虚拟文件系统
+
+[虚拟文件系统](Virtual-File-System.md)允许你通过将相同文件放入项目中的相同路径来覆盖任何文件.
+
+#### 示例: 替换标准电子邮件布局模板
+
+ABP框架提供了一个[邮件发送系统](Emailing.md), 它在内部使用文本模板来渲染邮件内容. 它在 `/Volo/Abp/Emailing/Templates/Layout.tp` 路径定义了一个标准邮件布局模板. 模板的唯一名称是 `Abp.StandardEmailTemplates.Layout` 并且这个字符中`Volo.Abp.Emailing.Templates.StandardEmailTemplates`静态类上定义为常量.
+
+执行以下步骤将替换模板替换成你自定义的;
+
+**1)** 在你的项目中相同的路径添加一个新文件 (`/Volo/Abp/Emailing/Templates/Layout.tpl`):
+
+![replace-email-layout](images/replace-email-layout.png)
+
+**2)** 准备你的邮件布局模板:
+
+````html
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    <h1>This my header</h1>
+
+    {%{{{content}}}%}
+
+    <footer>
+      This is my footer...
+    </footer>
+</body>
+</html>
+````
+
+此示例只是向模板添加页眉和页脚并呈现它们之间的内容(请参阅上面的布局模板部分).
+
+
+**3)** 在`.csproj`文件配置嵌入式资源e
+
+* 添加 [Microsoft.Extensions.FileProviders.Embedded](https://www.nuget.org/packages/Microsoft.Extensions.FileProviders.Embedded) NuGet 包到你的项目.
+* 在  `.csproj` 中添加 `<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>` 到 `<PropertyGroup>...</PropertyGroup>` 部分.
+* 添加以下代码到你的 `.csproj` 文件:
+
+````xml
+<ItemGroup>
+  <None Remove="Volo\Abp\Emailing\Templates\*.tpl" />
+  <EmbeddedResource Include="Volo\Abp\Emailing\Templates\*.tpl" />
+</ItemGroup>
+````
+
+这将模板文件做为"嵌入式资源".
+
+**4)** 配置虚拟文件系统
+
+在[模块](Module-Development-Basics.md)  `ConfigureServices` 方法配置 `AbpVirtualFileSystemOptions` 将嵌入的文件添加到虚拟文件系统中:
+
+```csharp
+Configure<AbpVirtualFileSystemOptions>(options =>
+{
+    options.FileSets.AddEmbedded<BookStoreDomainModule>();
+});
+```
+
+`BookStoreDomainModule` 应该是你的模块名称
+
+> 确保你的模块(支持或间接)[依赖](Module-Development-Basics.md) `AbpEmailingModule`. 因为VFS可以基于依赖顺序覆盖文件.
+
+现在渲染邮件布局模板时会使用你的模板.
+
+### 选项-2: 使用模板定义提供者
+
+你可以创建一个模板定义提供者类来获取邮件布局模板来更改它的虚拟文件路径.
+
+**示例: 使用 `/MyTemplates/EmailLayout.tpl` 文件而不是标准模板**
+
+```csharp
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Emailing.Templates;
+using Volo.Abp.TextTemplating;
+
+namespace MyProject
+{
+    public class MyTemplateDefinitionProvider
+        : TemplateDefinitionProvider, ITransientDependency
+    {
+        public override void Define(ITemplateDefinitionContext context)
+        {
+            var emailLayoutTemplate = context.GetOrNull(StandardEmailTemplates.Layout);
+
+            emailLayoutTemplate
+                .WithVirtualFilePath(
+                    "/MyTemplates/EmailLayout.tpl",
+                    isInlineLocalized: true
+                );
+        }
+    }
+}
+```
+
+你依然应该添加 `/MyTemplates/EmailLayout.tpl` 到虚拟文件系统. 这种方法允许你在任何文件夹中找到模板,而不是在依赖模块定义的文件夹中.
+
+除了模板内容之外你还可以操作模板定义属性, 例如`DisplayName`, `Layout`或`LocalizationSource`.
+
+## 高级功能
+
+本节介绍文本模板系统的一些内部知识和高级用法.
+
+### 模板内容Provider
+
+`TemplateRenderer` 用于渲染模板,这是大多数情况下所需的模板. 但是你可以使用 `ITemplateContentProvider` 获取原始(未渲染的)模板内容.
+
+> `ITemplateRenderer` 内部使用 `ITemplateContentProvider` 获取原始模板内容.
+
+示例:
+
+````csharp
+public class TemplateContentDemo : ITransientDependency
+{
+    private readonly ITemplateContentProvider _templateContentProvider;
+
+    public TemplateContentDemo(ITemplateContentProvider templateContentProvider)
+    {
+        _templateContentProvider = templateContentProvider;
+    }
+
+    public async Task RunAsync()
+    {
+        var result = await _templateContentProvider
+            .GetContentOrNullAsync("Hello");
+
+        Console.WriteLine(result);
+    }
+}
+````
+
+结果是原始模板内容:
+
+````
+Hello {%{{{model.name}}}%} :)
+````
+
+* `GetContentOrNullAsync` 如果没有为请求的模板定义任何内容,则返回 `null`.
+* 它可以获取 `cultureName` 参数,如果模板针对不同的文化具有不同的文件,则可以使用该参数(请参见上面的"多内容本地化"部分).
+
+### 模板内容贡献者
+
+`ITemplateContentProvider` 服务使用 `ITemplateContentContributor` 实现来查找模板内容. 有一个预实现的内容贡献者 `VirtualFileTemplateContentContributor`,它从上面描述的虚拟文件系统中获取模板内容.
+
+你可以实现 `ITemplateContentContributor` 从另一个源读取原始模板内容.
+
+示例:
+
+````csharp
+public class MyTemplateContentProvider
+    : ITemplateContentContributor, ITransientDependency
+{
+    public async Task<string> GetOrNullAsync(TemplateContentContributorContext context)
+    {
+        var templateName = context.TemplateDefinition.Name;
+
+        //TODO: Try to find content from another source
+        return null;
+    }
+}
+
+````
+
+如果源无法找到内容, 则返回 `null`, `ITemplateContentProvider` 将回退到下一个贡献者.
+
+### Template Definition Manager
+
+`ITemplateDefinitionManager` 服务可用于获取模板定义(由模板定义提供程序创建).
+
+## 另请参阅
+
+* 本文开发和引用的[应用程序示例源码](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo).
+* [本地化系统](Localization.md).
+* [虚拟文件系统](Virtual-File-System.md).

docs/zh-Hans/Text-Templating.md

@@ -8,450 +8,30 @@ Template + Model =renderer=> Rendered Content
 
 它非常类似于 ASP.NET Core Razor View (或 Page):
 
-*RAZOR VIEW (or PAGE) + MODEL ==render==> HTML CONTENT*
+*RAZOR VIEW (或 PAGE) + MODEL ==render==> HTML CONTENT*
 
 你可以将渲染的输出用于任何目的,例如发送电子邮件或准备一些报告.
 
-### 示例
+模板渲染引擎非常强大:
 
-Here, a simple template:
-
-````
-Hello {%{{{model.name}}}%} :)
-````
-
-你可以定义一个含有 `Name` 属性的类来渲染这个模板:
-
-````csharp
-public class HelloModel
-{
-    public string Name { get; set; }
-}
-````
-
-如果你使用 `Name` 为 `John` 的 `HelloModel` 渲染模板,输出为:
-
-````
-Hello John :)
-````
-
-模板渲染引擎非常强大;
-
-* 它基于 [Scriban](https://github.com/lunet-io/scriban) 库, 所以它支持 **条件逻辑**, **循环** 等.
-* 模板内容 **可以本地化**.
-* 你可以定义 **布局模板** 在渲染其他模板中用做布局.
+* 它支持**条件逻辑**, **循环**等等.
+* 模板内容**可以本地化**.
+* 你可以为其他渲染模板定义**布局模板**。
 * 对于高级场景,你可以传递任何对象到模板上下文.
 
-### 源码
-
-这里是本文开发和引用的[示例应用程序源码](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo).
-
-## 安装
-
-推荐使用 [ABP CLI](CLI.md) 安装包.
-
-### 使用 ABP CLI
-
-在项目目录(.csproj file)打开命令行窗口运行以下命令:
-
-````bash
-abp add-package Volo.Abp.TextTemplating
-````
-
-### 手动安装
-
-如果你想要手动安装;
-
-1. 添加 [Volo.Abp.TextTemplating](https://www.nuget.org/packages/Volo.Abp.TextTemplating) NuGet包到你的项目:
-
-````
-Install-Package Volo.Abp.TextTemplating
-````
-
-2. 添加 `AbpTextTemplatingModule` 到你的模块依赖列表:
-
-````csharp
-[DependsOn(
-    //...other dependencies
-    typeof(AbpTextTemplatingModule) //Add the new module dependency
-    )]
-public class YourModule : AbpModule
-{
-}
-````
-
-## 定义模板
-
-在渲染模板之前,需要定义它. 创建一个继承自 `TemplateDefinitionProvider` 的类:
-
-````csharp
-public class DemoTemplateDefinitionProvider : TemplateDefinitionProvider
-{
-    public override void Define(ITemplateDefinitionContext context)
-    {
-        context.Add(
-            new TemplateDefinition("Hello") //template name: "Hello"
-                .WithVirtualFilePath(
-                    "/Demos/Hello/Hello.tpl", //template content path
-                    isInlineLocalized: true
-                )
-        );
-    }
-}
-````
-
-* `context` 对象用于添加新模板或获取依赖模块定义的模板. 使用 `context.Add(...)` 定义新模板.
-* `TemplateDefinition` 是代表模板的类,每个模板必须有唯一的名称(在渲染模板时使用).
-* `/Demos/Hello/Hello.tpl` 是模板文件的路径.
-* `isInlineLocalized` 声明针对所有语言使用一个模板(`true` 还是针对每种语言使用不同的模板(`false`). 更多内容参阅下面的本地化部分.
-
-### 模板内容
-
-`WithVirtualFilePath` 表示我们使用[虚拟文件系统](Virtual-File-System.md)存储模板内容. 在项目内创建一个 `Hello.tpl` 文件,并在属性窗口中将其标记为"**嵌入式资源**":
-
-![hello-template](images/hello-template.png)
-
-示例 `Hello.tpl` 内容如下所示:
-
-````
-Hello {%{{{model.name}}}%} :)
-````
-
-[虚拟文件系统](Virtual-File-System.md) 需要在[模块](Module-Development-Basics.md)类的 `ConfigureServices` 方法添加你的文件:
-
-````csharp
-Configure<AbpVirtualFileSystemOptions>(options =>
-{
-    options.FileSets.AddEmbedded<TextTemplateDemoModule>("TextTemplateDemo");
-});
-````
-
-* `TextTemplateDemoModule`是模块类.
-* `TextTemplateDemo` 是你的项目的根命名空间.
-
-## 渲染模板
-
-`ITemplateRenderer` 服务用于渲染模板内容.
-
-### 示例: 渲染一个简单的模板
-
-````csharp
-public class HelloDemo : ITransientDependency
-{
-    private readonly ITemplateRenderer _templateRenderer;
-
-    public HelloDemo(ITemplateRenderer templateRenderer)
-    {
-        _templateRenderer = templateRenderer;
-    }
-
-    public async Task RunAsync()
-    {
-        var result = await _templateRenderer.RenderAsync(
-            "Hello", //the template name
-            new HelloModel
-            {
-                Name = "John"
-            }
-        );
-
-        Console.WriteLine(result);
-    }
-}
-````
-
-* `HelloDemo` 是一个简单的类,在构造函数注入了 `ITemplateRenderer` 并在 `RunAsync` 方法中使用它.
-* `RenderAsync` 有两个基本参数:
-  * `templateName`: 要渲染的模板名称 (本示例中是 `Hello`).
-  * `model`: 在模板内部用做 `model` 的对象 (本示例中是 `HelloModel` 对象).
-
-示例会返回以下结果:
-
-````csharp
-Hello John :)
-````
-
-### 匿名模型
-
-虽然建议为模板创建模型类,但在简单情况下使用匿名对象也是可行的:
-
-````csharp
-var result = await _templateRenderer.RenderAsync(
-    "Hello",
-    new
-    {
-        Name = "John"
-    }
-);
-````
-
-示例中我们并没有创建模型类,但是创建了一个匿名对象模型.
-
-### PascalCase 与 snake_case
-
-PascalCase 属性名(如 `UserName`) 在模板中使用蛇形命名(如 `user_name`).
-
-## 本地化
-
-可以基于当前文化对模板内容进行本地化. 以下部分描述了两种类型的本地化选项.
-
-### 内联本地化
-
-内联本地化使用[本地化系统](Localization.md)本地化模板内的文本.
-
-#### 示例: 重置密码链接
-
-假设你需要向用户发送电子邮件重置密码. 模板内容:
-
-````
-<a title="{%{{{L "ResetMyPasswordTitle"}}}%}" href="{%{{{model.link}}}%}">{%{{{L "ResetMyPassword" model.name}}}%}</a>
-````
-
-`L` 函数用于根据当前用户的文化来定位给定的Key,你需要在本地化文件中定义 `ResetMyPassword` 键:
-
-````json
-"ResetMyPasswordTitle": "Reset my password",
-"ResetMyPassword": "Hi {0}, Click here to reset your password"
-````
-
-你还需要在模板定义提供程序类中声明要与此模板一起使用的本地化资源:
-
-````csharp
-context.Add(
-    new TemplateDefinition(
-            "PasswordReset", //Template name
-            typeof(DemoResource) //LOCALIZATION RESOURCE
-        ).WithVirtualFilePath(
-            "/Demos/PasswordReset/PasswordReset.tpl", //template content path
-            isInlineLocalized: true
-        )
-);
-````
-
-当你这样渲染模板时:
-
-````csharp
-var result = await _templateRenderer.RenderAsync(
-    "PasswordReset", //the template name
-    new PasswordResetModel
-    {
-        Name = "john",
-        Link = "https://abp.io/example-link?userId=123&token=ABC"
-    }
-);
-````
-
-你可以看到以下本地化结果:
-
-````csharp
-<a title="Reset my password" href="https://abp.io/example-link?userId=123&token=ABC">Hi john, Click here to reset your password</a>
-````
-
-> 如果你为应用程序定义了 [默认本地化资源](Localization.md), 则无需声明模板定义的资源类型.
-
-### 多个内容本地化
-
-你可能希望为每种语言创建不同的模板文件,而不是使用本地化系统本地化单个模板. 如果模板对于特定的文化(而不是简单的文本本地化)应该是完全不同的,则可能需要使用它.
-
-#### 示例: 欢迎电子邮件模板
-
-假设你要发送电子邮件欢迎用户,但要定义基于用户的文化完全不同的模板.
-
-首先创建一个文件夹,将模板放在里面，像 `en.tpl`, `tr.tpl` 每一个你支持的文化:
-
-![multiple-file-template](images/multiple-file-template.png)
-
-然后在模板定义提供程序类中添加模板定义:
-
-````csharp
-context.Add(
-    new TemplateDefinition(
-            name: "WelcomeEmail",
-            defaultCultureName: "en"
-        )
-        .WithVirtualFilePath(
-            "/Demos/WelcomeEmail/Templates", //template content folder
-            isInlineLocalized: false
-        )
-);
-````
-
-* 设置 **默认文化名称**, 当没有所需的文化模板,回退到缺省文化.
-* 指定 **模板文件夹** 而不是单个模板文件.
-* 设置 `isInlineLocalized` 为 `false`.
-
-就这些,你可以渲染当前文化的模板:
-
-````csharp
-var result = await _templateRenderer.RenderAsync("WelcomeEmail");
-````
-
-> 为了简单我们跳过了模型,但是你可以使用前面所述的模型.
-
-### 指定文化
-
-`ITemplateRenderer` 服务如果没有指定则使用当前文化 (`CultureInfo.CurrentUICulture`). 如果你需要你可以使用 `cultureName` 参数指定文化.
-
-````csharp
-var result = await _templateRenderer.RenderAsync(
-    "WelcomeEmail",
-    cultureName: "en"
-);
-````
-
-## 布局模板
-
-布局模板用于在其他模板之间创建共享布局. 它类似于ASP.NET Core MVC / Razor Pages中的布局系统.
-
-### 示例: 邮件HTML布局模板
-
-例如,你想为所有电子邮件模板创建一个布局.
-
-首先像之前一样创建一个模板文件:
-
-````xml
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="utf-8" />
-</head>
-<body>
-    {%{{{content}}}%}
-</body>
-</html>
-````
-
-* 布局模板必须具有 **{%{{{content}}}%}** 部分作为渲染的子内容的占位符.
-
-在模板定义提供程序中注册模板:
-
-````csharp
-context.Add(
-    new TemplateDefinition(
-        "EmailLayout",
-        isLayout: true //SET isLayout!
-    ).WithVirtualFilePath(
-        "/Demos/EmailLayout/EmailLayout.tpl",
-        isInlineLocalized: true
-    )
-);
-````
-
-现在你可以将此模板用作任何其他模板的布局:
-
-````csharp
-context.Add(
-    new TemplateDefinition(
-            name: "WelcomeEmail",
-            defaultCultureName: "en",
-            layout: "EmailLayout" //Set the LAYOUT
-        ).WithVirtualFilePath(
-            "/Demos/WelcomeEmail/Templates",
-            isInlineLocalized: false
-        )
-);
-````
-
-## 全局上下文
-
-ABP传递 `model`,可用于访问模板内的模型. 如果需要,可以传递更多的全局变量.
-
-示例模板内容:
-
-````
-A global object value: {%{{{myGlobalObject}}}%}
-````
-
-模板假定它渲染上下文中的 `myGlobalObject` 对象. 你可以如下所示提供它:
-
-````csharp
-var result = await _templateRenderer.RenderAsync(
-    "GlobalContextUsage",
-    globalContext: new Dictionary<string, object>
-    {
-        {"myGlobalObject", "TEST VALUE"}
-    }
-);
-````
-
-渲染的结果将是:
-
-````
-A global object value: TEST VALUE
-````
-
-## 高级功能
-
-本节介绍文本模板系统的一些内部知识和高级用法.
-
-### 模板内容Provider
-
-`TemplateRenderer` 用于渲染模板,这是大多数情况下所需的模板. 但是你可以使用 `ITemplateContentProvider` 获取原始(未渲染的)模板内容.
-
-> `ITemplateRenderer` 内部使用 `ITemplateContentProvider` 获取原始模板内容.
-
-示例:
-
-````csharp
-public class TemplateContentDemo : ITransientDependency
-{
-    private readonly ITemplateContentProvider _templateContentProvider;
-
-    public TemplateContentDemo(ITemplateContentProvider templateContentProvider)
-    {
-        _templateContentProvider = templateContentProvider;
-    }
-
-    public async Task RunAsync()
-    {
-        var result = await _templateContentProvider
-            .GetContentOrNullAsync("Hello");
-
-        Console.WriteLine(result);
-    }
-}
-````
-
-结果是原始模板内容:
-
-````
-Hello {%{{{model.name}}}%} :)
-````
-
-* `GetContentOrNullAsync` 如果没有为请求的模板定义任何内容,则返回 `null`.
-* 它可以获取 `cultureName` 参数,如果模板针对不同的文化具有不同的文件,则可以使用该参数(请参见上面的"多内容本地化"部分).
-
-### 模板内容贡献者
-
-`ITemplateContentProvider` 服务使用 `ITemplateContentContributor` 实现来查找模板内容. 有一个预实现的内容贡献者 `VirtualFileTemplateContentContributor`,它从上面描述的虚拟文件系统中获取模板内容.
-
-你可以实现 `ITemplateContentContributor` 从另一个源读取原始模板内容.
-
-示例:
-
-````csharp
-public class MyTemplateContentProvider
-    : ITemplateContentContributor, ITransientDependency
-{
-    public async Task<string> GetOrNullAsync(TemplateContentContributorContext context)
-    {
-        var templateName = context.TemplateDefinition.Name;
-
-        //TODO: Try to find content from another source
-        return null;
-    }
-}
+ABP框架提供了两个模板引擎:
 
-````
+* **[Razor](Text-Templating-Razor.md)**
+* **[Scriban](Text-Templating-Scriban.md)**
 
-如果源无法找到内容, 则返回 `null`, `ITemplateContentProvider` 将回退到下一个贡献者.
+你可以在同一个应用应用程序中使用不同的模板引擎, 或者创建一个新的自定义模板引擎.
 
-### Template Definition Manager
+## 源码
 
-`ITemplateDefinitionManager` 服务可用于获取模板定义(由模板定义提供程序创建).
+查看开发和引用的[应用程序示例源码](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo).
 
 ## 另请参阅
 
 * 本文开发和引用的[应用程序示例源码](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo).
 * [本地化系统](Localization.md).
-* [虚拟文件系统](Virtual-File-System.md).
+* [虚拟文件系统](Virtual-File-System.md).