abpframework · enisn · Jul 9, 2021 · Jul 5, 2021 · Jul 5, 2021 · Jul 6, 2021
diff --git a/docs/en/CLI-New-Command-Samples.md b/docs/en/CLI-New-Command-Samples.md
@@ -217,7 +217,7 @@ As seen below, ABP Framework libraries are local project references.
 	<ProjectReference Include="C:\source\abp\framework\src\Volo.Abp.AspNetCore.Authentication.JwtBearer\Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj" />
 	<ProjectReference Include="..\Acme.BookStore.Application\Acme.BookStore.Application.csproj" />
 	<ProjectReference Include="..\Acme.BookStore.HttpApi\Acme.BookStore.HttpApi.csproj" />
-	<ProjectReference Include="..\Acme.BookStore.EntityFrameworkCore.DbMigrations\Acme.BookStore.EntityFrameworkCore.DbMigrations.csproj" />
+	<ProjectReference Include="..\Acme.BookStore.EntityFrameworkCore\Acme.BookStore.EntityFrameworkCore.csproj" />
 </ItemGroup>    
 ```
 

diff --git a/...om-Property-To-The-User-Entity/How-To-Add-Custom-Property-To-The-User-Entity.md b/...om-Property-To-The-User-Entity/How-To-Add-Custom-Property-To-The-User-Entity.md
@@ -101,15 +101,15 @@ Now we need to add migration to see what has changed in our database. This for,
 
 ![nuget-package-manager](./nuget-package-manager.png)
 
-Select the **CustomizeUserDemo.EntityFramework.DbMigrations** as the **default project** and execute the following command:
+Select the **CustomizeUserDemo.EntityFramework** as the **default project** and execute the following command:
 
 ```bash
 Add-Migration "Updated-User-Entity"
 ```
 
 ![added-new-migration](./added-new-migration.png)
 
-This will create a new migration class inside the `Migrations` folder of the **CustomizeUserDemo.EntityFrameworkCore.DbMigrations** project.
+This will create a new migration class inside the `Migrations` folder of the **CustomizeUserDemo.EntityFrameworkCore** project.
 
 > If you are using another IDE than the Visual Studio, you can use `dotnet-ef` tool as [documented here](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/?tabs=dotnet-core-cli#create-a-migration).
 

diff --git a/...es/2020-10-08-How-To-Add-Custom-Property-To-The-User-Entity/initial-project.png b/...es/2020-10-08-How-To-Add-Custom-Property-To-The-User-Entity/initial-project.png
diff --git a/docs/en/Connection-Strings.md b/docs/en/Connection-Strings.md
@@ -70,7 +70,7 @@ For [Entity Framework Core](Entity-Framework-Core.md) and [MongoDB](MongoDB.md),
 
 Relational databases require to create the database and the database schema (tables, views... etc.) before using it.
 
-The startup template (with EF Core ORM) comes with a single database and a `.EntityFrameworkCore.DbMigrations` project that contains the migration files for that database. This project mainly defines a *YourProjectName*MigrationsDbContext that calls the `Configure...()` methods of the used modules, like `builder.ConfigurePermissionManagement()`.
+The startup template (with EF Core ORM) comes with a single database and a `.EntityFrameworkCore` project that contains related classes and the migration files for that database. This project mainly defines a *YourProjectName*DbContext that calls the `Configure...()` methods of the used modules, like `builder.ConfigurePermissionManagement()`.
 
 Once you want to separate a module's database, you typically will need to create a second migration path. See the [EF Core Migrations](Entity-Framework-Core-Migrations.md) document to learn how to create and use a different database for a desired module.
 

diff --git a/docs/en/Entity-Framework-Core-Migrations.md b/docs/en/Entity-Framework-Core-Migrations.md
diff --git a/docs/en/Entity-Framework-Core-MySQL.md b/docs/en/Entity-Framework-Core-MySQL.md
@@ -15,7 +15,7 @@ Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFra
 Find `UseSqlServer()` calls in your solution. Check the following files:
 
 * *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project. Replace `UseSqlServer()` with `UseMySQL()`.
-* *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project. Replace `UseSqlServer()` with `UseMySql()`. Then add a new parameter (`ServerVersion`) to `UseMySql()` method. Example: `.UseMySql(configuration.GetConnectionString("Default"), ServerVersion.FromString("8.0.21-mysql"))`. See [this issue](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/pull/1233) for more information about `ServerVersion`)
+* *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project. Replace `UseSqlServer()` with `UseMySql()`. Then add a new parameter (`ServerVersion`) to `UseMySql()` method. Example: `.UseMySql(configuration.GetConnectionString("Default"), ServerVersion.FromString("8.0.21-mysql"))`. See [this issue](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/pull/1233) for more information about `ServerVersion`)
 
 > Depending on your solution structure, you may find more code files need to be changed.
 
@@ -29,8 +29,8 @@ You typically will change the `appsettings.json` inside the `.DbMigrator` and `.
 
 The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). EF Core Migrations depend on the selected DBMS provider. So, changing the DBMS provider will cause the migration fails.
 
-* Delete the Migrations folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
-* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+* Delete the Migrations folder under the `.EntityFrameworkCore` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore` project as the default project in the Package Manager Console).
 
 This will create a database migration with all database objects (tables) configured.
 

diff --git a/docs/en/Entity-Framework-Core-Oracle-Devart.md b/docs/en/Entity-Framework-Core-Oracle-Devart.md
@@ -19,20 +19,20 @@ Also replace `using Volo.Abp.EntityFrameworkCore.SqlServer;` with `using Volo.Ab
 Find `UseSqlServer()` calls in your solution, replace with `UseOracle()`. Check the following files:
 
 * *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project.
-* *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project.
+* *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project.
 
 
-In the `CreateDbContext()` method of the *YourProjectName*MigrationsDbContextFactory.cs, replace the following code block
+In the `CreateDbContext()` method of the *YourProjectName*DbContextFactory.cs, replace the following code block
 
 ```csharp
-var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+var builder = new DbContextOptionsBuilder<YourProjectNameDbContext>()
                 .UseSqlServer(configuration.GetConnectionString("Default"));
 ```
 
 with this one
 ```csharp
-var builder = (DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>)
-	new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>().UseOracle
+var builder = (DbContextOptionsBuilder<YourProjectNameDbContext>)
+	new DbContextOptionsBuilder<YourProjectNameDbContext>().UseOracle
 	(
 		configuration.GetConnectionString("Default")
 	);
@@ -51,8 +51,8 @@ You typically will change the `appsettings.json` inside the `.DbMigrator` and `.
 The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) by default. 
 EF Core Migrations depend on the selected DBMS provider. Changing the DBMS provider, may not work with the existing migrations.
 
-* Delete the `Migrations` folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
-* Run `Add-Migration "Initial"` on the Package Manager Console window (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+* Delete the `Migrations` folder under the `.EntityFrameworkCore` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console window (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore` project as the default project in the Package Manager Console).
 
 This will scaffold a new migration for Oracle.
 

diff --git a/docs/en/Entity-Framework-Core-Oracle-Official.md b/docs/en/Entity-Framework-Core-Oracle-Official.md
@@ -17,19 +17,19 @@ Also replace `using Volo.Abp.EntityFrameworkCore.SqlServer;` with `using Volo.Ab
 Find `UseSqlServer()` calls in your solution, replace with `UseOracle()`. Check the following files:
 
 * *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project.
-* *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project.
+* *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project.
 
 
-In the `CreateDbContext()` method of the *YourProjectName*MigrationsDbContextFactory.cs, replace the following code block
+In the `CreateDbContext()` method of the *YourProjectName*DbContextFactory.cs, replace the following code block
 
 ```csharp
-var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+var builder = new DbContextOptionsBuilder<YourProjectNameDbContext>()
                 .UseSqlServer(configuration.GetConnectionString("Default"));
 ```
 
 with this one (just changes `UseSqlServer(...)` to `UseOracle(...)`)
 ```csharp
-var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+var builder = new DbContextOptionsBuilder<YourProjectNameDbContext>()
                 .UseOracle(configuration.GetConnectionString("Default"));
 ```
 
@@ -46,8 +46,8 @@ You typically will change the `appsettings.json` inside the `.DbMigrator` and `.
 The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) by default. 
 EF Core Migrations depend on the selected DBMS provider. Changing the DBMS provider, may not work with the existing migrations.
 
-* Delete the `Migrations` folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
-* Run `Add-Migration "Initial"` on the Package Manager Console window (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+* Delete the `Migrations` folder under the `.EntityFrameworkCore` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console window (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore` project as the default project in the Package Manager Console).
 
 This will scaffold a new migration for Oracle.
 

diff --git a/docs/en/Entity-Framework-Core-Other-DBMS.md b/docs/en/Entity-Framework-Core-Other-DBMS.md
@@ -62,29 +62,27 @@ MySQL connection strings are different than SQL Server connection strings. So, c
 
 You typically will change the `appsettings.json` inside the `.DbMigrator` and `.Web` projects, but it depends on your solution structure.
 
-## Change the Migrations DbContext
+## DBMS restrictions
 
 MySQL DBMS has some slight differences than the SQL Server. Some module database mapping configuration (especially the field lengths) causes problems with MySQL. For example, some of the the [IdentityServer module](Modules/IdentityServer.md) tables has such problems and it provides an option to configure the fields based on your DBMS.
 
-The startup template contains a *YourProjectName*MigrationsDbContext which is responsible to maintain and migrate the database schema. This DbContext basically calls extension methods of the depended modules to configure their database tables.
-
-Open the *YourProjectName*MigrationsDbContext and change the `builder.ConfigureIdentityServer();` line as shown below:
+The module may provide some built-in solutions. You can configure it via `ModelBuilder`. eg: `Identity Server` module.
 
-````csharp
+```csharp
 builder.ConfigureIdentityServer(options =>
 {
     options.DatabaseProvider = EfCoreDatabaseProvider.MySql;
 });
-````
+```
 
 Then `ConfigureIdentityServer()` method will set the field lengths to not exceed the MySQL limits. Refer to related module documentation if you have any problem while creating or executing the database migrations.
 
 ## Re-Generate the Migrations
 
 The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). EF Core Migrations depend on the selected DBMS provider. So, changing the DBMS provider will cause the migration fails.
 
-* Delete the Migrations folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
-* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+* Delete the Migrations folder under the `.EntityFrameworkCore` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore` project as the default project in the Package Manager Console).
 
 This will create a database migration with all database objects (tables) configured.
 
@@ -94,16 +92,4 @@ Run the `.DbMigrator` project to create the database and seed the initial data.
 
 It is ready. Just run the application and enjoy coding.
 
-## DBMS restrictions
-
-Different DBMS may have some restrictions, such as the maximum length of field names, index length, etc.
-The module may provide some built-in solutions. You can configure it via `ModelBuilder`. eg: `Identity Server` module.
-
-```csharp
-builder.ConfigureIdentityServer(options =>
-{
-    options.DatabaseProvider = EfCoreDatabaseProvider.MySql;
-});
-```
-
 Related discussions: https://github.com/abpframework/abp/issues/1920
diff --git a/docs/en/Entity-Framework-Core-PostgreSQL.md b/docs/en/Entity-Framework-Core-PostgreSQL.md
@@ -15,7 +15,7 @@ Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFra
 Find `UseSqlServer()` call in *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project and replace with `UseNpgsql()`.
 
 
-Find `UseSqlServer()` call in *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project and replace with `UseNpgsql()`.
+Find `UseSqlServer()` call in *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project and replace with `UseNpgsql()`.
 
 > Depending on your solution structure, you may find more `UseSqlServer()` calls that needs to be changed.
 
@@ -29,8 +29,8 @@ You typically will change the `appsettings.json` inside the `.DbMigrator` and `.
 
 The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). EF Core Migrations depend on the selected DBMS provider. So, changing the DBMS provider will cause the migration fails.
 
-* Delete the Migrations folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
-* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+* Delete the Migrations folder under the `.EntityFrameworkCore` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore` project as the default project in the Package Manager Console).
 
 This will create a database migration with all database objects (tables) configured.
 

diff --git a/docs/en/Entity-Framework-Core-SQLite.md b/docs/en/Entity-Framework-Core-SQLite.md
@@ -15,7 +15,7 @@ Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFra
 Find `UseSqlServer()` calls in your solution, replace with `UseSqlite()`. Check the following files:
 
 * *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project.
-* *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project.
+* *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project.
 
 > Depending on your solution structure, you may find more code files need to be changed.
 
@@ -39,8 +39,8 @@ You typically will change the `appsettings.json` inside the `.DbMigrator` and `.
 
 The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). EF Core Migrations depend on the selected DBMS provider. So, changing the DBMS provider will cause the migration fails.
 
-* Delete the Migrations folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
-* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+* Delete the Migrations folder under the `.EntityFrameworkCore` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore` project as the default project in the Package Manager Console).
 
 This will create a database migration with all database objects (tables) configured.
 

diff --git a/docs/en/Modules/Docs.md b/docs/en/Modules/Docs.md
@@ -38,7 +38,7 @@ Note that this document covers `Entity Framework Core` provider but you can also
 
 ### 2- Running The Empty Application
 
-After you download the project, extract the ZIP file and open `Acme.MyProject.sln`. You will see that the solution consists of `Application`, `Application.Contracts`, `DbMigrator`, `Domain`, `Domain.Shared`, `EntityFrameworkCore`, `EntityFrameworkCore.DbMigations`, `HttpApi`, `HttpApi.Client` and `Web` projects. Right click on `Acme.MyProject.Web` project and **Set as StartUp Project**.
+After you download the project, extract the ZIP file and open `Acme.MyProject.sln`. You will see that the solution consists of `Application`, `Application.Contracts`, `DbMigrator`, `Domain`, `Domain.Shared`, `EntityFrameworkCore`, `HttpApi`, `HttpApi.Client` and `Web` projects. Right click on `Acme.MyProject.Web` project and **Set as StartUp Project**.
 
 ![Create a new project](../images/docs-module_solution-explorer.png)
 
@@ -237,15 +237,15 @@ If you choose Entity Framework as your database provider, you need to configure
     }
   ```
 
-* Open `Package Manager Console` in `Visual Studio` and choose `Acme.MyProject.EntityFrameworkCore.DbMigrations` as default project. Then write the below command to add the migration for Docs Module.
+* Open `Package Manager Console` in `Visual Studio` and choose `Acme.MyProject.EntityFrameworkCore` as default project. Then write the below command to add the migration for Docs Module.
 
   ```csharp
   add-migration Added_Docs_Module
   ```
 
-  When the command successfully executes , you will see a new migration file named as `20181221111621_Added_Docs_Module` in the folder `Acme.MyProject.EntityFrameworkCore.DbMigrations\Migrations`.
+  When the command successfully executes , you will see a new migration file named as `20181221111621_Added_Docs_Module` in the folder `Acme.MyProject.EntityFrameworkCore\Migrations`.
 
-  Now, update the database for Docs module database changes. To do this run the below code on `Package Manager Console` in `Visual Studio`.  Be sure `Acme.MyProject.EntityFrameworkCore.DbMigrations` is still default project.
+  Now, update the database for Docs module database changes. To do this run the below code on `Package Manager Console` in `Visual Studio`.  Be sure `Acme.MyProject.EntityFrameworkCore` is still default project.
 
   ```csharp
   update-database