Merge branch 'dev' into feat-card-component

.github/workflows/auto-pr.yml

@@ -1,13 +1,13 @@
-name: Merge branch dev with rel-7.0
+name: Merge branch dev with rel-7.1
 on:
   push:
     branches:
-      - rel-7.0
+      - rel-7.1
 permissions:
   contents: read
 
 jobs:
-  merge-dev-with-rel-6-0:
+  merge-dev-with-rel-7-1:
     permissions:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
@@ -18,13 +18,13 @@ jobs:
           ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-7.0:rel-7.0
-          git reset --hard rel-7.0
+          git fetch origin rel-7.1:rel-7.1
+          git reset --hard rel-7.1
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-7-0/${{github.run_number}}
-          title: Merge branch dev with rel-7.0
-          body: This PR generated automatically to merge dev with rel-7.0. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-7-1/${{github.run_number}}
+          title: Merge branch dev with rel-7.1
+          body: This PR generated automatically to merge dev with rel-7.1. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: ${{github.actor}}
           token: ${{ github.token }}

.github/workflows/image-compression.yml

@@ -6,6 +6,7 @@ on:
       - "**.jpeg"
       - "**.png"
       - "**.webp"
+      - "**.gif"
     types:
       - opened
       - synchronize

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

@@ -440,7 +440,6 @@
     "VersionHistoryDeletionConfirmationMessage": "Are you sure you want to delete this version?",
     "CreateAbpConsultantLogoInfo": "Maximum file size: <b>1MB</b> <br/> Supported file types: <b>jpg, jpeg, png, SVG, WebP</b>",
     "UrlCode": "Url Code",
-    "Icon": "Icon",
     "Clear": "Clear",
     "Permission:AbpConsultant": "ABP Consultant",
     "Menu:AbpConsultants": "ABP Consultants",
@@ -452,5 +451,7 @@
     "AbpConsultantCreate": "Create ABP Consultant",
     "WhoWeAreItem": "Who We Are Item",
     "FieldIsRequired": "{0} is required.",
+    "FieldIsNotValid": " {0} is not valid.",
+    "InterestedLicenseType": "Interested License Type"
   }
 }

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

@@ -187,6 +187,24 @@
     "SaveUpTo": "<span>SAVE</span> UP TO<strong>${0}K</strong>",
     "ImplementingDDD": "Implementing Domain Driven Design",
     "ExploreTheEBook": "Explore the E-Book",
-    "ExploreTheBook": "Explore the Book"
+    "ExploreTheBook": "Explore the Book",
+    "ConsultantType": "Consultancy Type",
+    "Expert": "ABP Expert",
+    "Partner": "ABP Partner",
+    "Industry": "Industry",
+    "Location": "Location",
+    "Contact": "Contact",
+    "Partner_Year": "Partnership Year",
+    "Info": "Info",
+    "SpokenLanguages": "Spoken Languages",
+    "SocialMedia": "Social Media",
+    "Activity": "Activity",
+    "Type": "Type",
+    "Contribution": "Contribution",
+    "WhoWeAre": "Who We Are",
+    "Icons": "Icons",
+    "Url": "Url",
+    "Icon": "Icon",
+    "RecentActivities": "Recent Activities"
   }
 }

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

@@ -369,7 +369,6 @@
     "FreeTrial": "Free Trial",
     "AcceptsMarketingCommunications": " Yes, I`d like to receive ABP Commercial marketing communications.",
     "PurposeOfUsage": "Purpose of usage",
-    "Industry": "Industry",
     "Choose": "- Choose -",
     "CompanyOrganizationName": "Company / Organization name",
     "CompanySize": "Company size",

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

@@ -13,7 +13,6 @@
     "Status": "Status",
     "ContentSource": "Content Source",
     "Details": "Details",
-    "Url": "Url",
     "Title": "Title",
     "CreationTime": "Creation time",
     "Save": "Save",

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

@@ -409,27 +409,12 @@
     "SeeTheScreenshot": "See the screenshot",
     "ApplicationModuleExplanation1": "Creates a reusable, fully layered application module solution.",
     "ApplicationModuleExplanation2": "You can use this option to create modules for your modular application.",
-    "Expert": "ABP Expert",
     "Expert_": "Expert",
-    "Partner": "ABP Partner",
     "Partner_": "Partnership",
     "WebSite": "Web Site",
-    "Industry": "Industry",
-    "Location": "Location",
-    "Contact": "Contact",
-    "ConsultantType": "Consultancy Type",
     "Expert_Year": "Expertise Year",
-    "Partner_Year": "Partnership Year",
-    "SpokenLanguages": "Spoken Languages",
-    "SocialMedia": "Social Media",
     "CompanyInfo": "Company Info",
-    "WhoWeAre": "Who We Are",
-    "RecentActivities": "Recent Activities",
     "Date": "Date",
-    "Activity": "Activity",
-    "Type": "Type",
-    "Contribution": "Contribution",
-    "Info": "Info",
     "WhoWeAre_Partner": "Who We Are",
     "WhoWeAre_Expert": "About Me"
   }

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>7.1.0</Version>
+    <Version>7.2.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/2023-02-08 v7_1_Preview/POST.md

@@ -0,0 +1,207 @@
+# ABP.IO Platform 7.1 RC Has Been Released
+
+Today, we are happy to release the [ABP Framework](https://abp.io/) and [ABP Commercial](https://commercial.abp.io/) version **7.1 RC** (Release Candidate). This blog post introduces the new features and important changes in this new version.
+
+Try this version and provide feedback for a more stable version of ABP v7.1! Thanks to all of you.
+
+## Get Started with the 7.1 RC
+
+Follow the steps below to try version 7.1.0 RC today:
+
+1) **Upgrade** the ABP CLI to version `7.1.0-rc.1` using a command line terminal:
+
+````bash
+dotnet tool update Volo.Abp.Cli -g --version 7.1.0-rc.1
+````
+
+**or install** it if you haven't before:
+
+````bash
+dotnet tool install Volo.Abp.Cli -g --version 7.1.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 [Get Started](https://abp.io/get-started) page to generate a CLI command to create a new application.
+
+You can use any IDE that supports .NET 7.x, like [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/).
+
+## Migrating to 7.1
+
+This version doesn't introduce any breaking changes. However, Entity Framework developers may need to add a new code-first database migration to their projects since we made some improvements to the existing entities of some application modules.
+
+## What's New with ABP Framework 7.1?
+
+In this section, I will introduce some major features released in this version. In addition to these features, so many enhancements have been made in this version too. 
+
+Here is a brief list of the titles explained in the next sections:
+
+* Blazor WASM option added to Application Single Layer Startup Template
+* Introducing the `IHasEntityVersion` interface and `EntitySynchronizer` base class
+* Introducing the `DeleteDirectAsync` method for the `IRepository` interface
+* Introducing the `IAbpHostEnvironment` interface
+* Improvements on the eShopOnAbp project
+* Others
+
+### Blazor WASM option added to Application Single Layer Startup Template
+
+We've created the [Application (Single Layer) Startup Template](https://docs.abp.io/en/abp/7.1/Startup-Templates/Application-Single-Layer) in v5.2 with three UI types: Angular, Blazor Server and MVC. At the moment, we didn't provide UI option for Blazor, because it required 3 projects at least (server-side, client-side and shared library between these two projects). 
+
+In this version, we've added the Blazor WASM option to the **Application (Single Layer) Startup Template**. It still contains three projects (`blazor`, `host`, and `contracts`) but hosted by a single `host` project.
+
+You can use the following CLI command to create an `app-nolayers` template with the Blazor UI as the UI option:
+
+```bash
+abp new TodoApp -t app-nolayers -u blazor --version 7.1.0-rc.1
+```
+
+> You can check the [Quick Start documentation](https://docs.abp.io/en/abp/7.1/Tutorials/Todo/Single-Layer/Index?UI=Blazor&DB=EF) for a quick start with this template.
+
+### Introducing the `IHasEntityVersion` interface and `EntitySynchronizer` base class
+
+Entity synchronization is an important concept, especially in distributed applications and module development. If we have an entity that is related to other modules, we need to align/sync their data once the entity changes and versioning entity changes can also be good, so we can know whether they're synced or not.
+
+In this version, [@gdlcf88](https://github.com/gdlcf88) made a great contribution to the ABP Framework and introduced the `IHasEntityVersion` interface which adds **auto-versioning** to entity classes and `EntitySynchronizer` base class to **automatically sync an entity's properties from a source entity**.
+
+You can check the issue and documentation from the following links for more info:
+
+- [Issue: Entity synchronizers and a new EntityVersion audit property](https://github.com/abpframework/abp/issues/14196)
+- [Versioning Entities](https://docs.abp.io/en/abp/7.1/Entities#versioning-entities)
+- [Distributed Event Bus - Entity Synchronizer](https://docs.abp.io/en/abp/7.1/Distributed-Event-Bus#entity-synchronizer)
+
+> Note: The entities of some modules from the ABP Framework have implemented the `IHasEntityVersion` interface. Therefore, if you are upgrading your application from an earlier version, you need to create a new migration and apply it to your database.
+
+### Introducing the `DeleteDirectAsync` method for the `IRepository` interface
+
+EF 7 introduced a new [`ExecuteDeleteAsync`](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-7.0/whatsnew#executeupdate-and-executedelete-bulk-updates) method that deletes entities without involving the change tracker into the process. Therefore, it's much faster.
+
+We've added the `DeleteDirectAsync` method to the `IRepository<>` interface to take the full power of EF 7. It deletes all entities that fit the given predicate. It directly deletes entities from the database, without fetching them. Therefore, some features (like **soft-delete**, **multi-tenancy**, and **audit logging)** won't work, so use this method carefully when you need it. And use the `DeleteAsync` method if you need those features.
+
+### Introducing the `IAbpHostEnvironment` interface
+
+Sometimes, while creating an application, we need to get the current hosting environment and take actions according to that. In such cases, we can use some services such as [IWebHostEnvironment](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.hosting.iwebhostenvironment?view=aspnetcore-7.0) or [IWebAssemblyHostEnvironment](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.components.webassembly.hosting.iwebassemblyhostenvironment) provided by .NET, in the final application. 
+
+However, we can not use these services in a class library, which is used by the final application. ABP Framework provides the `IAbpHostEnvironment` service, which allows you to get the current environment name whenever you want. `IAbpHostEnvironment` is used by the ABP Framework in several places to perform specific actions by the environment. For example, ABP Framework reduces the cache duration on the **Development** environment for some services.
+
+**Usage:**
+
+```csharp
+public class MyService
+{
+    private readonly IAbpHostEnvironment _abpHostEnvironment;
+    
+    public MyService(IAbpHostEnvironment abpHostEnvironment)
+    {
+        _abpHostEnvironment = abpHostEnvironment;
+    }
+
+    public void MyMethod()
+    {
+        //getting the current environment name
+        var environmentName = _abpHostEnvironment.EnvironmentName;
+
+        //check for the current environment
+        if (_abpHostEnvironment.IsDevelopment()) { /* ... */ } 
+    }
+}
+```
+
+You can inject the `IAbpHostEnvironment` into your service and get the current environment by using its `EnvironmentName` property. You can also check the current environment by using its extension methods such as `IsDevelopment()`.
+
+> Check the [ABP Application Startup](https://docs.abp.io/en/abp/7.1/Application-Startup) documentation for more information.
+
+### Improvements on the eShopOnAbp project
+
+K8s and Docker configurations have been made within this version (Dockerfiles and helm-charts have been added and image build scripts have been updated). See [#14083](https://github.com/abpframework/abp/issues/14083) for more information.
+
+### Others
+
+* Referral Links have been added to the CMS Kit Comment Feature (optional). You can specify common referral links (such as "nofollow" and "noreferrer") for links in the comments. See [#15458](https://github.com/abpframework/abp/issues/15458) for more information.
+* ReCaptcha verification has been added to the CMS Kit Comment Feature (optional). You can enable ReCaptcha support to enable protection against bots. See the [documentation](https://docs.abp.io/en/abp/7.1/Modules/Cms-Kit/Comments) for more information.
+* In the development environment, it is a must to reduce cache durations for some points. We typically don't have to invalidate the cache manually or wait on it for a certain time to be invalidated. For that purpose, we have reduced the cache durations for some points on the development environment. See [#14842](https://github.com/abpframework/abp/pull/14842) for more information.
+
+## What's New with ABP Commercial 7.1?
+
+We've also worked on [ABP Commercial](https://commercial.abp.io/) to align the new features and changes made in the ABP Framework. The following sections introduce a few new features coming with ABP Commercial 7.1.
+
+### Blazor WASM option added to Application Single Layer Pro Startup Template
+
+The [**Application (Single Layer) Startup Template**](https://docs.abp.io/en/commercial/latest/startup-templates/application-single-layer/index) with Blazor UI is also available for ABP Commercial customers with this version as explained above.
+
+You can use the following CLI command to create an `app-nolayers-pro` template with Blazor UI as the UI option:
+
+```bash
+abp new TodoApp -t app-nolayers-pro -u blazor --version 7.1.0-rc.1
+```
+
+You can also create an `app-nolayers-pro` template with Blazor UI via ABP Suite:
+
+![](suite-blazor-wasm-nolayers.png)
+
+### Suite - MAUI Blazor Code Generation
+
+We provided a new UI option "MAUI Blazor" for the `app-pro` template in the previous version and it's possible to create a `maui-blazor` application with both ABP CLI and ABP Suite.
+
+You can create an `app-pro` template with the MAUI Blazor as the UI option with the following ABP CLI command:
+
+```bash
+abp new Acme.BookStore -t app-pro -u maui-blazor
+```
+
+In this version, we implemented the code generation for MAUI Blazor. You can create and generate CRUD pages for this new UI option as you do in other UI types.
+
+> Note: MAUI Blazor is currently only available with the `app-pro` template.
+
+### SaaS Module - Allowing entering a username while impersonating the tenant
+
+In the previous versions, we were able to impersonate a tenant from the [SaaS Module's Tenant Management UI](https://docs.abp.io/en/commercial/7.1/modules/saas#tenant-management). There was a constraint in this approach, which forced us to only impersonate the "admin" user. However, the tenant might change the admin user's username, or we may want to impersonate another user of the tenant.
+
+Thus, with this version, we decided to allow the impersonation of the tenant by the specified username.
+
+*You can click on the "Login with this tenant" action button:*
+
+![](saas-impersonation-1.png)
+
+*Then, Specify the admin name of the tenant:*
+
+![](saas-impersonation-2.png)
+
+## Community News
+
+### New ABP Community Posts
+
+* [Sergei Gorlovetsky](https://community.abp.io/members/Sergei.Gorlovetsky) has created two new community articles:
+  * [Why ABP Framework is one of the best tools for migration from legacy MS Access systems to latest Web app](https://community.abp.io/posts/why-abp-framework-is-one-of-the-best-tools-for-migration-from-legacy-ms-access-systems-to-latest-web-app-7l39eof0)
+  * [ABP Framework — 5 steps Go No Go Decision Tree](https://community.abp.io/posts/abp-framework-5-steps-go-no-go-decision-tree-2sy6r2st)
+* [Onur Pıçakcı](https://github.com/onurpicakci) has created his first ABP community article that explains how to contribute to ABP Framework. You can read it 👉 [here](https://community.abp.io/posts/how-to-contribute-to-abp-framework-46dvzzvj).
+* [Maliming](https://github.com/maliming) has created a new community article to show how to convert create/edit modals to a page. You can read it 👉 [here](https://community.abp.io/posts/converting-createedit-modal-to-page-4ps5v60m).
+
+We thank you all. We thank all the authors for contributing to the [ABP Community platform](https://community.abp.io/).
+
+### Volosoft Attended NDC London 2023
+
+![](ndc-london.png)
+
+Core team members of the ABP Framework, [Halil Ibrahim Kalkan](https://twitter.com/hibrahimkalkan) and [Alper Ebicoglu](https://twitter.com/alperebicoglu) attended [NDC London 2023](https://ndclondon.com/) from the 23rd to the 27th of January.  
+
+### Community Talks 2023.1: LeptonX Customization
+
+![](community-talks-conver-image.png)
+
+In this episode of ABP Community Talks, 2023.1; we'll talk about **LeptonX Customization**. We will dive into the details and show you how to customize the [LeptonX Theme](https://leptontheme.com/) with examples. 
+
+The event will be live on Thursday, February 16, 2023 (20:00 - 21:00 UTC).
+
+> Register to listen and ask your questions now 👉 https://kommunity.com/volosoft/events/abp-community-talks-20231-leptonx-customization-03f9fd8c.
+
+## Conclusion
+
+This version comes with some new features and a lot of enhancements to the existing features. You can see the [Road Map](https://docs.abp.io/en/abp/7.1/Road-Map) documentation to learn about the release schedule and planned features for the next releases. Please try the ABP v7.1 RC and provide feedback to help us release a more stable version.
+
+Thanks for being a part of this community!

docs/en/Community-Articles/2023-01-30-How-To-Contribute-To-a-Open-Source-Software/how-can-I-contribute-to-open-source-projects-on-github.md

@@ -0,0 +1,105 @@
+# How to Contribute to ABP Framework
+
+## Introduction
+
+In this article I will explain how you can contribute to the open source ABP Framework. You will not only learn about the ABP Framework, but also how to contribute to an open source project, what are the standard rules, some git operations, etc.
+
+## What is Open Source?
+
+Open source software is code designed to be publicly available. Anyone can view, use, modify and distribute the project and code. The fact that the code is open source makes it a natural community and open for improvement. This enables ideas and thoughts to spread rapidly.
+
+## What is ABP Framework?
+
+ABP Framework is a complete infrastructure for building modern web applications following the best practices and guidelines of software development. ABP Framework is completely free, [open source](https://github.com/abpframework) and community driven. ABP is a modular framework and Application Modules provide pre-built application functionalities.
+
+## Before Contribution
+
+Before making any changes and trying to push them to the target repository we need to create a new [issue](https://github.com/abpframework/abp/issues) if there are no issues with the work. If there is an existing issue, you can proceed through this issue. This way, no other developer will work on the same issue and your PR will have a better chance to be accepted.
+
+Previous ABP Community Talk on this topic can be found [here](https://www.youtube.com/watch?v=Wz4Z-O-YoPg).
+
+## GitHub Issues
+You may want to fix a known bug or work on a planned enhancement. See the [issue list](https://github.com/abpframework/abp/issues) on GitHub.
+
+## Feature Requests
+If you have a feature idea for the framework or modules, create an issue on GitHub or attend an existing discussion. Then you can implement it if it's embraced by the community.
+
+## How to Contribute to an Open Source Software?
+There are some steps to contribute to OSS projects. You can follow the steps below.
+
+## Step 1: Fork the Project
+
+The first thing we need to do now is to fork the open source project. Forking will create a copy of the project in your own GitHub account. This will allow users to make changes to the code without affecting the original repository. Just press the fork key in the project.
+
+![fork-image](images/fork-project-image.png)
+
+After forking, it will create a new repo in your own GitHub profile.
+
+![fork-image-profile](images/fork-project-profile.png)
+
+## Step 2: Clone the Project
+
+In order to develop the project, you need to clone it to your local. After clicking on the code button, select your preferred cloning method and copy the link. You can run the copied link on your local machine with the `git clone` command, but we will use GitHub Desktop. Press `Open with GitHub Desktop` and the repo will be installed on your local machine. 
+
+or alternatively use the `git clone https://github.com/username/abp.git` command
+
+![clone-image](images/clone-image.png)
+
+## Step 3: Create a New Branch
+
+In this step, you need to create a new branch of your own before you start developing it. Open the repo on GitHub Desktop and create a new branch. When creating a new branch, be careful which branch you create it on.
+
+or alternatively use the `git checkout -b new-branch` command
+
+![branch-image](images/branch-image.png)
+
+## Step 4: Development
+
+Choose a suitable IDE to develop on the new branch you created. In order not to complicate things, we will create a `Developers.md` file and process it. Let's enter a sample text in the Developers file.
+
+![developer-list](images/developer-list.png)
+
+As you can see, all changes made to the repo are reflected directly on GitHub Desktop.
+
+![github-desktop-change](images/github-desktop-change.png)
+
+## Step 5: Commit
+
+The commit operation is used to save the changes you have made. It is useful to commit after certain operations are done in the project. It is useful to write a short sentence describing what you've done for the changes made in each commit. Press the `Commit to <branch-name>` button to commit. 
+
+or alternatively use the `git add .` and `git commit -m "Added the Developer List"` command
+
+![commit-image](images/commit-image.png)
+
+## Step 6: Publish the Changes
+
+The changes you have made so far are only visible on your local machine. You need to publish these changes to submit them to your forked repository. Please press the publish branch button to publish. 
+
+or alternatively use the `git push origin new-branch` command
+
+
+![push-image](images/git-push-image.png)
+
+## Step 7: Create a Pull Request
+
+After the push, the pull request `Create Pull Request` button will appear on GitHub Desktop. Click it and create a pull request.
+
+![github-desktop-pull-request](images/github-desktop-pull-request.png)
+
+You can also make a pull request from the repo in your GitHub profile.
+
+![compare-pull-request](images/pull-request-image.png)
+
+Before creating the pull request, make sure that the branch you created is making changes to the correct branch. After briefly describing your changes in the title and description, click the `Create pull request` button. This will send a pull request to the original repository. If the pull request is approved and merged by the community, your changes will also appear in the main repository.
+
+![open-pull-request](images/open-pull-request-image.png)
+
+That's it! You have contributed your development to an open source project.
+
+## Conclusion
+In this article, I showed you how you could contribute to the ABP Framework, an open source and community driven project. Thank you for reading the article, I hope it was useful. See you soon!
+
+## References
+- https://opensource.guide/how-to-contribute/
+- https://docs.abp.io/en/abp/latest/Contribution/Index
+

docs/en/Community-Articles/2023-02-06-Converting-Create-Edit-Modal-To-Page/POST.md

@@ -0,0 +1,86 @@
+# Converting Create/Edit Modal to Page
+
+In this document we will explain how to convert BookStore's `Books` create & edit modals to regular razor pages.
+
+## Before
+![before](images/old.gif)
+
+## Now
+![after](images/new.gif)
+
+## Index page
+
+Repalce `abp-button(NewBookButton)` buttom with `<a class="btn btn-primary" href="/Books/CreateModal"><i class="fa fa-plus"></i> @L["NewBook"].Value</a>`.
+
+## Index js file
+
+Remove the related codes of `createModal` and `editModal`.
+
+Change the `Edit row action` with `location.href = "/Books/EditModal?id=" + data.record.id;`
+
+
+## Create/Edit Book page
+
+Remove `Layout = null;` and add some custom style and javascript code to `CreateModal.cshtml` & `EditModal.cshtml`.
+
+```csharp
+@section styles {
+    <style>
+        .abp-view-modal .modal {
+                position: static;
+                display: block;
+                opacity: inherit !important;
+        }
+        .abp-view-modal .modal.fade .modal-dialog {
+            transition: inherit !important;
+            transform: inherit !important;;
+        }
+        .abp-view-modal .modal-header .btn-close {
+            display: none;
+        }
+    </style>
+}
+@section scripts {
+    <script>
+        $(".abp-view-modal form").abpAjaxForm().on('abp-ajax-success', function () {
+            location.href = "/Books";
+        });
+    </script>
+}
+```
+
+Add a `div` element with `abp-view-modal` class to wrap the `abp-dynamic-form`, Set size of `abp-modal` to `ExtraLarge` and remove the `AbpModalButtons.Cancel` button from `abp-modal-footer`.
+
+### CreateModal
+```csharp
+<div class="abp-view-modal">
+    <abp-dynamic-form abp-model="Book" asp-page="/Books/CreateModal">
+        <abp-modal static="true" size="ExtraLarge">
+            <abp-modal-header title="@L["NewBook"].Value"></abp-modal-header>
+            <abp-modal-body>
+                <abp-form-content />
+            </abp-modal-body>
+            <abp-modal-footer buttons="@(AbpModalButtons.Save)"></abp-modal-footer>
+        </abp-modal>
+    </abp-dynamic-form>
+</div>
+```
+
+### EditModal
+```csharp
+<div class="abp-view-modal">
+    <abp-dynamic-form abp-model="Book" asp-page="/Books/EditModal">
+        <abp-modal size="ExtraLarge">
+            <abp-modal-header title="@L["Update"].Value"></abp-modal-header>
+            <abp-modal-body>
+                <abp-form-content />
+            </abp-modal-body>
+            <abp-modal-footer buttons="@(AbpModalButtons.Save)"></abp-modal-footer>
+        </abp-modal>
+    </abp-dynamic-form>
+</div>
+```
+
+You can check this Git commit for details.
+
+https://github.com/abpframework/abp-samples/commit/f3014e0ec422cb2d8816d0e00dd6ab9cc1adfc21

docs/en/Dependency-Injection.md

@@ -440,16 +440,16 @@ Use `ICachedServiceProvider` (instead of `ITransientCachedServiceProvider`) unle
 
 ## Advanced Features
 
-### IServiceCollection.OnRegistred Event
+### IServiceCollection.OnRegistered Event
 
-You may want to perform an action for every service registered to the dependency injection. In the `PreConfigureServices` method of your module, register a callback using the `OnRegistred` method as shown below:
+You may want to perform an action for every service registered to the dependency injection. In the `PreConfigureServices` method of your module, register a callback using the `OnRegistered` method as shown below:
 
 ````csharp
 public class AppModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(ctx =>
+        context.Services.OnRegistered(ctx =>
         {
             var type = ctx.ImplementationType;
             //...
@@ -465,7 +465,7 @@ public class AppModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(ctx =>
+        context.Services.OnRegistered(ctx =>
         {
             if (ctx.ImplementationType.IsDefined(typeof(MyLogAttribute), true))
             {
@@ -478,7 +478,7 @@ public class AppModule : AbpModule
 
 This example simply checks if the service class has `MyLogAttribute` attribute and adds `MyLogInterceptor` to the interceptor list if so.
 
-> Notice that `OnRegistred` callback might be called multiple times for the same service class if it exposes more than one service/interface. So, it's safe to use `Interceptors.TryAdd` method instead of `Interceptors.Add` method. See [the documentation](Dynamic-Proxying-Interceptors.md) of dynamic proxying / interceptors.
+> Notice that `OnRegistered` callback might be called multiple times for the same service class if it exposes more than one service/interface. So, it's safe to use `Interceptors.TryAdd` method instead of `Interceptors.Add` method. See [the documentation](Dynamic-Proxying-Interceptors.md) of dynamic proxying / interceptors.
 
 ## 3rd-Party Providers
 

docs/en/Entity-Framework-Core.md

@@ -834,7 +834,7 @@ One advantage of using an interface for a DbContext is then it will be replaceab
 
 Once you properly define and use an interface for DbContext, then any other implementation can use the following ways to replace it:
 
-**ReplaceDbContextAttribute**
+#### ReplaceDbContext Attribute
 
 ```csharp
 [ReplaceDbContext(typeof(IBookStoreDbContext))]
@@ -844,7 +844,7 @@ public class OtherDbContext : AbpDbContext<OtherDbContext>, IBookStoreDbContext
 }
 ```
 
-**ReplaceDbContext option**
+#### ReplaceDbContext Option
 
 ````csharp
 context.Services.AddAbpDbContext<OtherDbContext>(options =>
@@ -856,6 +856,22 @@ context.Services.AddAbpDbContext<OtherDbContext>(options =>
 
 In this example, `OtherDbContext` implements `IBookStoreDbContext`. This feature allows you to have multiple DbContext (one per module) on development, but single DbContext (implements all interfaces of all DbContexts) on runtime.
 
+#### Replacing with Multi-Tenancy
+
+It is also possible to replace a DbContext based on the [multi-tenancy](Multi-Tenancy.md) side. `ReplaceDbContext` attribute and  `ReplaceDbContext` method can get a `MultiTenancySides` option with a default value of `MultiTenancySides.Both`.
+
+**Example:** Replace DbContext only for tenants, using the `ReplaceDbContext` attribute
+
+````csharp
+[ReplaceDbContext(typeof(IBookStoreDbContext), MultiTenancySides.Tenant)]
+````
+
+**Example:** Replace DbContext only for the host side, using the `ReplaceDbContext` method
+
+````csharp
+options.ReplaceDbContext<IBookStoreDbContext>(MultiTenancySides.Host);
+````
+
 ### Split Queries
 
 ABP enables [split queries](https://docs.microsoft.com/en-us/ef/core/querying/single-split-queries) globally by default for better performance. You can change it as needed.

docs/en/Migration-Guides/Abp-7_1.md

@@ -0,0 +1,19 @@
+# ABP Version 7.1 Migration Guide
+
+This document is a guide for upgrading ABP v7.0 solutions to ABP v7.1. There are a few changes in this version that may affect your applications, please read it carefully and apply the necessary changes to your application.
+
+## Navigation Menu - `CustomData` type changed to `Dictionary<string, object>`
+
+`ApplicationMenu` and `ApplicationMenuItem` classes' `CustomData` property type has been changed to `Dictionary<string, object>`. So, if you use the optional `CustomData` property of these classes, change it accordingly. See [#15608](https://github.com/abpframework/abp/pull/15608) for more information.
+
+*Old usage:*
+
+```csharp
+var menu = new ApplicationMenu("Home", L["Home"], "/", customData: new MyCustomData()); 
+```
+
+*New usage:*
+
+```csharp
+var menu = new ApplicationMenu("Home", L["Home"], "/").WithCustomData("CustomDataKey", new MyCustomData());
+```

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).
 
+- [7.0 to 7.1](Abp-7_1.md)
 - [6.0 to 7.0](Abp-7_0.md)
 - [5.3 to 6.0](Abp-6_0.md)
 - [5.2 to 5.3](Abp-5_3.md)

docs/en/Modules/Database-Tables.md

@@ -0,0 +1,575 @@
+# Database Tables
+
+This documentation describes all database tables and their purposes. You can read this documentation to get general knowledge of the database tables that come from each module.
+
+## [Audit Logging Module](Audit-Logging.md)
+
+### AbpAuditLogs
+
+This table stores information about the audit logs in the application. Each record represents an audit log and tracks the actions performed in the application.
+
+### AbpAuditLogActions
+
+This table stores information about the actions performed in the application, which are logged for auditing purposes.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpAuditLogs](#abpauditlogs) | Id | Links each action to a specific audit log. |
+
+### AbpEntityChanges
+
+This table stores information about entity changes in the application, which are logged for auditing purposes.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpAuditLogs](#abpauditlogs) | Id | Links each entity change to a specific audit log. |
+
+### AbpEntityPropertyChanges
+
+This table stores information about property changes to entities in the application, which are logged for auditing purposes.
+
+## Uses
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpEntityChanges](#abpentitychanges) | Id | 	Links each property change to a specific entity change. |
+
+## [Background Jobs Module](Background-Jobs.md)
+
+### AbpBackgroundJobs
+
+This table stores information about the background jobs in the application and facilitates their efficient management and tracking. Each entry in the table contains details of a background job, including the job name, arguments, try count, next try time, last try time, abandoned status, and priority.
+
+## [Tenant Management Module](Tenant-Management.md)
+
+### AbpTenants
+
+This table stores information about the tenants. Each record represents a tenant and contains information about the tenant, such as name and other details.
+
+### AbpTenantConnectionStrings
+
+This table stores information about the tenant database connection strings. When you define a connection string for a tenant, a new record will be added to this table. You can query this database to get connection strings by tenants.
+
+## Uses
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpTenants](#abptenants) | Id | The `Id` column in the `AbpTenants` table is used to associate the tenant connection string with the corresponding tenant. |
+
+## Blogging Module
+
+### BlgUsers
+
+This table stores information about the blog users. When a new identity user is created, a new record will be added to this table.
+
+### BlgBlogs
+
+This table serves to store blog information and semantically separates the posts of each blog.
+
+### BlgPosts
+
+This table stores information about the blog posts. You can query this table to get blog posts by blogs.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [BlgBlogs](#blgblogs) | Id | To associate the blog post with the corresponding blog. |
+### BlgComments
+
+This table stores information about the comments made on blog posts. You can query this table to get comments by posts.
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [BlgPosts](#blgposts) | Id | Links the comment to the corresponding blog post. |
+| [BlgComments](#blgcomments) | Id | Links the comment to the parent comment. |
+
+### BlgTags
+
+This table stores information about the tags. When a new tag is used, a new record will be added to this table. You can query this table to get tags by blogs.
+
+### BlgPostTags
+
+This table is used to associate tags with blog posts in order to categorize and organize the content. You can query this table to get post tags by posts.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [BlgTags](#blgtags) | Id | Links the post tag to the corresponding tag. |
+| [BlgPosts](#blgposts) | Id | Links the post tag to the corresponding blog post. |
+
+## [CMS Kit Module](Cms-Kit/Index.md)
+
+### CmsUsers
+
+This table stores information about the CMS Kit module users. When a new identity user is created, a new record will be added to this table.
+
+### CmsBlogs
+
+This table serves to store blog information and semantically separates the posts of each blog.
+
+### CmsBlogPosts
+
+This table stores information about the blog posts. You can query this table to get blog posts by blogs.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [CmsUsers](#cmsusers) | Id | Links the blog post to the corresponding author. |
+
+### CmsBlogFeatures
+
+This table stores information about the blog features. You can query this table to get blog features by blogs.
+
+### CmsComments
+
+This table is utilized by the [CMS Kit Comment system](Cms-Kit/Comments.md) to store comments made on the blog posts. You can query this table to get comments by posts.
+
+### CmsTags
+
+This table stores information about the tags. When a new tag is used, a new record will be added to this table. You can query this table to get tags by blogs.
+
+### CmsEntityTags
+
+This table is utilized by the [Tag Management system](Cms-Kit/Tags.md) to store tags and their relationship with various entities, thus enabling efficient categorization and organization of content. You can query this table to get entity tags by entities.
+
+### CmsGlobalResources
+
+This table is a database table for the [CMS Kit Global Resources system](Cms-Kit/Global-Resources.md), allowing dynamic addition of global styles and scripts.
+
+### CmsMediaDescriptors
+
+This table is utilized by the CMS kit module to manage media files by using the [BlobStoring](../Blob-Storing.md) module.
+
+### CmsMenuItems
+
+This table is used by the [CMS Kit Menu system](Cms-Kit/Menus.md) to manage and store information about dynamic public menus, including details such as menu item display names, URLs, and hierarchical relationships.
+
+### CmsPages
+
+This table is utilized by the [CMS Kit Page system](Cms-Kit/Pages.md) to store dynamic pages within the application, including information such as page URLs, titles, and content.
+
+### CmsRatings
+
+This table is utilized by the [CMS Kit Rating system](Cms-Kit/Ratings.md) to store ratings made on blog posts. You can query this table to get ratings by posts.
+
+### CmsUserReactions
+
+This table is utilized by the [CMS Kit Reaction system](Cms-Kit/Reactions.md) to store reactions made on blog posts. You can query this table to get reactions by posts.
+
+## [Docs Module](Docs.md)
+
+### DocsProjects
+
+This table stores project information to categorize documents according to different projects.
+
+### DocsDocuments
+
+This table retrieves the document if it's not found in the cache. The documentation is being updated when the content is retrieved from the database.
+
+### DocsDocumentContributors
+
+This table stores information about the contributors of the documents. You can query this table to get document contributors by documents.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [DocsDocuments](#docsdocuments) | Id | Links the document contributor to the corresponding document. |
+
+## [Feature Management Module](Feature-Management.md)
+
+### AbpFeatureGroups
+
+This table stores information about the feature groups in the application. For example, you can group all the features in the [`AbpFeatures`](#abpfeatures) table related to the `Identity` module under the `Identity` group.
+
+### AbpFeatures
+
+This table stores information about the features in the application. You can use the `Name` column to link each feature with its corresponding feature value in the [`AbpFeatureValues`](#abpfeaturevalues) table, so that you can easily manage and organize the features.
+
+### AbpFeatureValues
+
+This table stores the values of the features for different providers. You can use the `Name` column to link each feature value with its corresponding feature in the [`AbpFeatures`](#abpfeatures) table, so that you can easily manage and organize the features.
+
+## [Identity Module](Identity.md)
+
+### AbpUsers
+
+This table stores information about the identity users in the application.
+
+### AbpRoles
+
+This table stores information about the roles in the application. Roles are used to manage and control access to different parts of the application by assigning permissions and claims to roles and then assigning those roles to users. This table is important for managing and organizing the roles in the application, and for defining the access rights of the users.
+
+### AbpClaimTypes
+
+This table stores information about the claim types used in the application. You can use the `Name`, `Regex` columns to filter the claim types by name, and regex pattern respectively, so that you can easily manage and track the claim types in the application.
+
+### AbpLinkUsers
+
+This table is useful for linking multiple user accounts across different tenants or applications to a single user, allowing them to easily switch between their accounts.
+
+### AbpUserClaims
+
+This table can manage user-based access control by allowing to assign claims to users, which describes the access rights of the individual user.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpUsers](#abpusers) | Id | Links the user claim to the corresponding user. |
+
+### AbpUserLogins
+
+This table can store information about the user's external logins such as login with Facebook, Google, etc. and it can also be used to track the login history of users.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpUsers](#abpusers) | Id | Links the user login to the corresponding user. |
+
+### AbpUserRoles
+
+This table can manage user-based access control by allowing to assign roles to users, which describe the access rights of the individual user.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpUsers](#abpusers) | Id | Links the user role to the corresponding user. |
+| [AbpRoles](#abproles) | Id | Links the user role to the corresponding role. |
+
+### AbpUserTokens
+
+This table can store information about user's refresh tokens, access tokens and other tokens used in the application. It can also be used to invalidate or revoke user tokens.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpUsers](#abpusers) | Id | Links the user token to the corresponding user. |
+
+### AbpOrganizationUnits
+
+This table is useful for creating and managing a hierarchical structure of the organization, allowing to group users and assign roles based on the organization structure. You can use the `Code`, `ParentId` columns to filter the organization units by code and parent id respectively, so that you can easily manage and track the organization units in the application.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpOrganizationUnits](#abporganizationunits) | ParentId | Links the organization unit to its parent organization unit. |
+
+### AbpOrganizationUnitRoles
+
+This table is useful for managing role-based access control at the level of organization units, allowing to assign different roles to different parts of the organization structure. You can use the `OrganizationUnitId`, `RoleId` columns to filter the roles by organization unit id and role id respectively, so that you can easily manage and track the roles assigned to organization units in the application.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpOrganizationUnits](#abporganizationunits) | Id | Links the organization unit role to the corresponding organization unit. |
+| [AbpRoles](#abproles) | Id | Links the organization unit role to the corresponding role. |
+
+### AbpUserOrganizationUnits
+
+This table stores information about the organization units assigned to the users in the application. This table can manage user-organization unit relationships, and to group users based on the organization structure.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpUsers](#abpusers) | Id | Links the user organization unit to the corresponding user. |
+| [AbpOrganizationUnits](#abporganizationunits) | Id | Links the user organization unit to the corresponding organization unit. |
+
+### AbpRoleClaims
+
+This table is useful for managing role-based access control by allowing to assign claims to roles, which describes the access rights of the users that belong to that role.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpRoles](#abproles) | Id | Links the role claim to the corresponding role. |
+
+### AbpSecurityLogs
+
+This table logs important operations and changes related to user accounts, allowing users to save the security logs for future reference.
+
+## [Permission Management](Permission-Management.md)
+
+### AbpPermissionGroups
+
+This table is important for managing and organizing the permissions in the application, by grouping them into logical categories.
+
+### AbpPermissions
+
+This table is important for managing and controlling access to different parts of the application and for defining the granular permissions that make up the larger permissions or roles.
+
+### AbpPermissionGrants
+
+The table stores and manage the permissions in the application and to keep track of permissions that are granted, to whom and when. Columns such as `Name`, `ProviderName`, `ProviderKey`, `TenantId` can be used to filter the granted permissions by name, provider name, provider key, and tenant id respectively, so that you can easily manage and track the granted permissions in the application. 
+
+## [Setting Management](Setting-Management.md)
+
+### AbpSettings
+
+This table stores key-value pairs of settings for the application, and it allows dynamic configuration of the application without the need for recompilation.
+
+## [OpenIddict](OpenIddict.md)
+
+### OpenIddictApplications
+
+This table can store information about the OpenID Connect applications, including the client id, client secret, redirect URI, and other relevant information. It can also be used to authenticate and authorize clients using OpenID Connect protocol.
+
+### OpenIddictAuthorizations
+
+This table stores the OpenID Connect authorization data in the application. It can also be used to manage and validate the authorization grants issued to clients and users.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [OpenIddictApplications](#openiddictapplications) | Id | Links the authorization to the corresponding application. |
+
+### OpenIddictTokens
+
+This table can store information about the OpenID Connect tokens, including the token payload, expiration, type, and other relevant information. It can also be used to manage and validate the tokens issued to clients and users, such as access tokens and refresh tokens, and to control access to protected resources.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [OpenIddictApplications](#openiddictapplications) | Id | Links the token to the corresponding application. |
+| [OpenIddictAuthorizations](#openiddictauthorizations) | Id | Links the token to the corresponding authorization. |
+
+### OpenIddictScopes
+
+This table can store information about the OpenID Connect scopes, including the name and description of the scope. It can also be used to define the permissions or access rights associated with the scopes, which are then used to control access to protected resources.
+
+## [IdentityServer](IdentityServer.md)
+
+### IdentityServerApiResources
+
+This table can store information about the API resources, including the resource name, display name, description, and other relevant information. It can also be used to define the scopes, claims, and properties associated with the API resources, which are then used to control access to protected resources.
+
+### IdentityServerIdentityResources
+
+This table can store information about the identity resources, including the name, display name, description, and enabled status.
+
+### IdentityServerClients
+
+This table can store information about the clients, including the client id, client name, client URI and other relevant information. It can also be used to define the scopes, claims, and properties associated with the clients, which are then used to control access to protected resources.
+
+### IdentityServerApiScopes
+
+This table can store information about the API scopes, including the scope name, display name, description, and other relevant information. It can also be used to define the claims and properties associated with the API scopes, which are then used to control access to protected resources.
+
+### IdentityServerApiResourceClaims
+
+This table can store information about the claims of an API resource, including the claim type and API resource id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerApiResources](#identityserverapiresources) | Id | Links the claim to the corresponding API resource. |
+
+### IdentityServerIdentityResourceClaims
+
+This table can store information about the claims of an identity resource, including the claim type and identity resource id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerIdentityResources](#identityserveridentityresources) | Id | Links the claim to the corresponding identity resource. |
+
+### IdentityServerClientClaims
+
+This table can store information about the claims of a client, including the claim type, claim value and client id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the claim to the corresponding client. |
+
+### IdentityServerApiScopeClaims
+
+This table can store information about the claims of an API scope, including the claim type and API scope id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerApiScopes](#identityserverapiscopes) | Id | Links the claim to the corresponding API scope. |
+
+### IdentityServerApiResourceProperties
+
+This table can store information about properties, including the property key and value, and the associated API resource. These properties can store additional metadata or configuration information related to the API resources.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerApiResources](#identityserverapiresources) | Id | Links the property to the corresponding API resource. |
+
+### IdentityServerIdentityResourceProperties
+
+This table can store information about properties, including the property key and value, and the associated identity resource. These properties can store additional metadata or configuration information related to the identity resources.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerIdentityResources](#identityserveridentityresources) | Id | Links the property to the corresponding identity resource. |
+
+### IdentityServerClientProperties
+
+This table can be store information about the properties of a client, including the key, value and client id. These properties can store additional metadata or configuration information related to the clients.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the property to the corresponding client. |
+
+### IdentityServerApiScopeProperties
+
+This table can store information about the properties of an API scope, including the key, value and API scope id. These properties can store additional metadata or configuration information related to the API scopes.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerApiScopes](#identityserverapiscopes) | Id | Links the property to the corresponding API scope. |
+
+### IdentityServerApiResourceScopes
+
+This table can store information about the scopes of an API resource, including the scope name and API resource id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerApiResources](#identityserverapiresources) | Id | Links the scope to the corresponding API resource. |
+
+### IdentityServerClientScopes
+
+ This table can store information about the scopes of a client, including the scope and client id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the scope to the corresponding client. |
+
+### IdentityServerApiResourceSecrets
+
+This table can store information about the secrets of an API resource, including the secret value, expiration date, and API resource id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerApiResources](#identityserverapiresources) | Id | Links the secret to the corresponding API resource. |
+
+### IdentityServerClientSecrets
+
+This table can store information about the secrets of a client, including the secret value, expiration date, and client id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the secret to the corresponding client. |
+
+### IdentityServerClientCorsOrigins
+
+This table can store information about the CORS origins of a client, including the origin and client id. It can also be used to manage and validate the CORS origins of a client.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the CORS origin to the corresponding client. |
+
+### IdentityServerClientGrantTypes
+
+This table can store information about the grant types of a client, including the grant type and client id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the grant type to the corresponding client. |
+
+### IdentityServerClientIdPRestrictions
+
+This table can store information about the identity provider restrictions of a client, including the identity provider and client id. 
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the identity provider restriction to the corresponding client. |
+
+### IdentityServerClientPostLogoutRedirectUris
+
+This table can store information about the post logout redirect URIs of a client, including the post logout redirect URI and client id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the post logout redirect URI to the corresponding client. |
+
+### IdentityServerClientRedirectUris
+
+This table can store information about the redirect URIs of a client, including the redirect URI and client id.
+
+#### Foreign Keys
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [IdentityServerClients](#identityserverclients) | Id | Links the redirect URI to the corresponding client. |
+
+### IdentityServerDeviceFlowCodes
+
+This table can store information about the device flow codes, including the user code, device code, subject id, client id, creation time, expiration, data and session id.
+
+### IdentityServerPersistedGrants
+
+This table can store information about the persisted grants, including the key, type, subject id, client id, creation time, expiration, and data.
+
+## Others
+
+### AbpBlobContainers
+
+This table is important for providing a better user experience by allowing the application to support multiple containers and providing BLOB-specific features.
+
+### AbpBlobs
+
+This table stores the binary data of BLOBs (binary large objects) in the application. Each BLOB is related to a container in the [AbpBlobContainers](#abpblobcontainers) table, where the container name, tenant id and other properties of the container can be found.
+
+#### Foreign Keys 
+
+| Table | Column | Description |
+| --- | --- | --- |
+| [AbpBlobContainers](#abpblobcontainers) | Id | Links the BLOB to the corresponding container. |
+
+### AbpLocalizationResources
+
+This table stores the localization resources for the application. This table is important for providing a better user experience by allowing the application to support multiple resources and providing localized text and other localization-specific features.
+
+### AbpLocalizationTexts
+
+The table contains the resource name, culture name, and a json encoded value which holds the key-value pair of localization text. It allows for efficient storage and management of localization texts and allows for easy update or addition of new translations for specific resources and cultures.

docs/en/MongoDB.md

@@ -393,7 +393,7 @@ One advantage of using interface for a MongoDbContext is then it becomes replace
 
 Once you properly define and use an interface for a MongoDbContext , then any other implementation can use the following ways to replace it:
 
-**ReplaceDbContextAttribute**
+#### ReplaceDbContext Attribute
 
 ```csharp
 [ReplaceDbContext(typeof(IBookStoreMongoDbContext))]
@@ -403,7 +403,7 @@ public class OtherMongoDbContext : AbpMongoDbContext, IBookStoreMongoDbContext
 }
 ```
 
-**ReplaceDbContext option**
+#### ReplaceDbContext Option
 
 ```csharp
 context.Services.AddMongoDbContext<OtherMongoDbContext>(options =>
@@ -415,6 +415,22 @@ context.Services.AddMongoDbContext<OtherMongoDbContext>(options =>
 
 In this example, `OtherMongoDbContext` implements `IBookStoreMongoDbContext`. This feature allows you to have multiple MongoDbContext (one per module) on development, but single MongoDbContext (implements all interfaces of all MongoDbContexts) on runtime.
 
+#### Replacing with Multi-Tenancy
+
+It is also possible to replace a DbContext based on the [multi-tenancy](Multi-Tenancy.md) side. `ReplaceDbContext` attribute and  `ReplaceDbContext` method can get a `MultiTenancySides` option with a default value of `MultiTenancySides.Both`.
+
+**Example:** Replace DbContext only for tenants, using the `ReplaceDbContext` attribute
+
+````csharp
+[ReplaceDbContext(typeof(IBookStoreDbContext), MultiTenancySides.Tenant)]
+````
+
+**Example:** Replace DbContext only for the host side, using the `ReplaceDbContext` method
+
+````csharp
+options.ReplaceDbContext<IBookStoreDbContext>(MultiTenancySides.Host);
+````
+
 ### Customize Bulk Operations
 
 If you have better logic or using an external library for bulk operations, you can override the logic via implementing `IMongoDbBulkOperationProvider`.

docs/en/Repositories.md

@@ -164,6 +164,14 @@ 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.
 
+### Delete Direct
+
+`DeleteDirectAsync` method of the repository deletes all entities those fit to the given predicate. It directly deletes entities from database, without fetching them. 
+
+Some features (like soft-delete, multi-tenancy and audit logging) won't work, so use this method carefully when you need it. Use the `DeleteAsync` method if you need to these features.
+
+> Currently only [EF Core supports it](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-7.0/whatsnew#basic-executedelete-examples), For the ORMs doesn't support direct delete, we will fallback to the existing `DeleteAsync` method.
+
 ### Ensure Entities Exists
 
 The `EnsureExistsAsync` extension method accepts entity id or entities query expression to ensure entities exist, otherwise, it will throw `EntityNotFoundException`.

docs/en/Tutorials/Todo/Single-Layer/Index.md

@@ -14,6 +14,38 @@ This is a single-part quick-start tutorial to build a simple todo application wi
 
 You can find the source code of the completed application [here](https://github.com/abpframework/abp-samples/tree/master/TodoApp-SingleLayer).
 
+{{if UI=="Blazor"}}
+We are currently preparing a video tutorial for Blazor UI. You can watch other tutorials for the three UI types from [here](https://www.youtube.com/playlist?list=PLsNclT2aHJcPqZxk7D4tU8LtTeCFcN_ci).
+{{else}}
+This documentation has a video tutorial on **YouTube**!! You can watch it here:
+{{end}}
+
+{{if UI=="MVC" && DB =="EF"}}
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/Z6jZSPB19iw" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+{{else if UI=="BlazorServer" && DB=="EF"}}
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/-ynMYXBIg4Q" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+{{else if UI=="NG" && DB=="EF"}}
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/Pz4YWsU7CUs" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+{{else if UI=="MVC" && DB=="Mongo"}}
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/i9oDVl1J7Dk" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+{{else if UI=="BlazorServer" && DB=="Mongo"}}
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/z7YGDjcsTTs" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+{{else if UI=="NG" && DB=="Mongo"}}
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/LdKlIHi9S8I" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+{{end}}
+
 ## Pre-Requirements
 
 * An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 7.0+](https://dotnet.microsoft.com/download/dotnet) development.
@@ -169,7 +201,7 @@ We've mapped the `TodoItem` entity to the `TodoItems` table in the database. The
 
 The startup solution is configured to use Entity Framework Core [Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database.
 
-Open a command-line terminal in the {{if UI=="Blazor"}} directory of your `TodoApp.Host` project {{else}}root directory of your project (in the same folder of the `.csproj` file){{end} and type the following command:
+Open a command-line terminal in the {{if UI=="Blazor"}} directory of your `TodoApp.Host` project {{else}}root directory of your project (in the same folder of the `.csproj` file){{end}} and type the following command:
 
 ````bash
 dotnet ef migrations add Added_TodoItem

docs/en/UI/Angular/HTTP-Requests.md

@@ -298,3 +298,15 @@ export function handleHttpErrors(injector: Injector, httpError: HttpErrorRespons
   return throwError(httpError)
 }
 ```
+
+
+### How to Skip HTTP interceptors and ABP headers
+
+The ABP Framework adds several HTTP headers to the HttpClient, such as the "Auth token" or "tenant Id".
+The ABP Server must possess the information but the ABP user may not want to send this informations to an external server.
+ExternalHttpClient and IS EXTERNAL REQUEST HttpContext Token were added in V6.0.4.
+The ABP Http interceptors check the value of the `IS_EXTERNAL_REQUEST` token. If the token is True then ABP-specific headers won't be added to Http Request.
+The `ExternalHttpClient` extends from `HTTPClient` and sets the `IS_EXTERNAL_REQUEST` context token to true.
+When you are using `ExternalHttpClient` as HttpClient in your components, it does not add ABP-specific headers.
+
+Note: With `IS_EXTERNAL_REQUEST` or without it, ABP loading service works. 

docs/en/UI/Angular/Modal.md

@@ -57,7 +57,7 @@ You can add the `abp-modal` to your component very quickly. See an example:
 
 @Component(/* component metadata */)
 export class SampleComponent {
-    isModelOpen = false
+    isModalOpen = false
 }
 ```
 

docs/en/UI/AspNetCore/Navigation-Menu.md

@@ -100,7 +100,7 @@ There are more options of a menu item (the constructor of the `ApplicationMenuIt
 * `url` (`string`): The URL of the menu item.
 * `icon` (`string`): An icon name. Free [Font Awesome](https://fontawesome.com/) icon classes are supported out of the box. Example: `fa fa-book`. You can use any CSS font icon class as long as you include the necessary CSS files to your application.
 * `order` (`int`): The order of the menu item. Default value is `1000`. Items are sorted by the adding order unless you specify an order value.
-* `customData` (`object`): A custom object that you can associate to the menu item and use it while rendering the menu item.
+* `customData` (`Dictionary<string, object>`): A dictionary that allows storing custom objects that you can associate with the menu item and use it while rendering the menu item.
 * `target` (`string`): Target of the menu item. Can be `null` (default), "\_*blank*", "\_*self*", "\_*parent*", "\_*top*" or a frame name for web applications.
 * `elementId` (`string`): Can be used to render the element with a specific HTML `id` attribute.
 * `cssClass` (`string`): Additional string classes for the menu item.

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

@@ -85,6 +85,27 @@ You can simply override the styles in the Global Styles file of your application
 
 See the [Customization / Overriding Components](Customization-Overriding-Components.md) to learn how you can replace components, customize and extend the user interface.
 
+### Overriding the Menu Item
+Basic theme supports overriding a single menu item with a custom component. You can create a custom component and call `UseComponent` extension method of Basic Theme in the **MenuContributor**.
+
+```csharp
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Navigation;
+
+//...
+
+context.Menu.Items.Add(
+  new ApplicationMenuItem("Custom.1", "My Custom Menu", "#")
+    .UseComponent(typeof(MyMenuItemComponent)));
+```
+
+```html
+<li class="nav-item">
+    <a href="#" class="nav-link">
+        My Custom Menu
+    </a>
+</li>
+```
+
 ### Copy & Customize
 
 You can run the following [ABP CLI](../../CLI.md) command in **Blazor{{if UI == "Blazor"}}WebAssembly{{else}} Server{{end}}** project directory to copy the source code to your solution:

docs/en/docs-nav.json

@@ -1397,6 +1397,15 @@
         {
           "text": "Virtual File Explorer",
           "path": "Modules/Virtual-File-Explorer.md"
+        },
+        {
+          "text": "Common",
+          "items":[
+            {
+              "text": "Database Tables",
+              "path": "Modules/Database-Tables.md"
+            }
+          ]
         }
       ]
     },

docs/zh-Hans/Dependency-Injection.md

@@ -270,16 +270,16 @@ using (var scope = _serviceProvider.CreateScope())
 
 ## 高级特性
 
-### IServiceCollection.OnRegistred 事件
+### IServiceCollection.OnRegistered 事件
 
-你可能想在注册到依赖注入的每个服务上执行一个操作, 在你的模块的 `PreConfigureServices` 方法中, 使用 `OnRegistred` 方法注册一个回调(callback) , 如下所示:
+你可能想在注册到依赖注入的每个服务上执行一个操作, 在你的模块的 `PreConfigureServices` 方法中, 使用 `OnRegistered` 方法注册一个回调(callback) , 如下所示:
 
 ````csharp
 public class AppModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(ctx =>
+        context.Services.OnRegistered(ctx =>
         {
             var type = ctx.ImplementationType;
             //...
@@ -295,7 +295,7 @@ public class AppModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(ctx =>
+        context.Services.OnRegistered(ctx =>
         {
             if (ctx.ImplementationType.IsDefined(typeof(MyLogAttribute), true))
             {
@@ -308,7 +308,7 @@ public class AppModule : AbpModule
 
 这个示例判断一个服务类是否具有 `MyLogAttribute` 特性, 如果有的话就添加一个 `MyLogInterceptor` 到拦截器集合中.
 
-> 注意, 如果服务类公开了多于一个服务或接口, `OnRegistred` 回调(callback)可能被同一服务类多次调用. 因此, 较安全的方法是使用 `Interceptors.TryAdd` 方法而不是 `Interceptors.Add` 方法. 请参阅动态代理(dynamic proxying)/拦截器 [文档](Dynamic-Proxying-Interceptors.md).
+> 注意, 如果服务类公开了多于一个服务或接口, `OnRegistered` 回调(callback)可能被同一服务类多次调用. 因此, 较安全的方法是使用 `Interceptors.TryAdd` 方法而不是 `Interceptors.Add` 方法. 请参阅动态代理(dynamic proxying)/拦截器 [文档](Dynamic-Proxying-Interceptors.md).
 
 ## 第三方提供程序
 

framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Security/ApplicationConfigurationChangedService.cs

@@ -0,0 +1,15 @@
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Components.Web.Security;
+
+public delegate void ApplicationConfigurationChangedHandler();
+
+public class ApplicationConfigurationChangedService : IScopedDependency
+{
+    public event ApplicationConfigurationChangedHandler Changed;
+
+    public void NotifyChanged()
+    {
+        Changed?.Invoke();
+    }
+}

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCachedApplicationConfigurationClient.cs

@@ -1,4 +1,6 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.Authorization;
+using Volo.Abp.AspNetCore.Components.Web.Security;
 using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
 using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClientProxies;
 using Volo.Abp.AspNetCore.Mvc.Client;
@@ -10,23 +12,31 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly;
 public class WebAssemblyCachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
 {
     protected AbpApplicationConfigurationClientProxy ApplicationConfigurationClientProxy { get; }
-    
+
     protected AbpApplicationLocalizationClientProxy ApplicationLocalizationClientProxy { get; }
 
     protected ApplicationConfigurationCache Cache { get; }
 
     protected ICurrentTenantAccessor CurrentTenantAccessor { get; }
 
+    protected ApplicationConfigurationChangedService ApplicationConfigurationChangedService { get; }
+
+    protected AuthenticationStateProvider AuthenticationStateProvider { get; }
+
     public WebAssemblyCachedApplicationConfigurationClient(
         AbpApplicationConfigurationClientProxy applicationConfigurationClientProxy,
         ApplicationConfigurationCache cache,
-        ICurrentTenantAccessor currentTenantAccessor, 
-        AbpApplicationLocalizationClientProxy applicationLocalizationClientProxy)
+        ICurrentTenantAccessor currentTenantAccessor,
+        AbpApplicationLocalizationClientProxy applicationLocalizationClientProxy,
+        ApplicationConfigurationChangedService applicationConfigurationChangedService,
+        AuthenticationStateProvider authenticationStateProvider)
     {
         ApplicationConfigurationClientProxy = applicationConfigurationClientProxy;
         Cache = cache;
         CurrentTenantAccessor = currentTenantAccessor;
         ApplicationLocalizationClientProxy = applicationLocalizationClientProxy;
+        ApplicationConfigurationChangedService = applicationConfigurationChangedService;
+        AuthenticationStateProvider = authenticationStateProvider;
     }
 
     public virtual async Task InitializeAsync()
@@ -45,9 +55,11 @@ public class WebAssemblyCachedApplicationConfigurationClient : ICachedApplicatio
         );
 
         configurationDto.Localization.Resources = localizationDto.Resources;
-        
+
         Cache.Set(configurationDto);
 
+        ApplicationConfigurationChangedService.NotifyChanged();
+
         CurrentTenantAccessor.Current = new BasicTenantInfo(
             configurationDto.CurrentTenant.Id,
             configurationDto.CurrentTenant.Name

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs

@@ -39,7 +39,7 @@ public class AbpAspNetCoreMvcUiWidgetsModule : AbpModule
     {
         var widgetTypes = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (WidgetAttribute.IsWidget(context.ImplementationType))
             {

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Authentication/ChallengeAccountController.cs

@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 
 namespace Volo.Abp.AspNetCore.Mvc.Authentication;
 
@@ -9,15 +12,17 @@ public abstract class ChallengeAccountController : AbpController
 {
     protected string[] ChallengeAuthenticationSchemas { get; }
     protected string AuthenticationType { get; }
+    protected string[] ForbidSchemes { get; }
 
     protected ChallengeAccountController(string[] challengeAuthenticationSchemas = null)
     {
         ChallengeAuthenticationSchemas = challengeAuthenticationSchemas ?? new[] { "oidc" };
         AuthenticationType = "Identity.Application";
+        ForbidSchemes = Array.Empty<string>();
     }
 
     [HttpGet]
-    public ActionResult Login(string returnUrl = "", string returnUrlHash = "")
+    public virtual ActionResult Login(string returnUrl = "", string returnUrlHash = "")
     {
         if (CurrentUser.IsAuthenticated)
         {
@@ -28,7 +33,7 @@ public abstract class ChallengeAccountController : AbpController
     }
 
     [HttpGet]
-    public async Task<ActionResult> Logout(string returnUrl = "", string returnUrlHash = "")
+    public virtual async Task<ActionResult> Logout(string returnUrl = "", string returnUrlHash = "")
     {
         await HttpContext.SignOutAsync();
 
@@ -41,7 +46,7 @@ public abstract class ChallengeAccountController : AbpController
     }
 
     [HttpGet]
-    public async Task<IActionResult> FrontChannelLogout(string sid)
+    public virtual async Task<IActionResult> FrontChannelLogout(string sid)
     {
         if (User.Identity != null && User.Identity.IsAuthenticated)
         {
@@ -54,4 +59,21 @@ public abstract class ChallengeAccountController : AbpController
 
         return NoContent();
     }
+
+    [HttpGet]
+    public virtual Task<IActionResult> AccessDenied(string returnUrl = "", string returnUrlHash = "")
+    {
+        return Task.FromResult<IActionResult>(Challenge(
+            new AuthenticationProperties
+            {
+                RedirectUri = GetRedirectUrl(returnUrl, returnUrlHash)
+            },
+            ForbidSchemes.IsNullOrEmpty()
+                ? new[]
+                {
+                    HttpContext.RequestServices.GetRequiredService<IOptions<AuthenticationOptions>>().Value.DefaultForbidScheme
+                }
+                : ForbidSchemes
+        ));
+    }
 }

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

@@ -91,7 +91,7 @@ public class AbpAspNetCoreSignalRModule : AbpModule
     {
         var hubTypes = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (IsHubClass(context) && !IsDisabledForAutoMap(context))
             {

framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs

@@ -28,9 +28,6 @@ public class AbpSecurityHeadersMiddleware : IMiddleware, ITransientDependency
         /*The X-Frame-Options HTTP response header can be used to indicate whether or not a browser should be allowed to render a page in a <frame>, <iframe> or <object>. SAMEORIGIN makes it being displayed in a frame on the same origin as the page itself. The spec leaves it up to browser vendors to decide whether this option applies to the top level, the parent, or the whole chain*/
         AddHeaderIfNotExists(context, "X-Frame-Options", "SAMEORIGIN");
 
-        /*The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised in the Content-Type headers should be followed and not be changed. The header allows you to avoid MIME type sniffing by saying that the MIME types are deliberately configured.*/
-        AddHeaderIfNotExists(context, "X-Content-Type-Options", "nosniff");
-
         if (Options.Value.UseContentSecurityPolicyHeader)
         {
             AddHeaderIfNotExists(context, "Content-Security-Policy",

framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs

@@ -24,7 +24,7 @@ public class AbpAuditingModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(AuditingInterceptorRegistrar.RegisterIfNeeded);
+        context.Services.OnRegistered(AuditingInterceptorRegistrar.RegisterIfNeeded);
     }
 
     public override void ConfigureServices(ServiceConfigurationContext context)

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs

@@ -22,7 +22,7 @@ public class AbpAuthorizationModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(AuthorizationInterceptorRegistrar.RegisterIfNeeded);
+        context.Services.OnRegistered(AuthorizationInterceptorRegistrar.RegisterIfNeeded);
         AutoAddDefinitionProviders(context.Services);
     }
 
@@ -64,7 +64,7 @@ public class AbpAuthorizationModule : AbpModule
     {
         var definitionProviders = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (typeof(IPermissionDefinitionProvider).IsAssignableFrom(context.ImplementationType))
             {

framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobsAbstractionsModule.cs

@@ -21,7 +21,7 @@ public class AbpBackgroundJobsAbstractionsModule : AbpModule
     {
         var jobTypes = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(IBackgroundJob<>)) ||
                 ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(IAsyncBackgroundJob<>)))

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

@@ -127,6 +127,26 @@ public class AuthService : IAuthService, ITransientDependency
         }
     }
 
+    public async Task<bool> CheckMultipleOrganizationsAsync(string username)
+    {
+        var url = $"{CliUrls.WwwAbpIo}api/license/check-multiple-organizations?username={username}";
+
+        var client = CliHttpClientFactory.CreateClient();
+
+        using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
+        {
+            if (!response.IsSuccessStatusCode)
+            {
+                throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+            }
+
+            await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+            return JsonSerializer.Deserialize<bool>(responseContent);
+        }
+    }
+
     private async Task LogoutAsync(string accessToken)
     {
         try

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

@@ -9,4 +9,6 @@ public interface IAuthService
     Task LoginAsync(string userName, string password, string organizationName = null);
 
     Task LogoutAsync();
+
+    Task<bool> CheckMultipleOrganizationsAsync(string username);
 }

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

@@ -2,13 +2,11 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Text;
-using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web;
 using Volo.Abp.Cli.Args;
 using Volo.Abp.Cli.Auth;
-using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.ProjectBuilding;
 using Volo.Abp.Cli.Utils;
 using Volo.Abp.DependencyInjection;
@@ -26,17 +24,13 @@ public class LoginCommand : IConsoleCommand, ITransientDependency
     public ICancellationTokenProvider CancellationTokenProvider { get; }
     public IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
 
-    private readonly CliHttpClientFactory _cliHttpClientFactory;
-
     public LoginCommand(AuthService authService,
         ICancellationTokenProvider cancellationTokenProvider,
-        IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
-        CliHttpClientFactory cliHttpClientFactory)
+        IRemoteServiceExceptionHandler remoteServiceExceptionHandler)
     {
         AuthService = authService;
         CancellationTokenProvider = cancellationTokenProvider;
         RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
-        _cliHttpClientFactory = cliHttpClientFactory;
         Logger = NullLogger<LoginCommand>.Instance;
     }
 
@@ -111,7 +105,7 @@ public class LoginCommand : IConsoleCommand, ITransientDependency
     private async Task<bool> HasMultipleOrganizationAndThisNotSpecified(CommandLineArgs commandLineArgs, string organization)
     {
         if (string.IsNullOrWhiteSpace(organization) &&
-            await CheckMultipleOrganizationsAsync(commandLineArgs.Target))
+            await AuthService.CheckMultipleOrganizationsAsync(commandLineArgs.Target))
         {
             Logger.LogError($"You have multiple organizations, please specify your organization with `--organization` parameter.");
             return true;
@@ -168,26 +162,6 @@ public class LoginCommand : IConsoleCommand, ITransientDependency
         return false;
     }
 
-    private async Task<bool> CheckMultipleOrganizationsAsync(string username)
-    {
-        var url = $"{CliUrls.WwwAbpIo}api/license/check-multiple-organizations?username={username}";
-
-        var client = _cliHttpClientFactory.CreateClient();
-
-        using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
-        {
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
-            }
-
-            await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
-
-            var responseContent = await response.Content.ReadAsStringAsync();
-            return JsonSerializer.Deserialize<bool>(responseContent);
-        }
-    }
-
     public string GetUsageInfo()
     {
         var sb = new StringBuilder();

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

@@ -267,11 +267,19 @@ public class AngularSourceCodeAdder : ITransientDependency
         
         var fileContent = File.ReadAllText(filePath);
 
-        fileContent = "import { "+moduleName.Split(".").Last()+"Module } from '@"+moduleName.Split(".").Last().ToKebabCase()+"/config';" + Environment.NewLine + fileContent;
+        var moduleNameAsConfigPath = moduleName.ToKebabCase();
+        
+        if (moduleName.Contains("."))
+        {
+            var moduleNameSplited = moduleName.Split(".");
+            moduleNameAsConfigPath = moduleNameSplited.Take(moduleNameSplited.Length-1).JoinAsString(".").ToKebabCase() + "/" + moduleNameSplited.Last().ToKebabCase();
+        }
+
+        fileContent = "import { "+moduleName.Split(".").Last()+"ConfigModule } from '@"+moduleNameAsConfigPath+"/config';" + Environment.NewLine + fileContent;
         
         fileContent = Regex.Replace(fileContent, "imports\\s*:\\s*\\[", 
             "imports: ["+ Environment.NewLine +
-            "    " + moduleName.Split(".").Last() + "Module.forRoot(),");
+            "    " + moduleName.Split(".").Last() + "ConfigModule.forRoot(),");
         
         File.WriteAllText(filePath, fileContent);
     }

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

@@ -125,7 +125,6 @@ public class ProjectNpmPackageAdder : ITransientDependency
 
         Logger.LogInformation($"Installing '{npmPackage.Name}' package to the project '{packageJsonFilePath}'...");
 
-
         if (version == null)
         {
             version = DetectAbpVersionOrNull(Path.Combine(directory, "package.json"));
@@ -171,7 +170,7 @@ public class ProjectNpmPackageAdder : ITransientDependency
 
             foreach (var package in packages)
             {
-                if (package.Name.StartsWith("@abp/") || package.Name.StartsWith("@volo/"))
+                if ((package.Name.StartsWith("@abp/") || package.Name.StartsWith("@volo/")) && !package.Name.Contains("leptonx"))
                 {
                     return package.Value.ToString();
                 }

framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs

@@ -5,9 +5,9 @@ namespace Microsoft.Extensions.DependencyInjection;
 
 public static class ServiceCollectionRegistrationActionExtensions
 {
-    // OnRegistred
+    // OnRegistered
 
-    public static void OnRegistred(this IServiceCollection services, Action<IOnServiceRegistredContext> registrationAction)
+    public static void OnRegistered(this IServiceCollection services, Action<IOnServiceRegistredContext> registrationAction)
     {
         GetOrCreateRegistrationActionList(services).Add(registrationAction);
     }

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

@@ -42,7 +42,7 @@ public class AbpDataModule : AbpModule
     {
         var contributors = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (typeof(IDataSeedContributor).IsAssignableFrom(context.ImplementationType))
             {

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.DependencyInjection;
 
@@ -15,7 +16,7 @@ public abstract class AbpCommonDbContextRegistrationOptions : IAbpCommonDbContex
 
     public IServiceCollection Services { get; }
 
-    public Dictionary<Type, Type> ReplacedDbContextTypes { get; }
+    public Dictionary<MultiTenantDbContextType, Type> ReplacedDbContextTypes { get; }
 
     public Type DefaultRepositoryDbContextType { get; protected set; }
 
@@ -39,28 +40,28 @@ public abstract class AbpCommonDbContextRegistrationOptions : IAbpCommonDbContex
         Services = services;
         DefaultRepositoryDbContextType = originalDbContextType;
         CustomRepositories = new Dictionary<Type, Type>();
-        ReplacedDbContextTypes = new Dictionary<Type, Type>();
+        ReplacedDbContextTypes = new Dictionary<MultiTenantDbContextType, Type>();
         SpecifiedDefaultRepositories = new List<Type>();
     }
 
-    public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext>()
+    public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext>(MultiTenancySides multiTenancySides = MultiTenancySides.Both)
     {
-        return ReplaceDbContext(typeof(TOtherDbContext));
+        return ReplaceDbContext(typeof(TOtherDbContext), multiTenancySides: multiTenancySides);
     }
 
-    public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext, TTargetDbContext>()
+    public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext, TTargetDbContext>(MultiTenancySides multiTenancySides = MultiTenancySides.Both)
     {
-        return ReplaceDbContext(typeof(TOtherDbContext), typeof(TTargetDbContext));
+        return ReplaceDbContext(typeof(TOtherDbContext), typeof(TTargetDbContext), multiTenancySides);
     }
 
-    public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type targetDbContextType = null)
+    public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type targetDbContextType = null, MultiTenancySides multiTenancySides = MultiTenancySides.Both)
     {
         if (!otherDbContextType.IsAssignableFrom(OriginalDbContextType))
         {
             throw new AbpException($"{OriginalDbContextType.AssemblyQualifiedName} should inherit/implement {otherDbContextType.AssemblyQualifiedName}!");
         }
 
-        ReplacedDbContextTypes[otherDbContextType] = targetDbContextType;
+        ReplacedDbContextTypes[new MultiTenantDbContextType(otherDbContextType, multiTenancySides)] = targetDbContextType;
 
         return this;
     }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs

@@ -1,6 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.DependencyInjection;
 
@@ -72,19 +73,22 @@ public interface IAbpCommonDbContextRegistrationOptionsBuilder
     /// Replaces given DbContext type with this DbContext type.
     /// </summary>
     /// <typeparam name="TOtherDbContext">The DbContext type to be replaced</typeparam>
-    IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext>();
+    /// <param name="multiTenancySides">MultiTenancy side</param>
+    IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext>(MultiTenancySides multiTenancySides = MultiTenancySides.Both);
 
     /// <summary>
     /// Replaces given DbContext type with the target DbContext type.
     /// </summary>
     /// <typeparam name="TOtherDbContext">The DbContext type to be replaced</typeparam>
     /// <typeparam name="TTargetDbContext">The target DbContext type</typeparam>
-    IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext, TTargetDbContext>();
+    /// <param name="multiTenancySides">MultiTenancy side</param>
+    IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext<TOtherDbContext, TTargetDbContext>(MultiTenancySides multiTenancySides = MultiTenancySides.Both);
 
     /// <summary>
     /// Replaces given DbContext type with the given or this DbContext type.
     /// </summary>
     /// <param name="otherDbContextType">The DbContext type to be replaced</param>
     /// <param name="targetDbContextType">The target DbContext type (optional, used this DbContext type if not provided)</param>
-    IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type targetDbContextType = null);
+    /// <param name="multiTenancySides">MultiTenancy side</param>
+    IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType, Type targetDbContextType = null, MultiTenancySides multiTenancySides = MultiTenancySides.Both);
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/MultiTenantDbContextType.cs

@@ -0,0 +1,34 @@
+using System;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.DependencyInjection;
+
+public class MultiTenantDbContextType
+{
+    public Type Type { get; }
+
+    public MultiTenancySides MultiTenancySide { get; }
+
+    public MultiTenantDbContextType(Type type, MultiTenancySides multiTenancySide = MultiTenancySides.Both)
+    {
+        Type = type;
+        MultiTenancySide = multiTenancySide;
+    }
+
+    public override bool Equals(object obj)
+    {
+        var other = obj as MultiTenantDbContextType;
+
+        if (other == null)
+        {
+            return false;
+        }
+
+        return other.Type == Type && other.MultiTenancySide == MultiTenancySide;
+    }
+
+    public override int GetHashCode()
+    {
+        return Type.GetHashCode() ^ MultiTenancySide.GetHashCode();
+    }
+}

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/ReplaceDbContextAttribute.cs

@@ -1,14 +1,21 @@
 using System;
+using System.Linq;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.DependencyInjection;
 
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
 public class ReplaceDbContextAttribute : Attribute
 {
-    public Type[] ReplacedDbContextTypes { get; }
+    public MultiTenantDbContextType[] ReplacedDbContextTypes { get; }
 
     public ReplaceDbContextAttribute(params Type[] replacedDbContextTypes)
     {
-        ReplacedDbContextTypes = replacedDbContextTypes;
+        ReplacedDbContextTypes = replacedDbContextTypes.Select(type => new MultiTenantDbContextType(type)).ToArray();
+    }
+
+    public ReplaceDbContextAttribute(Type replacedDbContextType, MultiTenancySides side)
+    {
+        ReplacedDbContextTypes = new[] {new MultiTenantDbContextType(replacedDbContextType, side)};
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreServiceCollectionExtensions.cs

@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.DependencyInjection;
+using Volo.Abp.MultiTenancy;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -19,12 +20,12 @@ public static class AbpEfCoreServiceCollectionExtensions
 
         var options = new AbpDbContextRegistrationOptions(typeof(TDbContext), services);
 
-        var replacedDbContextTypes = typeof(TDbContext).GetCustomAttributes<ReplaceDbContextAttribute>(true)
+        var replacedMultiTenantDbContextTypes = typeof(TDbContext).GetCustomAttributes<ReplaceDbContextAttribute>(true)
             .SelectMany(x => x.ReplacedDbContextTypes).ToList();
 
-        foreach (var dbContextType in replacedDbContextTypes)
+        foreach (var dbContextType in replacedMultiTenantDbContextTypes)
         {
-            options.ReplaceDbContext(dbContextType);
+            options.ReplaceDbContext(dbContextType.Type, multiTenancySides: dbContextType.MultiTenancySide);
         }
 
         optionsBuilder?.Invoke(options);
@@ -33,19 +34,19 @@ public static class AbpEfCoreServiceCollectionExtensions
 
         foreach (var entry in options.ReplacedDbContextTypes)
         {
-            var originalDbContextType = entry.Key;
+            var originalDbContextType = entry.Key.Type;
             var targetDbContextType = entry.Value ?? typeof(TDbContext);
 
-            services.Replace(
-                ServiceDescriptor.Transient(
-                    originalDbContextType,
-                    sp => sp.GetRequiredService(targetDbContextType)
-                )
-            );
+            services.Replace(ServiceDescriptor.Transient(originalDbContextType, sp =>
+            {
+                var dbContextType = sp.GetRequiredService<IEfCoreDbContextTypeProvider>().GetDbContextType(originalDbContextType);
+                return sp.GetRequiredService(dbContextType);
+            }));
 
             services.Configure<AbpDbContextOptions>(opts =>
             {
-                opts.DbContextReplacements[originalDbContextType] = targetDbContextType;
+                var multiTenantDbContextType = new MultiTenantDbContextType(originalDbContextType, entry.Key.MultiTenancySide);
+                opts.DbContextReplacements[multiTenantDbContextType] = targetDbContextType;
             });
         }
 

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using JetBrains.Annotations;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.EntityFrameworkCore.DependencyInjection;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.EntityFrameworkCore;
 
@@ -15,14 +18,14 @@ public class AbpDbContextOptions
 
     internal Dictionary<Type, object> ConfigureActions { get; }
 
-    internal Dictionary<Type, Type> DbContextReplacements { get; }
+    internal Dictionary<MultiTenantDbContextType, Type> DbContextReplacements { get; }
 
     public AbpDbContextOptions()
     {
         DefaultPreConfigureActions = new List<Action<AbpDbContextConfigurationContext>>();
         PreConfigureActions = new Dictionary<Type, List<object>>();
         ConfigureActions = new Dictionary<Type, object>();
-        DbContextReplacements = new Dictionary<Type, Type>();
+        DbContextReplacements = new Dictionary<MultiTenantDbContextType, Type>();
     }
 
     public void PreConfigure([NotNull] Action<AbpDbContextConfigurationContext> action)
@@ -76,22 +79,22 @@ public class AbpDbContextOptions
         return ConfigureActions.ContainsKey(dbContextType);
     }
 
-    internal Type GetReplacedTypeOrSelf(Type dbContextType)
+    internal Type GetReplacedTypeOrSelf(Type dbContextType, MultiTenancySides multiTenancySides = MultiTenancySides.Both)
     {
         var replacementType = dbContextType;
         while (true)
         {
-            if (DbContextReplacements.TryGetValue(replacementType, out var foundType))
+            var foundType = DbContextReplacements.LastOrDefault(x => x.Key.Type == replacementType && x.Key.MultiTenancySide.HasFlag(multiTenancySides));
+            if (!foundType.Equals(default(KeyValuePair<MultiTenantDbContextType, Type>)))
             {
-                if (foundType == dbContextType)
+                if (foundType.Value == dbContextType)
                 {
                     throw new AbpException(
                         "Circular DbContext replacement found for " +
                         dbContextType.AssemblyQualifiedName
                     );
                 }
-
-                replacementType = foundType;
+                replacementType = foundType.Value;
             }
             else
             {

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EfCoreDbContextTypeProvider.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.EntityFrameworkCore;
+
+public class EfCoreDbContextTypeProvider : IEfCoreDbContextTypeProvider, ITransientDependency
+{
+    private readonly AbpDbContextOptions _options;
+    private readonly ICurrentTenant _currentTenant;
+
+    public EfCoreDbContextTypeProvider(IOptions<AbpDbContextOptions> options, ICurrentTenant currentTenant)
+    {
+        _currentTenant = currentTenant;
+        _options = options.Value;
+    }
+
+    public virtual Type GetDbContextType(Type dbContextType)
+    {
+        return _options.GetReplacedTypeOrSelf(dbContextType, _currentTenant.GetMultiTenancySide());
+    }
+}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/IEfCoreDbContextTypeProvider.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Volo.Abp.EntityFrameworkCore;
+
+public interface IEfCoreDbContextTypeProvider
+{
+    Type GetDbContextType(Type dbContextType);
+}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs

@@ -19,36 +19,36 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
     where TDbContext : IEfCoreDbContext
 {
     private const string TransactionsNotSupportedErrorMessage = "Current database does not support transactions. Your database may remain in an inconsistent state in an error case.";
-    
+
     public ILogger<UnitOfWorkDbContextProvider<TDbContext>> Logger { get; set; }
 
-    private readonly IUnitOfWorkManager _unitOfWorkManager;
-    private readonly IConnectionStringResolver _connectionStringResolver;
-    private readonly ICancellationTokenProvider _cancellationTokenProvider;
-    private readonly ICurrentTenant _currentTenant;
-    private readonly AbpDbContextOptions _options;
+    protected readonly IUnitOfWorkManager UnitOfWorkManager;
+    protected readonly IConnectionStringResolver ConnectionStringResolver;
+    protected readonly ICancellationTokenProvider CancellationTokenProvider;
+    protected readonly ICurrentTenant CurrentTenant;
+    protected readonly IEfCoreDbContextTypeProvider EfCoreDbContextTypeProvider;
 
     public UnitOfWorkDbContextProvider(
         IUnitOfWorkManager unitOfWorkManager,
         IConnectionStringResolver connectionStringResolver,
         ICancellationTokenProvider cancellationTokenProvider,
         ICurrentTenant currentTenant,
-        IOptions<AbpDbContextOptions> options)
+        IEfCoreDbContextTypeProvider efCoreDbContextTypeProvider)
     {
-        _unitOfWorkManager = unitOfWorkManager;
-        _connectionStringResolver = connectionStringResolver;
-        _cancellationTokenProvider = cancellationTokenProvider;
-        _currentTenant = currentTenant;
-        _options = options.Value;
+        UnitOfWorkManager = unitOfWorkManager;
+        ConnectionStringResolver = connectionStringResolver;
+        CancellationTokenProvider = cancellationTokenProvider;
+        CurrentTenant = currentTenant;
+        EfCoreDbContextTypeProvider = efCoreDbContextTypeProvider;
 
         Logger = NullLogger<UnitOfWorkDbContextProvider<TDbContext>>.Instance;
     }
 
     [Obsolete("Use GetDbContextAsync method.")]
-    public TDbContext GetDbContext()
+    public virtual TDbContext GetDbContext()
     {
         if (UnitOfWork.EnableObsoleteDbContextCreationWarning &&
-            !UnitOfWorkManager.DisableObsoleteDbContextCreationWarning.Value)
+            !Uow.UnitOfWorkManager.DisableObsoleteDbContextCreationWarning.Value)
         {
             Logger.LogWarning(
                 "UnitOfWorkDbContextProvider.GetDbContext is deprecated. Use GetDbContextAsync instead! " +
@@ -58,13 +58,13 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
             Logger.LogWarning(Environment.StackTrace.Truncate(2048));
         }
 
-        var unitOfWork = _unitOfWorkManager.Current;
+        var unitOfWork = UnitOfWorkManager.Current;
         if (unitOfWork == null)
         {
             throw new AbpException("A DbContext can only be created inside a unit of work!");
         }
 
-        var targetDbContextType = _options.GetReplacedTypeOrSelf(typeof(TDbContext));
+        var targetDbContextType = EfCoreDbContextTypeProvider.GetDbContextType(typeof(TDbContext));
         var connectionStringName = ConnectionStringNameAttribute.GetConnStringName(targetDbContextType);
         var connectionString = ResolveConnectionString(connectionStringName);
         var dbContextKey = $"{targetDbContextType.FullName}_{connectionString}";
@@ -78,15 +78,15 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
         return (TDbContext)((EfCoreDatabaseApi)databaseApi).DbContext;
     }
 
-    public async Task<TDbContext> GetDbContextAsync()
+    public virtual async Task<TDbContext> GetDbContextAsync()
     {
-        var unitOfWork = _unitOfWorkManager.Current;
+        var unitOfWork = UnitOfWorkManager.Current;
         if (unitOfWork == null)
         {
             throw new AbpException("A DbContext can only be created inside a unit of work!");
         }
 
-        var targetDbContextType = _options.GetReplacedTypeOrSelf(typeof(TDbContext));
+        var targetDbContextType = EfCoreDbContextTypeProvider.GetDbContextType(typeof(TDbContext));
         var connectionStringName = ConnectionStringNameAttribute.GetConnStringName(targetDbContextType);
         var connectionString = await ResolveConnectionStringAsync(connectionStringName);
 
@@ -107,7 +107,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
     }
 
     [Obsolete("Use CreateDbContextAsync method.")]
-    private TDbContext CreateDbContext(IUnitOfWork unitOfWork, string connectionStringName, string connectionString)
+    protected virtual TDbContext CreateDbContext(IUnitOfWork unitOfWork, string connectionStringName, string connectionString)
     {
         var creationContext = new DbContextCreationContext(connectionStringName, connectionString);
         using (DbContextCreationContext.Use(creationContext))
@@ -127,7 +127,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
         }
     }
 
-    private async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork, string connectionStringName, string connectionString)
+    protected virtual async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork, string connectionStringName, string connectionString)
     {
         var creationContext = new DbContextCreationContext(connectionStringName, connectionString);
         using (DbContextCreationContext.Use(creationContext))
@@ -148,14 +148,14 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
     }
 
     [Obsolete("Use CreateDbContextAsync.")]
-    private TDbContext CreateDbContext(IUnitOfWork unitOfWork)
+    protected virtual TDbContext CreateDbContext(IUnitOfWork unitOfWork)
     {
         return unitOfWork.Options.IsTransactional
             ? CreateDbContextWithTransaction(unitOfWork)
             : unitOfWork.ServiceProvider.GetRequiredService<TDbContext>();
     }
 
-    private async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork)
+    protected virtual async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork)
     {
         return unitOfWork.Options.IsTransactional
             ? await CreateDbContextWithTransactionAsync(unitOfWork)
@@ -163,7 +163,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
     }
 
     [Obsolete("Use CreateDbContextWithTransactionAsync.")]
-    private TDbContext CreateDbContextWithTransaction(IUnitOfWork unitOfWork)
+    protected virtual TDbContext CreateDbContextWithTransaction(IUnitOfWork unitOfWork)
     {
         var transactionApiKey = $"EntityFrameworkCore_{DbContextCreationContext.Current.ConnectionString}";
         var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as EfCoreTransactionApi;
@@ -183,7 +183,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
                     new EfCoreTransactionApi(
                         dbtransaction,
                         dbContext,
-                        _cancellationTokenProvider
+                        CancellationTokenProvider
                     )
                 );
             }
@@ -191,10 +191,10 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
             {
                 Logger.LogError(TransactionsNotSupportedErrorMessage);
                 Logger.LogException(e);
-                
+
                 return dbContext;
             }
-            
+
             return dbContext;
         }
         else
@@ -247,7 +247,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
                 {
                     Logger.LogError(TransactionsNotSupportedErrorMessage);
                     Logger.LogException(e);
-                    
+
                     return dbContext;
                 }
             }
@@ -258,7 +258,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
         }
     }
 
-    private async Task<TDbContext> CreateDbContextWithTransactionAsync(IUnitOfWork unitOfWork)
+    protected virtual async Task<TDbContext> CreateDbContextWithTransactionAsync(IUnitOfWork unitOfWork)
     {
         var transactionApiKey = $"EntityFrameworkCore_{DbContextCreationContext.Current.ConnectionString}";
         var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as EfCoreTransactionApi;
@@ -278,7 +278,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
                     new EfCoreTransactionApi(
                         dbTransaction,
                         dbContext,
-                        _cancellationTokenProvider
+                        CancellationTokenProvider
                     )
                 );
             }
@@ -286,7 +286,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
             {
                 Logger.LogError(TransactionsNotSupportedErrorMessage);
                 Logger.LogException(e);
-                    
+
                 return dbContext;
             }
 
@@ -329,7 +329,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
                     {
                         Logger.LogError(TransactionsNotSupportedErrorMessage);
                         Logger.LogException(e);
-                    
+
                         return dbContext;
                     }
                 }
@@ -347,7 +347,7 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
                 {
                     Logger.LogError(TransactionsNotSupportedErrorMessage);
                     Logger.LogException(e);
-                    
+
                     return dbContext;
                 }
             }
@@ -358,37 +358,37 @@ public class UnitOfWorkDbContextProvider<TDbContext> : IDbContextProvider<TDbCon
         }
     }
 
-    private async Task<string> ResolveConnectionStringAsync(string connectionStringName)
+    protected virtual async Task<string> ResolveConnectionStringAsync(string connectionStringName)
     {
         // Multi-tenancy unaware contexts should always use the host connection string
         if (typeof(TDbContext).IsDefined(typeof(IgnoreMultiTenancyAttribute), false))
         {
-            using (_currentTenant.Change(null))
+            using (CurrentTenant.Change(null))
             {
-                return await _connectionStringResolver.ResolveAsync(connectionStringName);
+                return await ConnectionStringResolver.ResolveAsync(connectionStringName);
             }
         }
 
-        return await _connectionStringResolver.ResolveAsync(connectionStringName);
+        return await ConnectionStringResolver.ResolveAsync(connectionStringName);
     }
 
     [Obsolete("Use ResolveConnectionStringAsync method.")]
-    private string ResolveConnectionString(string connectionStringName)
+    protected virtual string ResolveConnectionString(string connectionStringName)
     {
         // Multi-tenancy unaware contexts should always use the host connection string
         if (typeof(TDbContext).IsDefined(typeof(IgnoreMultiTenancyAttribute), false))
         {
-            using (_currentTenant.Change(null))
+            using (CurrentTenant.Change(null))
             {
-                return _connectionStringResolver.Resolve(connectionStringName);
+                return ConnectionStringResolver.Resolve(connectionStringName);
             }
         }
 
-        return _connectionStringResolver.Resolve(connectionStringName);
+        return ConnectionStringResolver.Resolve(connectionStringName);
     }
 
     protected virtual CancellationToken GetCancellationToken(CancellationToken preferredValue = default)
     {
-        return _cancellationTokenProvider.FallbackToProvider(preferredValue);
+        return CancellationTokenProvider.FallbackToProvider(preferredValue);
     }
 }

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs

@@ -47,7 +47,7 @@ public class AbpEventBusModule : AbpModule
         var localHandlers = new List<Type>();
         var distributedHandlers = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(ILocalEventHandler<>)))
             {

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/Domain/Entities/EntityNotFoundException.cs

@@ -3,7 +3,7 @@
 namespace Volo.Abp.Domain.Entities;
 
 /// <summary>
-/// This exception is thrown if an entity excepted to be found but not found.
+/// This exception is thrown if an entity is expected to be found but not found.
 /// </summary>
 public class EntityNotFoundException : AbpException
 {

framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs

@@ -22,7 +22,7 @@ public class AbpFeaturesModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(FeatureInterceptorRegistrar.RegisterIfNeeded);
+        context.Services.OnRegistered(FeatureInterceptorRegistrar.RegisterIfNeeded);
         AutoAddDefinitionProviders(context.Services);
     }
 
@@ -57,7 +57,7 @@ public class AbpFeaturesModule : AbpModule
     {
         var definitionProviders = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (typeof(IFeatureDefinitionProvider).IsAssignableFrom(context.ImplementationType))
             {

framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/AbpGlobalFeaturesModule.cs

@@ -17,7 +17,7 @@ public class AbpGlobalFeaturesModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(GlobalFeatureInterceptorRegistrar.RegisterIfNeeded);
+        context.Services.OnRegistered(GlobalFeatureInterceptorRegistrar.RegisterIfNeeded);
     }
 
     public override void ConfigureServices(ServiceConfigurationContext context)

framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs

@@ -35,7 +35,6 @@ public class MailKitSmtpEmailSender : EmailSenderBase, IMailKitSmtpEmailSender
         {
             var message = MimeMessage.CreateFromMailMessage(mail);
             message.MessageId = MimeUtils.GenerateMessageId();
-            message.Headers.Add(HeaderId.MessageId, message.MessageId);
             await client.SendAsync(message);
             await client.DisconnectAsync(true);
         }

framework/src/Volo.Abp.MemoryDb/Microsoft/Extensions/DependencyInjection/AbpMemoryDbServiceCollectionExtensions.cs

@@ -20,7 +20,7 @@ public static class AbpMemoryDbServiceCollectionExtensions
 
         foreach (var entry in options.ReplacedDbContextTypes)
         {
-            var originalDbContextType = entry.Key;
+            var originalDbContextType = entry.Key.Type;
             var targetDbContextType = entry.Value ?? typeof(TMemoryDbContext);
 
             services.Replace(

framework/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs

@@ -20,26 +20,26 @@ public static class AbpMongoDbServiceCollectionExtensions
 
         foreach (var dbContextType in replacedDbContextTypes)
         {
-            options.ReplaceDbContext(dbContextType);
+            options.ReplaceDbContext(dbContextType.Type, multiTenancySides: dbContextType.MultiTenancySide);
         }
 
         optionsBuilder?.Invoke(options);
 
         foreach (var entry in options.ReplacedDbContextTypes)
         {
-            var originalDbContextType = entry.Key;
+            var originalDbContextType = entry.Key.Type;
             var targetDbContextType = entry.Value ?? typeof(TMongoDbContext);
 
-            services.Replace(
-                ServiceDescriptor.Transient(
-                    originalDbContextType,
-                    sp => sp.GetRequiredService(targetDbContextType)
-                )
-            );
+            services.Replace(ServiceDescriptor.Transient(originalDbContextType, sp =>
+            {
+                var dbContextType = sp.GetRequiredService<IMongoDbContextTypeProvider>().GetDbContextType(originalDbContextType);
+                return sp.GetRequiredService(dbContextType);
+            }));
 
             services.Configure<AbpMongoDbContextOptions>(opts =>
             {
-                opts.DbContextReplacements[originalDbContextType] = targetDbContextType;
+                var multiTenantDbContextType = new MultiTenantDbContextType(originalDbContextType, entry.Key.MultiTenancySide);
+                opts.DbContextReplacements[multiTenantDbContextType] = targetDbContextType;
             });
         }
 

framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContextOptions.cs

@@ -1,37 +1,40 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using MongoDB.Driver;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.MongoDB;
 
 public class AbpMongoDbContextOptions
 {
-    internal Dictionary<Type, Type> DbContextReplacements { get; }
+    internal Dictionary<MultiTenantDbContextType, Type> DbContextReplacements { get; }
 
     public Action<MongoClientSettings> MongoClientSettingsConfigurer { get; set; }
 
     public AbpMongoDbContextOptions()
     {
-        DbContextReplacements = new Dictionary<Type, Type>();
+        DbContextReplacements = new Dictionary<MultiTenantDbContextType, Type>();
     }
 
-    internal Type GetReplacedTypeOrSelf(Type dbContextType)
+    internal Type GetReplacedTypeOrSelf(Type dbContextType, MultiTenancySides multiTenancySides = MultiTenancySides.Both)
     {
         var replacementType = dbContextType;
         while (true)
         {
-            if (DbContextReplacements.TryGetValue(replacementType, out var foundType))
+            var foundType = DbContextReplacements.LastOrDefault(x => x.Key.Type == replacementType && x.Key.MultiTenancySide.HasFlag(multiTenancySides));
+            if (!foundType.Equals(default(KeyValuePair<MultiTenantDbContextType, Type>)))
             {
-                if (foundType == dbContextType)
+                if (foundType.Value == dbContextType)
                 {
                     throw new AbpException(
                         "Circular DbContext replacement found for " +
                         dbContextType.AssemblyQualifiedName
                     );
                 }
-
-                replacementType = foundType;
+                replacementType = foundType.Value;
             }
             else
             {

framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/IMongoDbContextTypeProvider.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Volo.Abp.MongoDB;
+
+public interface IMongoDbContextTypeProvider
+{
+    Type GetDbContextType(Type dbContextType);
+}

framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoDbContextTypeProvider.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.MongoDB;
+
+public class MongoDbContextTypeProvider : IMongoDbContextTypeProvider, ITransientDependency
+{
+    private readonly AbpMongoDbContextOptions _options;
+    private readonly ICurrentTenant _currentTenant;
+
+    public MongoDbContextTypeProvider(IOptions<AbpMongoDbContextOptions> options, ICurrentTenant currentTenant)
+    {
+        _currentTenant = currentTenant;
+        _options = options.Value;
+    }
+
+    public virtual Type GetDbContextType(Type dbContextType)
+    {
+        return _options.GetReplacedTypeOrSelf(dbContextType, _currentTenant.GetMultiTenancySide());
+    }
+}

framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs

@@ -20,33 +20,36 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
     private const string TransactionsNotSupportedErrorMessage = "Current database does not support transactions. Your database may remain in an inconsistent state in an error case.";
     public ILogger<UnitOfWorkMongoDbContextProvider<TMongoDbContext>> Logger { get; set; }
 
-    private readonly IUnitOfWorkManager _unitOfWorkManager;
-    private readonly IConnectionStringResolver _connectionStringResolver;
-    private readonly ICancellationTokenProvider _cancellationTokenProvider;
-    private readonly ICurrentTenant _currentTenant;
-    private readonly AbpMongoDbContextOptions _options;
+    protected readonly IUnitOfWorkManager UnitOfWorkManager;
+    protected readonly IConnectionStringResolver ConnectionStringResolver;
+    protected readonly ICancellationTokenProvider CancellationTokenProvider;
+    protected readonly ICurrentTenant CurrentTenant;
+    protected readonly AbpMongoDbContextOptions Options;
+    protected readonly IMongoDbContextTypeProvider DbContextTypeProvider;
 
     public UnitOfWorkMongoDbContextProvider(
         IUnitOfWorkManager unitOfWorkManager,
         IConnectionStringResolver connectionStringResolver,
         ICancellationTokenProvider cancellationTokenProvider,
         ICurrentTenant currentTenant,
-        IOptions<AbpMongoDbContextOptions> options)
+        IOptions<AbpMongoDbContextOptions> options,
+        IMongoDbContextTypeProvider dbContextTypeProvider)
     {
-        _unitOfWorkManager = unitOfWorkManager;
-        _connectionStringResolver = connectionStringResolver;
-        _cancellationTokenProvider = cancellationTokenProvider;
-        _currentTenant = currentTenant;
-        _options = options.Value;
+        UnitOfWorkManager = unitOfWorkManager;
+        ConnectionStringResolver = connectionStringResolver;
+        CancellationTokenProvider = cancellationTokenProvider;
+        CurrentTenant = currentTenant;
+        DbContextTypeProvider = dbContextTypeProvider;
+        Options = options.Value;
 
         Logger = NullLogger<UnitOfWorkMongoDbContextProvider<TMongoDbContext>>.Instance;
     }
 
     [Obsolete("Use CreateDbContextAsync")]
-    public TMongoDbContext GetDbContext()
+    public virtual TMongoDbContext GetDbContext()
     {
         if (UnitOfWork.EnableObsoleteDbContextCreationWarning &&
-            !UnitOfWorkManager.DisableObsoleteDbContextCreationWarning.Value)
+            !Uow.UnitOfWorkManager.DisableObsoleteDbContextCreationWarning.Value)
         {
             Logger.LogWarning(
                 "UnitOfWorkDbContextProvider.GetDbContext is deprecated. Use GetDbContextAsync instead! " +
@@ -56,14 +59,14 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
             Logger.LogWarning(Environment.StackTrace.Truncate(2048));
         }
 
-        var unitOfWork = _unitOfWorkManager.Current;
+        var unitOfWork = UnitOfWorkManager.Current;
         if (unitOfWork == null)
         {
             throw new AbpException(
                 $"A {nameof(IMongoDatabase)} instance can only be created inside a unit of work!");
         }
 
-        var targetDbContextType = _options.GetReplacedTypeOrSelf(typeof(TMongoDbContext));
+        var targetDbContextType = DbContextTypeProvider.GetDbContextType(typeof(TMongoDbContext));
         var connectionString = ResolveConnectionString(targetDbContextType);
         var dbContextKey = $"{targetDbContextType.FullName}_{connectionString}";
 
@@ -82,16 +85,16 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
         return (TMongoDbContext)((MongoDbDatabaseApi) databaseApi).DbContext;
     }
 
-    public async Task<TMongoDbContext> GetDbContextAsync(CancellationToken cancellationToken = default)
+    public virtual async Task<TMongoDbContext> GetDbContextAsync(CancellationToken cancellationToken = default)
     {
-        var unitOfWork = _unitOfWorkManager.Current;
+        var unitOfWork = UnitOfWorkManager.Current;
         if (unitOfWork == null)
         {
             throw new AbpException(
                 $"A {nameof(IMongoDatabase)} instance can only be created inside a unit of work!");
         }
 
-        var targetDbContextType = _options.GetReplacedTypeOrSelf(typeof(TMongoDbContext));
+        var targetDbContextType = DbContextTypeProvider.GetDbContextType(typeof(TMongoDbContext));
         var connectionString = await ResolveConnectionStringAsync(targetDbContextType);
         var dbContextKey = $"{targetDbContextType.FullName}_{connectionString}";
 
@@ -139,7 +142,7 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
         return dbContext;
     }
 
-    private async Task<TMongoDbContext> CreateDbContextAsync(
+    protected virtual async Task<TMongoDbContext> CreateDbContextAsync(
         IUnitOfWork unitOfWork,
         MongoUrl mongoUrl,
         string databaseName,
@@ -166,7 +169,7 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
     }
 
     [Obsolete("Use CreateDbContextWithTransactionAsync")]
-    private TMongoDbContext CreateDbContextWithTransaction(
+    protected virtual TMongoDbContext CreateDbContextWithTransaction(
         IUnitOfWork unitOfWork,
         MongoUrl url,
         MongoClient client,
@@ -202,7 +205,7 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
                 transactionApiKey,
                 new MongoDbTransactionApi(
                     session,
-                    _cancellationTokenProvider
+                    CancellationTokenProvider
                 )
             );
 
@@ -216,7 +219,7 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
         return dbContext;
     }
 
-    private async Task<TMongoDbContext> CreateDbContextWithTransactionAsync(
+    protected virtual async Task<TMongoDbContext> CreateDbContextWithTransactionAsync(
         IUnitOfWork unitOfWork,
         MongoUrl url,
         MongoClient client,
@@ -253,7 +256,7 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
                 transactionApiKey,
                 new MongoDbTransactionApi(
                     session,
-                    _cancellationTokenProvider
+                    CancellationTokenProvider
                 )
             );
 
@@ -267,45 +270,45 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
         return dbContext;
     }
 
-    private async Task<string> ResolveConnectionStringAsync(Type dbContextType)
+    protected virtual async Task<string> ResolveConnectionStringAsync(Type dbContextType)
     {
         // Multi-tenancy unaware contexts should always use the host connection string
         if (typeof(TMongoDbContext).IsDefined(typeof(IgnoreMultiTenancyAttribute), false))
         {
-            using (_currentTenant.Change(null))
+            using (CurrentTenant.Change(null))
             {
-                return await _connectionStringResolver.ResolveAsync(dbContextType);
+                return await ConnectionStringResolver.ResolveAsync(dbContextType);
             }
         }
 
-        return await _connectionStringResolver.ResolveAsync(dbContextType);
+        return await ConnectionStringResolver.ResolveAsync(dbContextType);
     }
 
     [Obsolete("Use ResolveConnectionStringAsync method.")]
-    private string ResolveConnectionString(Type dbContextType)
+    protected virtual string ResolveConnectionString(Type dbContextType)
     {
         // Multi-tenancy unaware contexts should always use the host connection string
         if (typeof(TMongoDbContext).IsDefined(typeof(IgnoreMultiTenancyAttribute), false))
         {
-            using (_currentTenant.Change(null))
+            using (CurrentTenant.Change(null))
             {
-                return _connectionStringResolver.Resolve(dbContextType);
+                return ConnectionStringResolver.Resolve(dbContextType);
             }
         }
 
-        return _connectionStringResolver.Resolve(dbContextType);
+        return ConnectionStringResolver.Resolve(dbContextType);
     }
 
-    private MongoClient CreateMongoClient(MongoUrl mongoUrl)
+    protected virtual MongoClient CreateMongoClient(MongoUrl mongoUrl)
     {
         var mongoClientSettings = MongoClientSettings.FromUrl(mongoUrl);
-        _options.MongoClientSettingsConfigurer?.Invoke(mongoClientSettings);
+        Options.MongoClientSettingsConfigurer?.Invoke(mongoClientSettings);
 
         return new MongoClient(mongoClientSettings);
     }
 
     protected virtual CancellationToken GetCancellationToken(CancellationToken preferredValue = default)
     {
-        return _cancellationTokenProvider.FallbackToProvider(preferredValue);
+        return CancellationTokenProvider.FallbackToProvider(preferredValue);
     }
 }

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectMapper.cs

@@ -11,7 +11,7 @@ public static class ExtensibleObjectMapper
     /// <summary>
     /// Copies extra properties from the <paramref name="source"/> object
     /// to the <paramref name="destination"/> object.
-    /// 
+    ///
     /// Checks property definitions (over the <see cref="ObjectExtensionManager"/>)
     /// based on the <paramref name="definitionChecks"/> preference.
     /// </summary>
@@ -34,14 +34,29 @@ public static class ExtensibleObjectMapper
         Check.NotNull(source, nameof(source));
         Check.NotNull(destination, nameof(destination));
 
-        ExtensibleObjectMapper.MapExtraPropertiesTo(
-            typeof(TSource),
-            typeof(TDestination),
-            source.ExtraProperties,
-            destination.ExtraProperties,
-            definitionChecks,
-            ignoredProperties
-        );
+        var sourceType = typeof(TSource);
+        var destinationType = typeof(TDestination);
+
+        Check.AssignableTo<IHasExtraProperties>(sourceType, nameof(sourceType));
+        Check.AssignableTo<IHasExtraProperties>(destinationType, nameof(destinationType));
+        Check.NotNull(source.ExtraProperties, nameof(source.ExtraProperties));
+        Check.NotNull(destination.ExtraProperties, nameof(destination.ExtraProperties));
+
+        var sourceObjectExtension = ObjectExtensionManager.Instance.GetOrNull(sourceType);
+        var destinationObjectExtension = ObjectExtensionManager.Instance.GetOrNull(destinationType);
+
+        foreach (var keyValue in source.ExtraProperties)
+        {
+            if (CanMapProperty(
+                    keyValue.Key,
+                    sourceObjectExtension,
+                    destinationObjectExtension,
+                    definitionChecks,
+                    ignoredProperties))
+            {
+                destination.SetProperty(keyValue.Key, keyValue.Value);
+            }
+        }
     }
 
     /// <summary>
@@ -80,7 +95,7 @@ public static class ExtensibleObjectMapper
     /// <summary>
     /// Copies extra properties from the <paramref name="sourceDictionary"/> object
     /// to the <paramref name="destinationDictionary"/> object.
-    /// 
+    ///
     /// Checks property definitions (over the <see cref="ObjectExtensionManager"/>)
     /// based on the <paramref name="definitionChecks"/> preference.
     /// </summary>

framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs

@@ -63,7 +63,7 @@ public class AbpSecurityModule : AbpModule
     {
         var contributorTypes = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (typeof(IAbpClaimsPrincipalContributor).IsAssignableFrom(context.ImplementationType))
             {

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs

@@ -36,7 +36,7 @@ public class AbpSettingsModule : AbpModule
     {
         var definitionProviders = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (typeof(ISettingDefinitionProvider).IsAssignableFrom(context.ImplementationType))
             {

framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/AbpTextTemplatingCoreModule.cs

@@ -23,7 +23,7 @@ public class AbpTextTemplatingCoreModule : AbpModule
         var definitionProviders = new List<Type>();
         var contentContributors = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (typeof(ITemplateDefinitionProvider).IsAssignableFrom(context.ImplementationType))
             {

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenu.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using JetBrains.Annotations;
+using Volo.Abp.Data;
 using Volo.Abp.UI.Navigation;
 
 namespace Volo.Abp.UI.Navigation;
@@ -31,10 +33,9 @@ public class ApplicationMenu : IHasMenuItems
 
     /// <summary>
     /// Can be used to store a custom object related to this menu.
-    /// TODO: Convert to dictionary!
     /// </summary>
-    [CanBeNull]
-    public object CustomData { get; set; }
+    [NotNull]
+    public Dictionary<string, object> CustomData { get; } = new();
 
     public ApplicationMenu(
         [NotNull] string name,
@@ -59,6 +60,16 @@ public class ApplicationMenu : IHasMenuItems
         return this;
     }
 
+    /// <summary>
+    /// Adds a custom data item to <see cref="CustomData"/> with given key &amp; value.
+    /// </summary>
+    /// <returns>This <see cref="ApplicationMenu"/> itself.</returns>
+    public ApplicationMenu WithCustomData(string key, object value)
+    {
+        CustomData[key] = value;
+        return this;
+    }
+
     public override string ToString()
     {
         return $"[ApplicationMenu] Name = {Name}";

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs

@@ -79,7 +79,8 @@ public class ApplicationMenuItem : IHasMenuItems, IHasSimpleStateCheckers<Applic
     /// <summary>
     /// Can be used to store a custom object related to this menu item. Optional.
     /// </summary>
-    public object CustomData { get; set; }
+    [NotNull]
+    public Dictionary<string, object> CustomData { get; } = new();
 
     /// <summary>
     /// Can be used to render the element with a specific Id for DOM selections.
@@ -97,7 +98,6 @@ public class ApplicationMenuItem : IHasMenuItems, IHasSimpleStateCheckers<Applic
         string url = null,
         string icon = null,
         int order = DefaultOrder,
-        object customData = null,
         string target = null,
         string elementId = null,
         string cssClass = null,
@@ -111,7 +111,6 @@ public class ApplicationMenuItem : IHasMenuItems, IHasSimpleStateCheckers<Applic
         Url = url;
         Icon = icon;
         Order = order;
-        CustomData = customData;
         Target = target;
         ElementId = elementId ?? GetDefaultElementId();
         CssClass = cssClass;
@@ -131,6 +130,16 @@ public class ApplicationMenuItem : IHasMenuItems, IHasSimpleStateCheckers<Applic
         return this;
     }
 
+    /// <summary>
+    /// Adds a custom data item to <see cref="CustomData"/> with given key &amp; value.
+    /// </summary>
+    /// <returns>This <see cref="ApplicationMenuItem"/> itself.</returns>
+    public ApplicationMenuItem WithCustomData(string key, object value)
+    {
+        CustomData[key] = value;
+        return this;
+    }
+
     private string GetDefaultElementId()
     {
         return "MenuItem_" + Name;

framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkModule.cs

@@ -7,6 +7,6 @@ public class AbpUnitOfWorkModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(UnitOfWorkInterceptorRegistrar.RegisterIfNeeded);
+        context.Services.OnRegistered(UnitOfWorkInterceptorRegistrar.RegisterIfNeeded);
     }
 }

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationModule.cs

@@ -16,7 +16,7 @@ public class AbpValidationModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(ValidationInterceptorRegistrar.RegisterIfNeeded);
+        context.Services.OnRegistered(ValidationInterceptorRegistrar.RegisterIfNeeded);
         AutoAddObjectValidationContributors(context.Services);
     }
 
@@ -39,7 +39,7 @@ public class AbpValidationModule : AbpModule
     {
         var contributorTypes = new List<Type>();
 
-        services.OnRegistred(context =>
+        services.OnRegistered(context =>
         {
             if (typeof(IObjectValidationContributor).IsAssignableFrom(context.ImplementationType))
             {

framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AbpAuthorizationTestModule.cs

@@ -14,7 +14,7 @@ public class AbpAuthorizationTestModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.OnRegistred(onServiceRegistredContext =>
+        context.Services.OnRegistered(onServiceRegistredContext =>
         {
             if (typeof(IMyAuthorizedService1).IsAssignableFrom(onServiceRegistredContext.ImplementationType) &&
                 !DynamicProxyIgnoreTypes.Contains(onServiceRegistredContext.ImplementationType))

framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs

@@ -19,7 +19,7 @@ public abstract class AbpInterceptionTestBase<TStartupModule> : AbpAsyncIntegrat
         services.AddTransient<SimpleResultCacheTestInterceptor>();
         services.AddTransient<CachedTestObject>();
 
-        services.OnRegistred(registration =>
+        services.OnRegistered(registration =>
         {
             if (typeof(SimpleInterceptionTargetClass) == registration.ImplementationType)
             {

framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/FifthContext/FifthDbContext.cs

@@ -0,0 +1,15 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+
+public class FifthDbContext : AbpDbContext<FifthDbContext>, IFifthDbContext
+{
+    public DbSet<FifthDbContextDummyEntity> FifthDbContextDummyEntity { get; set; }
+
+    public DbSet<FifthDbContextMultiTenantDummyEntity> FifthDbContextMultiTenantDummyEntity { get; set; }
+
+    public FifthDbContext(DbContextOptions<FifthDbContext> options)
+        : base(options)
+    {
+    }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/FifthContext/FifthDbContextDummyEntity.cs

@@ -0,0 +1,9 @@
+using System;
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+
+public class FifthDbContextDummyEntity : AggregateRoot<Guid>
+{
+    public string Value { get; set; }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/FifthContext/FifthDbContextDummyEntityRepository.cs

@@ -0,0 +1,20 @@
+using System;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+
+namespace Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+
+public interface IFifthDbContextDummyEntityRepository : IBasicRepository<FifthDbContextDummyEntity, Guid>
+{
+
+}
+
+public class FifthDbContextDummyEntityRepository :
+    EfCoreRepository<IFifthDbContext, FifthDbContextDummyEntity, Guid>,
+    IFifthDbContextDummyEntityRepository
+{
+    public FifthDbContextDummyEntityRepository(IDbContextProvider<IFifthDbContext> dbContextProvider)
+        : base(dbContextProvider)
+    {
+    }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/FifthContext/FifthDbContextMultiTenantDummyEntity.cs

@@ -0,0 +1,12 @@
+using System;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+
+public class FifthDbContextMultiTenantDummyEntity : AggregateRoot<Guid>, IMultiTenant
+{
+    public string Value { get; set; }
+
+    public Guid? TenantId { get; set; }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/FifthContext/FifthDbContextMultiTenantDummyEntityRepository.cs

@@ -0,0 +1,20 @@
+using System;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+
+namespace Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+
+public interface IFifthDbContextMultiTenantDummyEntityRepository : IBasicRepository<FifthDbContextMultiTenantDummyEntity, Guid>
+{
+
+}
+
+public class FifthDbContextMultiTenantDummyEntityRepository :
+    EfCoreRepository<IFifthDbContext, FifthDbContextMultiTenantDummyEntity, Guid>,
+    IFifthDbContextMultiTenantDummyEntityRepository
+{
+    public FifthDbContextMultiTenantDummyEntityRepository(IDbContextProvider<IFifthDbContext> dbContextProvider)
+        : base(dbContextProvider)
+    {
+    }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/FifthContext/IFifthDbContext.cs

@@ -0,0 +1,10 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+
+public interface IFifthDbContext : IEfCoreDbContext
+{
+    DbSet<FifthDbContextDummyEntity> FifthDbContextDummyEntity { get; set; }
+
+    DbSet<FifthDbContextMultiTenantDummyEntity> FifthDbContextMultiTenantDummyEntity { get; set; }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs

@@ -6,9 +6,11 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Autofac;
 using Volo.Abp.EntityFrameworkCore.Domain;
 using Volo.Abp.EntityFrameworkCore.Sqlite;
+using Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
 using Volo.Abp.EntityFrameworkCore.TestApp.SecondContext;
 using Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext;
 using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.TestApp;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.TestApp.EntityFrameworkCore;
@@ -44,6 +46,17 @@ public class AbpEntityFrameworkCoreTestModule : AbpModule
             });
         });
 
+        context.Services.AddAbpDbContext<HostTestAppDbContext>(options =>
+        {
+            options.AddDefaultRepositories(true);
+            options.ReplaceDbContext<IFifthDbContext>(MultiTenancySides.Host);
+        });
+
+        context.Services.AddAbpDbContext<TenantTestAppDbContext>(options =>
+        {
+            options.AddDefaultRepositories(true);
+        });
+
         var sqliteConnection = CreateDatabaseAndGetConnection();
 
         Configure<AbpDbContextOptions>(options =>

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DbContext_Replace_Tests.cs

@@ -1,11 +1,12 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using Shouldly;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
 using Volo.Abp.EntityFrameworkCore.TestApp.FourthContext;
 using Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.TestApp.EntityFrameworkCore;
 using Volo.Abp.Uow;
@@ -19,7 +20,7 @@ public class DbContext_Replace_Tests : EntityFrameworkCoreTestBase
     private readonly IBasicRepository<FourthDbContextDummyEntity, Guid> _fourthDummyRepository;
     private readonly IPersonRepository _personRepository;
     private readonly IUnitOfWorkManager _unitOfWorkManager;
-    private readonly AbpDbContextOptions _options;
+    private readonly IEfCoreDbContextTypeProvider _dbContextTypeProvider;
 
     public DbContext_Replace_Tests()
     {
@@ -27,14 +28,14 @@ public class DbContext_Replace_Tests : EntityFrameworkCoreTestBase
         _fourthDummyRepository = GetRequiredService<IBasicRepository<FourthDbContextDummyEntity, Guid>>();
         _personRepository = GetRequiredService<IPersonRepository>();
         _unitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
-        _options = GetRequiredService<IOptions<AbpDbContextOptions>>().Value;
+        _dbContextTypeProvider = GetRequiredService<IEfCoreDbContextTypeProvider>();
     }
 
     [Fact]
     public async Task Should_Replace_DbContext()
     {
-        _options.GetReplacedTypeOrSelf(typeof(IThirdDbContext)).ShouldBe(typeof(TestAppDbContext));
-        _options.GetReplacedTypeOrSelf(typeof(IFourthDbContext)).ShouldBe(typeof(TestAppDbContext));
+        _dbContextTypeProvider.GetDbContextType(typeof(IThirdDbContext)).ShouldBe(typeof(TestAppDbContext));
+        _dbContextTypeProvider.GetDbContextType(typeof(IFourthDbContext)).ShouldBe(typeof(TestAppDbContext));
 
         (ServiceProvider.GetRequiredService<IThirdDbContext>() is TestAppDbContext).ShouldBeTrue();
         (ServiceProvider.GetRequiredService<IFourthDbContext>() is TestAppDbContext).ShouldBeTrue();
@@ -65,4 +66,47 @@ public class DbContext_Replace_Tests : EntityFrameworkCoreTestBase
             await uow.CompleteAsync();
         }
     }
+
+    [Fact]
+    public async Task Should_Replace_DbContext_By_Host_And_Tenant()
+    {
+        _dbContextTypeProvider.GetDbContextType(typeof(IFifthDbContext)).ShouldBe(typeof(HostTestAppDbContext));
+        (ServiceProvider.GetRequiredService<IFifthDbContext>() is HostTestAppDbContext).ShouldBeTrue();
+
+        using (var uow = _unitOfWorkManager.Begin())
+        {
+            var instance1 = await GetRequiredService<IBasicRepository<FifthDbContextDummyEntity, Guid>>().GetDbContextAsync();
+            (instance1 is IFifthDbContext).ShouldBeTrue();
+
+            var instance2 = await GetRequiredService<IBasicRepository<FifthDbContextMultiTenantDummyEntity, Guid>>().GetDbContextAsync();
+            (instance2 is HostTestAppDbContext).ShouldBeTrue();
+
+            instance1.ShouldBe(instance2);
+
+            await uow.CompleteAsync();
+        }
+
+        using (GetRequiredService<ICurrentTenant>().Change(Guid.NewGuid()))
+        {
+            _dbContextTypeProvider.GetDbContextType(typeof(IFifthDbContext)).ShouldBe(typeof(TenantTestAppDbContext));
+            (ServiceProvider.GetRequiredService<IFifthDbContext>() is TenantTestAppDbContext).ShouldBeTrue();
+
+            using (var uow = _unitOfWorkManager.Begin())
+            {
+                var instance1 = await GetRequiredService<IBasicRepository<FifthDbContextDummyEntity, Guid>>().GetDbContextAsync();
+                (instance1 is IFifthDbContext).ShouldBeTrue();
+
+                var instance2 = await GetRequiredService<IFifthDbContextDummyEntityRepository>().GetDbContextAsync();
+                (instance2 is HostTestAppDbContext).ShouldBeTrue();
+
+                instance1.ShouldBe(instance2);
+
+                // Multi-tenant entities use tenant DbContext
+                var instance3 = await GetRequiredService<IFifthDbContextMultiTenantDummyEntityRepository>().GetDbContextAsync();
+                (instance3 is TenantTestAppDbContext).ShouldBeTrue();
+
+                await uow.CompleteAsync();
+            }
+        }
+    }
 }

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/HostTestAppDbContext.cs

@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+
+namespace Volo.Abp.TestApp.EntityFrameworkCore;
+
+public class HostTestAppDbContext : AbpDbContext<HostTestAppDbContext>, IFifthDbContext
+{
+    public DbSet<FifthDbContextDummyEntity> FifthDbContextDummyEntity { get; set; }
+    public DbSet<FifthDbContextMultiTenantDummyEntity> FifthDbContextMultiTenantDummyEntity { get; set; }
+
+    public HostTestAppDbContext(DbContextOptions<HostTestAppDbContext> options)
+        : base(options)
+    {
+    }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TenantTestAppDbContext.cs

@@ -0,0 +1,19 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.TestApp.FifthContext;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.TestApp.EntityFrameworkCore;
+
+[ReplaceDbContext(typeof(IFifthDbContext), MultiTenancySides.Tenant)]
+public class TenantTestAppDbContext : AbpDbContext<TenantTestAppDbContext>, IFifthDbContext
+{
+    public DbSet<FifthDbContextDummyEntity> FifthDbContextDummyEntity { get; set; }
+    public DbSet<FifthDbContextMultiTenantDummyEntity> FifthDbContextMultiTenantDummyEntity { get; set; }
+
+    public TenantTestAppDbContext(DbContextOptions<TenantTestAppDbContext> options)
+        : base(options)
+    {
+    }
+}