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

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

@@ -53,6 +53,7 @@
     "CreateANugetPackage": "Create a Nuget package",
     "AddNew": "Add new",
     "PackageAlreadyExist{0}": "\"{0}\" package is already added.",
+    "ModuleAlreadyExist{0}": "\"{0}\" module is already added.",
     "ClearCache": "Clear cache",
     "SuccessfullyCleared": "Successfully cleared",
     "Menu:NpmPackages": "NPM Packages",
@@ -83,6 +84,7 @@
     "This{0}AlreadyExistInThisOrganization": "This {0} already exist in this organization",
     "AreYouSureYouWantToDeleteAllComputers": "Are you sure you want to delete all computers?",
     "DeleteAll": "Delete all",
-    "DoYouWantToCreateNewUser": "Do you want to create new user?" 
+    "DoYouWantToCreateNewUser": "Do you want to create new user?",
+    "MasterModules": "Master Modules"
   }
 }

docs/en/CLI.md

@@ -51,8 +51,8 @@ abp new Acme.BookStore
     * `--database-provider` or `-d`: Specifies the database provider. Default provider is `ef`. Available providers:
       * `ef`: Entity Framework Core.
       * `mongodb`: MongoDB.
-  *  `module`: [Module template](Startup-Templates/Module.md). Additional options:
+  * `module`: [Module template](Startup-Templates/Module.md). Additional options:
-      * `--no-ui`: Specifies to not include the UI. This makes possible to create service-only modules (a.k.a. microservices - without UI).
+    * `--no-ui`: Specifies to not include the UI. This makes possible to create service-only modules (a.k.a. microservices - without UI).
 * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory.
 * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version.
 
@@ -161,5 +161,4 @@ Examples:
 ````bash
 abp help        # Shows a general help.
 abp help new    # Shows help about the "new" command.
-````
+````
-

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

@@ -1,12 +1,16 @@
-# Switch to another DBMS for Entity Framework Core
+# Switch to Another DBMS for Entity Framework Core
 
-**[The application startup template](Startup-Templates/Application.md)** comes with SQL Server provider pre-configured for the Entity Framework Core. Entity Framework Core supports [many other DBMSs](https://docs.microsoft.com/en-us/ef/core/providers/) and you can use any of them with your ABP based applications.
+**[The application startup template](Startup-Templates/Application.md)** comes with **SQL Server provider pre-configured** for the Entity Framework Core. However, EF Core supports [many other DBMSs](https://docs.microsoft.com/en-us/ef/core/providers/) and you can use any of them within your ABP based applications.
 
-ABP framework provides integration packages for some common DBMSs to make the configuration a bit easier (see the [entity framework core document](Entity-Framework-Core.md) for a list of available integration packages). However, you can configure your DBMS provider without these integration packages.
+ABP framework provides **integration packages** for some common DBMSs to make the configuration a bit easier. You can use the following documents to learn how to **switch to your favorite DBMS**:
 
-While using the integration package is always recommended (it also makes standard for the depended version across different modules), you can do it manually if there is no integration package for your DBMS provider.
+* [MySQL](Entity-Framework-Core-MySQL.md)
+* [PostgreSQL](Entity-Framework-Core-PostgreSQL.md)
+* [SQLite](Entity-Framework-Core-SQLite.md)
 
-This document explains how to switch to MySQL without using [the MySQL integration package](Entity-Framework-Core-MySQL.md).
+However, you can configure your DBMS provider **without** these integration packages. While using the integration package is always recommended (it also makes standard for the depended version across different modules), you can do it manually if there is no integration package for your DBMS provider.
+
+For an example, this document explains how to switch to MySQL without using [the MySQL integration package](Entity-Framework-Core-MySQL.md).
 
 ## Replace the SQL Server Dependency
 

docs/en/Entity-Framework-Core.md

@@ -32,14 +32,9 @@ namespace MyCompany.MyProject
 
 Entity Framework Core supports various database management systems ([see all](https://docs.microsoft.com/en-us/ef/core/providers/)). ABP framework and this document doesn't depend on any specific DBMS.
 
-If you are creating a reusable library, avoid to depend on a specific DBMS package. However, in a final application you eventually will select a DBMS.
+If you are creating a [reusable application module](Modules/Index.md), avoid to depend on a specific DBMS package. However, in a final application you eventually will select a DBMS.
 
-ABP framework provides integration packages for some common DBMSs to make the configuration a bit easier. [The startup templates](Startup-Templates/Index.md) come with **SQL Server (localdb) pre-configured**. See the following documents to learn how to configure for the other DBMS providers:
+See [Switch to Another DBMS for Entity Framework Core](Entity-Framework-Core-Other-DBMS.md) document to learn how to switch the 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)
 
 ## Creating DbContext
 

docs/en/docs-nav.json

@@ -295,20 +295,22 @@
               "path": "Entity-Framework-Core.md",
               "items": [
                 {
-                  "text": "Switch to MySQL",
+                  "text": "Switch DBMS",
-                  "path": "Entity-Framework-Core-MySQL.md"
+                  "path": "Entity-Framework-Core-Other-DBMS.md",
-                },
+                  "items": [
-                {
+                    {
-                  "text": "Switch to PostgreSQL",
+                      "text": "To MySQL",
-                  "path": "Entity-Framework-Core-PostgreSQL.md"
+                      "path": "Entity-Framework-Core-MySQL.md"
-                },
+                    },
-                {
+                    {
-                  "text": "Switch to SQLite",
+                      "text": "To PostgreSQL",
-                  "path": "Entity-Framework-Core-SQLite.md"
+                      "path": "Entity-Framework-Core-PostgreSQL.md"
-                },
+                    },
-                {
+                    {
-                  "text": "Switch to another DBMS",
+                      "text": "To SQLite",
-                  "path": "Entity-Framework-Core-Other-DBMS.md"
+                      "path": "Entity-Framework-Core-SQLite.md"
+                    }
+                  ]
                 }
               ]
             },

docs/zh-Hans/CLI.md

@@ -125,6 +125,26 @@ abp update [options]
 #### Options
 
 * `--include-previews` 或 `-p`: 将预览版, 测试版本 和 rc 包 同时更新到最新版本.
+* `--npm`: 仅更新NPM包
+* `--nuget`: 仅更新的NuGet包
+
+### login
+
+CLI的一些功能需要登录到abp.io平台. 使用你的用户名登录
+
+```bash
+abp login <username>
+```
+
+请注意,新的登录将终止先前的会话并创建一个新的会话.
+
+### logout
+
+通过从计算机中删除会话令牌来注销.
+
+```
+abp logout
+```
 
 ### help
 

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs

@@ -15,10 +15,10 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser Creator { get; set; }
+        public virtual TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public TUser LastModifier { get; set; }
+        public virtual TUser LastModifier { get; set; }
     }
 
     /// <summary>
@@ -34,10 +34,10 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser Creator { get; set; }
+        public virtual TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public TUser LastModifier { get; set; }
+        public virtual TUser LastModifier { get; set; }
 
         protected FullAuditedAggregateRootWithUser()
         {

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs

@@ -15,10 +15,10 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser Creator { get; set; }
+        public virtual TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public TUser LastModifier { get; set; }
+        public virtual TUser LastModifier { get; set; }
     }
 
     /// <summary>
@@ -34,10 +34,10 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser Creator { get; set; }
+        public virtual TUser Creator { get; set; }
         
         /// <inheritdoc />
-        public TUser LastModifier { get; set; }
+        public virtual TUser LastModifier { get; set; }
 
         protected FullAuditedEntityWithUser()
         {