Merge remote-tracking branch 'abpframework/dev' into dev

common.DotSettings

@@ -20,4 +20,5 @@
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Async/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Mutable/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Volo/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

docs/en/Customizing-Application-Modules-Extending-Entities.md

@@ -37,13 +37,14 @@ As mentioned above, all extra properties of an entity are stored as a single JSO
 
 To overcome the difficulties described above, ABP Framework entity extension system for the Entity Framework Core that allows you to use the same extra properties API defined above, but store a desired property as a separate field in the database table.
 
-Assume that you want to add a `SocialSecurityNumber` to the `IdentityUser` entity of the [Identity Module](Modules/Identity.md). You can use the `EntityExtensionManager` static class:
+Assume that you want to add a `SocialSecurityNumber` to the `IdentityUser` entity of the [Identity Module](Modules/Identity.md). You can use the `ObjectExtensionManager`:
 
 ````csharp
-EntityExtensionManager.AddProperty<IdentityUser, string>(
-    "SocialSecurityNumber",
-    b => { b.HasMaxLength(32); }
-);
+ObjectExtensionManager.Instance
+    .MapEfCoreProperty<IdentityUser, string>(
+        "SocialSecurityNumber",
+        b => { b.HasMaxLength(32); }
+    );
 ````
 
 * You provide the `IdentityUser` as the entity name, `string` as the type of the new property, `SocialSecurityNumber` as the property name (also, the field name in the database table).

docs/en/Entities.md

@@ -375,7 +375,7 @@ The way to store this dictionary in the database depends on the database provide
 
 * For [Entity Framework Core](Entity-Framework-Core.md), here are two type of configurations;
   * By default, it is stored in a single `ExtraProperties` field as a `JSON` string (that means all extra properties stored in a single database table field). Serializing to `JSON` and deserializing from the `JSON` are automatically done by the ABP Framework using the [value conversions](https://docs.microsoft.com/en-us/ef/core/modeling/value-conversions) system of the EF Core.
-  * If you want, you can use the `EntityExtensionManager` to define a separate table field for a desired extra property. Properties those are not configured through the `EntityExtensionManager` will continue to use a single `JSON` field as described above. This feature is especially useful when you are using a pre-built [application module](Modules/Index.md) and want to [extend its entities](Customizing-Application-Modules-Extending-Entities.md). See the [EF Core integration document](Entity-Framework-Core.md) to learn how to use the `EntityExtensionManager`.
+  * If you want, you can use the `ObjectExtensionManager` to define a separate table field for a desired extra property. Properties those are not configured through the `ObjectExtensionManager` will continue to use a single `JSON` field as described above. This feature is especially useful when you are using a pre-built [application module](Modules/Index.md) and want to [extend its entities](Customizing-Application-Modules-Extending-Entities.md). See the [EF Core integration document](Entity-Framework-Core.md) to learn how to use the `ObjectExtensionManager`.
 * For [MongoDB](MongoDB.md), it is stored as a **regular field**, since MongoDB naturally supports this kind of [extra elements](https://mongodb.github.io/mongo-csharp-driver/1.11/serialization/#supporting-extra-elements) system.
 
 ### Discussion for the Extra Properties

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

@@ -409,18 +409,19 @@ public static class MyProjectNameEntityExtensions
     {
         OneTimeRunner.Run(() =>
         {
-            EntityExtensionManager.AddProperty<IdentityRole, string>(
-                "Title",
-                b => { b.HasMaxLength(128); }
-            );
+            ObjectExtensionManager.Instance
+                .MapEfCoreProperty<IdentityRole, string>(
+                    "Title",
+                    builder => { builder.HasMaxLength(64); }
+                );
         });
     }
 }
 ````
 
-> Instead of hard-coded "Title" string, we suggest to use `nameof(AppRole.Title)`.
+> Instead of hard-coded "Title" string, we suggest to use `nameof(AppRole.Title)` or use a constant string.
 
-`EntityExtensionManager` is used to add properties to existing entities. Since `EntityExtensionManager` is static, we should call it once. `OneTimeRunner` is a simple utility class defined by the ABP Framework.
+`ObjectExtensionManager` is used to add properties to existing entities. Since `ObjectExtensionManager.Instance` is a static instance (singleton), we should call it once. `OneTimeRunner` is a simple utility class defined by the ABP Framework.
 
 See the [EF Core integration documentation](Entity-Framework-Core.md) for more about the entity extension system.
 
@@ -543,7 +544,7 @@ In this way, you can easily attach any type of value to an entity of a depended
 
 Entity extension system solves the main problem of the extra properties: It can store an extra property in a **standard table field** in the database.
 
-All you need to do is to use the `EntityExtensionManager` to define the extra property as explained above, in the `AppRole` example. Then you can continue to use the same `GetProperty` and `SetProperty` methods  defined above to get/set the related property on the entity, but this time stored as a separate field in the database.
+All you need to do is to use the `ObjectExtensionManager` to define the extra property as explained above, in the `AppRole` example. Then you can continue to use the same `GetProperty` and `SetProperty` methods  defined above to get/set the related property on the entity, but this time stored as a separate field in the database.
 
 ###### Creating a New Table
 

docs/en/Entity-Framework-Core.md

@@ -298,56 +298,57 @@ public class BookService
 
 > Important: You must reference to the `Volo.Abp.EntityFrameworkCore` package from the project you want to access to the DbContext. This breaks encapsulation, but this is what you want in that case.
 
-## Extra Properties & Entity Extension Manager
+## Extra Properties & Object Extension Manager
 
 Extra Properties system allows you to set/get dynamic properties to entities those implement the `IHasExtraProperties` interface. It is especially useful when you want to add custom properties to the entities defined in an [application module](Modules/Index.md), when you use the module as package reference.
 
-By default, all the extra properties of an entity are stored as a single `JSON` object in the database. Entity extension system allows you to to store desired extra properties in separate fields in the related database table.
+By default, all the extra properties of an entity are stored as a single `JSON` object in the database.
 
-For more information about the extra properties & the entity extension system, see the following documents:
+Entity extension system allows you to to store desired extra properties in separate fields in the related database table. For more information about the extra properties & the entity extension system, see the following documents:
 
 * [Customizing the Application Modules: Extending Entities](Customizing-Application-Modules-Extending-Entities.md)
 * [Entities](Entities.md)
 
-This section only explains the `EntityExtensionManager` and its usage.
+This section only explains the EF Core related usage of the `ObjectExtensionManager`.
 
-### AddProperty Method
+### ObjectExtensionManager.Instance
 
-`AddProperty` method of the `EntityExtensionManager` allows you to define additional properties for an entity type.
+`ObjectExtensionManager` implements the singleton pattern, so you need to use the static `ObjectExtensionManager.Instance` to perform all the operations.
+
+### MapEfCoreProperty
+
+`MapEfCoreProperty` is a shortcut extension method to define an extension property for an entity and map to the database.
 
 **Example**: Add `Title` property (database field) to the `IdentityRole` entity:
 
 ````csharp
-EntityExtensionManager.AddProperty<IdentityRole, string>(
-    "Title",
-    b => { b.HasMaxLength(128); }
-);
+ObjectExtensionManager.Instance
+    .MapEfCoreProperty<IdentityRole, string>(
+        "Title",
+        builder => { builder.HasMaxLength(64); }
+    );
 ````
 
-If the related module has implemented this feature (by using the `ConfigureExtensions` explained below), then the new property is added to the model. Then you need to run the standard `Add-Migration` and `Update-Database` commands to update your database to add the new field.
+If the related module has implemented this feature (by using the `ConfigureEfCoreEntity` explained below), then the new property is added to the model. Then you need to run the standard `Add-Migration` and `Update-Database` commands to update your database to add the new field.
 
->`AddProperty` method must be called before using the related `DbContext`. It is a static method. The best way is to use it in your application as earlier as possible. The application startup template has a `YourProjectNameEntityExtensions` class that is safe to use this method inside.
+>`MapEfCoreProperty` method must be called before using the related `DbContext`. It is a static method. The best way is to use it in your application as earlier as possible. The application startup template has a `YourProjectNameEntityExtensions` class that is safe to use this method inside.
 
-### ConfigureExtensions
+### ConfigureEfCoreEntity
 
-If you are building a reusable module and want to allow application developers to add properties to your entities, you can use the `ConfigureExtensions` extension method in your entity mapping:
+If you are building a reusable module and want to allow application developers to add properties to your entities, you can use the `ConfigureEfCoreEntity` extension method in your entity mapping. However, there is a shortcut extension method `ConfigureObjectExtensions` that can be used while configuring the entity mapping:
 
 ````csharp
 builder.Entity<YourEntity>(b =>
 {
-    b.ConfigureExtensions();
+    b.ConfigureObjectExtensions();
     //...
 });
 ````
 
-If you call `ConfigureByConvention()` extension method (like `b.ConfigureByConvention()` in this example), ABP Framework internally calls the `ConfigureExtensions` method. It is a **best practice** to use the `ConfigureByConvention()` method since it also configures database mapping for base properties by convention.
+> If you call `ConfigureByConvention()` extension method (like `b.ConfigureByConvention()` for this example), ABP Framework internally calls the `ConfigureObjectExtensions` method. It is a **best practice** to use the `ConfigureByConvention()` method since it also configures database mapping for base properties by convention.
 
 See the "*ConfigureByConvention Method*" section above for more information.
 
-### GetPropertyNames
-
-`EntityExtensionManager.GetPropertyNames` static method can be used the names of the extension properties defined for this entity. It is normally not needed by an application code, but used by the ABP Framework internally.
-
 ## Advanced Topics
 
 ### Set Default Repository Classes

docs/en/Object-Extensions.md

@@ -0,0 +1,3 @@
+# Object Extensions
+
+TODO

docs/en/UI/Angular/Component-Replacement.md

@@ -1,10 +1,10 @@
-# Component Replacement
+## Component Replacement
 
 You can replace some ABP components with your custom components.
 
 The reason that you **can replace** but **cannot customize** default ABP components is disabling or changing a part of that component can cause problems. So we named those components as _Replaceable Components_.
 
-## How to Replace a Component
+### How to Replace a Component
 
 Create a new component that you want to use instead of an ABP component. Add that component to `declarations` and `entryComponents` in the `AppModule`.
 
@@ -29,7 +29,54 @@ export class AppComponent {
 
 ![Example Usage](./images/component-replacement.gif)
 
-## Available Replaceable Components
+
+### How to Replace a Layout
+
+Each ABP theme module has 3 layouts named `ApplicationLayoutComponent`, `AccountLayoutComponent`, `EmptyLayoutComponent`. These layouts can be replaced with the same way.
+
+> A layout component template should contain `<router-outlet></router-outlet>` element.
+
+The below example describes how to replace the `ApplicationLayoutComponent`:
+
+Run the following command to generate a layout in `angular` folder:
+
+```bash
+yarn ng generate component shared/my-application-layout --export --entryComponent
+
+# You don't need the --entryComponent option in Angular 9
+```
+
+Add the following code in your layout template (`my-layout.component.html`) where you want the page to be loaded.
+
+```html
+<router-outlet></router-outlet>
+```
+
+Open the `app.component.ts` and add the below content:
+
+```js
+import { ..., AddReplaceableComponent } from '@abp/ng.core'; // imported AddReplaceableComponent
+import { MyApplicationLayoutComponent } from './shared/my-application-layout/my-application-layout.component'; // imported MyApplicationLayoutComponent
+import { Store } from '@ngxs/store'; // imported Store
+//...
+export class AppComponent {
+  constructor(..., private store: Store) {} // injected Store
+
+  ngOnInit() {
+    // added below content
+    this.store.dispatch(
+      new AddReplaceableComponent({
+        component: MyApplicationLayoutComponent,
+        key: 'Theme.ApplicationLayoutComponent',
+      }),
+    );
+
+    //...
+  }
+}
+```
+
+### Available Replaceable Components
 
 | Component key                                      | Description                                   |
 | -------------------------------------------------- | --------------------------------------------- |

docs/en/UI/Angular/Service-Proxies.md

@@ -25,9 +25,9 @@ The files generated with the `--module all` option like below:
 
 ### Services
 
-Each generated service matches a back-end controller. The services methods call back-end APIs via [RestService](./Http-Requests.md#restservice).
+Each generated service matches a back-end controller. The services methods call back-end APIs via [RestService](./Http-Requests#restservice).
 
-A variable named `apiName` (available as of v2.4) is defined in each service. `apiName` matches the module's RemoteServiceName. This variable passes to the `RestService` as a parameter at each request. If there is no microservice API defined in the environment, `RestService` uses the default. See [getting a specific API endpoint from application config](./Http-Requests.md#how-to-get-a-specific-api-endpoint-from-application-config)
+A variable named `apiName` (available as of v2.4) is defined in each service. `apiName` matches the module's RemoteServiceName. This variable passes to the `RestService` as a parameter at each request. If there is no microservice API defined in the environment, `RestService` uses the default. See [getting a specific API endpoint from application config](./Http-Requests#how-to-get-a-specific-api-endpoint-from-application-config)
 
 The `providedIn` property of the services is defined as `'root'`. Therefore no need to add a service as a provider to a module. You can use a service by injecting it into a constructor as shown below:
 
@@ -64,4 +64,4 @@ Initial values ​​can optionally be passed to each class constructor.
 
 ## What's Next?
 
-* [HTTP Requests](./Http-Requests.md)
+* [HTTP Requests](./Http-Requests)

docs/zh-Hans/Customizing-Application-Modules-Extending-Entities.md

@@ -37,13 +37,14 @@ return user.GetProperty<string>("Title");
 
 为了解决上面的问题,用于EF Core的ABP框架实体扩展系统允许你使用上面定义相同的额外属性API,但将所需的属性存储在单独的数据库表字段中.
 
-假设你想要添加 `SocialSecurityNumber` 到[身份模块](Modules/Identity.md)的 `IdentityUser` 实体. 你可以使用 `EntityExtensionManager` 静态类:
+假设你想要添加 `SocialSecurityNumber` 到[身份模块](Modules/Identity.md)的 `IdentityUser` 实体. 你可以使用 `ObjectExtensionManager` 类:
 
 ````csharp
-EntityExtensionManager.AddProperty<IdentityUser, string>(
-    "SocialSecurityNumber",
-    b => { b.HasMaxLength(32); }
-);
+ObjectExtensionManager.Instance
+    .MapEfCoreProperty<IdentityUser, string>(
+        "SocialSecurityNumber",
+        b => { b.HasMaxLength(32); }
+    );
 ````
 
 * 你提供了 `IdentityUser` 作为实体名(泛型参数), `string` 做为新属性的类型, `SocialSecurityNumber` 做为属性名(也是数据库表的字段名).

docs/zh-Hans/Entities.md

@@ -367,7 +367,7 @@ public static class IdentityUserExtensions
 
 * 对于 [Entity Framework Core](Entity-Framework-Core.md),这是两种类型的配置;
     * 默认它以 `JSON` 字符串形式存储在 `ExtraProperties` 字段中. 序列化到 `JSON` 和反序列化到 `JSON` 由ABP使用EF Core的[值转换](https://docs.microsoft.com/zh-cn/ef/core/modeling/value-conversions)系统自动完成.
-    * 如果需要,你可以使用 `EntityExtensionManager` 为所需的额外属性定义一个单独的数据库字段. 那些使用 `EntityExtensionManager` 配置的属性继续使用单个 `JSON` 字段. 当你使用预构建的[应用模块](Modules/Index.md)并且想要[扩展模块的实体](Customizing-Application-Modules-Extending-Entities.md). 参阅[EF Core迁移文档](Entity-Framework-Core.md)了解如何使用 `EntityExtensionManager`.
+    * 如果需要,你可以使用 `ObjectExtensionManager` 为所需的额外属性定义一个单独的数据库字段. 那些使用 `ObjectExtensionManager` 配置的属性继续使用单个 `JSON` 字段. 当你使用预构建的[应用模块](Modules/Index.md)并且想要[扩展模块的实体](Customizing-Application-Modules-Extending-Entities.md). 参阅[EF Core迁移文档](Entity-Framework-Core.md)了解如何使用 `ObjectExtensionManager`.
 * 对于 [MongoDB](MongoDB.md), 它以 **常规字段** 存储, 因为 MongoDB 天生支持这种 [额外](https://mongodb.github.io/mongo-csharp-driver/1.11/serialization/#supporting-extra-elements) 系统.
 
 ### 讨论额外的属性

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

@@ -411,10 +411,11 @@ public static class MyProjectNameEntityExtensions
     {
         OneTimeRunner.Run(() =>
         {
-            EntityExtensionManager.AddProperty<IdentityRole, string>(
-                "Title",
-                b => { b.HasMaxLength(128); }
-            );
+            ObjectExtensionManager.Instance
+                .MapEfCoreProperty<IdentityRole, string>(
+                    "Title",
+                    builder => { builder.HasMaxLength(64); }
+                );
         });
     }
 }
@@ -422,7 +423,7 @@ public static class MyProjectNameEntityExtensions
 
 > 我们建议使用 `nameof(AppRole.Title)` 而不是硬编码 "Title" 字符串
 
-`EntityExtensionManager` 用于添加属性到现有的实体. 由于 `EntityExtensionManager` 是静态的,因此应调用一次. `OneTimeRunner` 是ABP框架定义简单的工具类.
+`ObjectExtensionManager` 用于添加属性到现有的实体. 由于 `ObjectExtensionManager.Instance` 是静态实例(单例),因此应调用一次. `OneTimeRunner` 是ABP框架定义简单的工具类.
 
 参阅[EF Core集成文档](Entity-Framework-Core.md)了解更多关于实体扩展系统.
 
@@ -547,7 +548,7 @@ public class IdentityRoleExtendingService : ITransientDependency
 
 实体扩展系统解决了额外属性主要的问题: 它可以将额外属性做为**标准表字段**存储到数据库.
 
-你需要做的就是如上所诉使用 `EntityExtensionManager` 定义额外属性, 然后你就可以使得 `GetProperty` 和 `SetProperty` 方法对实体的属性进行get/set,但是这时它存储在数据库表的单独字段中.
+你需要做的就是如上所诉使用 `ObjectExtensionManager` 定义额外属性, 然后你就可以使得 `GetProperty` 和 `SetProperty` 方法对实体的属性进行get/set,但是这时它存储在数据库表的单独字段中.
 
 ###### 创建新表
 

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

@@ -298,56 +298,57 @@ public class BookService
 
 > 要点: 你必须在使用`DbContext`的项目里引用`Volo.Abp.EntityFrameworkCore`包. 这会破坏封装,但在这种情况下,这就是你需要的.
 
-## Extra Properties & Entity Extension Manager
+## Extra Properties & Object Extension Manager
 
 额外属性系统允许你为实现了 `IHasExtraProperties` 的实体set/get动态属性. 当你想将自定义属性添加到[应用程序模块](Modules/Index.md)中定义的实体时,它特别有用.
 
-默认,实体的所有额外属性存储在数据库的一个 `JSON` 对象中. 实体扩展系统允许你存储额外属性在数据库的单独字段中.
+默认,实体的所有额外属性存储在数据库的一个 `JSON` 对象中.
 
-有关额外属性和实体扩展系统的更多信息,请参阅下列文档：
+实体扩展系统允许你存储额外属性在数据库的单独字段中. 有关额外属性和实体扩展系统的更多信息,请参阅下列文档：
 
 * [自定义应用模块: 扩展实体](Customizing-Application-Modules-Extending-Entities.md)
 * [实体](Entities.md)
 
-本节只解释了 `EntityExtensionManager` 及其用法.
+本节只解释了 EF Core相关的 `ObjectExtensionManager` 及其用法.
 
-### AddProperty 方法
+### ObjectExtensionManager.Instance
 
-`EntityExtensionManager` 的 `AddProperty` 方法允许你实体定义附加的属性.
+`ObjectExtensionManager` 实现单例模式，因此你需要使用静态的 `ObjectExtensionManager.Instance` 来执行所有操作。
+
+### MapEfCoreProperty
+
+`MapEfCoreProperty` 是一种快捷扩展方法,用于定义实体的扩展属性并映射到数据库.
 
 **示例**: 添加 `Title` 属性 (数据库字段)到 `IdentityRole` 实体:
 
 ````csharp
-EntityExtensionManager.AddProperty<IdentityRole, string>(
-    "Title",
-    b => { b.HasMaxLength(128); }
-);
+ObjectExtensionManager.Instance
+    .MapEfCoreProperty<IdentityRole, string>(
+        "Title",
+        builder => { builder.HasMaxLength(64); }
+    );
 ````
 
-如果相关模块已实现此功能(通过使用下面说明的 `ConfigureExtensions`)则将新属性添加到模型中. 然后你需要运行标准的 `Add-Migration` 和 `Update-Database` 命令更新数据库以添加新字段.
+如果相关模块已实现此功能(通过使用下面说明的 `ConfigureEfCoreEntity`)则将新属性添加到模型中. 然后你需要运行标准的 `Add-Migration` 和 `Update-Database` 命令更新数据库以添加新字段.
 
->`AddProperty` 方法必须在使用相关的 `DbContext` 之前调用,它是一个静态方法. 最好的方法是尽早的应用程序中使用它. 应用程序启动模板含有 `YourProjectNameEntityExtensions` 类,可以在放心的在此类中使用此方法.
+>`MapEfCoreProperty` 方法必须在使用相关的 `DbContext` 之前调用,它是一个静态方法. 最好的方法是尽早的应用程序中使用它. 应用程序启动模板含有 `YourProjectNameEntityExtensions` 类,可以在放心的在此类中使用此方法.
 
-### ConfigureExtensions
+### ConfigureEfCoreEntity
 
-如果你正在开发一个可重用使用的模块,并允许应用程序开发人员将属性添加到你的实体,你可以在实体映射使用 `ConfigureExtensions` 扩展方法:
+如果你正在开发一个可重用使用的模块,并允许应用程序开发人员将属性添加到你的实体,你可以在实体映射使用 `ConfigureEfCoreEntity` 扩展方法,但是在配置实体映射时可以使用快捷的扩展方法 `ConfigureObjectExtensions`:
 
 ````csharp
 builder.Entity<YourEntity>(b =>
 {
-    b.ConfigureExtensions();
+    b.ConfigureObjectExtensions();
     //...
 });
 ````
 
-如果你调用 `ConfigureByConvention()` 扩展方法(在此示例中 `b.ConfigureByConvention`),ABP框架内部会调用 `ConfigureExtensions` 方法. 使用 `ConfigureByConvention` 方法是**最佳实践**,因为它还按照约定配置基本属性的数据库映射.
+如果你调用 `ConfigureByConvention()` 扩展方法(在此示例中 `b.ConfigureByConvention`),ABP框架内部会调用 `ConfigureObjectExtensions` 方法. 使用 `ConfigureByConvention` 方法是**最佳实践**,因为它还按照约定配置基本属性的数据库映射.
 
 参阅上面提到的 "*ConfigureByConvention 方法*" 了解更多信息.
 
-### GetPropertyNames
-
-`EntityExtensionManager.GetPropertyNames` 静态方法可以用作为此实体定义的扩展属性的名称. 应用程序代码通常不需要,但是ABP框架在内部使用它.
-
 ## 高级主题
 
 ### 设置默认仓储类

docs/zh-Hans/Getting-Started-Angular-Template.md

@@ -0,0 +1,3 @@
+## Getting Started With the Angular Application Template
+
+TODO...

docs/zh-Hans/Getting-Started-With-Startup-Templates.md

@@ -0,0 +1,6 @@
+# 启动模板入门
+
+参阅下面的教程来学习如何开始使用的ABP框架预构建的应用程序启动模板:
+
+* [ASP.NET Core MVC/Razor页面模板入门](Getting-Started-AspNetCore-MVC-Template.md)
+* [Angular UI模板入门](Getting-Started-Angular-Template.md)

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

@@ -2,11 +2,16 @@
 
 ## 介绍
 
-应用程序启动模板是基于[领域驱动设计](../Domain-Driven-Design.md)(DDD)分层的应用程序结构. 在这篇文档中详细介绍了解决方案结构和项目,如果你想快速入门,请遵循以下指南:
+应用程序启动模板是基于[领域驱动设计](../Domain-Driven-Design.md)(DDD)分层的应用程序结构.
 
-* 参阅[ASP.NET Core MVC 模板入门](../Getting-Started-AspNetCore-MVC-Template.md)创建此模板的新解决方案并运行它.
+在这篇文档中详细介绍了**解决方案结构**和项目,如果你想快速入门,请遵循以下指南:
+
+* 参阅[ASP.NET Core MVC 模板入门](../Getting-Started-With-Startup-Templates.md)创建此模板的新解决方案并运行它.
 * 参阅[ASP.NET Core MVC 教程](../Tutorials/AspNetCore-Mvc/Part-I.md)学习使用此模板开发应用程序.
 
+* [入门文档](../Getting-Started-AspNetCore-MVC-Template.md) 介绍了如何在几分钟内创建一个新的应用程序.
+* [应用程序开发教程](../Tutorials/AspNetCore-Mvc/Part-I.md) 学习使用此模板开发应用程序.
+
 ## 如何开始
 
 你可以使用[ABP CLI](../CLI.md)创建基于此启动模板的新项目,或者你也可以在[入门](https://abp.io/get-started)页面创建并下载项目. 在这里我们使用CLI创建新项目.
@@ -120,6 +125,7 @@ ABP是一个模块化的框架,理想的设计是让每个模块都有自己的
 * 它依赖 `.EntityFrameworkCore` 项目,因为它重用了应用程序的 `DbContext` 配置 .
 
 > 只有在你使用了EF Core做为数据库提供程序时,此项目才会可用.
+> 参阅[Entity Framework Core迁移指南](../Entity-Framework-Core-Migrations.md)了解这个项目的详细信息.
 
 #### .DbMigrator 项目
 

docs/zh-Hans/UI/AspNetCore/Customization-User-Interface.md

@@ -1,3 +1,469 @@
 # ASP.NET Core (MVC / Razor Pages) 用户界面自定义指南
 
-TODO...
+本文档解释了如何重写ASP.NET Core MVC / Razor Page 应用程序依赖[应用模块](../../Modules/Index.md)的用户界面.
+
+## 重写页面
+
+本节介绍了[Razor 页面](https://docs.microsoft.com/zh-cn/aspnet/core/razor-pages/)开发,它是ASP.NET Core推荐的服务端渲染用户页面的方法. 预构建的模块通常使用Razor页面替代经典的MVC方式(下一节也介绍MVC模式).
+
+你通过有三种重写页面的需求:
+
+* 仅**重写页面模型**(C#)端执行其他逻辑,不更改UI.
+* 仅**重写Razor页面**(.cshtml文件),不更改逻辑.
+* **完全重写** 页面.
+
+### 重写页面模型 (C#)
+
+````csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Identity;
+using Volo.Abp.Identity.Web.Pages.Identity.Users;
+
+namespace Acme.BookStore.Web.Pages.Identity.Users
+{
+    [Dependency(ReplaceServices = true)]
+    [ExposeServices(typeof(EditModalModel))]
+    public class MyEditModalModel : EditModalModel
+    {
+        public MyEditModalModel(
+            IIdentityUserAppService identityUserAppService,
+            IIdentityRoleAppService identityRoleAppService
+            ) : base(
+                identityUserAppService,
+                identityRoleAppService)
+        {
+        }
+
+        public override async Task<IActionResult> OnPostAsync()
+        {
+            //TODO: Additional logic
+            await base.OnPostAsync();
+            //TODO: Additional logic
+        }
+    }
+}
+````
+
+* 这个类继承并替换 `EditModalModel` ,重写了 `OnPostAsync` 方法在基类代码的前后执行附加逻辑
+* 它使用 `ExposeServices` 和 `Dependency` attributes去替换这个类.
+
+### 重写Razor页面 (.CSHTML)
+
+使用[虚拟文件系统](../../Virtual-File-System.md)可以重写 `.cshtml` 文件(razor page, razor view, view component... 等.)
+
+虚拟文件系统允许我们将**资源嵌入到程序集中**. 通过这个方式,预构建的模块在Nuget包中定义了Razor页面. 当你依赖模块时,可以覆盖这个模块向虚拟文件系统添加的任何文件,包括页面/视图.
+
+#### 示例
+
+这个示例重写了[账户模块](../../Modules/Account.md)定义的**登录页面**UI
+
+物理文件可以覆盖相同位置的嵌入文件. 账户模块在 `Pages/Account` 文件夹下定义了 `Login.cshtml` 文件. 所以你可以在同一路径下创建文件覆盖它:
+![overriding-login-cshtml](../../images/overriding-login-cshtml.png)
+
+通常你想要拷贝模块的 `.cshtml` 原文件,然后进行需要的更改. 你可以在[这里](https://github.com/abpframework/abp/blob/dev/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml)找到源文件. 不要拷贝 `Login.cshtml.cs` 文件,它是隐藏razor页面的代码,我们不希望覆盖它(见下节).
+
+这就够了,接下来你可以对文件内容做你想要的更改.
+
+### 完全重写Razo页面
+
+也许你想要完全重写页面,Razor和页面相关的C#文件.
+
+在这种情况下;
+
+1. 像上面描述过的那术重写C#页面模型类,但不需要替换已存在的页面模型类.
+2. 像上面描述过的那样重写Razor页面,并且更改@model指向新的页面模型
+
+#### 示例
+
+这个示例重写了[账户模块](../../Modules/Account.md)定义的**登录页面**
+
+创建一个继承自 `LoginModel`(定义在`Volo.Abp.Account.Web.Pages.Account`命名空间下)的页面模型类:
+
+````csharp
+public class MyLoginModel : LoginModel
+{
+    public MyLoginModel(
+        IAuthenticationSchemeProvider schemeProvider, 
+        IOptions<AbpAccountOptions> accountOptions
+        ) : base(
+        schemeProvider, 
+        accountOptions)
+    {
+
+    }
+
+    public override Task<IActionResult> OnPostAsync(string action)
+    {
+        //TODO: Add logic
+        return base.OnPostAsync(action);
+    }
+
+    //TODO: Add new methods and properties...
+}
+````
+
+如果需要,你可以重写任何方法或添加新的属性/方法
+
+> 注意我们没有使用 `[Dependency(ReplaceServices = true)]` 或 `[ExposeServices(typeof(LoginModel))]`,因为我们不想替换依赖注入中已存在的类,我们定义了一个新的.
+
+拷贝 `Login.cshtml` 到你们解决方案,更改 **@model** 指定到 `MyLoginModel`:
+
+````xml
+@page
+...
+@model Acme.BookStore.Web.Pages.Account.MyLoginModel
+...
+````
+
+这就够了,接下来你可以做任何想要更改.
+
+#### 不使用继承替换页面模型
+
+你不需要继承源页面模型类(像之前的示例). 你可以完全**重写实现**你自己的页面. 在这种事情下你可以从 `PageModel`,`AbpPageModel` 或任何你需要的合适的基类派生.
+
+## 重写视图组件
+
+在ABP框架,预构建的模块和主题定义了一些**可重用的视图组件**. 这些视图组件可以像页面一样被替换.
+
+### 示例
+
+下面是应用程序启动模板自带的 **基本主题** 的截图.
+
+![bookstore-brand-area-highlighted](../../images/bookstore-brand-area-highlighted.png)
+
+[基本主题](../../Themes/Basic.md) 为layout定义了一些视图组件. 例如上面带有红色矩形的突出显示区域称为 **Brand组件**, 你可能想添加自己的**自己的应用程序logo**来自定义此组件. 让我们来看看如何去做.
+
+首先创建你的logo并且放到你的web应用程序文件夹中,我们使用 `wwwroot/logos/bookstore-logo.png` 路径. 然后在 `Themes/Basic/Components/Brand` 文件夹下复制[Brand组件视图](https://github.com/abpframework/abp/blob/dev/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/Default.cshtml). 结果应该是类似下面的图片:
+
+![bookstore-added-brand-files](../../images/bookstore-added-brand-files.png)
+
+然后对 `Default.cshtml` 文件做你想要的更改. 例如内容可以是这样的:
+
+````xml
+<a href="/">
+    <img src="~/logos/bookstore-logo.png" width="250" height="60"/>
+</a>
+````
+
+现在你可以运行应用程序看到结果:
+
+![bookstore-added-logo](../../images/bookstore-added-logo.png)
+
+如果你需要,你也可以仅使用依赖注入系统替换组件[背后的C#类代码](https://github.com/abpframework/abp/blob/dev/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs)
+
+### 重写主题
+
+正如上所解释的,你可以更改任何组件,layout或c#类. 参阅[主题文档]了解更多关于主题系统的信息.
+
+## 重写静态资源
+
+重写模块的静态资源(像JavaScript,Css或图片文件)是很简单的. 只需要在解决方案的相同路径创建文件,虚拟文件系统会自动处理它.
+
+## 操作捆绑
+
+[捆绑 & 压缩](Bundling-Minification.md) 系统提供了**动态可扩展的** 系统去创建**script**和**style**捆绑. 它允许你扩展和操作现有的包.
+
+### 示例: 添加全局CSS文件
+
+例如APP框架定义了一个**全局样式捆绑**添加到所有的页面(事实上由主题添加layout). 让我们添加一个**自定义样式文件**到这个捆绑文件的最后,我们可以覆盖任何全局样式.
+
+创建在 `wwwroot` 文件夹下创建一个CSS文件
+
+![bookstore-global-css-file](../../images/bookstore-global-css-file.png)
+
+在CSS文件中定义一些规则. 例如:
+
+````css
+.card-title {
+    color: orange;
+    font-size: 2em;
+    text-decoration: underline;
+}
+
+.btn-primary {
+    background-color: red;
+}
+````
+
+然后在你的[模块](../../Module-Development-Basics.md) `ConfigureServices` 方法添加这个文件到标准的全局样式捆绑包:
+
+````csharp
+Configure<AbpBundlingOptions>(options =>
+{
+    options.StyleBundles.Configure(
+        StandardBundles.Styles.Global, //The bundle name!
+        bundleConfiguration =>
+        {
+            bundleConfiguration.AddFiles("/styles/my-global-styles.css");
+        }
+    );
+});
+````
+
+#### 全局脚本捆绑包
+
+就像 `StandardBundles.Styles.Global` 一样,还有一个 `StandardBundles.Scripts.Global`,你可以添加文件或操作现有文件.
+
+### 示例: 操作捆绑包文件
+
+上面的示例中添加了新文件到捆绑包. 如果你创建 **bundle contributor** 类则可以做到更多. 示例:
+
+````csharp
+public class MyGlobalStyleBundleContributor : BundleContributor
+{
+    public override void ConfigureBundle(BundleConfigurationContext context)
+    {
+        context.Files.Clear();
+        context.Files.Add("/styles/my-global-styles.css");
+    }
+}
+````
+
+然后你可以添加这个contributor到已存在的捆绑中:
+
+````csharp
+Configure<AbpBundlingOptions>(options =>
+{
+    options.StyleBundles.Configure(
+        StandardBundles.Styles.Global,
+        bundleConfiguration =>
+        {
+            bundleConfiguration.AddContributors(typeof(MyGlobalStyleBundleContributor));
+        }
+    );
+});
+````
+
+示例中清除了所有的CSS文件,在现实中这并不是一个好主意,你可以找到某个特定的文件替换成你自己的文件.
+
+### 示例: 为特定页面添加JavaScript文件
+
+上面的示例将全局包添加到布局中. 如果要在依赖模块中为特定页面定义添加CSS/JavaScript文件(或替换文件)怎么做?
+
+假设你想要用户进入身份模块的**角色管理**页面时运行**JavaScript代码**.
+
+首先在 `wwwroot`, `Pages` 或 `Views` 文件夹下创建一个标准的JavaScript文件(默认ABP支持这些文件夹下的静态文件). 根据约定我们推荐 `Pages/Identity/Roles` 文件夹:
+
+![bookstore-added-role-js-file](../../images/bookstore-added-role-js-file.png)
+
+该文件的内容很简单:
+
+````js
+$(function() {
+    abp.log.info('My custom role script file has been loaded!');
+});
+````
+
+然后将这个文件添加到角色管页面理捆绑包中:
+
+````csharp
+Configure<AbpBundlingOptions>(options =>
+{
+    options.ScriptBundles
+        .Configure(
+            typeof(Volo.Abp.Identity.Web.Pages.Identity.Roles.IndexModel).FullName,
+            bundleConfig =>
+            {
+                bundleConfig.AddFiles("/Pages/Identity/Roles/my-role-script.js");
+            });
+});
+````
+
+`typeof(Volo.Abp.Identity.Web.Pages.Identity.Roles.IndexModel).FullName` 是获取角色管理页面捆绑包名称的安全方式:
+
+> 请注意并非每个页面都定义了这个页面的捆绑包. 它们仅在需要时定义.
+
+除了添加新的CSS/JavaScript文件到页面,你也可以以替换(通过捆绑包contributor)已存在.
+
+## 布局定制
+
+布局由主题([参阅主题](Theming.md))定义设计. 它们不包含在下载的应用程序解决方案中. 通过这种方式你可以轻松的**更改**主题并获取新的功能. 你不能**直接更改**应用程序中的布局代码,除非你用自己的布局替换它(在下一部分中说明).
+
+有一些通用的方法可以**自定义布局**,将在下一节中介绍.
+
+### 菜单贡献者
+
+ABP框架定义了两个**标准菜单**:
+
+![bookstore-menus-highlighted](../../images/bookstore-menus-highlighted.png)
+
+* `StandardMenus.Main`: 应用程序的主菜单.
+* `StandardMenus.User`: 用户菜单 (通常在屏幕的右上方).
+
+显示菜单是主题的责任,但**菜单项**由模板和你的应用程序代码决定. 只需要实现 `IMenuContributor` 接口并在 `ConfigureMenuAsync` 方法操作菜单项.
+
+渲染菜单时需要执行菜单贡献者. **应用程序启动模板** 已经定义了菜单贡献者,所以你可以使用它. 参阅[导航菜单](Navigation-Menu.md)文档了解更多.
+
+### 工具栏贡献者
+
+[工具栏系统](Toolbars.md)用于在用户界面定义 **工具栏** . 模块 (或你的应用程序)可以将 **项** 添加到工具栏, 随后主题将在**布局**上呈现工具栏.
+
+只有一个 **标准工具栏** (名称为 "Main" - 定义为常量: `StandardToolbars.Main`). 对于基本主题,按如下呈现:![bookstore-toolbar-highlighted](../../images/bookstore-toolbar-highlighted.png)
+
+在上面的屏幕快照中,主工具栏添加了两个项目:语言开关组件和用户菜单. 你可以在此处添加自己的项.
+
+#### 示例: 添加通知图标
+
+在这个示例中,我们会添加一个**通知(响铃)图标**到语言切换项的左侧. 工具栏的项项目是一个**视图组件**. 所以,在你的项目中创建一个新的视图组件:
+
+![bookstore-notification-view-component](../../images/bookstore-notification-view-component.png)
+
+**NotificationViewComponent.cs**
+
+````csharp
+public class NotificationViewComponent : AbpViewComponent
+{
+    public async Task<IViewComponentResult> InvokeAsync()
+    {
+        return View("/Pages/Shared/Components/Notification/Default.cshtml");
+    }
+}
+````
+
+**Default.cshtml**
+
+````xml
+<div id="MainNotificationIcon" style="color: white; margin: 8px;">
+    <i class="far fa-bell"></i>
+</div>
+````
+
+现在,我们创建一个类实现 `IToolbarContributor` 接口:
+
+````csharp
+public class MyToolbarContributor : IToolbarContributor
+{
+    public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
+    {
+        if (context.Toolbar.Name == StandardToolbars.Main)
+        {
+            context.Toolbar.Items
+                .Insert(0, new ToolbarItem(typeof(NotificationViewComponent)));
+        }
+
+        return Task.CompletedTask;
+    }
+}
+````
+
+这个类向 `Main` 工具栏的第一项添加了 `NotificationViewComponent`.
+
+最后你需要将这个贡献者添加到 `AbpToolbarOptions`,在你模块类的 `ConfigureServices` 方法:
+
+````csharp
+Configure<AbpToolbarOptions>(options =>
+{
+    options.Contributors.Add(new MyToolbarContributor());
+});
+````
+
+这就够了,当你运行应用程序后会看到工具栏上的通知图标:
+
+![bookstore-notification-icon-on-toolbar](../../images/bookstore-notification-icon-on-toolbar.png)
+
+示例中的 `NotificationViewComponent` 返回没有任何数据的视图. 在实际场景中,你可能想**查询数据库**(或调用HTTP API)获取通知并传递给视图. 如果需要可以将 `JavaScript` 或 `CSS` 文件添加到工具栏的全局捆绑包中(如前所述).
+
+参阅[工具栏文档](Toolbars.md)了解更多关于工具栏系统.
+
+### 布局钩子
+
+[布局钩子](Layout-Hooks.md) 系统允许你在布局页面的某些特定部分 **添加代码** . 所有主题的所有布局都应该实现这些钩子. 然后你可以将**视图组件**添加到钩子.
+
+#### 示例: 添加谷歌统计
+
+假设你想要添加谷歌统计脚本到布局(将适用所有的页面). 首先在你的项目中**创建一个视图组件**:
+
+![bookstore-google-analytics-view-component](../../images/bookstore-google-analytics-view-component.png)
+
+**NotificationViewComponent.cs**
+
+````csharp
+public class GoogleAnalyticsViewComponent : AbpViewComponent
+{
+    public IViewComponentResult Invoke()
+    {
+        return View("/Pages/Shared/Components/GoogleAnalytics/Default.cshtml");
+    }
+}
+````
+
+**Default.cshtml**
+
+````html
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-xxxxxx-1', 'auto');
+    ga('send', 'pageview');
+</script>
+````
+
+在你自己的代码中更改 `UA-xxxxxx-1` .
+
+然后你可以在你模块的 `ConfigureServices` 方法将这个组件添加到任何的钩子点:
+
+````csharp
+Configure<AbpLayoutHookOptions>(options =>
+{
+    options.Add(
+        LayoutHooks.Head.Last, //The hook name
+        typeof(GoogleAnalyticsViewComponent) //The component to add
+    );
+});
+````
+
+现在谷歌统计代码将在页面的 `head` 所为最后一项插入. 你(或你在使用的模块)可以将多个项添加到相同的钩子,它们都会添加到布局.
+
+在上面我们添加 `GoogleAnalyticsViewComponent` 到所有的布局,你可能只想添加到指定的布局:
+
+````csharp
+Configure<AbpLayoutHookOptions>(options =>
+{
+    options.Add(
+        LayoutHooks.Head.Last,
+        typeof(GoogleAnalyticsViewComponent),
+        layout: StandardLayouts.Application //Set the layout to add
+    );
+});
+````
+
+参阅下面的布局部分,以了解有关布局系统的更多信息.
+
+### 布局
+
+布局系统允许主题定义标准,命名布局并且允许任何页面选择使用合适的布局. 有三种预定义的布局:
+
+* "**Application**": 应用程序的主要(和默认)布局. 它通常包含页眉,菜单(侧栏),页脚,工具栏等.
+* "**Account**": 登录,注册和其他类似页面使用此布局. 默认它用于 `/Pages/Account` 文件夹下的页面.
+* "**Empty**": 空的最小的布局.
+
+这些名称在 `StandardLayouts` 类定义为常量. 这是标准的布局名称,所有的主题开箱即用的实现. 你也可以创建自己的布局.
+
+#### 布局位置
+
+你可以在[这里](https://github.com/abpframework/abp/tree/dev/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts)找到基本主题的布局文件. 你可以将它们作用构建自己的布局的参考,也可以在必要时覆盖它们.
+
+#### ITheme
+
+ABP框架使用 `ITheme` 服务通过局部名称获取布局位置. 你可以替换此服务动态的选择布局位置.
+
+#### IThemeManager
+
+`IThemeManager` 用于获取当前主题,并得到了布局路径. 任何页面可以都决定自己的布局. 例:
+
+````html
+@using Volo.Abp.AspNetCore.Mvc.UI.Theming
+@inject IThemeManager ThemeManager
+@{
+    Layout = ThemeManager.CurrentTheme.GetLayout(StandardLayouts.Empty);
+}
+````
+
+此页面将使用空白布局. 它使用 `ThemeManager.CurrentTheme.GetEmptyLayout()` 扩展方法.
+
+如果你设置特定目录下所有页面的布局,可以在该文件夹下的 `_ViewStart.cshtml` 文件编写以上代码.

docs/zh-Hans/docs-nav.json

@@ -5,6 +5,7 @@
       "items": [
         {
           "text": "从启动模板开始",
+          "path": "Getting-Started-With-Startup-Templates.md",
           "items": [
             {
               "text": "ASP.NET Core MVC 模板",
@@ -282,6 +283,10 @@
               "text": "仪表板和小部件(Widget)系统",
               "path": "UI/AspNetCore/Widgets.md"
             },
+            {
+              "text": "自定义/扩展UI",
+              "path": "UI/AspNetCore/Customization-User-Interface.md"
+            },
             {
               "text": "主题化",
               "path": "UI/AspNetCore/Theming.md"

framework/Volo.Abp.sln

@@ -273,7 +273,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo", "test\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj", "{0C498CF2-D052-4BF7-AD35-509A90F69707}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Client.IdentityModel.Web.Tests", "test\Volo.Abp.Http.Client.IdentityModel.Web.Tests\Volo.Abp.Http.Client.IdentityModel.Web.Tests.csproj", "{E1963439-2BE5-4DB5-8438-2A9A792A1ADA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Http.Client.IdentityModel.Web.Tests", "test\Volo.Abp.Http.Client.IdentityModel.Web.Tests\Volo.Abp.Http.Client.IdentityModel.Web.Tests.csproj", "{E1963439-2BE5-4DB5-8438-2A9A792A1ADA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.ObjectExtending", "src\Volo.Abp.ObjectExtending\Volo.Abp.ObjectExtending.csproj", "{D1815C77-16D6-4F99-8814-69065CD89FB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.ObjectExtending.Tests", "test\Volo.Abp.ObjectExtending.Tests\Volo.Abp.ObjectExtending.Tests.csproj", "{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -817,6 +821,14 @@ Global
 		{E1963439-2BE5-4DB5-8438-2A9A792A1ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1963439-2BE5-4DB5-8438-2A9A792A1ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1963439-2BE5-4DB5-8438-2A9A792A1ADA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1815C77-16D6-4F99-8814-69065CD89FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1815C77-16D6-4F99-8814-69065CD89FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1815C77-16D6-4F99-8814-69065CD89FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1815C77-16D6-4F99-8814-69065CD89FB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -956,6 +968,8 @@ Global
 		{29E42ADB-85F8-44AE-A9B0-078F84C1B866} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{0C498CF2-D052-4BF7-AD35-509A90F69707} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{E1963439-2BE5-4DB5-8438-2A9A792A1ADA} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+		{D1815C77-16D6-4F99-8814-69065CD89FB3} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperExtensibleDtoExtensions.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+
+namespace AutoMapper
+{
+    public static class AbpAutoMapperExtensibleDtoExtensions
+    {
+        public static IMappingExpression<TSource, TDestination> MapExtraProperties<TSource, TDestination>(
+            this IMappingExpression<TSource, TDestination> mappingExpression,
+            MappingPropertyDefinitionChecks definitionChecks = MappingPropertyDefinitionChecks.Both)
+            where TDestination : IHasExtraProperties
+            where TSource : IHasExtraProperties
+        {
+            return mappingExpression
+                .ForMember(
+                    x => x.ExtraProperties,
+                    y => y.MapFrom(
+                        (source, destination, extraProps) =>
+                        {
+                            var result = extraProps.IsNullOrEmpty()
+                                ? new Dictionary<string, object>()
+                                : new Dictionary<string, object>(extraProps);
+
+                            HasExtraPropertiesObjectExtendingExtensions
+                                .MapExtraPropertiesTo<TSource, TDestination>(
+                                    source.ExtraProperties,
+                                    result,
+                                    definitionChecks
+                                );
+
+                            return result;
+                        })
+                );
+        }
+    }
+}

framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj

@@ -15,6 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.ObjectExtending\Volo.Abp.ObjectExtending.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
   </ItemGroup>
 

framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs

@@ -3,11 +3,14 @@ using AutoMapper;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectMapping;
 
 namespace Volo.Abp.AutoMapper
 {
-    [DependsOn(typeof(AbpObjectMappingModule))]
+    [DependsOn(
+        typeof(AbpObjectMappingModule),
+        typeof(AbpObjectExtendingModule))]
     public class AbpAutoMapperModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)

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

@@ -73,6 +73,12 @@ namespace Volo.Abp.Cli.Commands
                 Logger.LogInformation("UI Framework: " + uiFramework);
             }
 
+            var connectionString = GetConnectionString(commandLineArgs);
+            if (connectionString != null)
+            {
+                Logger.LogInformation("Connection string: " + connectionString);
+            }
+
             var mobileApp = GetMobilePreference(commandLineArgs);
             if (mobileApp != MobileApp.None)
             {
@@ -122,7 +128,8 @@ namespace Volo.Abp.Cli.Commands
                     mobileApp,
                     gitHubLocalRepositoryPath,
                     templateSource,
-                    commandLineArgs.Options
+                    commandLineArgs.Options,
+                    connectionString
                 )
             );
 
@@ -168,6 +175,12 @@ namespace Volo.Abp.Cli.Commands
             Logger.LogInformation($"'{projectName}' has been successfully created to '{outputFolder}'");
         }
 
+        private static string GetConnectionString(CommandLineArgs commandLineArgs)
+        {
+            var connectionString = commandLineArgs.Options.GetOrNull(Options.ConnectionString.Short, Options.ConnectionString.Long);
+            return string.IsNullOrWhiteSpace(connectionString) ? null : connectionString;
+        }
+
         public string GetUsageInfo()
         {
             var sb = new StringBuilder();
@@ -309,6 +322,12 @@ namespace Volo.Abp.Cli.Commands
                 public const string Long = "template-source";
             }
 
+            public static class ConnectionString
+            {
+                public const string Short = "cs";
+                public const string Long = "connection-string";
+            }
+
             public static class CreateSolutionFolder
             {
                 public const string Short = "csf";

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

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Volo.Abp.Cli.ProjectBuilding.Files;
+using Volo.Abp.Text;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
+{
+    public class ConnectionStringChangeStep : ProjectBuildPipelineStep
+    {
+        private const string DefaultConnectionStringKey = "Default";
+
+        public override void Execute(ProjectBuildContext context)
+        {
+            var appSettingsJsonFiles = context.Files.Where(f =>
+                f.Name.EndsWith("appsettings.json", StringComparison.OrdinalIgnoreCase))
+                .ToArray();
+
+            if (!appSettingsJsonFiles.Any())
+            {
+                return;
+            }
+
+            var newConnectionString = $"\"{DefaultConnectionStringKey}\": \"{context.BuildArgs.ConnectionString}\"";
+
+            foreach (var appSettingsJson in appSettingsJsonFiles)
+            {
+                try
+                {
+                    var appSettingJsonContentWithoutBom = StringHelper.ConvertFromBytesWithoutBom(appSettingsJson.Bytes);
+                    var jsonObject = JObject.Parse(appSettingJsonContentWithoutBom);
+
+                    var connectionStringContainer = (JContainer)jsonObject?["ConnectionStrings"];
+                    if (connectionStringContainer == null)
+                    {
+                        continue;
+                    }
+
+                    if (!connectionStringContainer.Any())
+                    {
+                        continue;
+                    }
+
+                    var connectionStrings = connectionStringContainer.ToList();
+
+                    foreach (var connectionString in connectionStrings)
+                    {
+                        var property = ((JProperty)connectionString);
+                        var connectionStringName = property.Name;
+
+                        if (connectionStringName == DefaultConnectionStringKey)
+                        {
+                            var defaultConnectionString = property.ToString();
+                            if (defaultConnectionString == null)
+                            {
+                                continue;
+                            }
+
+                            appSettingsJson.ReplaceText(defaultConnectionString, newConnectionString);
+                            break;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Cannot change the connection string in " + appSettingsJson.Name + ". Error: " + ex.Message);
+                }
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs

@@ -28,6 +28,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
                 pipeline.Steps.Add(new RemoveRootFolderStep());
             }
 
+            if (context.BuildArgs.ConnectionString != null)
+            {
+                pipeline.Steps.Add(new ConnectionStringChangeStep());
+            }
+
             pipeline.Steps.Add(new CreateProjectResultZipStep());
 
             return pipeline;

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

@@ -27,6 +27,9 @@ namespace Volo.Abp.Cli.ProjectBuilding
         [CanBeNull]
         public string TemplateSource { get; set; }
 
+        [CanBeNull]
+        public string ConnectionString { get; set; }
+
         [NotNull]
         public Dictionary<string, string> ExtraProperties { get; set; }
 
@@ -39,7 +42,8 @@ namespace Volo.Abp.Cli.ProjectBuilding
             MobileApp? mobileApp = null,
             [CanBeNull] string abpGitHubLocalRepositoryPath = null,
             [CanBeNull] string templateSource = null,
-            Dictionary<string, string> extraProperties = null)
+            Dictionary<string, string> extraProperties = null,
+            [CanBeNull] string connectionString = null)
         {
             SolutionName = Check.NotNull(solutionName, nameof(solutionName));
             TemplateName = templateName;
@@ -50,6 +54,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
             AbpGitHubLocalRepositoryPath = abpGitHubLocalRepositoryPath;
             TemplateSource = templateSource;
             ExtraProperties = extraProperties ?? new Dictionary<string, string>();
+            ConnectionString = connectionString;
         }
     }
 }

framework/src/Volo.Abp.Core/Volo/Abp/Check.cs

@@ -121,6 +121,21 @@ namespace Volo.Abp
             return value;
         }
 
+        [ContractAnnotation("type:null => halt")]
+        public static Type AssignableTo<TBaseType>(
+            Type type,
+            [InvokerParameterName] [NotNull] string parameterName)
+        {
+            NotNull(type, parameterName);
+
+            if (!type.IsAssignableTo<TBaseType>())
+            {
+                throw new ArgumentException($"{parameterName} (type of {type.AssemblyQualifiedName}) should be assignable to the {typeof(TBaseType).GetFullNameWithAssemblyName()}!");
+            }
+
+            return type;
+        }
+
         public static string Length(
             [CanBeNull] string value,
             [InvokerParameterName] [NotNull] string parameterName, 

framework/src/Volo.Abp.Core/Volo/Abp/IO/FileHelper.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Volo.Abp.Text;
 
 namespace Volo.Abp.IO
 {
@@ -73,6 +75,63 @@ namespace Volo.Abp.IO
             }
         }
 
-        //TODO: ReadAllLinesAsync
+        /// <summary>
+        /// Opens a text file, reads all lines of the file, and then closes the file.
+        /// </summary>
+        /// <param name="path">The file to open for reading.</param>
+        /// <param name="encoding">Encoding of the file. Default is UTF8</param>
+        /// <param name="fileMode">Specifies how the operating system should open a file. Default is Open</param>
+        /// <param name="fileAccess">Defines constants for read, write, or read/write access to a file. Default is Read</param>
+        /// <param name="fileShare">Contains constants for controlling the kind of access other FileStream objects can have to the same file. Default is Read</param>
+        /// <param name="bufferSize">Length of StreamReader buffer. Default is 4096.</param>
+        /// <param name="fileOptions">Indicates FileStream options. Default is Asynchronous (The file is to be used for asynchronous reading.) and SequentialScan (The file is to be accessed sequentially from beginning to end.) </param>
+        /// <returns>A string containing all lines of the file.</returns>
+        public static async Task<string[]> ReadAllLinesAsync(string path,
+            Encoding encoding = null,
+            FileMode fileMode = FileMode.Open,
+            FileAccess fileAccess = FileAccess.Read,
+            FileShare fileShare = FileShare.Read,
+            int bufferSize = 4096,
+            FileOptions fileOptions = FileOptions.Asynchronous | FileOptions.SequentialScan)
+        {
+            if (encoding == null)
+            {
+                encoding = Encoding.UTF8;
+            }
+
+            var lines = new List<string>();
+
+            using (var stream = new FileStream(
+                path,
+                fileMode,
+                fileAccess,
+                fileShare,
+                bufferSize,
+                fileOptions))
+            {
+                using (var reader = new StreamReader(stream, encoding))
+                {
+                    string line;
+                    while ((line = await reader.ReadLineAsync()) != null)
+                    {
+                        lines.Add(line);
+                    }
+                }
+            }
+
+            return lines.ToArray();
+        }
+
+        /// <summary>
+        /// Opens a text file, reads content without BOM
+        /// </summary>
+        /// <param name="path">The file to open for reading.</param>
+        /// <returns>A string containing all lines of the file.</returns>
+        public static async Task<string> ReadFileWithoutBomAsync(string path)
+        {
+            var content = await ReadAllBytesAsync(path);
+
+            return StringHelper.ConvertFromBytesWithoutBom(content);
+        }
     }
 }

framework/src/Volo.Abp.Core/Volo/Abp/Text/StringHelper.cs

@@ -0,0 +1,37 @@
+using System.Text;
+
+namespace Volo.Abp.Text
+{
+    public class StringHelper
+    {
+        /// <summary>
+        /// Converts a byte[] to string without BOM (byte order mark).
+        /// </summary>
+        /// <param name="bytes">The byte[] to be converted to string</param>
+        /// <param name="encoding">The encoding to get string. Default is UTF8</param>
+        /// <returns></returns>
+        public static string ConvertFromBytesWithoutBom(byte[] bytes, Encoding encoding = null)
+        {
+            if (bytes == null)
+            {
+                return null;
+            }
+
+            if (encoding == null)
+            {
+                encoding = Encoding.UTF8;
+            }
+
+            var hasBom = bytes.Length >= 3 && bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF;
+
+            if (hasBom)
+            {
+                return encoding.GetString(bytes, 3, bytes.Length - 3);
+            }
+            else
+            {
+                return encoding.GetString(bytes);
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Data/Volo.Abp.Data.csproj

@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <ProjectReference Include="..\Volo.Abp.ObjectExtending\Volo.Abp.ObjectExtending.csproj" />
     <ProjectReference Include="..\Volo.Abp.Uow\Volo.Abp.Uow.csproj" />
   </ItemGroup>
 

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

@@ -2,13 +2,15 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.Uow;
 
 namespace Volo.Abp.Data
 {
     [DependsOn(
+        typeof(AbpObjectExtendingModule),
         typeof(AbpUnitOfWorkModule)
-        )]
+    )]
     public class AbpDataModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs

@@ -5,6 +5,7 @@ namespace Volo.Abp.Application.Dtos
 {
     /// <summary>
     /// This class can be inherited by DTO classes to implement <see cref="IAuditedObject"/> interface.
+    /// It has the <see cref="Creator"/> and <see cref="LastModifier"/> objects as a DTOs represent the related user.
     /// </summary>
     /// <typeparam name="TUserDto">Type of the User DTO</typeparam>
     [Serializable]
@@ -19,6 +20,7 @@ namespace Volo.Abp.Application.Dtos
 
     /// <summary>
     /// This class can be inherited by DTO classes to implement <see cref="IAuditedObject"/> interface.
+    /// It has the <see cref="Creator"/> and <see cref="LastModifier"/> objects as a DTOs represent the related user.
     /// </summary>
     /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
     /// <typeparam name="TUserDto">Type of the User DTO</typeparam>

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs

@@ -5,6 +5,7 @@ namespace Volo.Abp.Application.Dtos
 {
     /// <summary>
     /// This class can be inherited by DTO classes to implement <see cref="ICreationAuditedObject{TCreator}"/> interface.
+    /// It also has the <see cref="Creator"/> object as a DTO represents the user.
     /// </summary>
     /// <typeparam name="TUserDto">Type of the User DTO</typeparam>
     [Serializable]
@@ -14,7 +15,8 @@ namespace Volo.Abp.Application.Dtos
     }
 
     /// <summary>
-    /// This class can be inherited by DTO classes to implement <see cref="ICreationAuditedObjectObject{TCreator}"/> interface.
+    /// This class can be inherited by DTO classes to implement <see cref="ICreationAuditedObject{TCreator}"/> interface.
+    /// It also has the <see cref="Creator"/> object as a DTO represents the user.
     /// </summary>
     /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
     /// <typeparam name="TUserDto">Type of the User DTO</typeparam>

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleAuditedEntityDto.cs

@@ -0,0 +1,35 @@
+using System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Application.Dtos
+{
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IAuditedObject"/> interface.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
+    [Serializable]
+    public abstract class ExtensibleAuditedEntityDto<TPrimaryKey> : ExtensibleCreationAuditedEntityDto<TPrimaryKey>, IAuditedObject
+    {
+        /// <inheritdoc />
+        public DateTime? LastModificationTime { get; set; }
+
+        /// <inheritdoc />
+        public Guid? LastModifierId { get; set; }
+    }
+
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IAuditedObject"/> interface.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    [Serializable]
+    public abstract class ExtensibleAuditedEntityDto : ExtensibleCreationAuditedEntityDto, IAuditedObject
+    {
+        /// <inheritdoc />
+        public DateTime? LastModificationTime { get; set; }
+
+        /// <inheritdoc />
+        public Guid? LastModifierId { get; set; }
+    }
+}

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleAuditedEntityWithUserDto.cs

@@ -0,0 +1,40 @@
+using System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Application.Dtos
+{
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IAuditedObject"/> interface.
+    /// It has the <see cref="Creator"/> and <see cref="LastModifier"/> objects as a DTOs represent the related user.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
+    /// <typeparam name="TUserDto">Type of the User DTO</typeparam>
+    [Serializable]
+    public abstract class ExtensibleAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleAuditedEntityDto<TPrimaryKey>, IAuditedObject<TUserDto>
+    {
+        /// <inheritdoc />
+        public TUserDto Creator { get; set; }
+
+        /// <inheritdoc />
+        public TUserDto LastModifier { get; set; }
+    }
+
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IAuditedObject"/> interface.
+    /// It has the <see cref="Creator"/> and <see cref="LastModifier"/> objects as a DTOs represent the related user.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TUserDto">Type of the User DTO</typeparam>
+    [Serializable]
+    public abstract class ExtensibleAuditedEntityWithUserDto<TUserDto> : ExtensibleAuditedEntityDto,
+        IAuditedObject<TUserDto>
+    {
+        /// <inheritdoc />
+        public TUserDto Creator { get; set; }
+
+        /// <inheritdoc />
+        public TUserDto LastModifier { get; set; }
+    }
+}

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleCreationAuditedEntityDto.cs

@@ -0,0 +1,35 @@
+using System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Application.Dtos
+{
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="ICreationAuditedObject"/> interface.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
+    [Serializable]
+    public abstract class ExtensibleCreationAuditedEntityDto<TPrimaryKey> : ExtensibleEntityDto<TPrimaryKey>, ICreationAuditedObject
+    {
+        /// <inheritdoc />
+        public DateTime CreationTime { get; set; }
+
+        /// <inheritdoc />
+        public Guid? CreatorId { get; set; }
+    }
+
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="ICreationAuditedObject"/> interface.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    [Serializable]
+    public abstract class ExtensibleCreationAuditedEntityDto : ExtensibleEntityDto, ICreationAuditedObject
+    {
+        /// <inheritdoc />
+        public DateTime CreationTime { get; set; }
+
+        /// <inheritdoc />
+        public Guid? CreatorId { get; set; }
+    }
+}

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleCreationAuditedEntityWithUserDto.cs

@@ -0,0 +1,32 @@
+using System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Application.Dtos
+{
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="ICreationAuditedObject{TCreator}"/> interface.
+    /// It has the <see cref="Creator"/> object as a DTO represents the user.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
+    /// <typeparam name="TUserDto">Type of the User DTO</typeparam>
+    [Serializable]
+    public abstract class ExtensibleCreationAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleCreationAuditedEntityDto<TPrimaryKey>, ICreationAuditedObject<TUserDto>
+    {
+        public TUserDto Creator { get; set; }
+    }
+
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="ICreationAuditedObject{TCreator}"/> interface.
+    /// It has the <see cref="Creator"/> object as a DTO represents the user.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TUserDto">Type of the User DTO</typeparam>
+    [Serializable]
+    public abstract class ExtensibleCreationAuditedEntityWithUserDto<TUserDto> : ExtensibleCreationAuditedEntityDto,
+        ICreationAuditedObject<TUserDto>
+    {
+        public TUserDto Creator { get; set; }
+    }
+}

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleEntityDto.cs

@@ -0,0 +1,28 @@
+using System;
+using Volo.Abp.ObjectExtending;
+
+namespace Volo.Abp.Application.Dtos
+{
+    [Serializable]
+    public abstract class ExtensibleEntityDto<TKey> : ExtensibleObject, IEntityDto<TKey>
+    {
+        /// <summary>
+        /// Id of the entity.
+        /// </summary>
+        public TKey Id { get; set; }
+
+        public override string ToString()
+        {
+            return $"[DTO: {GetType().Name}] Id = {Id}";
+        }
+    }
+
+    [Serializable]
+    public abstract class ExtensibleEntityDto : ExtensibleObject, IEntityDto
+    {
+        public override string ToString()
+        {
+            return $"[DTO: {GetType().Name}]";
+        }
+    }
+}

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleFullAuditedEntityDto.cs

@@ -0,0 +1,41 @@
+using System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Application.Dtos
+{
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObject"/> interface.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
+    [Serializable]
+    public abstract class ExtensibleFullAuditedEntityDto<TPrimaryKey> : ExtensibleAuditedEntityDto<TPrimaryKey>, IFullAuditedObject
+    {
+        /// <inheritdoc />
+        public bool IsDeleted { get; set; }
+
+        /// <inheritdoc />
+        public Guid? DeleterId { get; set; }
+
+        /// <inheritdoc />
+        public DateTime? DeletionTime { get; set; }
+    }
+
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObject"/> interface.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    [Serializable]
+    public abstract class ExtensibleFullAuditedEntityDto : ExtensibleAuditedEntityDto, IFullAuditedObject
+    {
+        /// <inheritdoc />
+        public bool IsDeleted { get; set; }
+
+        /// <inheritdoc />
+        public Guid? DeleterId { get; set; }
+
+        /// <inheritdoc />
+        public DateTime? DeletionTime { get; set; }
+    }
+}

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleFullAuditedEntityWithUserDto.cs

@@ -0,0 +1,46 @@
+using System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Application.Dtos
+{
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObject{TUser}"/> interface.
+    /// It has the <see cref="Creator"/>, <see cref="LastModifier"/> and <see cref="Deleter"/> objects as a DTOs represent the related user.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
+    /// <typeparam name="TUserDto">Type of the User</typeparam>
+    [Serializable]
+    public abstract class ExtensibleFullAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleFullAuditedEntityDto<TPrimaryKey>, IFullAuditedObject<TUserDto>
+    {
+        /// <inheritdoc />
+        public TUserDto Creator { get; set; }
+
+        /// <inheritdoc />
+        public TUserDto LastModifier { get; set; }
+
+        /// <inheritdoc />
+        public TUserDto Deleter { get; set; }
+    }
+
+    /// <summary>
+    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObject{TUser}"/> interface.
+    /// It has the <see cref="Creator"/>, <see cref="LastModifier"/> and <see cref="Deleter"/> objects as a DTOs represent the related user.
+    /// It also implements the <see cref="IHasExtraProperties"/> interface.
+    /// </summary>
+    /// <typeparam name="TUserDto">Type of the User</typeparam>
+    [Serializable]
+    public abstract class ExtensibleFullAuditedEntityWithUserDto<TUserDto> : ExtensibleFullAuditedEntityDto,
+        IFullAuditedObject<TUserDto>
+    {
+        /// <inheritdoc />
+        public TUserDto Creator { get; set; }
+
+        /// <inheritdoc />
+        public TUserDto LastModifier { get; set; }
+
+        /// <inheritdoc />
+        public TUserDto Deleter { get; set; }
+    }
+}

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs

@@ -4,7 +4,8 @@ using Volo.Abp.Auditing;
 namespace Volo.Abp.Application.Dtos
 {
     /// <summary>
-    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObjectObject{TUser}"/> interface.
+    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObject{TUser}"/> interface.
+    /// It has the <see cref="Creator"/>, <see cref="LastModifier"/> and <see cref="Deleter"/> objects as a DTOs represent the related user.
     /// </summary>
     /// <typeparam name="TUserDto">Type of the User</typeparam>
     [Serializable]
@@ -21,7 +22,8 @@ namespace Volo.Abp.Application.Dtos
     }
 
     /// <summary>
-    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObjectObject{TUser}"/> interface.
+    /// This class can be inherited by DTO classes to implement <see cref="IFullAuditedObject{TUser}"/> interface.
+    /// It has the <see cref="Creator"/>, <see cref="LastModifier"/> and <see cref="Deleter"/> objects as a DTOs represent the related user.
     /// </summary>
     /// <typeparam name="TPrimaryKey">Type of primary key</typeparam>
     /// <typeparam name="TUserDto">Type of the User</typeparam>

framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
   </ItemGroup>
    
 </Project>

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

@@ -18,11 +18,11 @@ using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities.Events;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.EntityFrameworkCore.EntityHistory;
-using Volo.Abp.EntityFrameworkCore.Extensions;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 using Volo.Abp.EntityFrameworkCore.ValueConverters;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.Reflection;
 using Volo.Abp.Timing;
 using Volo.Abp.Uow;
@@ -183,10 +183,18 @@ namespace Volo.Abp.EntityFrameworkCore
                 return;
             }
 
-            var propertyNames = EntityExtensionManager.GetPropertyNames(entityType);
+            var objectExtension = ObjectExtensionManager.Instance.GetOrNull(entityType);
+            if (objectExtension == null)
+            {
+                return;
+            }
 
-            foreach (var propertyName in propertyNames)
+            foreach (var property in objectExtension.GetProperties())
             {
+                if (!property.IsMappedToFieldForEfCore())
+                {
+                    continue;
+                }
                 /* Checking "currentValue != null" has a good advantage:
                  * Assume that you we already using a named extra property,
                  * then decided to create a field (entity extension) for it.
@@ -194,10 +202,10 @@ namespace Volo.Abp.EntityFrameworkCore
                  * updates the field on the next save!
                  */
 
-                var currentValue = e.Entry.CurrentValues[propertyName];
+                var currentValue = e.Entry.CurrentValues[property.Name];
                 if (currentValue != null)
                 {
-                    entity.SetProperty(propertyName, currentValue);
+                    entity.SetProperty(property.Name, currentValue);
                 }
             }
         }
@@ -251,12 +259,21 @@ namespace Volo.Abp.EntityFrameworkCore
             {
                 return;
             }
-            
-            var propertyNames = EntityExtensionManager.GetPropertyNames(entityType);
 
-            foreach (var propertyName in propertyNames)
+            var objectExtension = ObjectExtensionManager.Instance.GetOrNull(entityType);
+            if (objectExtension == null)
+            {
+                return;
+            }
+
+            foreach (var property in objectExtension.GetProperties())
             {
-                entry.Property(propertyName).CurrentValue = entity.GetProperty(propertyName);
+                if (!entity.HasProperty(property.Name))
+                {
+                    continue;
+                }
+
+                entry.Property(property.Name).CurrentValue = entity.GetProperty(property.Name);
             }
         }
 

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Extensions/EntityExtensionInfo.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace Volo.Abp.EntityFrameworkCore.Extensions
-{
-    public class EntityExtensionInfo
-    {
-        public Dictionary<string, PropertyExtensionInfo> Properties { get; set; }
-
-        public EntityExtensionInfo()
-        {
-            Properties = new Dictionary<string, PropertyExtensionInfo>();
-        }
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Extensions/EntityExtensionManager.cs

@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Volo.Abp.Data;
-
-namespace Volo.Abp.EntityFrameworkCore.Extensions
-{
-    public static class EntityExtensionManager
-    {
-        private static readonly Dictionary<Type, EntityExtensionInfo> ExtensionInfos;
-
-        static EntityExtensionManager()
-        {
-            ExtensionInfos = new Dictionary<Type, EntityExtensionInfo>();
-        }
-
-        /// <summary>
-        /// Adds an extension property for an entity.
-        /// If it is already added, replaces the <paramref name="propertyBuildAction"/>
-        /// by the given one!
-        /// </summary>
-        /// <typeparam name="TEntity">Type of the entity</typeparam>
-        /// <typeparam name="TProperty">Type of the new property</typeparam>
-        /// <param name="propertyName">Name of the property</param>
-        /// <param name="propertyBuildAction">An action to configure the database mapping for the new property</param>
-        public static void AddProperty<TEntity, TProperty>(
-            [NotNull]string propertyName,
-            [NotNull]Action<PropertyBuilder> propertyBuildAction)
-        {
-            AddProperty(
-                typeof(TEntity),
-                typeof(TProperty),
-                propertyName,
-                propertyBuildAction
-            );
-        }
-
-        /// <summary>
-        /// Adds an extension property for an entity.
-        /// If it is already added, replaces the <paramref name="propertyBuildAction"/>
-        /// by the given one!
-        /// </summary>
-        /// <param name="entityType">Type of the entity</param>
-        /// <param name="propertyType">Type of the new property</param>
-        /// <param name="propertyName">Name of the property</param>
-        /// <param name="propertyBuildAction">An action to configure the database mapping for the new property</param>
-        public static void AddProperty(
-            Type entityType,
-            Type propertyType,
-            [NotNull]string propertyName,
-            [NotNull]Action<PropertyBuilder> propertyBuildAction)
-        {
-            Check.NotNull(entityType, nameof(entityType));
-            Check.NotNull(propertyType, nameof(propertyType));
-            Check.NotNullOrWhiteSpace(propertyName, nameof(propertyName));
-            Check.NotNull(propertyBuildAction, nameof(propertyBuildAction));
-
-            var extensionInfo = ExtensionInfos
-                .GetOrAdd(entityType, () => new EntityExtensionInfo());
-
-            var propertyExtensionInfo = extensionInfo.Properties
-                .GetOrAdd(propertyName, () => new PropertyExtensionInfo(propertyType));
-
-            propertyExtensionInfo.Action = propertyBuildAction;
-        }
-
-        /// <summary>
-        /// Configures the entity mapping for the defined extensions.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity tye</typeparam>
-        /// <param name="entityTypeBuilder">Entity type builder</param>
-        public static void ConfigureExtensions<TEntity>(
-            [NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder)
-            where TEntity : class, IHasExtraProperties
-        {
-            ConfigureExtensions(typeof(TEntity), entityTypeBuilder);
-        }
-
-        /// <summary>
-        /// Configures the entity mapping for the defined extensions.
-        /// </summary>
-        /// <param name="entityType">Type of the entity</param>
-        /// <param name="entityTypeBuilder">Entity type builder</param>
-        public static void ConfigureExtensions(
-            [NotNull] Type entityType,
-            [NotNull] EntityTypeBuilder entityTypeBuilder)
-        {
-            Check.NotNull(entityType, nameof(entityType));
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-
-            var entityExtensionInfo = ExtensionInfos.GetOrDefault(entityType);
-            if (entityExtensionInfo == null)
-            {
-                return;
-            }
-
-            foreach (var propertyExtensionInfo in entityExtensionInfo.Properties)
-            {
-                var propertyName = propertyExtensionInfo.Key;
-                var propertyType = propertyExtensionInfo.Value.PropertyType;
-
-                /* Prevent multiple calls to the entityTypeBuilder.Property(...) method */
-                if (entityTypeBuilder.Metadata.FindProperty(propertyName) != null)
-                {
-                    continue;
-                }
-
-                var property = entityTypeBuilder.Property(
-                    propertyType,
-                    propertyName
-                );
-
-                propertyExtensionInfo.Value.Action(property);
-            }
-        }
-
-        public static string[] GetPropertyNames(Type entityType)
-        {
-            var entityExtensionInfo = ExtensionInfos.GetOrDefault(entityType);
-            if (entityExtensionInfo == null)
-            {
-                return Array.Empty<string>();
-            }
-
-            return entityExtensionInfo
-                .Properties
-                .Select(p => p.Key)
-                .ToArray();
-        }
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Extensions/PropertyExtensionInfo.cs

@@ -1,17 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace Volo.Abp.EntityFrameworkCore.Extensions
-{
-    public class PropertyExtensionInfo
-    {
-        public Action<PropertyBuilder> Action { get; set; }
-
-        public Type PropertyType { get; }
-
-        public PropertyExtensionInfo(Type propertyType)
-        {
-            PropertyType = propertyType;
-        }
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs

@@ -5,10 +5,10 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
-using Volo.Abp.EntityFrameworkCore.Extensions;
 using Volo.Abp.EntityFrameworkCore.ValueComparers;
 using Volo.Abp.EntityFrameworkCore.ValueConverters;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.EntityFrameworkCore.Modeling
 {
@@ -18,6 +18,7 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
         {
             b.TryConfigureConcurrencyStamp();
             b.TryConfigureExtraProperties();
+            b.TryConfigureObjectExtensions();
             b.TryConfigureMayHaveCreator();
             b.TryConfigureMustHaveCreator();
             b.TryConfigureSoftDelete();
@@ -54,15 +55,30 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
 
         public static void TryConfigureExtraProperties(this EntityTypeBuilder b)
         {
-            //TODO: Max length?
-            if (b.Metadata.ClrType.IsAssignableTo<IHasExtraProperties>())
+            if (!b.Metadata.ClrType.IsAssignableTo<IHasExtraProperties>())
             {
-                b.Property<Dictionary<string, object>>(nameof(IHasExtraProperties.ExtraProperties))
-                    .HasColumnName(nameof(IHasExtraProperties.ExtraProperties))
-                    .HasConversion(new ExtraPropertiesValueConverter(b.Metadata.ClrType))
-                    .Metadata.SetValueComparer(new AbpDictionaryValueComparer<string, object>());
+                return;
+            }
 
-                EntityExtensionManager.ConfigureExtensions(b.Metadata.ClrType, b);
+            b.Property<Dictionary<string, object>>(nameof(IHasExtraProperties.ExtraProperties))
+                .HasColumnName(nameof(IHasExtraProperties.ExtraProperties))
+                .HasConversion(new ExtraPropertiesValueConverter(b.Metadata.ClrType))
+                .Metadata.SetValueComparer(new AbpDictionaryValueComparer<string, object>());
+
+            b.TryConfigureObjectExtensions();
+        }
+
+        public static void ConfigureObjectExtensions<T>(this EntityTypeBuilder<T> b)
+            where T : class, IHasExtraProperties
+        {
+            b.As<EntityTypeBuilder>().TryConfigureObjectExtensions();
+        }
+
+        public static void TryConfigureObjectExtensions(this EntityTypeBuilder b)
+        {
+            if (b.Metadata.ClrType.IsAssignableTo<IHasExtraProperties>())
+            {
+                ObjectExtensionManager.Instance.ConfigureEfCoreEntity(b);
             }
         }
 
@@ -286,7 +302,6 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
             b.As<EntityTypeBuilder>().TryConfigureConcurrencyStamp();
         }
 
-
         //TODO: Add other interfaces (IAuditedObject<TUser>...)
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Newtonsoft.Json;
-using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.EntityFrameworkCore.ValueConverters
 {
@@ -22,11 +22,16 @@ namespace Volo.Abp.EntityFrameworkCore.ValueConverters
 
             if (entityType != null)
             {
-                var propertyNames = EntityExtensionManager.GetPropertyNames(entityType);
-
-                foreach (var propertyName in propertyNames)
+                var objectExtension = ObjectExtensionManager.Instance.GetOrNull(entityType);
+                if (objectExtension != null)
                 {
-                    copyDictionary.Remove(propertyName);
+                    foreach (var property in objectExtension.GetProperties())
+                    {
+                        if (property.IsMappedToFieldForEfCore())
+                        {
+                            copyDictionary.Remove(property.Name);
+                        }
+                    }
                 }
             }
 

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs

@@ -0,0 +1,41 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class EfCoreObjectExtensionInfoExtensions
+    {
+        public static ObjectExtensionInfo MapEfCoreProperty<TProperty>(
+            [NotNull] this ObjectExtensionInfo objectExtensionInfo,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
+        {
+            return objectExtensionInfo.MapEfCoreProperty(
+                typeof(TProperty),
+                propertyName,
+                propertyBuildAction
+            );
+        }
+
+        public static ObjectExtensionInfo MapEfCoreProperty(
+            [NotNull] this ObjectExtensionInfo objectExtensionInfo,
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
+        {
+            Check.NotNull(objectExtensionInfo, nameof(objectExtensionInfo));
+
+            return objectExtensionInfo.AddOrUpdateProperty(
+                propertyType,
+                propertyName,
+                options =>
+                {
+                    options.MapEfCore(
+                        propertyBuildAction
+                    );
+                }
+            );
+        }
+    }
+}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs

@@ -0,0 +1,80 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class EfCoreObjectExtensionManagerExtensions
+    {
+        public static ObjectExtensionManager MapEfCoreProperty<TEntity, TProperty>(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            where TEntity : IHasExtraProperties, IEntity
+        {
+            return objectExtensionManager.MapEfCoreProperty(
+                typeof(TEntity),
+                typeof(TProperty),
+                propertyName,
+                propertyBuildAction
+            );
+        }
+
+        public static ObjectExtensionManager MapEfCoreProperty(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] Type entityType,
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+
+            return objectExtensionManager.AddOrUpdateProperty(
+                entityType,
+                propertyType,
+                propertyName,
+                options =>
+                {
+                    options.MapEfCore(
+                        propertyBuildAction
+                    );
+                }
+            );
+        }
+
+        public static void ConfigureEfCoreEntity(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] EntityTypeBuilder typeBuilder)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+            Check.NotNull(typeBuilder, nameof(typeBuilder));
+
+            var objectExtension = objectExtensionManager.GetOrNull(typeBuilder.Metadata.ClrType);
+            if (objectExtension == null)
+            {
+                return;
+            }
+
+            foreach (var property in objectExtension.GetProperties())
+            {
+                var efCoreMapping = property.GetEfCoreMappingOrNull();
+                if (efCoreMapping == null)
+                {
+                    continue;
+                }
+
+                /* Prevent multiple calls to the entityTypeBuilder.Property(...) method */
+                if (typeBuilder.Metadata.FindProperty(property.Name) != null)
+                {
+                    continue;
+                }
+
+                var propertyBuilder = typeBuilder.Property(property.Type, property.Name);
+
+                efCoreMapping.PropertyBuildAction?.Invoke(propertyBuilder);
+            }
+        }
+    }
+}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class EfCoreObjectExtensionPropertyInfoExtensions
+    {
+        public const string EfCorePropertyConfigurationName = "EfCoreMapping";
+
+        [NotNull]
+        public static ObjectExtensionPropertyInfo MapEfCore(
+            [NotNull] this ObjectExtensionPropertyInfo propertyExtension,
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+        {
+            Check.NotNull(propertyExtension, nameof(propertyExtension));
+
+            propertyExtension.Configuration[EfCorePropertyConfigurationName] =
+                new ObjectExtensionPropertyInfoEfCoreMappingOptions(
+                    propertyExtension,
+                    propertyBuildAction
+                );
+
+            return propertyExtension;
+        }
+
+        [CanBeNull]
+        public static ObjectExtensionPropertyInfoEfCoreMappingOptions GetEfCoreMappingOrNull(
+            [NotNull] this ObjectExtensionPropertyInfo propertyExtension)
+        {
+            Check.NotNull(propertyExtension, nameof(propertyExtension));
+
+            return propertyExtension
+                    .Configuration
+                    .GetOrDefault(EfCorePropertyConfigurationName)
+                as ObjectExtensionPropertyInfoEfCoreMappingOptions;
+        }
+
+        public static bool IsMappedToFieldForEfCore(
+            [NotNull] this ObjectExtensionPropertyInfo propertyExtension)
+        {
+            Check.NotNull(propertyExtension, nameof(propertyExtension));
+
+            return propertyExtension
+                .Configuration
+                .ContainsKey(EfCorePropertyConfigurationName);
+        }
+    }
+}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs

@@ -0,0 +1,27 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class ObjectExtensionPropertyInfoEfCoreMappingOptions
+    {
+        [NotNull]
+        public ObjectExtensionPropertyInfo ExtensionProperty { get; }
+
+        [NotNull]
+        public ObjectExtensionInfo ObjectExtension => ExtensionProperty.ObjectExtension;
+
+        [CanBeNull]
+        public Action<PropertyBuilder> PropertyBuildAction { get; set; }
+
+        public ObjectExtensionPropertyInfoEfCoreMappingOptions(
+            [NotNull] ObjectExtensionPropertyInfo extensionProperty,
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+        {
+            ExtensionProperty = Check.NotNull(extensionProperty, nameof(extensionProperty));
+            
+            PropertyBuildAction = propertyBuildAction;
+        }
+    }
+}

framework/src/Volo.Abp.ObjectExtending/FodyWeavers.xml

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

framework/src/Volo.Abp.ObjectExtending/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?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">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

framework/src/Volo.Abp.ObjectExtending/Properties/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Volo.Abp.ObjectExtending.Tests")]

framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\configureawait.props" />
+  <Import Project="..\..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Volo.Abp.ObjectExtending</AssemblyName>
+    <PackageId>Volo.Abp.ObjectExtending</PackageId>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+  </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,9 @@
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class AbpObjectExtendingModule : AbpModule
+    {
+
+    }
+}

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

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.ObjectExtending
+{
+    [Serializable]
+    public class ExtensibleObject : IHasExtraProperties
+    {
+        public Dictionary<string, object> ExtraProperties { get; protected set; }
+
+        public ExtensibleObject()
+        {
+            ExtraProperties = new Dictionary<string, object>();
+        }
+    }
+}

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

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using JetBrains.Annotations;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class HasExtraPropertiesObjectExtendingExtensions
+    {
+        /// <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>
+        /// <typeparam name="TSource">Source class type</typeparam>
+        /// <typeparam name="TDestination">Destination class type</typeparam>
+        /// <param name="source">The source object</param>
+        /// <param name="destination">The destination object</param>
+        /// <param name="definitionChecks">
+        /// Controls which properties to map.
+        /// </param>
+        public static void MapExtraPropertiesTo<TSource, TDestination>(
+            [NotNull] this TSource source,
+            [NotNull] TDestination destination,
+            MappingPropertyDefinitionChecks definitionChecks = MappingPropertyDefinitionChecks.Both)
+            where TSource : IHasExtraProperties
+            where TDestination : IHasExtraProperties
+        {
+            Check.NotNull(source, nameof(source));
+            Check.NotNull(destination, nameof(destination));
+
+            MapExtraPropertiesTo(
+                typeof(TSource),
+                typeof(TDestination),
+                source.ExtraProperties,
+                destination.ExtraProperties,
+                definitionChecks
+            );
+        }
+
+        /// <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>
+        /// <typeparam name="TSource">Source class type (for definition check)</typeparam>
+        /// <typeparam name="TDestination">Destination class type (for definition check)</typeparam>
+        /// <param name="sourceDictionary">The source dictionary object</param>
+        /// <param name="destinationDictionary">The destination dictionary object</param>
+        /// <param name="definitionChecks">
+        /// Controls which properties to map.
+        /// </param>
+        public static void MapExtraPropertiesTo<TSource, TDestination>(
+            [NotNull] Dictionary<string, object> sourceDictionary,
+            [NotNull] Dictionary<string, object> destinationDictionary,
+            MappingPropertyDefinitionChecks definitionChecks = MappingPropertyDefinitionChecks.Both)
+            where TSource : IHasExtraProperties
+            where TDestination : IHasExtraProperties
+        {
+            MapExtraPropertiesTo(
+                typeof(TSource),
+                typeof(TDestination),
+                sourceDictionary,
+                destinationDictionary,
+                definitionChecks
+            );
+        }
+
+        /// <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>
+        /// <param name="sourceType">Source type (for definition check)</param>
+        /// <param name="destinationType">Destination class type (for definition check)</param>
+        /// <param name="sourceDictionary">The source dictionary object</param>
+        /// <param name="destinationDictionary">The destination dictionary object</param>
+        /// <param name="definitionChecks">
+        /// Controls which properties to map.
+        /// </param>
+        public static void MapExtraPropertiesTo(
+            [NotNull] Type sourceType,
+            [NotNull] Type destinationType,
+            [NotNull] Dictionary<string, object> sourceDictionary,
+            [NotNull] Dictionary<string, object> destinationDictionary,
+            MappingPropertyDefinitionChecks definitionChecks = MappingPropertyDefinitionChecks.Both)
+        {
+            Check.AssignableTo<IHasExtraProperties>(sourceType, nameof(sourceType));
+            Check.AssignableTo<IHasExtraProperties>(destinationType, nameof(destinationType));
+            Check.NotNull(sourceDictionary, nameof(sourceDictionary));
+            Check.NotNull(destinationDictionary, nameof(destinationDictionary));
+
+            var sourceObjectExtension = ObjectExtensionManager.Instance.GetOrNull(sourceType);
+            if (definitionChecks.HasFlag(MappingPropertyDefinitionChecks.Source) &&
+                sourceObjectExtension == null)
+            {
+                return;
+            }
+
+            var destinationObjectExtension = ObjectExtensionManager.Instance.GetOrNull(destinationType);
+            if (definitionChecks.HasFlag(MappingPropertyDefinitionChecks.Destination) &&
+                destinationObjectExtension == null)
+            {
+                return;
+            }
+
+            if (definitionChecks == MappingPropertyDefinitionChecks.None)
+            {
+                foreach (var keyValue in sourceDictionary)
+                {
+                    destinationDictionary[keyValue.Key] = keyValue.Value;
+                }
+            }
+            else if (definitionChecks == MappingPropertyDefinitionChecks.Source)
+            {
+                Debug.Assert(sourceObjectExtension != null, nameof(sourceObjectExtension) + " != null");
+
+                foreach (var property in sourceObjectExtension.GetProperties())
+                {
+                    if (!sourceDictionary.ContainsKey(property.Name))
+                    {
+                        continue;
+                    }
+
+                    destinationDictionary[property.Name] = sourceDictionary[property.Name];
+                }
+            }
+            else if (definitionChecks == MappingPropertyDefinitionChecks.Destination)
+            {
+                Debug.Assert(destinationObjectExtension != null, nameof(destinationObjectExtension) + " != null");
+
+                foreach (var keyValue in sourceDictionary)
+                {
+                    if (!destinationObjectExtension.HasProperty(keyValue.Key))
+                    {
+                        continue;
+                    }
+
+                    destinationDictionary[keyValue.Key] = keyValue.Value;
+                }
+            }
+            else if (definitionChecks == MappingPropertyDefinitionChecks.Both)
+            {
+                Debug.Assert(sourceObjectExtension != null, nameof(sourceObjectExtension) + " != null");
+                Debug.Assert(destinationObjectExtension != null, nameof(destinationObjectExtension) + " != null");
+
+                foreach (var property in sourceObjectExtension.GetProperties())
+                {
+                    if (!sourceDictionary.ContainsKey(property.Name))
+                    {
+                        continue;
+                    }
+
+                    if (!destinationObjectExtension.HasProperty(property.Name))
+                    {
+                        continue;
+                    }
+
+                    destinationDictionary[property.Name] = sourceDictionary[property.Name];
+                }
+            }
+            else
+            {
+                throw new NotImplementedException(definitionChecks + " was not implemented!");
+            }
+        }
+    }
+}

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

@@ -0,0 +1,28 @@
+using System;
+
+namespace Volo.Abp.ObjectExtending
+{
+    [Flags]
+    public enum MappingPropertyDefinitionChecks : byte
+    {
+        /// <summary>
+        /// No check. Copy all extra properties from the source to the destination.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Copy the extra properties defined for the source class.
+        /// </summary>
+        Source = 1,
+
+        /// <summary>
+        /// Copy the extra properties defined for the destination class.
+        /// </summary>
+        Destination = 2,
+
+        /// <summary>
+        /// Copy extra properties defined for both of the source and destination classes.
+        /// </summary>
+        Both = Source | Destination
+    }
+}

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

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using JetBrains.Annotations;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class ObjectExtensionInfo
+    {
+        [NotNull]
+        public Type Type { get; }
+
+        [NotNull]
+        protected Dictionary<string, ObjectExtensionPropertyInfo> Properties { get; }
+
+        [NotNull]
+        public Dictionary<object, object> Configuration { get; }
+
+        public ObjectExtensionInfo([NotNull] Type type)
+        {
+            Type = Check.AssignableTo<IHasExtraProperties>(type, nameof(type));
+            Properties = new Dictionary<string, ObjectExtensionPropertyInfo>();
+            Configuration = new Dictionary<object, object>();
+        }
+
+        public virtual bool HasProperty(string propertyName)
+        {
+            return Properties.ContainsKey(propertyName);
+        }
+
+        [NotNull]
+        public virtual ObjectExtensionInfo AddOrUpdateProperty<TProperty>(
+            [NotNull] string propertyName,
+            [CanBeNull] Action<ObjectExtensionPropertyInfo> configureAction = null)
+        {
+            return AddOrUpdateProperty(
+                typeof(TProperty),
+                propertyName,
+                configureAction
+            );
+        }
+
+        [NotNull]
+        public virtual ObjectExtensionInfo AddOrUpdateProperty(
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<ObjectExtensionPropertyInfo> configureAction = null)
+        {
+            Check.NotNull(propertyType, nameof(propertyType));
+            Check.NotNull(propertyName, nameof(propertyName));
+
+            var propertyInfo = Properties.GetOrAdd(
+                propertyName,
+                () => new ObjectExtensionPropertyInfo(this, propertyType, propertyName)
+            );
+
+            configureAction?.Invoke(propertyInfo);
+
+            return this;
+        }
+
+        [NotNull]
+        public virtual ImmutableList<ObjectExtensionPropertyInfo> GetProperties()
+        {
+            return Properties.Values.ToImmutableList();
+        }
+
+        [CanBeNull]
+        public virtual ObjectExtensionPropertyInfo GetPropertyOrNull(
+            [NotNull] string propertyName)
+        {
+            Check.NotNullOrEmpty(propertyName, nameof(propertyName));
+
+            return Properties.GetOrDefault(propertyName);
+        }
+    }
+}

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

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using JetBrains.Annotations;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class ObjectExtensionManager
+    {
+        public static ObjectExtensionManager Instance { get; set; } = new ObjectExtensionManager();
+
+        protected Dictionary<Type, ObjectExtensionInfo> ObjectsExtensions { get; }
+
+        protected internal ObjectExtensionManager()
+        {
+            ObjectsExtensions = new Dictionary<Type, ObjectExtensionInfo>();
+        }
+
+        [NotNull]
+        public virtual ObjectExtensionManager AddOrUpdate<TObject>(
+            [CanBeNull] Action<ObjectExtensionInfo> configureAction = null)
+            where TObject : IHasExtraProperties
+        {
+            return AddOrUpdate(typeof(TObject), configureAction);
+        }
+
+        [NotNull]
+        public virtual ObjectExtensionManager AddOrUpdate(
+            [NotNull] Type type,
+            [CanBeNull] Action<ObjectExtensionInfo> configureAction = null)
+        {
+            Check.AssignableTo<IHasExtraProperties>(type, nameof(type));
+            
+            var extensionInfo = ObjectsExtensions.GetOrAdd(
+                type,
+                () => new ObjectExtensionInfo(type)
+            );
+
+            configureAction?.Invoke(extensionInfo);
+
+            return this;
+        }
+
+        [CanBeNull]
+        public virtual ObjectExtensionInfo GetOrNull<TObject>()
+            where TObject : IHasExtraProperties
+        {
+            return GetOrNull(typeof(TObject));
+        }
+
+        [CanBeNull]
+        public virtual ObjectExtensionInfo GetOrNull([NotNull] Type type)
+        {
+            Check.AssignableTo<IHasExtraProperties>(type, nameof(type));
+
+            return ObjectsExtensions.GetOrDefault(type);
+        }
+
+        [NotNull]
+        public virtual ImmutableList<ObjectExtensionInfo> GetExtendedObjects()
+        {
+            return ObjectsExtensions.Values.ToImmutableList();
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+using System;
+using JetBrains.Annotations;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class ObjectExtensionManagerExtensions
+    {
+        public static ObjectExtensionManager AddOrUpdateProperty<TObject, TProperty>(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<ObjectExtensionPropertyInfo> configureAction = null) 
+            where TObject : IHasExtraProperties
+        {
+            return objectExtensionManager.AddOrUpdateProperty(
+                typeof(TObject),
+                typeof(TProperty),
+                propertyName,
+                configureAction
+            );
+        }
+
+        public static ObjectExtensionManager AddOrUpdateProperty(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] Type objectType,
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<ObjectExtensionPropertyInfo> configureAction = null)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+
+            return objectExtensionManager.AddOrUpdate(
+                objectType,
+                options =>
+                {
+                    options.AddOrUpdateProperty(
+                        propertyType,
+                        propertyName,
+                        configureAction
+                    );
+                });
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class ObjectExtensionPropertyInfo
+    {
+        [NotNull]
+        public ObjectExtensionInfo ObjectExtension { get; }
+
+        [NotNull]
+        public string Name { get; }
+
+        [NotNull]
+        public Type Type { get; }
+
+        [NotNull]
+        public Dictionary<object, object> Configuration { get; }
+
+        public ObjectExtensionPropertyInfo(
+            [NotNull] ObjectExtensionInfo objectExtension, 
+            [NotNull] Type type, 
+            [NotNull] string name)
+        {
+            ObjectExtension = Check.NotNull(objectExtension, nameof(objectExtension));
+            Type = Check.NotNull(type, nameof(type));
+            Name = Check.NotNull(name, nameof(name));
+
+            Configuration = new Dictionary<object, object>();
+        }
+    }
+}

framework/test/Volo.Abp.AutoMapper.Tests/AutoMapper/AbpAutoMapperExtensibleDtoExtensions_Tests.cs

@@ -0,0 +1,41 @@
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending.TestObjects;
+using Volo.Abp.Testing;
+using Xunit;
+
+namespace AutoMapper
+{
+    public class AbpAutoMapperExtensibleDtoExtensions_Tests : AbpIntegratedTest<AutoMapperTestModule>
+    {
+        private readonly Volo.Abp.ObjectMapping.IObjectMapper _objectMapper;
+
+        public AbpAutoMapperExtensibleDtoExtensions_Tests()
+        {
+            _objectMapper = ServiceProvider.GetRequiredService<Volo.Abp.ObjectMapping.IObjectMapper>();
+        }
+
+        [Fact]
+        public void MapExtraPropertiesTo_Should_Only_Map_Defined_Properties_By_Default()
+        {
+            var person = new ExtensibleTestPerson()
+                .SetProperty("Name", "John")
+                .SetProperty("Age", 42)
+                .SetProperty("ChildCount", 2)
+                .SetProperty("Sex", "male");
+
+            var personDto = new ExtensibleTestPersonDto()
+                .SetProperty("ExistingDtoProperty", "existing-value");
+
+            _objectMapper.Map(person, personDto);
+
+            personDto.GetProperty<string>("Name").ShouldBe("John"); //Defined in both classes
+            personDto.HasProperty("Age").ShouldBeFalse(); //Not defined on the destination
+            personDto.HasProperty("ChildCount").ShouldBeFalse(); //Not defined in the source
+            personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
+            personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
+        }
+    }
+}

framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
-    <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
+    <ProjectReference Include="..\Volo.Abp.ObjectExtending.Tests\Volo.Abp.ObjectExtending.Tests.csproj" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
   </ItemGroup>
 

framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperTestModule.cs

@@ -1,9 +1,12 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.AutoMapper
 {
-    [DependsOn(typeof(AbpAutoMapperModule))]
+    [DependsOn(
+        typeof(AbpAutoMapperModule),
+        typeof(AbpObjectExtendingTestModule)
+        )]
     public class AutoMapperTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)

framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyMapProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using Volo.Abp.ObjectExtending.TestObjects;
 
 namespace Volo.Abp.AutoMapper.SampleClasses
 {
@@ -7,6 +8,9 @@ namespace Volo.Abp.AutoMapper.SampleClasses
         public MyMapProfile()
         {
             CreateMap<MyEntity, MyEntityDto>().ReverseMap();
+
+            CreateMap<ExtensibleTestPerson, ExtensibleTestPersonDto>()
+                .MapExtraProperties();
         }
     }
 }

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs

@@ -1,4 +1,4 @@
-using Volo.Abp.EntityFrameworkCore.Extensions;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.Threading;
 
@@ -12,10 +12,11 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
         {
             OneTimeRunner.Run(() =>
             {
-                EntityExtensionManager.AddProperty<City, string>(
-                    "PhoneCode",
-                    p => p.HasMaxLength(8)
-                );
+                ObjectExtensionManager.Instance
+                    .MapEfCoreProperty<City, string>(
+                        "PhoneCode",
+                        p => p.HasMaxLength(8)
+                    );
             });
         }
     }

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

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.Extensions;
 using Volo.Abp.EntityFrameworkCore.TestApp.SecondContext;
 using Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext;
 using Volo.Abp.TestApp.Domain;
@@ -37,8 +36,6 @@ namespace Volo.Abp.EntityFrameworkCore
 
             modelBuilder.Entity<City>(b =>
             {
-                //b.ConfigureExtensions();
-
                 b.OwnsMany(c => c.Districts, d =>
                 {
                     d.WithOwner().HasForeignKey(x => x.CityId);

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

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.Extensions;
 using Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext;
 using Volo.Abp.TestApp.Domain;
 
@@ -44,8 +43,6 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
 
             modelBuilder.Entity<City>(b =>
             {
-                //b.ConfigureExtensions();
-
                 b.OwnsMany(c => c.Districts, d =>
                 {
                     d.WithOwner().HasForeignKey(x => x.CityId);

framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\common.test.props" />
+  
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.ObjectExtending\Volo.Abp.ObjectExtending.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+  </ItemGroup>
+
+</Project>

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/AbpObjectExtendingTestBase.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Testing;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public abstract class AbpObjectExtendingTestBase : AbpIntegratedTest<AbpObjectExtendingTestModule>
+    {
+
+    }
+}

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/AbpObjectExtendingTestModule.cs

@@ -0,0 +1,27 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending.TestObjects;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.ObjectExtending
+{
+    [DependsOn(
+        typeof(AbpObjectExtendingModule),
+        typeof(AbpTestBaseModule)
+        )]
+    public class AbpObjectExtendingTestModule : AbpModule
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            OneTimeRunner.Run(() =>
+            {
+                ObjectExtensionManager.Instance
+                    .AddOrUpdateProperty<ExtensibleTestPerson, string>("Name")
+                    .AddOrUpdateProperty<ExtensibleTestPerson, int>("Age")
+                    .AddOrUpdateProperty<ExtensibleTestPersonDto, string>("Name")
+                    .AddOrUpdateProperty<ExtensibleTestPersonDto, int>("ChildCount");
+            });
+        }
+    }
+}

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/HasExtraPropertiesObjectExtendingExtensions_Tests.cs

@@ -0,0 +1,73 @@
+using Shouldly;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending.TestObjects;
+using Xunit;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class HasExtraPropertiesObjectExtendingExtensions_Tests : AbpObjectExtendingTestBase
+    {
+        private readonly ExtensibleTestPerson _person;
+        private readonly ExtensibleTestPersonDto _personDto;
+
+        public HasExtraPropertiesObjectExtendingExtensions_Tests()
+        {
+            _person = new ExtensibleTestPerson()
+                .SetProperty("Name", "John")
+                .SetProperty("Age", 42)
+                .SetProperty("ChildCount", 2)
+                .SetProperty("Sex", "male");
+
+            _personDto = new ExtensibleTestPersonDto()
+                .SetProperty("ExistingDtoProperty", "existing-value");
+        }
+        
+        [Fact]
+        public void MapExtraPropertiesTo_Should_Only_Map_Defined_Properties_By_Default()
+        {
+            _person.MapExtraPropertiesTo(_personDto);
+
+            _personDto.GetProperty<string>("Name").ShouldBe("John"); //Defined in both classes
+            _personDto.HasProperty("Age").ShouldBeFalse(); //Not defined on the destination
+            _personDto.HasProperty("ChildCount").ShouldBeFalse(); //Not defined in the source
+            _personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
+            _personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
+        }
+
+        [Fact]
+        public void MapExtraPropertiesTo_Should_Only_Map_Source_Defined_Properties_If_Requested()
+        {
+            _person.MapExtraPropertiesTo(_personDto, MappingPropertyDefinitionChecks.Source);
+
+            _personDto.GetProperty<string>("Name").ShouldBe("John"); //Defined in both classes
+            _personDto.GetProperty<int>("Age").ShouldBe(42); //Defined in source
+            _personDto.HasProperty("ChildCount").ShouldBeFalse(); //Not defined in the source
+            _personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
+            _personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
+        }
+
+        [Fact]
+        public void MapExtraPropertiesTo_Should_Only_Map_Destination_Defined_Properties_If_Requested()
+        {
+            _person.MapExtraPropertiesTo(_personDto, MappingPropertyDefinitionChecks.Destination);
+
+            _personDto.GetProperty<string>("Name").ShouldBe("John"); //Defined in both classes
+            _personDto.GetProperty<int>("ChildCount").ShouldBe(2); //Defined in destination
+            _personDto.HasProperty("Age").ShouldBeFalse(); //Not defined in destination
+            _personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
+            _personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
+        }
+
+        [Fact]
+        public void MapExtraPropertiesTo_Should_Copy_all_With_No_Property_Definition_Check()
+        {
+            _person.MapExtraPropertiesTo(_personDto, MappingPropertyDefinitionChecks.None);
+
+            _personDto.GetProperty<string>("Name").ShouldBe("John");
+            _personDto.GetProperty<int>("Age").ShouldBe(42);
+            _personDto.GetProperty<int>("ChildCount").ShouldBe(2);
+            _personDto.GetProperty<string>("Sex").ShouldBe("male");
+            _personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
+        }
+    }
+}

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ObjectExtensionManager_Tests.cs

@@ -0,0 +1,63 @@
+using System.Linq;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class ObjectExtensionManager_Tests
+    {
+        private readonly ObjectExtensionManager _objectExtensionManager;
+
+        public ObjectExtensionManager_Tests()
+        {
+            _objectExtensionManager = new ObjectExtensionManager();
+        }
+
+        [Fact]
+        public void Should_Not_Add_Same_Property_Multiple_Times()
+        {
+            _objectExtensionManager
+                .AddOrUpdateProperty<MyExtensibleObject, string>("TestProp")
+                .AddOrUpdateProperty<MyExtensibleObject, string>("TestProp");
+
+            var objectExtension = _objectExtensionManager.GetOrNull<MyExtensibleObject>();
+            objectExtension.ShouldNotBeNull();
+            
+            var properties = objectExtension.GetProperties();
+            properties.Count.ShouldBe(1);
+            properties.FirstOrDefault(p => p.Name == "TestProp").ShouldNotBeNull();
+        }
+
+        [Fact]
+        public void Should_Update_Property_Configuration()
+        {
+            _objectExtensionManager
+                .AddOrUpdateProperty<MyExtensibleObject, string>(
+                    "TestProp",
+                    options =>
+                    {
+                        options.Configuration["TestConfig1"] = "TestConfig1-Value";
+                    }
+                ).AddOrUpdateProperty<MyExtensibleObject, string>(
+                    "TestProp",
+                    options =>
+                    {
+                        options.Configuration["TestConfig2"] = "TestConfig2-Value";
+                    }
+                );
+
+            var objectExtension = _objectExtensionManager.GetOrNull<MyExtensibleObject>();
+            objectExtension.ShouldNotBeNull();
+
+            var property = objectExtension.GetPropertyOrNull("TestProp");
+            property.ShouldNotBeNull();
+            property.Configuration["TestConfig1"].ShouldBe("TestConfig1-Value");
+            property.Configuration["TestConfig2"].ShouldBe("TestConfig2-Value");
+        }
+
+        private class MyExtensibleObject : ExtensibleObject
+        {
+
+        }
+    }
+}

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/TestObjects/ExtensibleTestPerson.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.ObjectExtending.TestObjects
+{
+    public class ExtensibleTestPerson : ExtensibleObject
+    {
+
+    }
+}

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/TestObjects/ExtensibleTestPersonDto.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.ObjectExtending.TestObjects
+{
+    public class ExtensibleTestPersonDto : ExtensibleObject
+    {
+
+    }
+}

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Repositories;
 
 namespace Volo.Abp.AuditLogging
@@ -44,5 +45,29 @@ namespace Volo.Abp.AuditLogging
         Task<Dictionary<DateTime, double>> GetAverageExecutionDurationPerDayAsync(
             DateTime startDate,
             DateTime endDate);
+
+        Task<EntityChange> GetEntityChange(Guid auditLogId, Guid entityChangeId, bool includeDetails = true);
+
+        Task<List<EntityChange>> GetEntityChangeListAsync(
+            string sorting = null,
+            int maxResultCount = 50,
+            int skipCount = 0,
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null,
+            bool includeDetails = false,
+            CancellationToken cancellationToken = default);
+
+        Task<long> GetEntityChangeCountAsync(
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null,
+            CancellationToken cancellationToken = default);
     }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/AbpAuditLoggingEfCoreQueryableExtensions.cs

@@ -18,5 +18,17 @@ namespace Volo.Abp.AuditLogging
                 .Include(x => x.Actions)
                 .Include(x => x.EntityChanges).ThenInclude(ec=>ec.PropertyChanges);
         }
+
+        public static IQueryable<EntityChange> IncludeDetails(
+            this IQueryable<EntityChange> queryable,
+            bool include = true)
+        {
+            if (!include)
+            {
+                return queryable;
+            }
+
+            return queryable.Include(x => x.PropertyChanges);
+        }
     }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs

@@ -6,6 +6,7 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
 
@@ -134,10 +135,71 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
 
             return result.ToDictionary(element => element.Day.ClearTime(), element => element.avgExecutionTime);
         }
-
+        
         public override IQueryable<AuditLog> WithDetails()
         {
             return GetQueryable().IncludeDetails();
         }
+
+        public Task<EntityChange> GetEntityChange(Guid auditLogId, Guid entityChangeId, bool includeDetails = true)
+        {
+            return DbContext.Set<EntityChange>().AsNoTracking().IncludeDetails(includeDetails)
+                .Where(x => x.Id == entityChangeId && x.AuditLogId == auditLogId).FirstAsync();
+        }
+
+        public virtual async Task<List<EntityChange>> GetEntityChangeListAsync(
+            string sorting = null,
+            int maxResultCount = 50,
+            int skipCount = 0,
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null,
+            bool includeDetails = false,
+            CancellationToken cancellationToken = default)
+        {
+            var query = GetEntityChangeListQuery(auditLogId, startTime, endTime, changeType, entityId, entityTypeFullName, includeDetails);
+
+            return await query.OrderBy(sorting ?? "changeTime desc")
+                .PageBy(skipCount, maxResultCount)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+
+        public virtual async Task<long> GetEntityChangeCountAsync(
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null,
+            CancellationToken cancellationToken = default)
+        {
+            var query = GetEntityChangeListQuery(auditLogId, startTime, endTime, changeType, entityId, entityTypeFullName);
+
+            var totalCount = await query.LongCountAsync(GetCancellationToken(cancellationToken));
+
+            return totalCount;
+        }
+
+        protected virtual IQueryable<EntityChange> GetEntityChangeListQuery(
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null,
+            bool includeDetails = false)
+        {
+            return DbContext.Set<EntityChange>().AsNoTracking().IncludeDetails(includeDetails)
+                        .WhereIf(auditLogId.HasValue, e => e.AuditLogId == auditLogId)
+                        .WhereIf(startTime.HasValue, e => e.ChangeTime >= startTime)
+                        .WhereIf(endTime.HasValue, e => e.ChangeTime <= endTime)
+                        .WhereIf(changeType.HasValue, e => e.ChangeType == changeType)
+                        .WhereIf(!string.IsNullOrWhiteSpace(entityId), e => e.EntityId == entityId)
+                        .WhereIf(!string.IsNullOrWhiteSpace(entityTypeFullName),
+                            e => e.EntityTypeFullName.Contains(entityTypeFullName));
+        }
     }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs

@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Repositories.MongoDB;
 using Volo.Abp.MongoDB;
 
@@ -138,5 +139,116 @@ namespace Volo.Abp.AuditLogging.MongoDB
 
             return result.ToDictionary(element => element.Day.ClearTime(), element => element.avgExecutionTime);
         }
+
+        public virtual async Task<EntityChange> GetEntityChange(Guid auditLogId, Guid entityChangeId, bool includeDetails = true)
+        {
+            return (await GetMongoQueryable()
+                    .Where(x => x.Id == auditLogId && x.EntityChanges.Any(y => y.Id == entityChangeId)).FirstAsync())
+                .EntityChanges.First(x => x.Id == entityChangeId);
+        }
+
+        public virtual async Task<List<EntityChange>> GetEntityChangeListAsync(
+            string sorting = null,
+            int maxResultCount = 50,
+            int skipCount = 0,
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null,
+            bool includeDetails = false,
+            CancellationToken cancellationToken = default)
+        {
+            var query = GetEntityChangeListQuery(auditLogId, startTime, endTime, changeType, entityId, entityTypeFullName);
+
+            var auditLogs = await query.As<IMongoQueryable<AuditLog>>()
+                .PageBy<AuditLog, IMongoQueryable<AuditLog>>(skipCount, maxResultCount)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+            
+            // TODO: Improve this specification
+
+            return auditLogs
+                .SelectMany(x => x.EntityChanges.Where(y =>
+                    IsSatisfiedEntityChange(y, auditLogId, startTime, endTime, changeType, entityId, entityTypeFullName)))
+                .AsQueryable().OrderBy(sorting ?? "changeTime desc").ToList();
+        }
+
+        public virtual async Task<long> GetEntityChangeCountAsync(
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null,
+            CancellationToken cancellationToken = default)
+        {
+            var query = GetEntityChangeListQuery(auditLogId, startTime, endTime, changeType, entityId, entityTypeFullName);
+            var count = await query.As<IMongoQueryable<AuditLog>>()
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+
+            return count;
+        }
+
+        protected virtual IQueryable<AuditLog> GetEntityChangeListQuery(
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null)
+        {
+            return GetMongoQueryable()
+                    .Where(x => x.EntityChanges != null)
+                    .WhereIf(auditLogId.HasValue, e => e.Id == auditLogId)
+                    .WhereIf(startTime.HasValue, e => e.EntityChanges.Any(ec => ec.ChangeTime >= startTime))
+                    .WhereIf(endTime.HasValue, e => e.EntityChanges.Any(ec => ec.ChangeTime >= endTime))
+                    .WhereIf(changeType.HasValue, e => e.EntityChanges.Any(ec => ec.ChangeType == changeType))
+                    .WhereIf(!string.IsNullOrWhiteSpace(entityId), e => e.EntityChanges.Any(ec => ec.EntityId == entityId))
+                    .WhereIf(!string.IsNullOrWhiteSpace(entityTypeFullName),
+                        e => e.EntityChanges.Any(ec => ec.EntityTypeFullName.Contains(entityTypeFullName)));
+        }
+
+        protected virtual bool IsSatisfiedEntityChange(
+            EntityChange entityChange, 
+            Guid? auditLogId = null,
+            DateTime? startTime = null,
+            DateTime? endTime = null,
+            EntityChangeType? changeType = null,
+            string entityId = null,
+            string entityTypeFullName = null)
+        {
+            if (auditLogId != null && auditLogId != entityChange.AuditLogId)
+            {
+                return false;
+            }
+
+            if (startTime != null && startTime.Value >= entityChange.ChangeTime)
+            {
+                return false;
+            }
+
+            if (endTime != null && endTime.Value <= entityChange.ChangeTime)
+            {
+                return false;
+            }
+
+            if (changeType != null && changeType != entityChange.ChangeType)
+            {
+                return false;
+            }
+
+            if (entityId != null && entityId != entityChange.EntityId)
+            {
+                return false;
+            }
+
+            if (entityTypeFullName != null && entityChange.EntityTypeFullName.Contains(entityTypeFullName))
+            {
+                return false;
+            }
+
+            return true;
+        }
     }
 }

modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo/Abp/AuditLogging/AuditLogRepository_Tests.cs

@@ -333,5 +333,433 @@ namespace Volo.Abp.AuditLogging
             results.Count.ShouldBe(1);
             results.Values.First().ShouldBe(50); // (45 + 55) / 2
         }
+
+        [Fact]
+        public async Task GetEntityChangeListAsync()
+        {
+            // Arrange
+            var userId = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var userId2 = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var ipAddress = "153.1.7.61";
+            var firstComment = "first Comment";
+
+            var log1 = new AuditLogInfo
+            {
+                UserId = userId,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                UserName = "Douglas",
+                EntityChanges = {
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Deleted",
+                    ChangeType = EntityChangeType.Deleted,
+                    ChangeTime = DateTime.Now,
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                },
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Created",
+                    ChangeType = EntityChangeType.Created,
+                    ChangeTime = DateTime.Now,
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                }
+
+                }
+            };
+
+            var log2 = new AuditLogInfo
+            {
+                UserId = userId2,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                HttpStatusCode = (int?)HttpStatusCode.BadGateway,
+                EntityChanges = {
+                    new EntityChangeInfo
+                    {
+                        EntityId = Guid.NewGuid().ToString(),
+                        EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Updated",
+                        ChangeType = EntityChangeType.Updated,
+                        ChangeTime = DateTime.Now,
+                        PropertyChanges = new List<EntityPropertyChangeInfo>
+                        {
+                            new EntityPropertyChangeInfo
+                            {
+                                PropertyTypeFullName = typeof(string).FullName,
+                                PropertyName = "Name",
+                                NewValue = "New value",
+                                OriginalValue = null
+                            }
+                        }
+                    }
+                }
+            };
+
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log1));
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log2));
+
+            //Assert
+            var entityChanges = await AuditLogRepository.GetEntityChangeListAsync();
+            entityChanges.ShouldNotBeNull();
+            entityChanges.Count.ShouldBe(3);
+
+            entityChanges.Single(x => x.ChangeType == EntityChangeType.Created).ShouldNotBeNull();
+            entityChanges.Single(x => x.ChangeType == EntityChangeType.Deleted).ShouldNotBeNull();
+            entityChanges.Single(x => x.ChangeType == EntityChangeType.Updated).ShouldNotBeNull();
+        }
+
+        [Fact]
+        public async Task GetEntityChangeAsync()
+        {
+            // Arrange
+            var userId = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var userId2 = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var ipAddress = "153.1.7.61";
+            var firstComment = "first Comment";
+
+            var log1 = new AuditLogInfo
+            {
+                UserId = userId,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                UserName = "Douglas",
+                EntityChanges = {
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Deleted",
+                    ChangeType = EntityChangeType.Deleted,
+                    ChangeTime = new DateTime(1995, 3, 27),
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                },
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Created",
+                    ChangeType = EntityChangeType.Created,
+                    ChangeTime = DateTime.Now,
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                }
+
+                }
+            };
+
+            var log2 = new AuditLogInfo
+            {
+                UserId = userId2,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                HttpStatusCode = (int?)HttpStatusCode.BadGateway,
+                EntityChanges = {
+                    new EntityChangeInfo
+                    {
+                        EntityId = Guid.NewGuid().ToString(),
+                        EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Updated",
+                        ChangeType = EntityChangeType.Updated,
+                        ChangeTime = DateTime.Now,
+                        PropertyChanges = new List<EntityPropertyChangeInfo>
+                        {
+                            new EntityPropertyChangeInfo
+                            {
+                                PropertyTypeFullName = typeof(string).FullName,
+                                PropertyName = "Name",
+                                NewValue = "New value",
+                                OriginalValue = null
+                            }
+                        }
+                    }
+                }
+            };
+
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log1));
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log2));
+
+            var entityChanges = await AuditLogRepository.GetEntityChangeListAsync();
+            var entityChange =
+                await AuditLogRepository.GetEntityChange(entityChanges.First().AuditLogId, entityChanges.First().Id);
+
+            entityChange.ChangeTime.ShouldBe(entityChanges.First().ChangeTime);
+        }
+
+        [Fact]
+        public async Task GetOrderedEntityChangeListAsync()
+        {
+            // Arrange
+            var userId = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var userId2 = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var ipAddress = "153.1.7.61";
+            var firstComment = "first Comment";
+
+            var deletedEntityChangeTime = new DateTime(2000, 05, 05, 05, 05, 05);
+            var createdEntityChangeTime = new DateTime(2005, 05, 05, 05, 05, 05);
+            var updatedEntityChangeTime = new DateTime(2010, 05, 05, 05, 05, 05);
+
+            var log1 = new AuditLogInfo
+            {
+                UserId = userId,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                UserName = "Douglas",
+                EntityChanges = {
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Deleted",
+                    ChangeType = EntityChangeType.Deleted,
+                    ChangeTime = deletedEntityChangeTime,
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                },
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Created",
+                    ChangeType = EntityChangeType.Created,
+                    ChangeTime = createdEntityChangeTime,
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                }
+
+                }
+            };
+
+            var log2 = new AuditLogInfo
+            {
+                UserId = userId2,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                HttpStatusCode = (int?)HttpStatusCode.BadGateway,
+                EntityChanges = {
+                    new EntityChangeInfo
+                    {
+                        EntityId = Guid.NewGuid().ToString(),
+                        EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Updated",
+                        ChangeType = EntityChangeType.Updated,
+                        ChangeTime = updatedEntityChangeTime,
+                        PropertyChanges = new List<EntityPropertyChangeInfo>
+                        {
+                            new EntityPropertyChangeInfo
+                            {
+                                PropertyTypeFullName = typeof(string).FullName,
+                                PropertyName = "Name",
+                                NewValue = "New value",
+                                OriginalValue = null
+                            }
+                        }
+                    }
+                }
+            };
+
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log1));
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log2));
+
+            //Assert
+            var entityChangesDesc = await AuditLogRepository.GetEntityChangeListAsync();
+            entityChangesDesc.ShouldNotBeNull();
+            entityChangesDesc.Count.ShouldBe(3);
+
+            entityChangesDesc.First().EntityTypeFullName.ShouldBe("Volo.Abp.AuditLogging.TestEntity_Updated");
+            entityChangesDesc.Last().EntityTypeFullName.ShouldBe("Volo.Abp.AuditLogging.TestEntity_Deleted");
+
+            var entityChangesAsc = await AuditLogRepository.GetEntityChangeListAsync("changeTime asc");
+
+            entityChangesAsc.First().EntityTypeFullName.ShouldBe("Volo.Abp.AuditLogging.TestEntity_Deleted");
+            entityChangesAsc.Last().EntityTypeFullName.ShouldBe("Volo.Abp.AuditLogging.TestEntity_Updated");
+        }
+
+        [Fact]
+        public async Task GetSpecifiedEntityChangeListAsync()
+        {
+            // Arrange
+            var userId = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var userId2 = new Guid("4456fb0d-74cc-4807-9eee-23e551e6cb06");
+            var ipAddress = "153.1.7.61";
+            var firstComment = "first Comment";
+
+            var deletedEntityChangeTime = new DateTime(2000, 05, 05, 05, 05, 05);
+            var createdEntityChangeTime = new DateTime(2005, 05, 05, 05, 05, 05);
+            var updatedEntityChangeTime = new DateTime(2010, 05, 05, 05, 05, 05);
+
+            var log1 = new AuditLogInfo
+            {
+                UserId = userId,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                UserName = "Douglas",
+                EntityChanges = {
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Deleted",
+                    ChangeType = EntityChangeType.Deleted,
+                    ChangeTime = deletedEntityChangeTime,
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                },
+                    new EntityChangeInfo
+                {
+                    EntityId = Guid.NewGuid().ToString(),
+                    EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Created",
+                    ChangeType = EntityChangeType.Created,
+                    ChangeTime = createdEntityChangeTime,
+                    PropertyChanges = new List<EntityPropertyChangeInfo>
+                    {
+                        new EntityPropertyChangeInfo
+                        {
+                            PropertyTypeFullName = typeof(string).FullName,
+                            PropertyName = "Name",
+                            NewValue = "New value",
+                            OriginalValue = null
+                        }
+                    }
+                }
+                }
+            };
+
+            var log2 = new AuditLogInfo
+            {
+                UserId = userId2,
+                ImpersonatorUserId = Guid.NewGuid(),
+                ImpersonatorTenantId = Guid.NewGuid(),
+                ExecutionTime = DateTime.Today,
+                ExecutionDuration = 42,
+                ClientIpAddress = ipAddress,
+                ClientName = "MyDesktop",
+                BrowserInfo = "Chrome",
+                Comments = new List<string> { firstComment, "Second Comment" },
+                HttpStatusCode = (int?)HttpStatusCode.BadGateway,
+                EntityChanges = {
+                    new EntityChangeInfo
+                    {
+                        EntityId = Guid.NewGuid().ToString(),
+                        EntityTypeFullName = "Volo.Abp.AuditLogging.TestEntity_Updated",
+                        ChangeType = EntityChangeType.Updated,
+                        ChangeTime = updatedEntityChangeTime,
+                        PropertyChanges = new List<EntityPropertyChangeInfo>
+                        {
+                            new EntityPropertyChangeInfo
+                            {
+                                PropertyTypeFullName = typeof(string).FullName,
+                                PropertyName = "Name",
+                                NewValue = "New value",
+                                OriginalValue = null
+                            }
+                        }
+                    }
+                }
+            };
+
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log1));
+            await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, log2));
+
+            //Assert
+            var entityChanges = await AuditLogRepository.GetEntityChangeListAsync(changeType: EntityChangeType.Created);
+            entityChanges.ShouldNotBeNull();
+            entityChanges.Count.ShouldBe(1);
+        }
     }
 }

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs

@@ -202,7 +202,7 @@ namespace Volo.Blogging.Posts
 
         private async Task RemoveOldTags(ICollection<string> newTags, Post post)
         {
-            foreach (var oldTag in post.Tags)
+            foreach (var oldTag in post.Tags.ToList())
             {
                 var tag = await _tagRepository.GetAsync(oldTag.TagId);
 

modules/docs/app/VoloDocs.Web/Controllers/HomeController.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc;
-
-namespace VoloDocs.Web.Controllers
-{
-    public class HomeController : AbpController
-    {
-        public void Index()
-        {
-
-        }
-    }
-}

modules/docs/app/VoloDocs.Web/Pages/Index.cshtml

@@ -3,3 +3,21 @@
 @{
 }
 
+@if (!Model.Projects.Any())
+{
+    <abp-alert alert-type="Warning">
+        <strong>No projects found!</strong><br />
+        See <a href=" https://docs.abp.io/en/abp/latest/Modules/Docs">documentation</a> to see how you can create a new one.
+    </abp-alert>
+}
+else
+{
+    <h1>Projects</h1>
+
+    <abp-list-group class="mt-5">
+        @foreach (var project in Model.Projects)
+        {
+            <abp-list-group-item href="@Model.GetUrlForProject(project)">@project.Name</abp-list-group-item>
+        }
+    </abp-list-group>
+}

modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs

@@ -1,29 +1,59 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Options;
 using Volo.Docs;
+using Volo.Docs.Projects;
 
 namespace VoloDocs.Web.Pages
 {
     public class IndexModel : PageModel
     {
+        public IReadOnlyList<ProjectDto> Projects { get; set; }
+
         private readonly DocsUiOptions _urlUiOptions;
 
-        public IndexModel(IOptions<DocsUiOptions> urlOptions)
+        private readonly IProjectAppService _projectAppService;
+
+        public IndexModel(IOptions<DocsUiOptions> urlOptions, IProjectAppService projectAppService)
         {
+            _projectAppService = projectAppService;
             _urlUiOptions = urlOptions.Value;
         }
 
-        public IActionResult OnGet()
+        public async Task<IActionResult> OnGetAsync()
         {
-            //TODO: Create HomeController & Index instead of Page. Otherwise, we have an empty Index.cshtml file.
-            if (!_urlUiOptions.RoutePrefix.IsNullOrWhiteSpace())
+            var projects = await _projectAppService.GetListAsync();
+
+            if (projects.Items.Count == 1)
             {
-                return Redirect("." + _urlUiOptions.RoutePrefix);
+                return await RedirectToProjectAsync(projects.Items.First());
+            }
+            else if (projects.Items.Count > 1)
+            {
+                Projects = projects.Items;
             }
 
             return Page();
         }
+
+        private async Task<IActionResult> RedirectToProjectAsync(ProjectDto project, string language = "en", string version = null)
+        {
+            var path = GetUrlForProject(project, language, version);
+            return await Task.FromResult(Redirect(path));
+        }
+
+        //Eg: "/en/abp/latest"
+        public string GetUrlForProject(ProjectDto project, string language = "en", string version = null)
+        {
+            return "." +
+                   _urlUiOptions.RoutePrefix.EnsureStartsWith('/').EnsureEndsWith('/') +
+                   language.EnsureEndsWith('/') +
+                   project.ShortName.EnsureEndsWith('/') +
+                   (version ?? DocsAppConsts.Latest);
+        }
     }
-}
+}

modules/docs/app/VoloDocs.Web/appsettings.json

@@ -3,5 +3,10 @@
   "LogoUrl": "/assets/images/Logo.png",
   "ElasticSearch": {
     "Url": "http://localhost:9200"
+  },
+  "Volo.Docs": {
+    "DocumentCacheTimeoutInterval": "24:00:00",
+    "DocumentResource.AbsoluteExpirationRelativeToNow": "24:00:00",
+    "DocumentResource.SlidingExpiration": "02:00:00"
   }
 }

modules/docs/app/VoloDocs.Web/package.json

@@ -6,4 +6,4 @@
     "@abp/aspnetcore.mvc.ui.theme.basic": "^1.0.2",
     "@abp/docs": "^1.0.2"
   }
-}
+}

modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs

@@ -4,11 +4,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Newtonsoft.Json;
+using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
 using Volo.Docs.Documents;
 using Volo.Docs.Documents.FullSearch.Elastic;
 using Volo.Docs.Projects;
+using Volo.Extensions;
 
 namespace Volo.Docs.Admin.Documents
 {
@@ -38,15 +40,19 @@ namespace Volo.Docs.Admin.Documents
         {
             var project = await _projectRepository.GetAsync(input.ProjectId);
 
-            var navigationFile = await GetDocumentAsync(
+            var navigationDocument = await GetDocumentAsync(
                 project,
                 project.NavigationDocumentName,
                 input.LanguageCode,
                 input.Version
             );
 
-            var nav = JsonConvert.DeserializeObject<NavigationNode>(navigationFile.Content);
-            var leafs = nav.Items.GetAllNodes(x => x.Items)
+            if (!JsonConvertExtensions.TryDeserializeObject<NavigationNode>(navigationDocument.Content, out var navigation))
+            {
+                throw new UserFriendlyException($"Cannot validate navigation file '{project.NavigationDocumentName}' for the project {project.Name}.");
+            }
+
+            var leafs = navigation.Items.GetAllNodes(x => x.Items)
                 .Where(x => x.IsLeaf && !x.Path.IsNullOrWhiteSpace())
                 .ToList();
 

modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs

@@ -3,13 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Nest;
 using Newtonsoft.Json;
+using Volo.Abp;
 using Volo.Abp.Caching;
 using Volo.Docs.Documents.FullSearch.Elastic;
 using Volo.Docs.Projects;
+using Volo.Extensions;
 
 namespace Volo.Docs.Documents
 {
@@ -24,6 +28,10 @@ namespace Volo.Docs.Documents
         protected IHostEnvironment HostEnvironment { get; }
         private readonly IDocumentFullSearch _documentFullSearch;
         private readonly DocsElasticSearchOptions _docsElasticSearchOptions;
+        private readonly IConfiguration _configuration;
+        private readonly TimeSpan _cacheTimeout;
+        private readonly TimeSpan _documentResourceAbsoluteExpiration;
+        private readonly TimeSpan _documentResourceSlidingExpiration;
 
         public DocumentAppService(
             IProjectRepository projectRepository,
@@ -32,9 +40,10 @@ namespace Volo.Docs.Documents
             IDistributedCache<LanguageConfig> languageCache,
             IDistributedCache<DocumentResourceDto> resourceCache,
             IDistributedCache<DocumentUpdateInfo> documentUpdateCache,
-            IHostEnvironment hostEnvironment, 
-            IDocumentFullSearch documentFullSearch, 
-            IOptions<DocsElasticSearchOptions> docsElasticSearchOptions)
+            IHostEnvironment hostEnvironment,
+            IDocumentFullSearch documentFullSearch,
+            IOptions<DocsElasticSearchOptions> docsElasticSearchOptions,
+            IConfiguration configuration)
         {
             _projectRepository = projectRepository;
             _documentRepository = documentRepository;
@@ -44,7 +53,11 @@ namespace Volo.Docs.Documents
             DocumentUpdateCache = documentUpdateCache;
             HostEnvironment = hostEnvironment;
             _documentFullSearch = documentFullSearch;
+            _configuration = configuration;
             _docsElasticSearchOptions = docsElasticSearchOptions.Value;
+            _cacheTimeout = GetCacheTimeout();
+            _documentResourceAbsoluteExpiration = GetDocumentResourceAbsoluteExpirationTimeout();
+            _documentResourceSlidingExpiration = GetDocumentResourceSlidingExpirationTimeout();
         }
 
         public virtual async Task<DocumentWithDetailsDto> GetAsync(GetDocumentInput input)
@@ -82,7 +95,10 @@ namespace Volo.Docs.Documents
                 input.Version
             );
 
-            var navigationNode = JsonConvert.DeserializeObject<NavigationNode>(navigationDocument.Content);
+            if (!JsonConvertExtensions.TryDeserializeObject<NavigationNode>(navigationDocument.Content, out var navigationNode))
+            {
+                throw new UserFriendlyException($"Cannot validate navigation file '{project.NavigationDocumentName}' for the project {project.Name}.");
+            }
 
             var leafs = navigationNode.Items.GetAllNodes(x => x.Items)
                 .Where(x => !x.Path.IsNullOrWhiteSpace())
@@ -127,9 +143,8 @@ namespace Volo.Docs.Documents
                 GetResourceAsync,
                 () => new DistributedCacheEntryOptions
                 {
-                    //TODO: Configurable?
-                    AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(6),
-                    SlidingExpiration = TimeSpan.FromMinutes(30)
+                    AbsoluteExpirationRelativeToNow = _documentResourceAbsoluteExpiration,
+                    SlidingExpiration = _documentResourceSlidingExpiration
                 }
             );
         }
@@ -173,11 +188,16 @@ namespace Volo.Docs.Documents
                     input.Version
                 );
 
-                return JsonConvert.DeserializeObject<DocumentParametersDto>(document.Content);
+                if (!JsonConvertExtensions.TryDeserializeObject<DocumentParametersDto>(document.Content, out var documentParameters))
+                {
+                    throw new UserFriendlyException($"Cannot validate document parameters file '{project.ParametersDocumentName}' for the project {project.Name}.");
+                }
+
+                return documentParameters;
             }
             catch (DocumentNotFoundException)
             {
-                Logger.LogWarning($"Parameter file ({project.ParametersDocumentName}) not found.");
+                Logger.LogWarning($"Parameter file ({project.ParametersDocumentName}) not found!");
                 return new DocumentParametersDto();
             }
         }
@@ -190,48 +210,23 @@ namespace Volo.Docs.Documents
         {
             version = string.IsNullOrWhiteSpace(version) ? project.LatestVersionBranchName : version;
 
-            async Task<DocumentWithDetailsDto> GetDocumentAsync(Document oldDocument = null)
-            {
-                Logger.LogInformation($"Not found in the cache. Requesting {documentName} from the source...");
-
-                var source = _documentStoreFactory.Create(project.DocumentStoreType);
-                var sourceDocument = await source.GetDocumentAsync(project, documentName, languageCode, version, oldDocument?.LastSignificantUpdateTime);
-
-                await _documentRepository.DeleteAsync(project.Id, sourceDocument.Name, sourceDocument.LanguageCode, sourceDocument.Version);
-                await _documentRepository.InsertAsync(sourceDocument, true);
-
-                Logger.LogInformation($"Document retrieved: {documentName}");
-
-                var cacheKey = $"DocumentUpdateInfo{sourceDocument.ProjectId}#{sourceDocument.Name}#{sourceDocument.LanguageCode}#{sourceDocument.Version}";
-                await DocumentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
-                {
-                    Name = sourceDocument.Name,
-                    CreationTime = sourceDocument.CreationTime,
-                    LastUpdatedTime = sourceDocument.LastUpdatedTime,
-                    LastSignificantUpdateTime = sourceDocument.LastSignificantUpdateTime
-                });
-
-                return CreateDocumentWithDetailsDto(project, sourceDocument);
-            }
-
             if (HostEnvironment.IsDevelopment())
             {
-                return await GetDocumentAsync();
+                return await GetDocumentAsync(documentName, project, languageCode, version);
             }
 
             var document = await _documentRepository.FindAsync(project.Id, documentName, languageCode, version);
             if (document == null)
             {
-                return await GetDocumentAsync();
+                return await GetDocumentAsync(documentName, project, languageCode, version);
             }
 
             //Only the latest version (dev) of the document needs to update the cache.
             if (!project.LatestVersionBranchName.IsNullOrWhiteSpace() &&
                 document.Version == project.LatestVersionBranchName &&
-                //TODO: Configurable cache time?
-                document.LastCachedTime + TimeSpan.FromHours(2) < DateTime.Now)
+                document.LastCachedTime + _cacheTimeout < DateTime.Now)
             {
-                return await GetDocumentAsync(document);
+                return await GetDocumentAsync(documentName, project, languageCode, version, document);
             }
 
             var cacheKey = $"DocumentUpdateInfo{document.ProjectId}#{document.Name}#{document.LanguageCode}#{document.Version}";
@@ -253,5 +248,62 @@ namespace Volo.Docs.Documents
             documentDto.Contributors = ObjectMapper.Map<List<DocumentContributor>, List<DocumentContributorDto>>(document.Contributors);
             return documentDto;
         }
+
+        private async Task<DocumentWithDetailsDto> GetDocumentAsync(string documentName, Project project, string languageCode, string version, Document oldDocument = null)
+        {
+            Logger.LogInformation($"Not found in the cache. Requesting {documentName} from the source...");
+
+            var source = _documentStoreFactory.Create(project.DocumentStoreType);
+            var sourceDocument = await source.GetDocumentAsync(project, documentName, languageCode, version, oldDocument?.LastSignificantUpdateTime);
+
+            await _documentRepository.DeleteAsync(project.Id, sourceDocument.Name, sourceDocument.LanguageCode, sourceDocument.Version);
+            await _documentRepository.InsertAsync(sourceDocument, true);
+
+            Logger.LogInformation($"Document retrieved: {documentName}");
+
+            var cacheKey = $"DocumentUpdateInfo{sourceDocument.ProjectId}#{sourceDocument.Name}#{sourceDocument.LanguageCode}#{sourceDocument.Version}";
+            await DocumentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
+            {
+                Name = sourceDocument.Name,
+                CreationTime = sourceDocument.CreationTime,
+                LastUpdatedTime = sourceDocument.LastUpdatedTime,
+                LastSignificantUpdateTime = sourceDocument.LastSignificantUpdateTime
+            });
+
+            return CreateDocumentWithDetailsDto(project, sourceDocument);
+        }
+
+        private TimeSpan GetCacheTimeout()
+        {
+            var value = _configuration["Volo.Docs:DocumentCacheTimeoutInterval"];
+            if (value.IsNullOrEmpty())
+            {
+                return TimeSpan.FromHours(6);
+            }
+
+            return TimeSpan.Parse(value);
+        }
+
+        private TimeSpan GetDocumentResourceAbsoluteExpirationTimeout()
+        {
+            var value = _configuration["Volo.Docs:DocumentResource.AbsoluteExpirationRelativeToNow"];
+            if (value.IsNullOrEmpty())
+            {
+                return TimeSpan.FromHours(6);
+            }
+
+            return TimeSpan.Parse(value);
+        }
+
+        private TimeSpan GetDocumentResourceSlidingExpirationTimeout()
+        {
+            var value = _configuration["Volo.Docs:DocumentResource.SlidingExpiration"];
+            if (value.IsNullOrEmpty())
+            {
+                return TimeSpan.FromMinutes(30);
+            }
+
+            return TimeSpan.Parse(value);
+        }
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainConsts.cs

@@ -0,0 +1,7 @@
+namespace Volo.Docs
+{
+    public class DocsDomainConsts
+    {
+        public static string LanguageConfigFileName = "docs-langs.json";
+    }
+}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs

@@ -4,11 +4,13 @@ using System.IO;
 using System.Security;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using Volo.Abp;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.IO;
 using Volo.Docs.Documents;
 using Volo.Docs.FileSystem.Projects;
 using Volo.Docs.Projects;
+using Volo.Extensions;
 
 namespace Volo.Docs.FileSystem.Documents
 {
@@ -22,7 +24,7 @@ namespace Volo.Docs.FileSystem.Documents
             var path = Path.Combine(projectFolder, languageCode, documentName);
 
             CheckDirectorySecurity(projectFolder, path);
-            
+
             var content = await FileHelper.ReadAllTextAsync(path);
             var localDirectory = "";
 
@@ -55,10 +57,15 @@ namespace Volo.Docs.FileSystem.Documents
 
         public async Task<LanguageConfig> GetLanguageListAsync(Project project, string version)
         {
-            var path = Path.Combine(project.GetFileSystemPath(), "docs-langs.json");
-            var configAsJson = await FileHelper.ReadAllTextAsync(path);
+            var path = Path.Combine(project.GetFileSystemPath(), DocsDomainConsts.LanguageConfigFileName);
+            var configJsonContent = await FileHelper.ReadAllTextAsync(path);
+
+            if (!JsonConvertExtensions.TryDeserializeObject<LanguageConfig>(configJsonContent, out var languageConfig))
+            {
+                throw new UserFriendlyException($"Cannot validate language config file '{DocsDomainConsts.LanguageConfigFileName}' for the project {project.Name}.");
+            }
 
-            return JsonConvert.DeserializeObject<LanguageConfig>(configAsJson);
+            return languageConfig;
         }
 
         public async Task<DocumentResource> GetResource(Project project, string resourceName, string languageCode, string version)

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using Volo.Abp.Domain.Services;
 using Volo.Docs.Documents;
 using Volo.Docs.GitHub.Projects;
 using Volo.Docs.Projects;
-using Newtonsoft.Json.Linq;
 using Octokit;
+using Volo.Abp;
+using Volo.Extensions;
 using Project = Volo.Docs.Projects.Project;
 
 namespace Volo.Docs.GitHub.Documents
@@ -55,11 +55,11 @@ namespace Volo.Docs.GitHub.Documents
             var lastSignificantUpdateTime = !isNavigationDocument && !isParameterDocument && version == project.LatestVersionBranchName ?
                 await GetLastSignificantUpdateTime(
                     fileCommits,
-                    project, 
+                    project,
                     project.GetGitHubInnerUrl(languageCode, documentName),
                     lastKnownSignificantUpdateTime,
                     documentCreationTime
-                    ) ?? lastKnownSignificantUpdateTime 
+                    ) ?? lastKnownSignificantUpdateTime
                 : null;
 
             var document = new Document(GuidGenerator.Create(),
@@ -179,11 +179,16 @@ namespace Volo.Docs.GitHub.Documents
             var rootUrl = project.GetGitHubUrl(version);
             var userAgent = project.GetGithubUserAgentOrNull();
 
-            var url = CalculateRawRootUrl(rootUrl) + "docs-langs.json";
+            var url = CalculateRawRootUrl(rootUrl) + DocsDomainConsts.LanguageConfigFileName;
 
             var configAsJson = await DownloadWebContentAsStringAsync(url, token, userAgent);
 
-            return JsonConvert.DeserializeObject<LanguageConfig>(configAsJson);
+            if (!JsonConvertExtensions.TryDeserializeObject<LanguageConfig>(configAsJson, out var languageConfig))
+            {
+                throw new UserFriendlyException($"Cannot validate language config file '{DocsDomainConsts.LanguageConfigFileName}' for the project {project.Name} - v{version}.");
+            }
+
+            return languageConfig;
         }
 
         private async Task<IReadOnlyList<Release>> GetReleasesAsync(Project project)
@@ -199,8 +204,14 @@ namespace Volo.Docs.GitHub.Documents
             var url = project.GetGitHubUrl();
             var ownerName = GetOwnerNameFromUrl(url);
             var repositoryName = GetRepositoryNameFromUrl(url);
-            return await _githubRepositoryManager.GetFileCommitsAsync(ownerName, repositoryName,
-                version, filename, project.GetGitHubAccessTokenOrNull());
+
+            return await _githubRepositoryManager.GetFileCommitsAsync(
+                ownerName,
+                repositoryName,
+                version,
+                filename,
+                project.GetGitHubAccessTokenOrNull()
+            );
         }
 
         protected virtual string GetOwnerNameFromUrl(string url)
@@ -212,7 +223,7 @@ namespace Volo.Docs.GitHub.Documents
             }
             catch (Exception)
             {
-                throw new Exception($"Github url is not valid: {url}");
+                throw new Exception($"GitHub url is not valid: {url}");
             }
         }
 

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubRepositoryManager.cs

@@ -23,54 +23,25 @@ namespace Volo.Docs.GitHub.Documents
 
         public async Task<string> GetFileRawStringContentAsync(string rawUrl, string token, string userAgent)
         {
-            var httpClient = _clientFactory.CreateClient(HttpClientName);
-            if (!token.IsNullOrWhiteSpace())
-            {
-                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Token", token);
-            }
-
-            if (!userAgent.IsNullOrWhiteSpace())
-            {
-                httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent);
-            }
-
+            using var httpClient = CreateHttpClient(token, userAgent);
             return await httpClient.GetStringAsync(new Uri(rawUrl));
         }
 
         public async Task<byte[]> GetFileRawByteArrayContentAsync(string rawUrl, string token, string userAgent)
         {
-            var httpClient = _clientFactory.CreateClient(HttpClientName);
-            if (!token.IsNullOrWhiteSpace())
-            {
-                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Token", token);
-            }
-
-            if (!userAgent.IsNullOrWhiteSpace())
-            {
-                httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent);
-            }
-
+            using var httpClient = CreateHttpClient(token, userAgent);
             return await httpClient.GetByteArrayAsync(new Uri(rawUrl));
         }
-
+         
         public async Task<IReadOnlyList<Release>> GetReleasesAsync(string name, string repositoryName, string token)
         {
-            var client = token.IsNullOrWhiteSpace()
-                ? new GitHubClient(new ProductHeaderValue(name))
-                : new GitHubClient(new ProductHeaderValue(name), new InMemoryCredentialStore(new Credentials(token)));
-
-            return (await client
-                .Repository
-                .Release
-                .GetAll(name, repositoryName)).ToList();
+            var client = GetGitHubClient(name, token);
+            return await client.Repository.Release.GetAll(name, repositoryName);
         }
 
         public async Task<IReadOnlyList<GitHubCommit>> GetFileCommitsAsync(string name, string repositoryName, string version, string filename, string token)
         {
-            var client = token.IsNullOrWhiteSpace()
-                ? new GitHubClient(new ProductHeaderValue(name))
-                : new GitHubClient(new ProductHeaderValue(name), new InMemoryCredentialStore(new Credentials(token)));
-
+            var client = GetGitHubClient(name, token);
             var repo = await client.Repository.Get(name, repositoryName);
             var request = new CommitRequest { Path = filename, Sha = version };
             return await client.Repository.Commit.GetAll(repo.Id, request);
@@ -78,12 +49,32 @@ namespace Volo.Docs.GitHub.Documents
 
         public async Task<GitHubCommit> GetSingleCommitsAsync(string name, string repositoryName, string sha, string token)
         {
-            var client = token.IsNullOrWhiteSpace()
-                ? new GitHubClient(new ProductHeaderValue(name))
-                : new GitHubClient(new ProductHeaderValue(name), new InMemoryCredentialStore(new Credentials(token)));
-
+            var client = GetGitHubClient(name, token);
             var repo = await client.Repository.Get(name, repositoryName);
             return await client.Repository.Commit.Get(repo.Id, sha);
         }
+
+        private HttpClient CreateHttpClient(string token, string userAgent)
+        {
+            var httpClient = _clientFactory.CreateClient(HttpClientName);
+            if (!token.IsNullOrWhiteSpace())
+            {
+                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Token", token);
+            }
+
+            if (!userAgent.IsNullOrWhiteSpace())
+            {
+                httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent);
+            }
+
+            return httpClient;
+        }
+
+        private static GitHubClient GetGitHubClient(string name, string token)
+        {
+            return token.IsNullOrWhiteSpace()
+                ? new GitHubClient(new ProductHeaderValue(name))
+                : new GitHubClient(new ProductHeaderValue(name), new InMemoryCredentialStore(new Credentials(token)));
+        }
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Extensions/NewtonsoftJsonExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Volo.Extensions
+{
+    public static class JsonConvertExtensions
+    {
+        public static bool TryDeserializeObject<T>(string jsonContent, out T result)
+        {
+            try
+            {
+                result = JsonConvert.DeserializeObject<T>(jsonContent);
+                return true;
+            }
+            catch
+            {
+                result = default;
+                return false;
+            }
+        }
+    }
+}

modules/docs/src/Volo.Docs.Web/HtmlConverting/ScribanDocumentSectionRenderer.cs

@@ -7,16 +7,17 @@ using Newtonsoft.Json;
 using Scriban;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Volo.Docs.Documents;
+using Volo.Abp;
+using Volo.Extensions;
 
 namespace Volo.Docs.HtmlConverting
 {
     public class ScribanDocumentSectionRenderer : IDocumentSectionRenderer
     {
-        private const string jsonOpener = "````json";
-        private const string jsonCloser = "````";
-        private const string docs_param = "//[doc-params]";
-        private const string docs_templates = "//[doc-template]";
+        private const string JsonOpener = "````json";
+        private const string JsonCloser = "````";
+        private const string DocsParam = "//[doc-params]";
+        private const string DocsTemplates = "//[doc-template]";
 
         public ILogger<ScribanDocumentSectionRenderer> Logger { get; set; }
 
@@ -40,6 +41,7 @@ namespace Volo.Docs.HtmlConverting
             }
 
             var result = await scribanTemplate.RenderAsync(parameters);
+
             return RemoveOptionsJson(result);
         }
 
@@ -47,7 +49,7 @@ namespace Volo.Docs.HtmlConverting
         {
             try
             {
-                if (!document.Contains(jsonOpener) || !document.Contains(docs_param))
+                if (!document.Contains(JsonOpener) || !document.Contains(DocsParam))
                 {
                     return new Dictionary<string, List<string>>();
                 }
@@ -59,9 +61,14 @@ namespace Volo.Docs.HtmlConverting
                     return new Dictionary<string, List<string>>();
                 }
 
-                var pureJson = insideJsonSection.Replace(docs_param, "").Trim();
+                var pureJson = insideJsonSection.Replace(DocsParam, "").Trim();
+
+                if (!JsonConvertExtensions.TryDeserializeObject<Dictionary<string, List<string>>>(pureJson, out var availableParameters))
+                {
+                    throw new UserFriendlyException("ERROR-20200327: Cannot validate JSON content for `AvailableParameters`!");
+                }
 
-                return JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(pureJson);
+                return await Task.FromResult(availableParameters);
             }
             catch (Exception)
             {
@@ -70,12 +77,13 @@ namespace Volo.Docs.HtmlConverting
             }
         }
 
-        private string RemoveOptionsJson(string document)
+        private static string RemoveOptionsJson(string document)
         {
             var orgDocument = document;
+
             try
             {
-                if (!document.Contains(jsonOpener) || !document.Contains(docs_param))
+                if (!document.Contains(JsonOpener) || !document.Contains(DocsParam))
                 {
                     return orgDocument;
                 }
@@ -88,8 +96,9 @@ namespace Volo.Docs.HtmlConverting
                 }
 
                 return document.Remove(
-                            jsonBeginningIndex - jsonOpener.Length, (jsonEndingIndex + jsonCloser.Length) - (jsonBeginningIndex - jsonOpener.Length)
-                        );
+                    jsonBeginningIndex - JsonOpener.Length,
+                    (jsonEndingIndex + JsonCloser.Length) - (jsonBeginningIndex - JsonOpener.Length)
+                );
             }
             catch (Exception)
             {
@@ -97,25 +106,25 @@ namespace Volo.Docs.HtmlConverting
             }
         }
 
-        private (int, int, string) GetJsonBeginEndIndexesAndPureJson(string document)
+        private static (int, int, string) GetJsonBeginEndIndexesAndPureJson(string document)
         {
             var searchedIndex = 0;
 
             while (searchedIndex < document.Length)
             {
-                var jsonBeginningIndex = document.Substring(searchedIndex).IndexOf(jsonOpener, StringComparison.Ordinal) + jsonOpener.Length + searchedIndex;
+                var jsonBeginningIndex = document.Substring(searchedIndex).IndexOf(JsonOpener, StringComparison.Ordinal) + JsonOpener.Length + searchedIndex;
 
                 if (jsonBeginningIndex < 0)
                 {
                     return (-1, -1, "");
                 }
 
-                var jsonEndingIndex = document.Substring(jsonBeginningIndex).IndexOf(jsonCloser, StringComparison.Ordinal) + jsonBeginningIndex;
+                var jsonEndingIndex = document.Substring(jsonBeginningIndex).IndexOf(JsonCloser, StringComparison.Ordinal) + jsonBeginningIndex;
                 var insideJsonSection = document[jsonBeginningIndex..jsonEndingIndex];
 
-                if (insideJsonSection.IndexOf(docs_param) < 0)
+                if (insideJsonSection.IndexOf(DocsParam, StringComparison.Ordinal) < 0)
                 {
-                    searchedIndex = jsonEndingIndex + jsonCloser.Length;
+                    searchedIndex = jsonEndingIndex + JsonCloser.Length;
                     continue;
                 }
 
@@ -129,68 +138,84 @@ namespace Volo.Docs.HtmlConverting
         {
             var templates = new List<DocumentPartialTemplateWithValuesDto>();
 
-            while (documentContent.Contains(jsonOpener))
+            while (documentContent.Contains(JsonOpener))
             {
                 var afterJsonOpener = documentContent.Substring(
-                    documentContent.IndexOf(jsonOpener, StringComparison.Ordinal) + jsonOpener.Length);
+                    documentContent.IndexOf(JsonOpener, StringComparison.Ordinal) + JsonOpener.Length
+                );
 
                 var betweenJsonOpenerAndCloser = afterJsonOpener.Substring(0,
-                    afterJsonOpener.IndexOf(jsonCloser, StringComparison.Ordinal));
+                    afterJsonOpener.IndexOf(JsonCloser, StringComparison.Ordinal)
+                );
 
                 documentContent = afterJsonOpener.Substring(
-                    afterJsonOpener.IndexOf(jsonCloser, StringComparison.Ordinal) + jsonCloser.Length);
+                    afterJsonOpener.IndexOf(JsonCloser, StringComparison.Ordinal) + JsonCloser.Length
+                );
 
-                if (!betweenJsonOpenerAndCloser.Contains(docs_templates))
+                if (!betweenJsonOpenerAndCloser.Contains(DocsTemplates))
                 {
                     continue;
                 }
 
-                var json = betweenJsonOpenerAndCloser.Substring(betweenJsonOpenerAndCloser.IndexOf(docs_templates, StringComparison.Ordinal) + docs_templates.Length);
+                var json = betweenJsonOpenerAndCloser.Substring(betweenJsonOpenerAndCloser.IndexOf(DocsTemplates, StringComparison.Ordinal) + DocsTemplates.Length);
 
-                var template = JsonConvert.DeserializeObject<DocumentPartialTemplateWithValuesDto>(json);
+                if (!JsonConvertExtensions.TryDeserializeObject<DocumentPartialTemplateWithValuesDto>(json, out var template))
+                {
+                    throw new UserFriendlyException($"ERROR-20200327: Cannot validate JSON content for `AvailableParameters`!");
+                }
 
                 templates.Add(template);
             }
 
-            return templates;
+            return await Task.FromResult(templates);
         }
 
-        private string SetPartialTemplates(string document, List<DocumentPartialTemplateContent> templates)
+        private static string SetPartialTemplates(string document, IReadOnlyCollection<DocumentPartialTemplateContent> templates)
         {
             var newDocument = new StringBuilder();
 
-            while (document.Contains(jsonOpener))
+            while (document.Contains(JsonOpener))
             {
                 var beforeJson = document.Substring(0,
-                    document.IndexOf(jsonOpener, StringComparison.Ordinal) + jsonOpener.Length);
+                    document.IndexOf(JsonOpener, StringComparison.Ordinal) + JsonOpener.Length
+                );
 
                 var afterJsonOpener = document.Substring(
-                    document.IndexOf(jsonOpener, StringComparison.Ordinal) + jsonOpener.Length);
+                    document.IndexOf(JsonOpener, StringComparison.Ordinal) + JsonOpener.Length
+                );
 
                 var betweenJsonOpenerAndCloser = afterJsonOpener.Substring(0,
-                    afterJsonOpener.IndexOf(jsonCloser, StringComparison.Ordinal));
+                    afterJsonOpener.IndexOf(JsonCloser, StringComparison.Ordinal)
+                );
 
-                if (!betweenJsonOpenerAndCloser.Contains(docs_templates))
+                if (!betweenJsonOpenerAndCloser.Contains(DocsTemplates))
                 {
                     document = afterJsonOpener.Substring(
-                        afterJsonOpener.IndexOf(jsonCloser, StringComparison.Ordinal) + jsonCloser.Length);
-                    newDocument.Append(beforeJson + betweenJsonOpenerAndCloser + jsonCloser);
+                        afterJsonOpener.IndexOf(JsonCloser, StringComparison.Ordinal) + JsonCloser.Length
+                    );
+
+                    newDocument.Append(beforeJson + betweenJsonOpenerAndCloser + JsonCloser);
                     continue;
                 }
 
-                var json = betweenJsonOpenerAndCloser.Substring(betweenJsonOpenerAndCloser.IndexOf(docs_templates, StringComparison.Ordinal) + docs_templates.Length);
-
-                var templatePath = JsonConvert.DeserializeObject<DocumentPartialTemplateWithValuesDto>(json)?.Path;
+                var json = betweenJsonOpenerAndCloser.Substring(
+                    betweenJsonOpenerAndCloser.IndexOf(DocsTemplates, StringComparison.Ordinal) + DocsTemplates.Length
+                );
 
-                var template = templates.FirstOrDefault(t => t.Path == templatePath);
+                if (JsonConvertExtensions.TryDeserializeObject<DocumentPartialTemplateWithValuesDto>(json, out var documentPartialTemplateWithValuesDto))
+                {
+                    var template = templates.FirstOrDefault(t => t.Path == documentPartialTemplateWithValuesDto.Path);
 
-                var beforeTemplate = document.Substring(0,
-                    document.IndexOf(jsonOpener, StringComparison.Ordinal));
+                    var beforeTemplate = document.Substring(0,
+                        document.IndexOf(JsonOpener, StringComparison.Ordinal)
+                    );
 
-                newDocument.Append(beforeTemplate + template?.Content + jsonCloser);
+                    newDocument.Append(beforeTemplate + template?.Content + JsonCloser);
 
-                document = afterJsonOpener.Substring(
-                    afterJsonOpener.IndexOf(jsonCloser, StringComparison.Ordinal) + jsonCloser.Length);
+                    document = afterJsonOpener.Substring(
+                        afterJsonOpener.IndexOf(JsonCloser, StringComparison.Ordinal) + JsonCloser.Length
+                    );
+                }
             }
 
             newDocument.Append(document);

modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml

@@ -68,7 +68,7 @@
                             }
 
                             <div class="for-mobile">
-                                <div class="navbar-light">
+                                <div class="navbar-dark">
                                     <button type="button" class="open-dmenu navbar-toggler" aria-label="Close">
                                         <span class="navbar-toggler-icon"></span>
                                     </button>
@@ -108,7 +108,7 @@
                                             <div class="input-group">
                                                 <div class="input-group-prepend">
                                                     <label class="input-group-text">
-                                                        <i class="fa fa-check-square-o" aria-hidden="true" data-toggle="tooltip" title="@L["Version"]"></i>
+                                                        <i class="fas fa-code-branch" aria-hidden="true" data-toggle="tooltip" title="@L["Version"]"></i>
                                                     </label>
                                                 </div>
 
@@ -124,15 +124,15 @@
 
                             @if (Model.LanguageSelectListItems.Count > 1)
                             {
-                                <div class="col  @(Model.VersionSelectItems.Any()?"pl-0":"")">
+                                <div class="col-5  @(Model.VersionSelectItems.Any()?"pl-0":"")">
                                     <div class="docs-version docs-language @(Model.VersionSelectItems.Any()?"pl-1":"")">
                                         <div class="version-select">
                                             <div class="input-group">
-                                                <div class="input-group-prepend">
+                                                @*<div class="input-group-prepend">
                                                     <label class="input-group-text">
                                                         <i class="fa fa-globe" aria-hidden="true" data-toggle="tooltip" title="@L["Language"]"></i>
                                                     </label>
-                                                </div>
+                                                </div>*@
                                                 <select asp-items="Model.LanguageSelectListItems"
                                                         class="form-control"
                                                         onchange="window.location.replace(this.value)">
@@ -163,11 +163,11 @@
 
                         @if (Model.FullSearchEnabled)
                         {
-                            <div class="docs-version mb-4">
+                            <div class="docs-version mt-2 mb-4">
                                 <div class="version-select">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
-                                            <label class="input-group-text"><i class="fa fa-filter"></i></label>
+                                            <label class="input-group-text"><i class="fa fa-search"></i></label>
                                         </div>
 
                                         <input class="form-control" 
@@ -224,7 +224,9 @@
                             @if (!string.IsNullOrEmpty(Model.Document.EditLink))
                             {
                                 <a href="@Model.Document.EditLink" target="_blank">
-                                    <i class="fa fa-edit"></i> @(L["Edit"]) (@L["LastEditTime"]: @Model.Document.LastUpdatedTime.ToShortDateString())
+                                    <i class="fa fa-edit"></i> 
+                                    @(L["Edit"]) 
+                                    <span class="for-desktop">(@L["LastEditTime"]: @Model.Document.LastUpdatedTime.ToShortDateString())</span>
                                 </a>
                             }
                         </div>
@@ -232,20 +234,21 @@
                         <div class="float-right mr-3">
                             @if (Model.Document.Contributors != null && Model.Document.Contributors.Count > 0)
                             {
-                                @(L["Contributors"].Value + " :")
+                            <span class="for-desktop">
+                                @(L["Contributors"].Value + " :") </span>
                                 @foreach (var contributor in Model.Document.Contributors)
                                 {
                                     <a href="@contributor.UserProfileUrl" target="_blank">
                                         <img src="@contributor.AvatarUrl"
-                                             class="rounded-circle" 
+                                             class="rounded-circle"
                                              alt="Avatar"
-                                             height="21" 
-                                             width="21" 
+                                             height="21"
+                                             width="21"
                                              title="@contributor.Username" />
                                     </a>
                                 }
-                            }
-                        </div>
+                                }
+</div>
 
                     </div>