Merge branch 'dev' into bs5

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

@@ -312,7 +312,6 @@
     "PaymentStateSetTo" : "Payment state set to {0}",
     "ChangeState": "Change State",
     "Permission:TrialLicense" : "Trial License",
-    "Permission:ManageTrialLicense": "Manage Trial License",
     "Menu:TrialLicenses": "Trial Licenses",
     "TrialLicenses": "Trial Licenses",
     "UserNameFilter": "Username",
@@ -340,8 +339,8 @@
     "Activated": "Activated",
     "PurchasedToNormalLicense": "Purchased",
     "Expired": "Expired",
-    "TrialLicenseDeletionWarningMessage": "Trial license and if any organization and qa organization will be deleted!",
+    "TrialLicenseDeletionWarningMessage": "Are you sure you want to delete the trial license? Trial license, organization, support accounts will be deleted!",
-    "IsTrial": "Is trial",
+    "LicenseCategoryFilter": "License category",
     "Volo.AbpIo.Commercial:030000": "You already used your trial period.",
     "Volo.AbpIo.Commercial:030001": "This organization name already exists.",
     "Volo.AbpIo.Commercial:030002": "Once activated, trial license cannot be set to requested!",
@@ -349,6 +348,7 @@
     "Volo.AbpIo.Commercial:030004": "Status could not be changed due to an unexpected error!",
     "Volo.AbpIo.Commercial:030005": "Start date and end date cannot be given when the trial license is in the requested state!",
     "Volo.AbpIo.Commercial:030006": "End date must always be greater than start date!",
-    "Volo.AbpIo.Commercial:030007": "This trial license has already been activated once!"
+    "Volo.AbpIo.Commercial:030007": "This trial license has already been activated once!",
+    "Volo.AbpIo.Commercial:030008": "Purchase date can be set only when status is Purchased!",
   }
 }

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

@@ -1,4 +1,4 @@
-{
+{
   "culture": "en",
   "texts": {
     "Permission:CommunityArticle": "Community Article",

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/ro-RO.json

@@ -1,4 +1,4 @@
-{
+{
   "culture": "ro-RO",
   "texts": {
     "Permission:CommunityArticle": "Articol comunitar",

docs/cs/Entity-Framework-Core-PostgreSQL.md

@@ -1,4 +1,4 @@
-# Přepnutí na EF Core PostgreSQL providera
+# Přepnutí na EF Core PostgreSQL providera
 
 Tento dokument vysvětluje, jak přepnout na poskytovatele databáze **PostgreSQL** pro **[spouštěcí šablonu aplikace](Startup-Templates/Application.md)**, která je dodávána s předem nakonfigurovaným SQL poskytovatelem.
 

docs/cs/Getting-Started-AspNetCore-Application.md

@@ -1,4 +1,4 @@
-# Začínáme s ASP.NET Core MVC aplikací
+# Začínáme s ASP.NET Core MVC aplikací
 
 Tento tutoriál vysvětluje jak začít s ABP z ničeho s minimem závislostí. Obvykle chcete začít se **[startovací šablonou](https://abp.io/Templates)**.
 

docs/cs/Getting-Started-Console-Application.md

@@ -1,4 +1,4 @@
-# Začínáme s konzolovou aplikací
+# Začínáme s konzolovou aplikací
 
 Tento tutoriál vysvětluje jak začít s ABP z ničeho s minimem závislostí. Obvykle chcete začít se **[startovací šablonou](https://abp.io/Templates)**.
 

docs/cs/Index.md

@@ -1,4 +1,4 @@
-# ABP dokumentace
+# ABP dokumentace
 
 ABP je **open source aplikační framework** se zaměřením na vývoj webových aplikací založených na ASP.NET Core, zároveň ho však lze využít i k vývoji jiných typů aplikací.
 

docs/en/API/Application-Configuration.md

@@ -1,4 +1,4 @@
-# Application Configuration Endpoint
+# Application Configuration Endpoint
 
 ABP Framework provides a pre-built and standard endpoint that contains some useful information about the application/service. Here, the list of some fundamental information at this endpoint:
 

docs/en/API/Swagger-Integration.md

@@ -1,4 +1,4 @@
-# Swagger Integration
+# Swagger Integration
 
 [Swagger (OpenAPI)](https://swagger.io/) is a language-agnostic specification for describing REST APIs. It allows both computers and humans to understand the capabilities of a REST API without direct access to the source code. Its main goals are to:
 

docs/en/Audit-Logging.md

@@ -1,4 +1,4 @@
-# Audit Logging
+# Audit Logging
 
 [Wikipedia](https://en.wikipedia.org/wiki/Audit_trail): "*An audit trail (also called **audit log**) is a security-relevant chronological record, set of records, and/or destination and source of records that provide documentary evidence of the sequence of activities that have affected at any time a specific operation, procedure, or event*".
 

docs/en/Best-Practices/Application-Services.md

@@ -1,4 +1,4 @@
-## Application Services Best Practices & Conventions
+## Application Services Best Practices & Conventions
 
 * **Do** create an application service for each **aggregate root**.
 

docs/en/Best-Practices/Data-Transfer-Objects.md

@@ -1,4 +1,4 @@
-## Data Transfer Objects Best Practices & Conventions
+## Data Transfer Objects Best Practices & Conventions
 
 * **Do** define DTOs in the **application contracts** package.
 * **Do** inherit from the pre-built **base DTO classes** where possible and necessary (like `EntityDto<TKey>`, `CreationAuditedEntityDto<TKey>`, `AuditedEntityDto<TKey>`, `FullAuditedEntityDto<TKey>` and so on).

docs/en/Best-Practices/Domain-Services.md

@@ -1,4 +1,4 @@
-## Domain Services Best Practices & Conventions
+## Domain Services Best Practices & Conventions
 
 > **This document is not ready yet. Please see the [Domain Services](../Domain-Services.md) document.**
 

docs/en/Best-Practices/Entity-Framework-Core-Integration.md

@@ -1,4 +1,4 @@
-## Entity Framework Core Integration Best Practices
+## Entity Framework Core Integration Best Practices
 
 > See [Entity Framework Core Integration document](../Entity-Framework-Core.md) for the basics of the EF Core integration.
 

docs/en/Best-Practices/Index.md

@@ -1,4 +1,4 @@
-## Module Development Best Practices & Conventions
+## Module Development Best Practices & Conventions
 
 ### Introduction
 

docs/en/Best-Practices/Module-Architecture.md

@@ -1,4 +1,4 @@
-## Module Architecture Best Practices & Conventions
+## Module Architecture Best Practices & Conventions
 
 ### Solution Structure
 

docs/en/Best-Practices/MongoDB-Integration.md

@@ -1,4 +1,4 @@
-## MongoDB Integration
+## MongoDB Integration
 
 * Do define a separated `MongoDbContext` interface and class for each module.
 

docs/en/CLI.md

@@ -1,4 +1,4 @@
-# ABP CLI
+# ABP CLI
 
 ABP CLI (Command Line Interface) is a command line tool to perform some common operations for ABP based solutions.
 

docs/en/Configuration.md

@@ -1,3 +1,3 @@
-# Configuration
+# Configuration
 
 ASP.NET Core has an flexible and extensible key-value based configuration system. In fact, the configuration system is a part of Microsoft.Extensions libraries and it is independent from ASP.NET Core. That means it can be used in any type of application. See [Microsoft's documentation](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/) to learn the configuration infrastructure. ABP framework is 100% compatible with the configuration system.

docs/en/Dependency-Injection.md

@@ -1,4 +1,4 @@
-# Dependency Injection
+# Dependency Injection
 
 ABP's Dependency Injection system is developed based on Microsoft's [dependency injection extension](https://medium.com/volosoft/asp-net-core-dependency-injection-best-practices-tips-tricks-c6e9c67f9d96) library (Microsoft.Extensions.DependencyInjection nuget package). So, it's documentation is valid in ABP too.
 

docs/en/Domain-Services.md

@@ -1,4 +1,4 @@
-# Domain Services
+# Domain Services
 
 ## Introduction
 

docs/en/Emailing.md

@@ -1,4 +1,4 @@
-# Email Sending
+# Email Sending
 
 ABP Framework provides various services, settings and integrations for sending emails;
 

docs/en/Entity-Framework-Core-Migrations.md

@@ -1,4 +1,4 @@
-# EF Core Database Migrations
+# EF Core Database Migrations
 
 This document begins by **introducing the default structure** provided by [the application startup template](Startup-Templates/Application.md) and **discusses various scenarios** you may want to implement for your own application.
 

docs/en/Entity-Framework-Core-MySQL.md

@@ -1,4 +1,4 @@
-# Switch to EF Core MySQL Provider
+# Switch to EF Core MySQL Provider
 
 This document explains how to switch to the **MySQL** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 

docs/en/Entity-Framework-Core-Oracle-Devart.md

@@ -1,4 +1,4 @@
-# Switch to EF Core Oracle Devart Provider
+# Switch to EF Core Oracle Devart Provider
 
 This document explains how to switch to the **Oracle** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 

docs/en/Entity-Framework-Core-Oracle-Official.md

@@ -1,4 +1,4 @@
-# Switch to EF Core Oracle Provider
+# Switch to EF Core Oracle Provider
 
 This document explains how to switch to the **Oracle** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 

docs/en/Entity-Framework-Core-Oracle.md

@@ -1,4 +1,4 @@
-# Switch to EF Core Oracle Provider
+# Switch to EF Core Oracle Provider
 
 This document explains how to switch to the **Oracle** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 

docs/en/Entity-Framework-Core-Other-DBMS.md

@@ -1,4 +1,4 @@
-# Switch to Another DBMS for Entity Framework Core
+# Switch to Another DBMS for Entity Framework Core
 
 **[The application startup template](Startup-Templates/Application.md)** comes with **SQL Server provider pre-configured** for the Entity Framework Core. However, EF Core supports [many other DBMSs](https://docs.microsoft.com/en-us/ef/core/providers/) and you can use any of them within your ABP based applications.
 

docs/en/Entity-Framework-Core-PostgreSQL.md

@@ -1,4 +1,4 @@
-# Switch to EF Core PostgreSQL Provider
+# Switch to EF Core PostgreSQL Provider
 
 This document explains how to switch to the **PostgreSQL** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 

docs/en/Entity-Framework-Core-SQLite.md

@@ -1,4 +1,4 @@
-# Switch to EF Core SQLite Provider
+# Switch to EF Core SQLite Provider
 
 This document explains how to switch to the **SQLite** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 

docs/en/Getting-Started-AspNetCore-Application.md

@@ -1,4 +1,4 @@
-# Getting Started ABP With AspNet Core MVC Web Application
+# Getting Started ABP With AspNet Core MVC Web Application
 
 This tutorial explains how to start ABP from scratch with minimal dependencies. You generally want to start with the **[startup template](Getting-Started-AspNetCore-MVC-Template.md)**.
 

docs/en/Getting-Started-React-Native.md

@@ -1,4 +1,4 @@
-# Getting Started with the React Native
+# Getting Started with the React Native
 
 ````json
 //[doc-params]

docs/en/Getting-Started-With-Startup-Templates.md

@@ -1,4 +1,4 @@
-# Getting Started with the Startup Templates
+# Getting Started with the Startup Templates
 
 See the following tutorials to learn how to get started with the ABP Framework using the pre-built application startup templates:
 

docs/en/Index.md

@@ -1,4 +1,4 @@
-# ABP Documentation
+# ABP Documentation
 
 ABP Framework is a complete **infrastructure** based on the **ASP.NET Core** to create **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**.
 

docs/en/Integration-Tests.md

@@ -1 +1 @@
-This document has been [moved to here](Testing.md).
+This document has been [moved to here](Testing.md).

docs/en/Json-Serialization.md

@@ -1,3 +1,3 @@
-# JSON
+# JSON
 
 TODO

docs/en/MailKit.md

@@ -1,4 +1,4 @@
-# MailKit Integration
+# MailKit Integration
 
 [MailKit](http://www.mimekit.net/) is a cross-platform, popular open source mail client library for .net. ABP Framework provides an integration package to use the MailKit as the [email sender](Emailing.md).
 

docs/en/Migration-Guides/Abp-5_0-Angular.md

@@ -0,0 +1,101 @@
+# Angular UI v4.x to v5.0 Migration Guide
+
+## Breaking Changes
+
+### Overall
+
+See the overall list of breaking changes:
+
+- Bootstrap 5 implementation [#10067](https://github.com/abpframework/abp/issues/10067)
+- Remove NGXS dependency & states [#9952](https://github.com/abpframework/abp/issues/9952)
+- Install @angular/localize package to startup templates [#10099](https://github.com/abpframework/abp/issues/10099)
+- Create new secondary entrypoints and move the related proxies to there [#10060](https://github.com/abpframework/abp/issues/10060)
+- Move SettingTabsService to @abp/ng.setting-management/config package from @abp/ng.core [#10061](https://github.com/abpframework/abp/issues/10061)
+- Make the @abp/ng.account dependent on @abp/ng.identity [#10059](https://github.com/abpframework/abp/issues/10059)
+- Set default abp-modal size medium [#10118](https://github.com/abpframework/abp/issues/10118)
+- Update all dependency versions to the latest [#9806](https://github.com/abpframework/abp/issues/9806)
+- Chart.js big include with CommonJS warning [#7472](https://github.com/abpframework/abp/issues/7472)
+
+### Angular v12
+
+The new ABP Angular UI is based on Angular v12. We started to compile Angular UI packages with the Ivy compilation. Therefore, **new packages only work with Angular v12**. If you are still on the older version of Angular v12, you have to update to Angular v12. The update is usually very easy. See [Angular Update Guide](https://update.angular.io/?l=2&v=11.0-12.0) for further information.
+
+### Bootstrap 5
+
+TODO
+
+### NGXS has been removed
+
+We aim to make the ABP Framework free of any state-management solutions. ABP developers should be able to use the ABP Framework with any library/framework of their choice. So, we decided to remove NGXS from ABP packages.
+
+If you'd like to use NGXS after upgrading to v5.0, you have to install the NGXS to your project. The package can be installed with the following command:
+
+```bash
+npm install @ngxs/store
+
+# or
+
+yarn add @ngxs/store
+```
+
+NGXS states and actions, some namespaces have been removed. See [this issue](https://github.com/abpframework/abp/issues/9952) for the details.
+
+If you don't want to use the NGXS, you should remove all NGXS related imports, injections, etc., from your project.
+
+### @angular/localize package
+
+[`@angular/localize`](https://angular.io/api/localize) dependency has been removed from `@abp/ng.core` package. The package must be installed in your app. Run the following command to install:
+
+```bash
+npm install @angular/localize
+
+# or
+
+yarn add @angular/localize
+```
+
+> ABP Angular UI packages are not dependent on the `@angular/localize` package. However, some packages (like `@ng-bootstrap/ng-bootstrap`) depend on the package. Thus, this package needs to be installed in your project.
+
+### Proxy endpoints
+
+New endpoints named proxy have been created, related proxies have moved.
+For example; before v5.0, `IdentityUserService` could be imported from `@abp/ng.identity`. As of v5.0, the service can be imported from `@abp/ng.identity/proxy`. See an example:
+
+```ts
+import { IdentityUserService } from '@abp/ng.identity/proxy';
+
+@Component({})
+export class YourComponent {
+  constructor(private identityUserService: IdentityUserService) {}
+}
+```
+
+Following proxies have been affected:
+
+- `@abp/ng.account` to `@abp/ng.account.core/proxy`
+- `@abp/ng.feature-management` to `@abp/ng.feature-management/proxy`
+- `@abp/ng.identity` to `@abp/ng.identity/proxy`
+- `@abp/ng.permission-management` to `@abp/ng.permission-management/proxy`
+- `@abp/ng.tenant-management` to `@abp/ng.tenant-management/proxy`
+- **ProfileService** is deleted from `@abp/ng.core`. Instead, you can import it from `@abp/ng.identity/proxy`
+
+### SettingTabsService
+
+**SettingTabsService** has moved from `@abp/ng.core` to `@abp/ng.setting-management/config`.
+
+### ChartComponent
+
+`ChartComponent` has moved from `@abp/ng.theme.shared` to `@abp/ng.components/chart.js`. To use the component, you need to import the `ChartModule` to your module as follows:
+
+```ts
+import { ChartModule } from '@abp/ng.components/chart.js';
+
+@NgModule({
+  imports: [
+    ChartModule,
+    // ...
+  ],
+  // ...
+})
+export class YourFeatureModule {}
+```

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

@@ -0,0 +1,42 @@
+# ABP Framework v4.x to v5.0 Migration Guide
+
+## IdentityUser
+
+We added an `IsActive(bool)` property to `IdentityUser` to [control whether it is available](https://github.com/abpframework/abp/pull/10185). **Please set it to `true` of the old user after the upgrade.**
+
+For EF Core you can change `defaultValue` to `true` in the migration class:
+```cs
+public partial class AddIsActiveToIdentityUser : Migration
+{
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<bool>(
+            name: "IsActive",
+            table: "AbpUsers",
+            type: "bit",
+            nullable: false,
+            defaultValue: true); // Default is false.
+    }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(
+            name: "IsActive",
+            table: "AbpUsers");
+    }
+}
+```
+
+
+## MongoDB
+
+ABP Framework will serialize the datetime based on [AbpClockOptions](https://docs.abp.io/en/abp/latest/Timing#clock-options) start from 5.0, before `DateTime` values in MongoDB are [always saved as UTC](https://mongodb.github.io/mongo-csharp-driver/2.13/reference/bson/mapping/#datetime-serialization-options).
+
+You can disable this behavior by configure `AbpMongoDbOptions`.
+```cs
+services.Configure<AbpMongoDbOptions>(x => x.UseAbpClockHandleDateTime = false);
+```
+
+## Angular UI
+
+See the [Angular UI Migration Guide](Abp-5_0-Angular.md).

docs/en/Migration-Guides/Index.md

@@ -1,7 +1,7 @@
 # ABP Framework Migration Guides
 
-* [4.2 to 4.3](Abp-4_3.md)
+- [4.x to 5.0](Abp-5_0.md)
-* [4.x to 4.2](Abp-4_2.md)
+- [4.2 to 4.3](Abp-4_3.md)
-* [3.3.x to 4.0](Abp-4_0.md)
+- [4.x to 4.2](Abp-4_2.md)
-* [2.9.x to 3.0](../UI/Angular/Migration-Guide-v3.md)
+- [3.3.x to 4.0](Abp-4_0.md)
-
+- [2.9.x to 3.0](../UI/Angular/Migration-Guide-v3.md)

docs/en/Module-Development-Basics.md

@@ -1,4 +1,4 @@
-# Modularity
+# Modularity
 
 ## Introduction
 

docs/en/Modules/Setting-Management.md

@@ -278,7 +278,7 @@ Open the `app.component.ts` and modify the file as shown below:
 
 ```js
 import { Component } from '@angular/core';
-import { SettingTabsService } from '@abp/ng.core'; // imported SettingTabsService
+import { SettingTabsService } from '@abp/ng.setting-management/config'; // imported SettingTabsService
 import { MySettingsComponent } from './my-settings/my-settings.component'; // imported MySettingsComponent
 
 @Component(/* component metadata */)

docs/en/Object-Extensions.md

@@ -1,4 +1,4 @@
-# Object Extensions
+# Object Extensions
 
 ABP Framework provides an **object extension system** to allow you to **add extra properties** to an existing object **without modifying** the related class. This allows to extend functionalities implemented by a depended [application module](Modules/Index.md), especially when you want to [extend entities](Customizing-Application-Modules-Extending-Entities.md) and [DTOs](Customizing-Application-Modules-Overriding-Services.md) defined by the module.
 

docs/en/Options.md

@@ -1,4 +1,4 @@
-# Options
+# Options
 
 Microsoft has introduced [the options pattern](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/options) that is used to configure a group of settings used by the framework services. This pattern is implemented by the [Microsoft.Extensions.Options](https://www.nuget.org/packages/Microsoft.Extensions.Options) NuGet package, so it is usable by any type of applications in addition to ASP.NET Core based applications.
 

docs/en/RabbitMq.md

@@ -1,3 +1,3 @@
-# RabbitMQ
+# RabbitMQ
 
 TODO!

docs/en/Road-Map.md

@@ -1,4 +1,4 @@
-# ABP Framework Road Map
+# ABP Framework Road Map
 
 This document provides a road map, release schedule and planned features for the ABP Framework.
 

docs/en/SMS-Sending.md

@@ -1,4 +1,4 @@
-# SMS Sending
+# SMS Sending
 
 The ABP Framework provides an abstraction to sending SMS. Having such an abstraction has some benefits;
 

docs/en/Settings.md

@@ -1,4 +1,4 @@
-# Settings
+# Settings
 
 [Configuration system](Configuration.md) is a good way to configure the application on startup. In addition to the configurations, ABP provides another way to set and get some application settings.
 

docs/en/Specifications.md

@@ -1,4 +1,4 @@
-# Specifications
+# Specifications
 
 Specification Pattern is used to define **named, reusable, combinable and testable filters** for entities and other business objects.
 

docs/en/Startup-Templates/Application.md

@@ -1,4 +1,4 @@
-# Application Startup Template
+# Application Startup Template
 
 ## Introduction
 

docs/en/Startup-Templates/Index.md

@@ -1,4 +1,4 @@
-# Startup Templates
+# Startup Templates
 
 While you can start with an empty project and add needed packages manually, startup templates make easy and comfortable to start a new solution with the ABP framework. Click the name from the list below to see the documentation of the related startup template:
 

docs/en/Startup-Templates/Module.md

@@ -1,4 +1,4 @@
-# Module Startup Template
+# Module Startup Template
 
 This template can be used to create a **reusable [application module](../Modules/Index.md)** based on the [module development best practices & conventions](../Best-Practices/Index.md). It is also suitable for creating **microservices** (with or without UI).
 

docs/en/Testing.md

@@ -1,4 +1,4 @@
-# Automated Testing
+# Automated Testing
 
 ## Introduction
 

docs/en/Timing.md

@@ -1,4 +1,4 @@
-# Timing
+# Timing
 
 Working with times & [time zones](https://en.wikipedia.org/wiki/Time_zone) is always tricky, especially if you need to build a **global system** that is used by users in **different time zones**.
 

docs/es/Index.md

@@ -1,4 +1,4 @@
-# Documentación de ABP
+# Documentación de ABP
 
 ABP es un **marco de desarrollo de código abierto** enfocado en el desarrollo de aplicaciones web basadas en ASP.NET Core, pero tambien soporta el desarrollo de otro tipo de aplicaciones.
 

docs/pt-BR/Audit-Logging.md

@@ -1,3 +1,3 @@
-# Audit Logging
+# Audit Logging
 
 Façam

docs/pt-BR/Domain-Services.md

@@ -1,3 +1,3 @@
-# ABP Documentation
+# ABP Documentation
 
 Façam!

docs/pt-BR/Emailing.md

@@ -1,3 +1,3 @@
-# Emailing
+# Emailing
 
 Façam!

docs/pt-BR/Integration-Tests.md

@@ -1,3 +1,3 @@
-# Integration Tests
+# Integration Tests
 
 Façam!

docs/pt-BR/SMS-Sending.md

@@ -1,3 +1,3 @@
-# Emailing
+# Emailing
 
 Façam!

docs/pt-BR/Settings.md

@@ -1,3 +1,3 @@
-# Settings
+# Settings
 
 Façam!

docs/pt-BR/Specifications.md

@@ -1,3 +1,3 @@
-# Specifications
+# Specifications
 
 Façam!

docs/pt-BR/Testing.md

@@ -1,3 +1,3 @@
-# Testing
+# Testing
 
 Façam!

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

@@ -1,4 +1,4 @@
-## 应用服务最佳实践 & 约定
+## 应用服务最佳实践 & 约定
 
 * **推荐** 为每个 **聚合根** 创建一个应用服务.
 

docs/zh-Hans/Best-Practices/Data-Transfer-Objects.md

@@ -1,4 +1,4 @@
-## 数据传输对象最佳实践 & 约定
+## 数据传输对象最佳实践 & 约定
 
 * **推荐** 在 **application.contracts** 层中定义DTO.
 * **推荐** 在可能和必要的情况下从预构建的 **基础DTO类** 继承 (如 `EntityDto<TKey>`, `CreationAuditedEntityDto<TKey>`, `AuditedEntityDto<TKey>`, `FullAuditedEntityDto<TKey>` 等).

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

@@ -1,3 +1,3 @@
-## 领域服务最佳实践 & 约定
+## 领域服务最佳实践 & 约定
 
 TODO

docs/zh-Hans/Best-Practices/Entity-Framework-Core-Integration.md

@@ -1,4 +1,4 @@
-## Entity Framework Core 集成最佳实践
+## Entity Framework Core 集成最佳实践
 
 > 有关EF Core 集成的基础知识,请参阅[Entity Framework Core 集成文档](../Entity-Framework-Core.md).
 

docs/zh-Hans/Best-Practices/Index.md

@@ -1,4 +1,4 @@
-## 模块开发最佳实践 & 约定
+## 模块开发最佳实践 & 约定
 
 ### 介绍
 

docs/zh-Hans/Best-Practices/Module-Architecture.md

@@ -1,4 +1,4 @@
-## 模块化架构最佳实践 & 约定
+## 模块化架构最佳实践 & 约定
 
 ### 解决方案结构
 

docs/zh-Hans/Domain-Services.md

@@ -1,3 +1,3 @@
-# ABP Documentation
+# ABP Documentation
 
 待添加

docs/zh-Hans/Entity-Framework-Core-Migrations.md

@@ -1,4 +1,4 @@
-
+
 # EF Core数据库迁移
 
 本文首先介绍[应用程序启动模板](Startup-Templates/Application.md)提供的**默认结构**,并讨论你可能希望为自己的应用程序实现的**各种场景**.

docs/zh-Hans/Getting-Started-AspNetCore-Application.md

@@ -1,4 +1,4 @@
-# 在AspNet Core MVC Web Application中使用ABP 
+# 在AspNet Core MVC Web Application中使用ABP 
 
 本教程将介绍如何开始以最少的依赖关系开始使用ABP开发. 
 

docs/zh-Hans/Index.md

@@ -1,4 +1,4 @@
-# ABP 文档
+# ABP 文档
 
 > 中文文档翻译来自[cnAbp](https://github.com/cnabp)组织,Abp中文网会持续跟进翻译,目前Abp vNext的英文文档还未完成,大家对整体框架没有深入的理解,翻译难免存在一些问题.敬请见谅.😀
 

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

@@ -1,4 +1,4 @@
-## 模块化
+## 模块化
 
 ### 介绍
 

docs/zh-Hans/Modules/Setting-Management.md

@@ -249,7 +249,7 @@ yarn ng generate component my-settings
 
 ```js
 import { Component } from '@angular/core';
-import { SettingTabsService } from '@abp/ng.core'; // imported SettingTabsService
+import { SettingTabsService } from '@abp/ng.setting-management/config'; // imported SettingTabsService
 import { MySettingsComponent } from './my-settings/my-settings.component'; // imported MySettingsComponent
 
 @Component(/* component metadata */)
@@ -273,4 +273,4 @@ export class AppComponent {
 
 导航到 `/setting-management` 路由你会看到以下变化:
 
-![Custom Settings Tab](../images/custom-settings.png)
+![Custom Settings Tab](../images/custom-settings.png)

docs/zh-Hans/Startup-Templates/Application.md

@@ -1,4 +1,4 @@
-# 应用程序启动模板
+# 应用程序启动模板
 
 ## 介绍
 

docs/zh-Hans/Startup-Templates/Index.md

@@ -1,4 +1,4 @@
-# 启动模板
+# 启动模板
 
 虽然你可以从一个空项目开始并手动添加所需的包,但启动模板可以非常轻松,舒适地使用ABP框架启动新的解决方案.
 

docs/zh-Hans/Startup-Templates/Module.md

@@ -1,4 +1,4 @@
-# MVC模块启动模板
+# MVC模块启动模板
 
 可用此模板开发基于[模块开发最佳实践和约定](../Best-Practices/Index.md)的可**复用 [应用程序模块](../Modules/Index.md)** . 它同样适用于开发**微服务**.
 

framework/Volo.Abp.sln

@@ -387,6 +387,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.IdentityModel.Test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Threading.Tests", "test\Volo.Abp.Threading.Tests\Volo.Abp.Threading.Tests.csproj", "{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Boxes", "src\Volo.Abp.EventBus.Boxes\Volo.Abp.EventBus.Boxes.csproj", "{6E289F31-7924-418B-9DAC-62A7CFADF916}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.DistributedLocking", "src\Volo.Abp.DistributedLocking\Volo.Abp.DistributedLocking.csproj", "{9A7EEA08-15BE-476D-8168-53039867038E}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Auditing.Contracts", "src\Volo.Abp.Auditing.Contracts\Volo.Abp.Auditing.Contracts.csproj", "{508B6355-AD28-4E60-8549-266D21DBF2CF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Client.Web", "src\Volo.Abp.Http.Client.Web\Volo.Abp.Http.Client.Web.csproj", "{F7407459-8AFA-45E4-83E9-9BB01412CC08}"
@@ -1157,6 +1160,14 @@ Global
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A7EEA08-15BE-476D-8168-53039867038E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A7EEA08-15BE-476D-8168-53039867038E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A7EEA08-15BE-476D-8168-53039867038E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A7EEA08-15BE-476D-8168-53039867038E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{508B6355-AD28-4E60-8549-266D21DBF2CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{508B6355-AD28-4E60-8549-266D21DBF2CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{508B6355-AD28-4E60-8549-266D21DBF2CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1360,6 +1371,8 @@ Global
 		{90B1866A-EF99-40B9-970E-B898E5AA523F} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{40C6740E-BFCA-4D37-8344-3D84E2044BB2} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+		{6E289F31-7924-418B-9DAC-62A7CFADF916} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{9A7EEA08-15BE-476D-8168-53039867038E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{508B6355-AD28-4E60-8549-266D21DBF2CF} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{F7407459-8AFA-45E4-83E9-9BB01412CC08} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 	EndGlobalSection

framework/src/Volo.Abp.ApiVersioning.Abstractions/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.ApiVersioning.Abstractions/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Components.Server/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Components.Server/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Components.Web/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Components.Web/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Components.Web/wwwroot/libs/abp/js/abp.js

@@ -1,4 +1,4 @@
-var abp = abp || {};
+var abp = abp || {};
 (function () {
     abp.utils = abp.utils || {};
 

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xml

@@ -1,3 +1,3 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/FodyWeavers.xsd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">