Merge branch 'dev' of https://github.com/abpframework/abp into gterdem/AAD-Guid

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

@@ -0,0 +1,273 @@
+# EF Core Advanced Database Migrations
+
+This document begins by **introducing the default structure** provided by [the application startup template](Startup-Templates/Application.md) and **discusses various scenarios** you may want to implement for your own application.
+
+> This document is for who want to fully understand and customize the database structure comes with [the application startup template](Startup-Templates/Application.md). If you simply want to create entities and manage your code first migrations, just follow [the startup tutorials](Tutorials/Index.md).
+
+## About the EF Core Code First Migrations
+
+Entity Framework Core provides an easy to use and powerful [database migration system](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). ABP Framework [startup templates](Startup-Templates/Index.md) take the advantage of this system to allow you to develop your application in a standard way.
+
+However, EF Core migration system is **not so good in a modular environment** where each module maintains its **own database schema** while two or more modules may **share a single database** in practical.
+
+Since ABP Framework cares about modularity in all aspects, it provides a **solution** to this problem. It is important to understand this solution if you need to **customize your database structure**.
+
+> See [EF Core's own documentation](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) to fully learn the EF Core Code First Migrations and why you need to such a system.
+
+## The Default Solution & Database Configuration
+
+When you [create a new web application](https://abp.io/get-started) (with EF Core, which is the default database provider), your solution structure will be similar to the picture below:
+
+![bookstore-visual-studio-solution-v3](images/bookstore-visual-studio-solution-v3.png)
+
+> Actual solution structure may be a bit different based on your preferences, but the database part will be same.
+
+### The Database Structure
+
+The startup template has some [application modules](Modules/Index.md) pre-installed. Each layer of the solution has corresponding module package references. So, the `.EntityFrameworkCore` project has the NuGet references for the `.EntityFrameworkCore` packages of the used modules:
+
+![bookstore-efcore-dependencies](images/bookstore-efcore-dependencies.png)
+
+In this way, you collect all the EF Core dependencies under the `.EntityFrameworkCore` project.
+
+> In addition to the module references, it references to the `Volo.Abp.EntityFrameworkCore.SqlServer` package since the startup template is pre-configured for the SQL Server. See the documentation if you want to [switch to another DBMS](Entity-Framework-Core-Other-DBMS.md).
+
+While every module has its own `DbContext` class by design and can use its **own physical database**, the solution is configured to use a **single shared database** as shown in the figure below:
+
+![single-database-usage](images/single-database-usage.png)
+
+This is **the simplest configuration** and suitable for most of the applications. `appsettings.json` file has a **single connection string**, named `Default`:
+
+````json
+"ConnectionStrings": {
+  "Default": "..."
+}
+````
+
+So, you have a **single database schema** which contains all the tables of the modules **sharing** this database.
+
+ABP Framework's [connection string](Connection-Strings.md) system allows you to easily **set a different connection string** for a desired module:
+
+````json
+"ConnectionStrings": {
+  "Default": "...",
+  "AbpAuditLogging": "..."
+}
+````
+
+The example configuration about tells to the ABP Framework to use the second connection string for the [Audit Logging module](Modules/Audit-Logging.md).
+
+However, this is just the beginning. You also need to create the second database, create audit log tables inside it and maintain the database tables using the code first approach. One of the main purposes of this document is to guide you on such database separation scenarios.
+
+#### Module Tables
+
+Every module uses its own databases tables. For example, the [Identity Module](Modules/Identity.md) has some tables to manage the users and roles in the system.
+
+#### Table Prefixes
+
+Since it is allowed to share a single database by all modules (it is the default configuration), a module typically uses a prefix to group its own tables.
+
+The fundamental modules, like [Identity](Modules/Identity.md), [Tenant Management](Modules/Tenant-Management.md) and [Audit Logs](Modules/Audit-Logging.md), use the `Abp` prefix, while some other modules use their own prefixes. [Identity Server](Modules/IdentityServer.md) module uses the `IdentityServer` prefix for example.
+
+If you want, you can change the database table name prefix for a module for your application. Example:
+
+````csharp
+Volo.Abp.IdentityServer.AbpIdentityServerDbProperties.DbTablePrefix = "Ids";
+````
+
+This code changes the prefix of the [Identity Server](Modules/IdentityServer.md) module. Write this code at the very beginning in your application.
+
+> Every module also defines `DbSchema` property (near to `DbTablePrefix`), so you can set it for the databases support the schema usage.
+
+### The Projects
+
+From the database point of view, there are three important projects those will be explained in the next sections.
+
+#### .EntityFrameworkCore Project
+
+This project has the `DbContext` class (`BookStoreDbContext` for this sample) of your application.
+
+Every module uses its own `DbContext` class to access to the database. Likewise, your application has its own `DbContext`. You typically use this `DbContext` in your application code (in your custom [repositories](Repositories.md) if you follow the best practices). It is almost an empty `DbContext` since your application don't have any entities at the beginning, except the pre-defined `AppUser` entity:
+
+````csharp
+[ConnectionStringName("Default")]
+public class BookStoreDbContext : AbpDbContext<BookStoreDbContext>
+{
+    public DbSet<AppUser> Users { get; set; }
+
+    /* Add DbSet properties for your Aggregate Roots / Entities here. */
+
+    public BookStoreDbContext(DbContextOptions<BookStoreDbContext> options)
+        : base(options)
+    {
+
+    }
+
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        base.OnModelCreating(builder);
+
+        /* Configure the shared tables (with included modules) here */
+
+        builder.Entity<AppUser>(b =>
+        {
+            //Sharing the same table "AbpUsers" with the IdentityUser
+            b.ToTable("AbpUsers"); 
+            
+            //Configure base properties
+            b.ConfigureByConvention();
+            b.ConfigureAbpUser();
+
+            //Moved customization of the "AbpUsers" table to an extension method
+            b.ConfigureCustomUserProperties();
+        });
+
+        /* Configure your own tables/entities inside the ConfigureBookStore method */
+        builder.ConfigureBookStore();
+    }
+}
+````
+
+This simple `DbContext` class still needs some explanations:
+
+* It defines a `[ConnectionStringName]` attribute which tells ABP to always use the `Default` connection string for this `Dbcontext`.
+* It inherits from the `AbpDbContext<T>`  instead of the standard `DbContext` class. You can see the [EF Core integration](Entity-Framework-Core.md) document for more. For now, know that the `AbpDbContext<T>` base class implements some conventions of the ABP Framework to automate some common tasks for you.
+* It declares a `DbSet` property for the `AppUser` entity. `AppUser` shares the same table (named `AbpUsers` by default) with the `IdentityUser` entity of the [Identity module](Modules/Identity.md). The startup template provides this entity inside the application since we think that the User entity is generally needs to be customized in your application.
+* The constructor takes a `DbContextOptions<T>` instance.
+* It overrides the `OnModelCreating` method to define the EF Core mappings.
+  * It first calls the the `base.OnModelCreating` method to let the ABP Framework to implement the base mappings for us.
+  * It then configures the mapping for the `AppUser` entity. There is a special case for this entity (it shares a table with the Identity module), which will be explained in the next sections.
+  * It finally calls the `builder.ConfigureBookStore()` extension method to configure other entities of your application.
+
+This design will be explained in more details after introducing the other database related projects.
+
+#### .EntityFrameworkCore.DbMigrations Project
+
+As mentioned in the previous section, every module (and your application) have **their own** separate `DbContext` classes. Each `DbContext` class only defines the entity to table mappings related to its own module and each module (and your application) use the related `DbContext` class **on runtime**.
+
+As you know, EF Core Code First migration system relies on a `DbContext` class **to track and generate** the code first migrations. So, which `DbContext` we should use for the migrations? The answer is *none of them*. There is another `DbContext` defined in the `.EntityFrameworkCore.DbMigrations` project (which is the `BookStoreMigrationsDbContext` for this example solution).
+
+##### The MigrationsDbContext
+
+The `MigrationsDbContext` is only used to create and apply the database migrations. It is **not used on runtime**. It **merges** all the entity to table mappings of all the used modules plus the application's mappings.
+
+In this way, you create and maintain a **single database migration path**. However, there are some difficulties of this approach and the next sections explains how ABP Framework overcomes these difficulties. But first, see the `BookStoreMigrationsDbContext` class as an example:
+
+````csharp
+/* This DbContext is only used for database migrations.
+ * It is not used on runtime. See BookStoreDbContext for the runtime DbContext.
+ * It is a unified model that includes configuration for
+ * all used modules and your application.
+ */
+public class BookStoreMigrationsDbContext : AbpDbContext<BookStoreMigrationsDbContext>
+{
+    public BookStoreMigrationsDbContext(
+        DbContextOptions<BookStoreMigrationsDbContext> options)
+        : base(options)
+    {
+
+    }
+
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        base.OnModelCreating(builder);
+
+        /* Include modules to your migration db context */
+        builder.ConfigurePermissionManagement();
+        builder.ConfigureSettingManagement();
+        builder.ConfigureBackgroundJobs();
+        builder.ConfigureAuditLogging();
+        builder.ConfigureIdentity();
+        builder.ConfigureIdentityServer();
+        builder.ConfigureFeatureManagement();
+        builder.ConfigureTenantManagement();
+
+        /* Configure customizations for entities from the modules included  */
+        builder.Entity<IdentityUser>(b =>
+        {
+            b.ConfigureCustomUserProperties();
+        });
+
+        /* Configure your own tables/entities inside the ConfigureBookStore method */
+        builder.ConfigureBookStore();
+    }
+}
+````
+
+##### Sharing the Mapping Code
+
+First problem is that: A module uses its own `DbContext` which needs to the database mappings. The `MigrationsDbContext` also needs to the same mapping in order to create the database tables for this module. We definitely don't want to duplicate the mapping code.
+
+The solution is to define an extension method (on the `ModelBuilder`) that can be called by both `DbContext` classes. So, every module defines such an extension method.
+
+For example, the `builder.ConfigureBackgroundJobs()` method call configures the database tables for the [Background Jobs module](Modules/Background-Jobs.md). The definition of this extension method is something like that:
+
+````csharp
+public static class BackgroundJobsDbContextModelCreatingExtensions
+{
+    public static void ConfigureBackgroundJobs(
+        this ModelBuilder builder,
+        Action<BackgroundJobsModelBuilderConfigurationOptions> optionsAction = null)
+    {
+        var options = new BackgroundJobsModelBuilderConfigurationOptions(
+            BackgroundJobsDbProperties.DbTablePrefix,
+            BackgroundJobsDbProperties.DbSchema
+        );
+
+        optionsAction?.Invoke(options);
+        
+        builder.Entity<BackgroundJobRecord>(b =>
+        {
+            b.ToTable(options.TablePrefix + "BackgroundJobs", options.Schema);
+
+            b.ConfigureCreationTime();
+            b.ConfigureExtraProperties();
+
+            b.Property(x => x.JobName)
+                .IsRequired()
+                .HasMaxLength(BackgroundJobRecordConsts.MaxJobNameLength);
+            
+            //...
+        });
+    }
+}
+````
+
+This extension method also gets options to change the database table prefix and schema for this module, but it is not important here.
+
+The final application calls the extension methods inside the `MigrationsDbContext`  class, so it can decide which modules are included to the database maintained by this `MigrationsDbContext`. If you want to create a second database and move some module tables to the second database, then you need to have a second `MigrationsDbContext` class which only calls the extension methods of the related modules. This topic will be detailed in the next sections.
+
+The same `ConfigureBackgroundJobs` method is also called the `DbContext` of the Background Jobs module:
+
+````csharp
+[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)]
+public class BackgroundJobsDbContext
+    : AbpDbContext<BackgroundJobsDbContext>, IBackgroundJobsDbContext
+{
+    public DbSet<BackgroundJobRecord> BackgroundJobs { get; set; }
+
+    public BackgroundJobsDbContext(DbContextOptions<BackgroundJobsDbContext> options) 
+        : base(options)
+    {
+
+    }
+
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        base.OnModelCreating(builder);
+
+        //Reuse the same extension method!
+        builder.ConfigureBackgroundJobs();
+    }
+}
+````
+
+In this way, the mapping configuration of a module can be shared between `DbContext` classes.
+
+##### Reusing a Table Defined by a Module
+
+TODO
+
+##### Discussion of an Alternative Scenario: Every Module Manages Its Own Migration Path
+
+TODO

docs/en/Exception-Handling.md

@@ -204,7 +204,7 @@ Instead of localizing the message while throwing the exception, you can separate
 First, define the **code-namespace** to **localization resource** mapping in the module configuration:
 
 ````C#
-services.Configure<ExceptionLocalizationOptions>(options =>
+services.Configure<AbpExceptionLocalizationOptions>(options =>
 {
     options.MapCodeNamespace("Volo.Qa", typeof(QaResource));
 });
@@ -285,7 +285,7 @@ The `IHttpExceptionStatusCodeFinder` is used to automatically determine the HTTP
 Automatic HTTP status code determination can be overrided by custom mappings. For example:
 
 ````C#
-services.Configure<ExceptionHttpStatusCodeOptions>(options =>
+services.Configure<AbpExceptionHttpStatusCodeOptions>(options =>
 {
     options.Map("Volo.Qa:010002", HttpStatusCode.Conflict);
 });

docs/en/Modules/Identity.md

@@ -0,0 +1,4 @@
+# Identity Management Module
+
+See [the source code](https://github.com/abpframework/abp/tree/dev/modules/identity). Documentation will come soon...
+

docs/en/Modules/Tenant-Management.md

@@ -0,0 +1,3 @@
+# Tenant Management Module
+
+TODO

docs/en/Tutorials/Index.md

@@ -0,0 +1,6 @@
+# Tutorials
+
+## Application Development
+
+* [With ASP.NET Core MVC / Razor Pages UI](AspNetCore-Mvc/Part-I.md)
+* [With Angular UI](Angular/Part-I.md)

docs/en/docs-nav.json

@@ -33,6 +33,7 @@
     },
     {
       "text": "Tutorials",
+      "path": "Tutorials/Index.md",
       "items": [
         {
           "text": "Application Development",

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

@@ -2,9 +2,13 @@
 
 **[应用程序启动模板](Startup-Templates/Application.md)** 为EF Core预配置了Sql Server提供程序,EF Core支持许多其它DBMS,你可以在基于ABP的应用程序使用它们.
 
-ABP框架为一些常见的DMBS提供了简化配置的集成包(有关可用集成包的列表,请参阅[EF Core文档](Entity-Framework-Core.md)),你也可以不使用集成包配置DBMS提供程序.
+ABP框架为一些常见的DMBS提供了简化配置的**集成包**,你可以通过以下文档来学习如何**切换到你喜欢的DBMS**:
 
-虽然总是建议使用集成包(它也使不同模块之间的依赖版本成为标准版本),但是如果没有用于DBMS提供程序的集成包,也可以手动集成.
+* [MySQL](Entity-Framework-Core-MySQL.md)
+* [PostgreSQL](Entity-Framework-Core-PostgreSQL.md)
+* [SQLite](Entity-Framework-Core-SQLite.md)
+
+你也可以不使用集成包配置DBMS提供程序,虽然总是建议使用集成包(它也使不同模块之间的依赖版本成为标准版本),但是如果没有用于DBMS提供程序的集成包,也可以手动集成.
 
 本文介绍了如何在不使用[MySQL集成包](Entity-Framework-Core-MySQL.md)的情况下切换到MySQL.
 

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

@@ -32,14 +32,9 @@ namespace MyCompany.MyProject
 
 EF Core支持多种数据库管理系统([查看全部](https://docs.microsoft.com/en-us/ef/core/providers/)). ABP框架和本文档不依赖于任何特定的DBMS.
 
-如果要创建一个可重用的库,应避免依赖于特定的DBMS包.但在最终的应用程序中,始终会选择一个DBMS.
+如果要创建一个可重用的[应用程序模块](Modules/Index.md),应避免依赖于特定的DBMS包.但在最终的应用程序中,始终会选择一个DBMS.
 
-ABP框架为一些常见的DBMS提供了集成包,使配置变得更加简单. [启动模板](Startup-Templates/Index.md)附带**预先配置的SQL Server (localdb)**.请参阅以下文档,了解如何配置其他DBMS提供程序:
-
-* [MySQL](Entity-Framework-Core-MySQL.md)
-* [PostgreSQL](Entity-Framework-Core-PostgreSQL.md)
-* [SQLite](Entity-Framework-Core-SQLite.md)
-* [Others](Entity-Framework-Core-Other-DBMS.md)
+参阅[为Entity Framework Core切换到其他DBMS](Entity-Framework-Core-Other-DBMS.md)文档学习如何切换DBMS.
 
 ## 创建 DbContext
 

docs/zh-Hans/Exception-Handling.md

@@ -190,7 +190,7 @@ throw new UserFriendlyException(_stringLocalizer["UserNameShouldBeUniqueMessage"
 "UserNameShouldBeUniqueMessage": "Username should be unique! '{0}' is already taken!"
 ````
 
-* `IUserFriendlyException`接口派生自`IBusinessException`,而 `UserFriendlyException `类派生自`BusinessException`类.
+* `IUserFriendlyException`接口派生自`IBusinessException`,而 `UserFriendlyException`类派生自`BusinessException`类.
 
 #### 使用错误代码
 

docs/zh-Hans/Tutorials/Angular/Part-I.md

@@ -0,0 +1,3 @@
+## Angular 教程 - 第一章
+
+TODO...

docs/zh-Hans/Tutorials/AspNetCore-Mvc/AspNetCore-Mvc/Part-I.md

@@ -16,7 +16,7 @@
 
 ### 创建项目
 
-创建一个名为`Acme.BookStore`的新项目, 创建数据库并按照[入门文档](../../Getting-Started-AspNetCore-MVC-Template.md)运行应用程序.
+创建一个名为`Acme.BookStore`的新项目, 创建数据库并按照[入门文档](../../../Getting-Started-AspNetCore-MVC-Template.md)运行应用程序.
 
 ### 解决方案的结构
 
@@ -24,16 +24,16 @@
 
 ![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution-v3.png)
 
-> 你可以查看[应用程序模板文档](../../Startup-Templates/Application.md)以详细了解解决方案结构.但是,你将通过本教程了解基础知识.
+> 你可以查看[应用程序模板文档](../../../Startup-Templates/Application.md)以详细了解解决方案结构.但是,你将通过本教程了解基础知识.
 
 ### 创建Book实体
 
 启动模板中的域层分为两个项目:
 
- - `Acme.BookStore.Domain`包含你的[实体](../../Entities.md), [领域服务](../../Domain-Services.md)和其他核心域对象.
+ - `Acme.BookStore.Domain`包含你的[实体](../../../Entities.md), [领域服务](../../../Domain-Services.md)和其他核心域对象.
  - `Acme.BookStore.Domain.Shared`包含可与客户共享的常量,枚举或其他域相关对象.
 
-在解决方案的**领域层**(`Acme.BookStore.Domain`项目)中定义[实体](../../Entities.md). 该应用程序的主要实体是`Book`. 在`Acme.BookStore.Domain`项目中创建一个名为`Book`的类，如下所示：
+在解决方案的**领域层**(`Acme.BookStore.Domain`项目)中定义[实体](../../../Entities.md). 该应用程序的主要实体是`Book`. 在`Acme.BookStore.Domain`项目中创建一个名为`Book`的类，如下所示：
 
 ````C#
 using System;
@@ -66,7 +66,7 @@ namespace Acme.BookStore
 }
 ````
 
-* ABP为实体提供了两个基本的基类: `AggregateRoot`和`Entity`. **Aggregate Root**是**域驱动设计(DDD)** 概念之一. 有关详细信息和最佳做法,请参阅[实体文档](../../Entities.md).
+* ABP为实体提供了两个基本的基类: `AggregateRoot`和`Entity`. **Aggregate Root**是**域驱动设计(DDD)** 概念之一. 有关详细信息和最佳做法,请参阅[实体文档](../../../Entities.md).
 * `Book`实体继承了`AuditedAggregateRoot`,`AuditedAggregateRoot`类在`AggregateRoot`类的基础上添加了一些审计属性(`CreationTime`, `CreatorId`, `LastModificationTime` 等).
 * `Guid`是`Book`实体的主键类型.
 * 使用 **数据注解** 为EF Core添加映射.或者你也可以使用 EF Core 自带的[fluent mapping API](https://docs.microsoft.com/en-us/ef/core/modeling).
@@ -138,7 +138,7 @@ PM> Update-Database
 
 ### 创建应用服务
 
-下一步是创建[应用服务](../../Application-Services.md)来管理(创建,列出,更新,删除)书籍. 启动模板中的应用程序层分为两个项目:
+下一步是创建[应用服务](../../../Application-Services.md)来管理(创建,列出,更新,删除)书籍. 启动模板中的应用程序层分为两个项目:
 
 * `Acme.BookStore.Application.Contracts`主要包含你的DTO和应用程序服务接口.
 * `Acme.BookStore.Application`包含应用程序服务的实现.
@@ -166,7 +166,7 @@ namespace Acme.BookStore
 }
 ````
 
-* **DTO**类被用来在 **表示层** 和 **应用层** **传递数据**.查看[DTO文档](../../Data-Transfer-Objects.md)查看更多信息.
+* **DTO**类被用来在 **表示层** 和 **应用层** **传递数据**.查看[DTO文档](../../../Data-Transfer-Objects.md)查看更多信息.
 * 为了在页面上展示书籍信息,`BookDto`被用来将书籍数据传递到表示层.
 * `BookDto`继承自 `AuditedEntityDto<Guid>`.跟上面定义的`Book`类一样具有一些审计属性.
 
@@ -217,7 +217,7 @@ namespace Acme.BookStore
 ````
 
 * 这个DTO类被用于在创建或更新书籍的时候从用户界面获取图书信息.
-* 它定义了数据注释属性(如`[Required]`)来定义属性的验证. DTO由ABP框架[自动验证](../../Validation.md).
+* 它定义了数据注释属性(如`[Required]`)来定义属性的验证. DTO由ABP框架[自动验证](../../../Validation.md).
 
 就像上面的`BookDto`一样,创建一个从`CreateUpdateBookDto`对象到`Book`实体的映射:
 
@@ -281,12 +281,12 @@ namespace Acme.BookStore
 ````
 
 * `BookAppService`继承了`CrudAppService<...>`.它实现了上面定义的CRUD方法.
-* `BookAppService`注入`IRepository <Book,Guid>`,这是`Book`实体的默认仓储. ABP自动为每个聚合根(或实体)创建默认仓储. 请参阅[仓储文档](../../Repositories.md)
+* `BookAppService`注入`IRepository <Book,Guid>`,这是`Book`实体的默认仓储. ABP自动为每个聚合根(或实体)创建默认仓储. 请参阅[仓储文档](../../../Repositories.md)
 * `BookAppService`使用`IObjectMapper`将`Book`对象转换为`BookDto`对象, 将`CreateUpdateBookDto`对象转换为`Book`对象. 启动模板使用[AutoMapper](http://automapper.org/)库作为对象映射提供程序. 你之前定义了映射, 因此它将按预期工作.
 
 ### 自动生成API Controllers
 
-你通常创建**Controller**以将应用程序服务公开为**HTTP API**端点. 因此允许浏览器或第三方客户端通过AJAX调用它们. ABP可以[**自动**](../../AspNetCore/Auto-API-Controllers.md)按照惯例将你的应用程序服务配置为MVC API控制器.
+你通常创建**Controller**以将应用程序服务公开为**HTTP API**端点. 因此允许浏览器或第三方客户端通过AJAX调用它们. ABP可以[**自动**](../../../AspNetCore/Auto-API-Controllers.md)按照惯例将你的应用程序服务配置为MVC API控制器.
 
 #### Swagger UI
 
@@ -392,7 +392,7 @@ context.Menu.AddItem(
 }
 ````
 
-* ABP的本地化功能建立在[ASP.NET Core's standard localization]((https://docs.microsoft.com/en-us/aspnet/core/fundamentals/localization))之上并增加了一些扩展.查看[本地化文档](../../Localization.md).
+* ABP的本地化功能建立在[ASP.NET Core's standard localization]((https://docs.microsoft.com/en-us/aspnet/core/fundamentals/localization))之上并增加了一些扩展.查看[本地化文档](../../../Localization.md).
 * 本地化key是任意的. 你可以设置任何名称. 我们更喜欢为菜单项添加`Menu:`前缀以区别于其他文本. 如果未在本地化文件中定义文本,则它将**返回**到本地化的key(ASP.NET Core的标准行为).
 
 运行该应用程序,看到新菜单项已添加到顶部栏:
@@ -437,8 +437,8 @@ context.Menu.AddItem(
 </abp-card>
 ````
 
-* `abp-script` [tag helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/tag-helpers/intro)用于将外部的 **脚本** 添加到页面中.它比标准的`script`标签多了很多额外的功能.它可以处理 **最小化**和 **版本**.查看[捆绑 & 压缩文档](../../AspNetCore/Bundling-Minification.md)获取更多信息.
-* `abp-card` 和 `abp-table` 是为Twitter Bootstrap的[card component](http://getbootstrap.com/docs/4.1/components/card/)封装的 **tag helpers**.ABP中有很多tag helpers,可以很方便的使用大多数[bootstrap](https://getbootstrap.com/)组件.你也可以使用原生的HTML标签代替tag helpers.使用tag helper可以通过智能提示和编译时类型检查减少HTML代码并防止错误.查看[tag helpers 文档](../../AspNetCore/Tag-Helpers/Index.md).
+* `abp-script` [tag helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/tag-helpers/intro)用于将外部的 **脚本** 添加到页面中.它比标准的`script`标签多了很多额外的功能.它可以处理 **最小化**和 **版本**.查看[捆绑 & 压缩文档](../../../AspNetCore/Bundling-Minification.md)获取更多信息.
+* `abp-card` 和 `abp-table` 是为Twitter Bootstrap的[card component](http://getbootstrap.com/docs/4.1/components/card/)封装的 **tag helpers**.ABP中有很多tag helpers,可以很方便的使用大多数[bootstrap](https://getbootstrap.com/)组件.你也可以使用原生的HTML标签代替tag helpers.使用tag helper可以通过智能提示和编译时类型检查减少HTML代码并防止错误.查看[tag helpers 文档](../../../AspNetCore/Tag-Helpers/Index.md).
 * 你可以像上面本地化菜单一样 **本地化** 列名.
 
 #### 添加脚本文件

docs/zh-Hans/Tutorials/AspNetCore-Mvc/AspNetCore-Mvc/Part-III.md

@@ -68,7 +68,7 @@ namespace Acme.BookStore
 ````
 
 * 注入`IRepository<Book,Guid>`并在`SeedAsync`中使用它来创建两个书实体作为测试数据.
-* 使用`IGuidGenerator`服务创建GUID. 虽然`Guid.NewGuid()`非常适合测试，但`IGuidGenerator`在使用真实数据库时还有其他特别重要的功能(参见[Guid生成文档](../../Guid-Generation.md)了解更多信息).
+* 使用`IGuidGenerator`服务创建GUID. 虽然`Guid.NewGuid()`非常适合测试，但`IGuidGenerator`在使用真实数据库时还有其他特别重要的功能(参见[Guid生成文档](../../../Guid-Generation.md)了解更多信息).
 
 ### 测试 BookAppService
 

docs/zh-Hans/Tutorials/AspNetCore-Mvc/Index.md

@@ -0,0 +1,6 @@
+# 教程
+
+## 应用开发
+
+* [使用ASP.NET Core MVC/ Razor Pages UI](AspNetCore-Mvc/Part-I.md)
+* [使用Angular UI](Angular/Part-I.md)

docs/zh-Hans/docs-nav.json

@@ -29,6 +29,7 @@
     },
     {
       "text": "教程",
+      "path": "Tutorials/Index.md",
       "items": [
         {
           "text": "应用开发",
@@ -277,20 +278,22 @@
               "path": "Entity-Framework-Core.md",
               "items": [
                 {
-                  "text": "切换到MySql",
-                  "path": "Entity-Framework-Core-MySQL.md"
-                },
-                {
-                  "text": "切换到PostgreSQL",
-                  "path": "Entity-Framework-Core-PostgreSQL.md"
-                },
-                {
-                  "text": "切换到SQLite",
-                  "path": "Entity-Framework-Core-SQLite.md"
-                },
-                {
-                  "text": "切换到其他DBMS",
-                  "path": "Entity-Framework-Core-Other-DBMS.md"
+                  "text": "切换DMBS",
+                  "path": "Entity-Framework-Core-Other-DBMS.md",
+                  "items":[
+                    {
+                      "text": "到MySql",
+                      "path": "Entity-Framework-Core-MySQL.md"
+                    },
+                    {
+                      "text": "到PostgreSQL",
+                      "path": "Entity-Framework-Core-PostgreSQL.md"
+                    },
+                    {
+                      "text": "到SQLite",
+                      "path": "Entity-Framework-Core-SQLite.md"
+                    }
+                  ]
                 }
               ]
             },