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

.github/workflows/main.yml

@@ -0,0 +1,28 @@
+name: "Main"
+on:
+  pull_request:
+    paths:
+      - "framework/**"
+      - "modules/**"
+      - "templates/**"
+  push:
+    paths:
+      - "framework/**"
+      - "modules/**"
+      - "templates/**"
+jobs:
+  build-test:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-dotnet@master
+        with:
+          dotnet-version: "3.1.100"
+
+      - name: Build All
+        run: .\build\build-all.ps1
+        shell: pwsh
+
+      - name: Test All
+        run: .\build\test-all.ps1
+        shell: pwsh

abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/ru.json

@@ -0,0 +1,13 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Account": "Аккаунт",
+    "Welcome": "Добро пожаловать",
+    "UseOneOfTheFollowingLinksToContinue": "Для продолжения используйте одну из следующих ссылок",
+    "FrameworkHomePage": "Главная страница фреймворка",
+    "FrameworkDocumentation": "Документация фреймворка",
+    "OfficialBlog": "Официальный блог",
+    "CommercialHomePage": "Главная страница коммерческой версии",
+    "CommercialSupportWebSite": "Сайт коммерческой поддержки"
+  }
+}

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

@@ -0,0 +1,90 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Permission:Organizations": "Организации",
+    "Permission:Manage": "Управление организациями",
+    "Permission:NpmPackages": "Пакеты NPM",
+    "Permission:NugetPackages": "Пакеты NuGet",
+    "Permission:Maintenance": "Обслуживание",
+    "Permission:Maintain": "Обслуживать",
+    "Permission:ClearCaches": "Очистить кэш",
+    "Permission:Modules": "Модули",
+    "Permission:Packages": "Пакеты",
+    "Permission:Edit": "Редактировать",
+    "Permission:Delete": "Удалить",
+    "Permission:Create": "Создать",
+    "Menu:Organizations": "Организации",
+    "Menu:Packages": "Пакеты",
+    "NpmPackageDeletionWarningMessage": "Этот пакет NPM будет удален. Вы подтверждаете это?",
+    "NugetPackageDeletionWarningMessage": "Этот пакет NuGet будет удален. Вы подтверждаете это?",
+    "ModuleDeletionWarningMessage": "Этот модуль будет удален. Вы подтверждаете это?",
+    "Name": "Имя",
+    "DisplayName": "Отображаемое имя",
+    "ShortDescription": "Краткое описание",
+    "NameFilter": "Имя",
+    "CreationTime": "Время создания",
+    "IsPro": "Is pro",
+    "EfCoreConfigureMethodName": "Настроить имя метода",
+    "IsProFilter": "Is pro",
+    "ApplicationType": "Тип приложения",
+    "Target": "Цель",
+    "TargetFilter": "Цель",
+    "ModuleClass": "Класс модуля",
+    "NugetPackageTarget.DomainShared": "Domain Shared",
+    "NugetPackageTarget.Domain": "Domain",
+    "NugetPackageTarget.Application": "Application",
+    "NugetPackageTarget.ApplicationContracts": "Application Contracts",
+    "NugetPackageTarget.HttpApi": "Http Api",
+    "NugetPackageTarget.HttpApiClient": "Http Api Client",
+    "NugetPackageTarget.Web": "Web",
+    "NugetPackageTarget.EntityFrameworkCore": "DeleteAllEntityFramework Core",
+    "NugetPackageTarget.MongoDB": "MongoDB",
+    "Edit": "Редактировать",
+    "Delete": "Удалить",
+    "Refresh": "Обновить",
+    "NpmPackages": "NPM пакеты",
+    "NugetPackages": "NuGet пакеты",
+    "NpmPackageCount": "Количество пакетов NPM",
+    "NugetPackageCount": "Количество пакетов NuGet",
+    "Module": "Модули",
+    "ModuleInfo": "Информация о модуле",
+    "CreateANpmPackage": "Создать пакет NPM",
+    "CreateAModule": "Создать модуль",
+    "CreateANugetPackage": "Создать пакет NuGet",
+    "AddNew": "Добавить новый",
+    "PackageAlreadyExist{0}": "\"{0}\" пакет уже существует.",
+    "ModuleAlreadyExist{0}": "\"{0}\" модуль уже добавлен.",
+    "ClearCache": "Очистить кэш",
+    "SuccessfullyCleared": "Успешно очищено",
+    "Menu:NpmPackages": "Пакеты NPM",
+    "Menu:Modules": "Модули",
+    "Menu:Maintenance": "Поддержка",
+    "Menu:NugetPackages": "Пакеты NuGet",
+    "CreateAnOrganization": "Создать организацию",
+    "Organizations": "Организации",
+    "LongName": "Полное название",
+    "LicenseType": "Тип лицензии",
+    "LicenseStartTime": "Время начала действия лицензии",
+    "LicenseEndTime": "Время окончания действия лицензии",
+    "AllowedDeveloperCount": "Разрешенное количество разработчиков",
+    "UserNameOrEmailAddress": "Имя пользователя или адрес электронной почты",
+    "AddOwner": "Добавить владельца",
+    "UserName": "Имя пользователя",
+    "Email": "Электронная почта",
+    "Developers": "Разработчики",
+    "AddDeveloper": "Добавить разработчика",
+    "Create": "Создать",
+    "UserNotFound": "Пользователь не обнаружен",
+    "{0}WillBeRemovedFromMembers": "{0} будет удален из членов",
+    "Computers": "Компьютеры",
+    "UniqueComputerId": "Уникальный id компьютера",
+    "LastSeenDate": "Дата последнего визита",
+    "{0}Computer{1}WillBeRemovedFromRecords": "Компьютер {0} ({1}) будет удален из записей",
+    "OrganizationDeletionWarningMessage": "Организация будет удалена",
+    "This{0}AlreadyExistInThisOrganization": "{0} уже существует в данной организации",
+    "AreYouSureYouWantToDeleteAllComputers": "Вы уверены, что хотите удалить все компьютеры?",
+    "DeleteAll": "Удалить все",
+    "DoYouWantToCreateNewUser": "Вы хотите создать нового пользователя?",
+    "MasterModules": "Мастер модулей"
+  }
+}

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

@@ -50,7 +50,7 @@ ObjectExtensionManager.Instance
 * 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).
 * You also need to provide an action that defines the database mapping properties using the [EF Core Fluent API](https://docs.microsoft.com/en-us/ef/core/modeling/entity-properties).
 
-> This code part must be executed before the related `DbContext` used. The [application startup template](Startup-Templates/Application.md) defines a static class named `YourProjectNameEntityExtensions`. You can define your extensions in this class to ensure that it is executed in the proper time. Otherwise, you should handle it yourself.
+> This code part must be executed before the related `DbContext` used. The [application startup template](Startup-Templates/Application.md) defines a static class named `YourProjectNameEfCoreEntityExtensionMappings`. You can define your extensions in this class to ensure that it is executed in the proper time. Otherwise, you should handle it yourself.
 
 Once you define an entity extension, you then need to use the standard [Add-Migration](https://docs.microsoft.com/en-us/ef/core/miscellaneous/cli/powershell#add-migration) and [Update-Database](https://docs.microsoft.com/en-us/ef/core/miscellaneous/cli/powershell#update-database) commands of the EF Core to create a code first migration class and update your database.
 
@@ -174,4 +174,4 @@ public class MyDistributedIdentityUserCreatedEventHandler :
 ## See Also
 
 * [Migration System for the EF Core](Entity-Framework-Core-Migrations.md)
-* [Customizing the Existing Modules](Customizing-Application-Modules-Guide.md)
+* [Customizing the Existing Modules](Customizing-Application-Modules-Guide.md)

docs/en/Exception-Handling.md

@@ -315,8 +315,8 @@ The `context` object contains necessary information about the exception occurred
 
 Some exception types are automatically thrown by the framework:
 
-- `AbpAuthorizationException` is thrown if the current user has no permission to perform the requested operation. See authorization document (TODO: link) for more.
-- `AbpValidationException` is thrown if the input of the current request is not valid. See validation document (TODO: link) for more.
+- `AbpAuthorizationException` is thrown if the current user has no permission to perform the requested operation. See [authorization](Authorization.md) for more.
+- `AbpValidationException` is thrown if the input of the current request is not valid. See [validation] (Validation.md) for more.
 - `EntityNotFoundException` is thrown if the requested entity is not available. This is mostly thrown by [repositories](Repositories.md).
 
 You can also throw these type of exceptions in your code (although it's rarely needed).

docs/en/Getting-Started-Angular-Template.md

@@ -1,126 +1,8 @@
-## Getting Started With the Angular Application Template
+# Getting Started with the Startup Templates
 
-This tutorial explains how to create a new Angular application using the startup template, configure and run it.
+See the following tutorials to learn how to get started with the ABP Framework using the pre-built application startup templates:
 
-### Creating a New Project
+* [Getting Started With the ASP.NET Core MVC / Razor Pages UI](Getting-Started?UI=MVC&DB=EF&Tiered=No)
+* [Getting Started with the Angular UI](Getting-Started?UI=NG&DB=EF&Tiered=No)
 
-This tutorial uses **ABP CLI** to create a new project. See the [Get Started](https://abp.io/get-started) page for other options.
-
-Install the ABP CLI using a command line window, if you've not installed before:
-
-````bash
-dotnet tool install -g Volo.Abp.Cli
-````
-
-Use `abp new` command in an empty folder to create your project:
-
-````bash
-abp new Acme.BookStore -u angular
-````
-
-> You can use different level of namespaces; e.g. BookStore, Acme.BookStore or Acme.Retail.BookStore.
-
-`-u angular` option specifies the UI framework to be Angular. Default database provider is EF Core. See the [CLI documentation](CLI.md) for all available options.
-
-#### Pre Requirements
-
-The created solution requires;
-
-* [Visual Studio 2019 (v16.4+)](https://visualstudio.microsoft.com/vs/)
-* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/)
-* [Node v12+](https://nodejs.org)
-* [Yarn v1.19+](https://classic.yarnpkg.com/)
-
-### The Solution Structure
-
-Open the solution in **Visual Studio**:
-
-![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution-for-spa.png)
-
-The solution has a layered structure (based on [Domain Driven Design](Domain-Driven-Design.md)) and contains unit & integration test projects properly configured to work with **EF Core** & **SQLite in-memory** database.
-
-> See the [Application Template Document](Startup-Templates/Application.md) to understand the solution structure in details.
-
-### Database Connection String
-
-Check the **connection string** in the `appsettings.json` file under the `.HttpApi.Host` project:
-
-````json
-{
-  "ConnectionStrings": {
-    "Default": "Server=localhost;Database=BookStore;Trusted_Connection=True"
-  }
-}
-````
-
-The solution is configured to use **Entity Framework Core** with **MS SQL Server**. EF Core supports [various](https://docs.microsoft.com/en-us/ef/core/providers/) database providers, so you can use another DBMS if you want. Change the connection string if you need.
-
-### Create Database & Apply Database Migrations
-
-You have two options to create the database.
-
-#### Using the DbMigrator Application
-
-The solution contains a console application (named `Acme.BookStore.DbMigrator` in this sample) that can create database, apply migrations and seed initial data. It is useful on development as well as on production environment.
-
-> `.DbMigrator` project has its own `appsettings.json`. So, if you have changed the connection string above, you should also change this one.
-
-Right click to the `.DbMigrator` project and select **Set as StartUp Project**:
-
-![set-as-startup-project](images/set-as-startup-project.png)
-
-Hit F5 (or Ctrl+F5) to run the application. It will have an output like shown below:
-
-![set-as-startup-project](images/db-migrator-app.png)
-
-#### Using EF Core Update-Database Command
-
-Ef Core has `Update-Database` command which creates database if necessary and applies pending migrations. Right click to the `.HttpApi.Host` project and select **Set as StartUp Project**:
-
-![set-as-startup-project](images/set-as-startup-project.png)
-
-Open the **Package Manager Console**, select `.EntityFrameworkCore.DbMigrations` project as the **Default Project** and run the `Update-Database` command:
-
-![pcm-update-database](images/pcm-update-database-v2.png)
-
-This will create a new database based on the configured connection string.
-
-> Using the `.DbMigrator` tool is the suggested way, because it also seeds the initial data to be able to properly run the web application.
-
-### Running the Application
-
-#### Run the API Host (Server Side)
-
-Ensure that the `.HttpApi.Host` project is the startup project and run the application which will open a Swagger UI:
-
-![bookstore-homepage](images/bookstore-swagger-ui-host.png)
-
-You can see the application APIs and test them here. Get [more info](https://swagger.io/tools/swagger-ui/) about the Swagger UI.
-
-##### Authorization for the Swagger UI
-
-Most of the application APIs require authentication & authorization. If you want to test authorized APIs, manually go to the `/Account/Login` page, enter `admin` as the username and `1q2w3E*` as the password to login to the application. Then you will be able to execute authorized APIs too.
-
-#### Run the Angular Application (Client Side)
-
-Go to the `angular` folder, open a command line terminal, type the `yarn` command (we suggest the [yarn](https://yarnpkg.com) package manager while `npm install` will also work in most cases)
-
-````bash
-yarn
-````
-
-Once all node modules are loaded, execute `yarn start` or `npm start` command:
-
-````bash
-yarn start
-````
-
-Open your favorite browser and go to `localhost:4200` URL. Initial username is `admin` and password is `1q2w3E*`.
-
-The startup template includes the **identity management** and **tenant management** modules. Once you login, the Administration menu will be available where you can manage **tenants**, **roles**, **users** and their **permissions**.
-
-> We recommend [Visual Studio Code](https://code.visualstudio.com/) as the editor for the Angular project, but you are free to use your favorite editor.
-
-### What's Next?
-
-* [Application development tutorial](Tutorials/Part-1)
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Getting-Started-AspNetCore-MVC-Template.md

@@ -1,104 +1,8 @@
-## Getting Started With the ASP.NET Core MVC Template
+# Getting Started with the Startup Templates
 
-This tutorial explains how to create a new ASP.NET Core MVC web application using the startup template, configure and run it.
+See the following tutorials to learn how to get started with the ABP Framework using the pre-built application startup templates:
 
-### Creating a New Project
+* [Getting Started With the ASP.NET Core MVC / Razor Pages UI](Getting-Started?UI=MVC&DB=EF&Tiered=No)
+* [Getting Started with the Angular UI](Getting-Started?UI=NG&DB=EF&Tiered=No)
 
-This tutorial uses **ABP CLI** to create a new project. See the [Get Started](https://abp.io/get-started) page for other options.
-
-Install the ABP CLI using a command line window, if you've not installed before:
-
-````bash
-dotnet tool install -g Volo.Abp.Cli
-````
-
-Use `abp new` command in an empty folder to create your project:
-
-````bash
-abp new Acme.BookStore
-````
-
-> You can use different level of namespaces; e.g. BookStore, Acme.BookStore or Acme.Retail.BookStore.
-
-`new` command creates a **layered MVC application** with **Entity Framework Core** as the database provider. However, it has additional options. See the [CLI documentation](CLI.md) for all available options.
-
-#### Pre Requirements
-
-The created solution requires;
-
-* [Visual Studio 2019 (v16.4+)](https://visualstudio.microsoft.com/vs/)
-* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/)
-* [Node v12+](https://nodejs.org)
-* [Yarn v1.19+](https://classic.yarnpkg.com/)
-
-### The Solution Structure
-
-Open the solution in **Visual Studio**:
-
-![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution-v3.png)
-
-The solution has a layered structure (based on [Domain Driven Design](Domain-Driven-Design.md)) and contains unit & integration test projects properly configured to work with **EF Core** & **SQLite in-memory** database.
-
-> See [Application template document](Startup-Templates/Application.md) to understand the solution structure in details.
-
-### Database Connection String
-
-Check the **connection string** in the `appsettings.json` file under the `.Web` project:
-
-````json
-{
-  "ConnectionStrings": {
-    "Default": "Server=localhost;Database=BookStore;Trusted_Connection=True"
-  }
-}
-````
-
-The solution is configured to use **Entity Framework Core** with **MS SQL Server**. EF Core supports [various](https://docs.microsoft.com/en-us/ef/core/providers/) database providers, so you can use another DBMS if you want. Change the connection string if you need.
-
-### Create Database & Apply Database Migrations
-
-You have two options to create the database.
-
-#### Using the DbMigrator Application
-
-The solution contains a console application (named `Acme.BookStore.DbMigrator` in this sample) that can create database, apply migrations and seed initial data. It is useful on development as well as on production environment.
-
-> `.DbMigrator` project has its own `appsettings.json`. So, if you have changed the connection string above, you should also change this one.
-
-Right click to the `.DbMigrator` project and select **Set as StartUp Project**:
-
-![set-as-startup-project](images/set-as-startup-project.png)
-
-Hit F5 (or Ctrl+F5) to run the application. It will have an output like shown below:
-
-![set-as-startup-project](images/db-migrator-app.png)
-
-#### Using EF Core Update-Database Command
-
-Ef Core has `Update-Database` command which creates database if necessary and applies pending migrations. Right click to the `.Web` project and select **Set as StartUp Project**:
-
-![set-as-startup-project](images/set-as-startup-project.png)
-
-Open the **Package Manager Console**, select `.EntityFrameworkCore.DbMigrations` project as the **Default Project** and run the `Update-Database` command:
-
-![pcm-update-database](images/pcm-update-database-v2.png)
-
-This will create a new database based on the configured connection string.
-
-> Using the `.Migrator` tool is the suggested way, because it also seeds the initial data to be able to properly run the web application.
-
-### Running the Application
-
-Ensure that the `.Web` project is the startup project. Run the application which will open the **home** page in your browser:
-
-![bookstore-homepage](images/bookstore-homepage.png)
-
-Click the **Login** button, enter `admin` as the username and `1q2w3E*` as the password to login to the application.
-
-The startup template includes the **identity management** and **tenant management** modules. Once you login, the Administration menu will be available where you can manage **tenants**, **roles**, **users** and their **permissions**. User management page is shown below:
-
-![bookstore-user-management](images/bookstore-user-management-v2.png)
-
-### What's Next?
-
-* [Application development tutorial](Tutorials/Part-1.md)
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

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

@@ -2,5 +2,7 @@
 
 See the following tutorials to learn how to get started with the ABP Framework using the pre-built application startup templates:
 
-* [Getting Started With the ASP.NET Core MVC / Razor Pages UI](Getting-Started-AspNetCore-MVC-Template.md)
-* [Getting Started with the Angular UI](Getting-Started-Angular-Template.md)
+* [Getting Started With the ASP.NET Core MVC / Razor Pages UI](Getting-Started?UI=MVC&DB=EF&Tiered=No)
+* [Getting Started with the Angular UI](Getting-Started?UI=NG&DB=EF&Tiered=No)
+
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Getting-Started.md

@@ -0,0 +1,407 @@
+# Getting started
+
+````json
+//[doc-params]
+{
+    "UI": ["MVC","NG"],
+    "DB": ["EF", "Mongo"],
+    "Tiered": ["Yes", "No"]
+}
+````
+
+This tutorial explains how to create a new {{if UI == "MVC"}} ASP.NET Core MVC web {{else if UI == "NG"}} Angular {{end}} application using the startup template, configure and run it.
+
+
+## Setup your development environment
+
+First things first! Let's setup your development environment before creating the first project.
+
+### Pre-requirements
+
+The following tools should be installed on your development machine:
+
+* [Visual Studio 2019 (v16.4+)](https://visualstudio.microsoft.com/vs/) for Windows / [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
+* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/)
+
+* [Node v12+](https://nodejs.org)
+* [Yarn v1.19+](https://classic.yarnpkg.com/)
+
+> You can use another editor instead of Visual Studio as long as it supports .NET Core and ASP.NET Core.
+
+### Install the ABP CLI
+
+[ABP CLI](./CLI.md) is a command line interface that is used to authenticate and automate some tasks for ABP based applications.
+
+> ABP CLI is a free & open source tool for [the ABP framework](https://abp.io/).
+
+First, you need to install the ABP CLI using the following command:
+
+````shell
+dotnet tool install -g Volo.Abp.Cli
+````
+
+If you've already installed, you can update it using the following command:
+
+````shell
+dotnet tool update -g Volo.Abp.Cli
+````
+
+## Create a new project
+
+> This document assumes that you prefer to use **{{ UI_Value }}** as the UI framework and **{{ DB_Value }}** as the database provider. For other options, please change the preference on top of this document.
+
+### Using the ABP CLI to create a new project
+
+Use the `new` command of the ABP CLI to create a new project:
+
+````shell
+abp new Acme.BookStore -t app{{if UI == "NG"}} -u angular {{end}}{{if DB == "Mongo"}} -d mongodb{{end}}{{if Tiered == "Yes" && UI != "NG"}} --tiered {{else if Tiered == "Yes" && UI == "NG"}}--separate-identity-server{{end}}
+````
+
+* `-t` argument specifies the [startup template](Startup-Templates/Application.md) name. `app` is the startup template that contains the essential [ABP Modules](Modules/Index.md) pre-installed and configured for you.
+
+{{ if UI == "NG" }}
+
+* `-u` argument specifies the UI framework, `angular` in this case.
+
+{{ if Tiered == "Yes" }}
+
+* `--separate-identity-server` argument is used to separate the identity server application from the API host application. If not specified, you will have a single endpoint.
+
+{{ end }}
+
+{{ end }}
+
+{{ if DB == "Mongo" }}
+
+* `-d` argument specifies the database provider, `mongodb` in this case.
+
+{{ end }}
+
+{{ if Tiered == "Yes" && UI != "NG" }}
+
+* `--tiered` argument is used to create N-tiered solution where authentication server, UI and API layers are physically separated.
+
+{{ end }}
+
+> You can use different level of namespaces; e.g. BookStore, Acme.BookStore or Acme.Retail.BookStore. 
+
+#### ABP CLI commands & options
+
+[ABP CLI document](./CLI.md) covers all of the available commands and options for the ABP CLI. See the [ABP Startup Templates](Startup-Templates/Index.md) document for other templates.
+
+## The solution structure
+
+{{ if UI == "MVC" }}
+
+After creating your project, you will have the following solution folders & files:
+
+![](images/solution-files-mvc.png)
+
+You will see the following solution structure when you open the `.sln` file in the Visual Studio:
+
+{{if DB == "Mongo"}}
+
+![vs-default-app-solution-structure](images/vs-app-solution-structure-mongodb.png)
+
+{{else}}
+
+![vs-default-app-solution-structure](images/vs-app-solution-structure{{if Tiered == "Yes"}}-tiered{{end}}.png)
+
+{{end}}
+
+{{ else if UI == "NG" }}
+There are three folders in the created solution:
+
+![](images/solution-files-non-mvc.png)
+
+* `angular` folder contains the Angular UI application.
+* `aspnet-core` folder contains the backend solution.
+* `react-native` folder contains the React Native UI application.
+
+Open the `.sln` (Visual Studio solution) file under the `aspnet-core` folder:
+
+![vs-angular-app-backend-solution-structure](images/vs-spa-app-backend-structure{{if DB == "Mongo"}}-mongodb{{end}}.png)
+
+{{ end }}
+
+> ###### About the projects in your solution
+>
+> Your solution may have slightly different structure based on your **UI**, **database** and other preferences.
+
+The solution has a layered structure (based on [Domain Driven Design](./Domain-Driven-Design.md)) and also contains unit & integration test projects.
+
+{{ if DB == "EF" }}
+
+Integration tests projects are properly configured to work with **EF Core** & **SQLite in-memory** database.
+
+{{ else if DB == "Mongo" }}
+
+Integration tests projects are properly configured to work with in-memory **MongoDB** database created per test (used [Mongo2Go](https://github.com/Mongo2Go/Mongo2Go) library).
+
+{{ end }}
+
+> See the [application template document](Startup-Templates/Application.md) to understand the solution structure in details. 
+
+## Create the database
+
+### Database connection string
+
+Check the **connection string** in the `appsettings.json` file under the {{if UI == "MVC"}}{{if Tiered == "Yes"}}`.IdentityServer` and `.HttpApi.Host` projects{{else}}`.Web` project{{end}}{{else if UI == "NG" }}`.HttpApi.Host` project{{end}}:
+
+{{ if DB == "EF" }}
+
+````json
+"ConnectionStrings": {
+  "Default": "Server=localhost;Database=BookStore;Trusted_Connection=True"
+}
+````
+
+The solution is configured to use **Entity Framework Core** with **MS SQL Server**. EF Core supports [various](https://docs.microsoft.com/en-us/ef/core/providers/) database providers, so you can use any supported DBMS. See [the Entity Framework integration document](https://docs.abp.io/en/abp/latest/Entity-Framework-Core) to learn how to switch to another DBMS.
+
+### Apply the migrations
+
+The solution uses the [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/?tabs=dotnet-core-cli). So, you need to apply migrations to create the database. There are two ways of applying the database migrations.
+
+#### Apply migrations using the DbMigrator
+
+The solution comes with a `.DbMigrator` console application which applies migrations and also seed the initial data. It is useful on development as well as on production environment.
+
+> `.DbMigrator` project has its own `appsettings.json`. So, if you have changed the connection string above, you should also change this one. 
+
+Right click to the `.DbMigrator` project and select **Set as StartUp Project**
+
+![set-as-startup-project](images/set-as-startup-project.png)
+
+ Hit F5 (or Ctrl+F5) to run the application. It will have an output like shown below:
+
+ ![db-migrator-output](images/db-migrator-output.png)
+
+> Initial seed data creates the `admin` user in the database which is then used to login to the application. So, you need to use `.DbMigrator` at least once for a new database.
+
+#### Using EF Core Update-Database command
+
+Ef Core has `Update-Database` command which creates database if necessary and applies pending migrations.
+
+{{ if UI == "MVC" }}
+
+Right click to the {{if Tiered == "Yes"}}`.IdentityServer`{{else}}`.Web`{{end}} project and select **Set as StartUp project**: 
+
+{{ else if UI != "MVC" }}
+
+Right click to the `.HttpApi.Host` project and select **Set as StartUp Project**: 
+
+{{ end }}
+
+![set-as-startup-project](images/set-as-startup-project.png)
+
+Open the **Package Manager Console**, select `.EntityFrameworkCore.DbMigrations` project as the **Default Project** and run the `Update-Database` command:
+
+![package-manager-console-update-database](images/package-manager-console-update-database.png)
+
+This will create a new database based on the configured connection string.
+
+> Using the `.Migrator` tool is the suggested way, because it also seeds the initial data to be able to properly run the web application. 
+
+{{ else if DB == "Mongo" }}
+
+````json
+"ConnectionStrings": {
+  "Default": "mongodb://localhost:27017/BookStore"
+}
+````
+
+The solution is configured to use **MongoDB** in your local computer, so you need to have a MongoDB server instance up and running or change the connection string to another MongoDB server.
+
+### Seed initial data
+
+The solution comes with a `.DbMigrator` console application which seeds the initial data. It is useful on development as well as on production environment.
+
+> `.DbMigrator` project has its own `appsettings.json`. So, if you have changed the connection string above, you should also change this one. 
+
+Right click to the `.DbMigrator` project and select **Set as StartUp Project**
+
+![set-as-startup-project](images/set-as-startup-project.png)
+
+ Hit F5 (or Ctrl+F5) to run the application. It will have an output like shown below:
+
+ ![db-migrator-output](images/db-migrator-output.png)
+
+> Initial seed data creates the `admin` user in the database which is then used to login to the application. So, you need to use `.DbMigrator` at least once for a new database.
+
+{{ end }}
+
+## Run the application
+
+{{ if UI == "MVC" }}
+
+{{ if Tiered == "Yes" }}
+
+Ensure that the `.IdentityServer` project is the startup project. Run the application which will open a **login** page in your browser.
+
+> Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
+
+You can login, but you cannot enter to the main application here. This is just the authentication server.
+
+Ensure that the `.HttpApi.Host` project is the startup project and run the application which will open a **Swagger UI** in your browser.
+
+![swagger-ui](images/swagger-ui.png)
+
+This is the API application that is used by the web application.
+
+Lastly, ensure that the `.Web` project is the startup project and run the application which will open a **welcome** page in your browser
+
+![mvc-tiered-app-home](images/bookstore-home.png)
+
+Click to the **login** button which will redirect you to the `Identity Server` to login to the application:
+
+![bookstore-login](images/bookstore-login.png)
+
+{{ else }}
+
+Ensure that the `.Web` project is the startup project. Run the application which will open the **login** page in your browser:
+
+> Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
+
+![bookstore-login](images/bookstore-login.png)
+
+{{ end }}
+
+{{ else if UI != "MVC" }}
+
+#### Running the HTTP API Host (server-side)
+
+{{ if Tiered == "Yes" }}
+
+Ensure that the `.IdentityServer` project is the startup project. Run the application which will open a **login** page in your browser.
+
+> Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
+
+You can login, but you cannot enter to the main application here. This is just the authentication server.
+
+{{ end }}
+
+Ensure that the `.HttpApi.Host` project is the startup project and run the application which will open a Swagger UI:
+
+{{ if Tiered == "No" }}
+
+> Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
+
+{{ end }}
+
+![swagger-ui](images/swagger-ui.png)
+
+You can see the application APIs and test them here. Get [more info](https://swagger.io/tools/swagger-ui/) about the Swagger UI.
+
+> ##### Authorization for the Swagger UI
+>
+> Most of the HTTP APIs require authentication & authorization. If you want to test authorized APIs, manually go to the `/Account/Login` page, enter `admin` as the username and `1q2w3E*` as the password to login to the application. Then you will be able to execute authorized APIs too.
+
+{{ end }}
+
+{{ if UI == "NG" }}
+#### Running the Angular application (client-side)
+
+Go to the `angular` folder, open a command line terminal, type the `yarn` command (we suggest to the [yarn](https://yarnpkg.com/) package manager while `npm install` will also work in most cases)
+
+```bash
+yarn
+```
+
+Once all node modules are loaded, execute `yarn start` (or `npm start`) command:
+
+```bash
+yarn start
+```
+
+Wait `Angular CLI` to launch `Webpack` dev-server with `BrowserSync`. 
+This will take care of compiling your `TypeScript` code, and automatically reloading your browser. 
+After it finishes, `Angular Live Development Server` will be listening on localhost:4200, 
+open your web browser and navigate to [localhost:4200](http://localhost:4200/)
+
+
+
+![bookstore-login](images/bookstore-login.png)
+
+{{ end }}
+
+Enter **admin** as the username and **1q2w3E*** as the password to login to the application:
+
+![bookstore-home](images/bookstore-home.png)
+
+The application is up and running. You can start developing your application based on this startup template.
+
+#### Mobile Development
+
+ABP platform provide [React Native](https://reactnative.dev/) template to develop mobile applications.
+
+>The solution includes the React Native application in the `react-native` folder as default. If you don't plan to develop a mobile application with React Native, you can ignore this step and delete the `react-native` folder.
+
+The React Native application running on an Android emulator or a physical phone cannot connect to the backend on `localhost`. To fix this problem, it is necessary to run backend on the local IP.
+
+{{ if Tiered == "No"}}
+![React Native host project local IP entry](images/rn-host-local-ip.png)
+
+* Open the `appsettings.json` in the `.HttpApi.Host` folder. Replace the `localhost` address on the `SelfUrl` and `Authority` properties with your local IP address.
+* Open the `launchSettings.json` in the `.HttpApi.Host/Properties` folder. Replace the `localhost` address on the `applicationUrl` properties with your local IP address.
+
+{{ else if Tiered == "Yes" }}
+
+![React Native tiered project local IP entry](images/rn-tiered-local-ip.png)
+
+* Open the `appsettings.json` in the `.IdentityServer` folder. Replace the `localhost` address on the `SelfUrl` property with your local IP address.
+* Open the `launchSettings.json` in the `.IdentityServer/Properties` folder. Replace the `localhost` address on the `applicationUrl` properties with your local IP address.
+* Open the `appsettings.json` in the `.HttpApi.Host` folder. Replace the `localhost` address on the `Authority` property with your local IP address.
+* Open the `launchSettings.json` in the `.HttpApi.Host/Properties` folder. Replace the `localhost` address on the `applicationUrl` properties with your local IP address.
+
+{{ end }}
+
+Run the backend as described in the [**Running the HTTP API Host (server-side)**](#running-the-http-api-host-server-side) section.
+
+> React Native application does not trust the auto-generated .NET HTTPS certificate, you should use the HTTP during development.
+
+Go to the `react-native` folder, open a command line terminal, type the `yarn` command (we suggest to the [yarn](https://yarnpkg.com/) package manager while `npm install` will also work in most cases):
+
+```bash
+yarn
+```
+
+* Open the `Environment.js` in the `react-native` folder and replace the `localhost` address on the `apiUrl` and `issuer` properties with your local IP address as shown below:
+
+![react native environment local IP](images/rn-environment-local-ip.png)
+
+{{ if Tiered == "Yes" }}
+
+> Make sure that `issuer` matches the running address of the `.IdentityServer` project, `apiUrl` matches the running address of the `.HttpApi.Host` project.
+
+{{else}}
+
+> Make sure that `issuer` and `apiUrl` matches the running address of the `.HttpApi.Host` project.
+
+{{ end }}
+
+Once all node modules are loaded, execute `yarn start` (or `npm start`) command:
+
+```bash
+yarn start
+```
+
+Wait Expo CLI to start. Expo CLI opens the management interface on the `http://localhost:19002/` address.
+
+![expo-interface](images/rn-expo-interface.png)
+
+In the above management interface, you can start the application with an Android emulator, an iOS simulator or a physical phone by the scan the QR code with the [Expo Client](https://expo.io/tools#client).
+
+> See the [Android Studio Emulator](https://docs.expo.io/versions/v36.0.0/workflow/android-studio-emulator/), [iOS Simulator](https://docs.expo.io/versions/v36.0.0/workflow/ios-simulator/) documents on expo.io.
+
+![React Native login screen on iPhone 11](images/rn-login-iphone.png)
+
+Enter **admin** as the username and **1q2w3E*** as the password to login to the application.
+
+The application is up and running. You can continue to develop your application based on this startup template.
+
+> The [application startup template](startup-templates/application/index.md) includes the TenantManagement and Identity modules.
+
+## What's next?
+
+[Application development tutorial](tutorials/book-store/part-1.md)

docs/en/Tutorials/Angular/Part-I.md

@@ -4,3 +4,5 @@
 
 * [With ASP.NET Core MVC / Razor Pages UI](../Part-1?UI=MVC)
 * [With Angular UI](../Part-1?UI=NG)
+
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Tutorials/Angular/Part-II.md

@@ -4,3 +4,5 @@
 
 * [With ASP.NET Core MVC / Razor Pages UI](../Part-1?UI=MVC)
 * [With Angular UI](../Part-1?UI=NG)
+
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Tutorials/Angular/Part-III.md

@@ -4,3 +4,5 @@
 
 * [With ASP.NET Core MVC / Razor Pages UI](../Part-1?UI=MVC)
 * [With Angular UI](../Part-1?UI=NG)
+
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Tutorials/AspNetCore-Mvc/Part-I.md

@@ -4,3 +4,5 @@
 
 * [With ASP.NET Core MVC / Razor Pages UI](../Part-1?UI=MVC)
 * [With Angular UI](../Part-1?UI=NG)
+
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Tutorials/AspNetCore-Mvc/Part-II.md

@@ -4,3 +4,5 @@
 
 * [With ASP.NET Core MVC / Razor Pages UI](../Part-1?UI=MVC)
 * [With Angular UI](../Part-1?UI=NG)
+
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Tutorials/AspNetCore-Mvc/Part-III.md

@@ -4,3 +4,5 @@
 
 * [With ASP.NET Core MVC / Razor Pages UI](../Part-1?UI=MVC)
 * [With Angular UI](../Part-1?UI=NG)
+
+<!-- TODO: this document has been moved, it should be deleted in the future. -->

docs/en/Tutorials/Part-1.md

@@ -34,14 +34,14 @@ The ASP.NET Core {{UI_Value}} tutorial series consists of 3 parts:
 
 ### Creating the project
 
-Create a new project named `Acme.BookStore` where `Acme` is the company name and `BookStore` is the project name. You can check out [creating a new project](../Getting-Started-{{if UI == 'NG'}}Angular{{else}}AspNetCore-MVC{{end}}-Template#creating-a-new-project) document to see how you can create a new project.  We will create the project with ABP CLI. But first of all, we need to login to the ABP Platform.
+Create a new project named `Acme.BookStore` where `Acme` is the company name and `BookStore` is the project name. You can check out [creating a new project](../Getting-Started-{{if UI == 'NG'}}Angular{{else}}AspNetCore-MVC{{end}}-Template#creating-a-new-project) document to see how you can create a new project.  We will create the project with ABP CLI.
 
 #### Create the project
 
 By running the below command, it creates a new ABP project with the database provider `{{DB_Text}}` and UI option `MVC`. To see the other CLI options, check out [ABP CLI](https://docs.abp.io/en/abp/latest/CLI) document.
 
 ```bash
-abp new Acme.BookStore --template app --database-provider {{DB}} --ui {{UI_Text}}
+abp new Acme.BookStore --template app --database-provider {{DB}} --ui {{UI_Text}} --mobile none
 ```
 ![Creating project](./images/bookstore-create-project-{{UI_Text}}.png)
 

docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md

@@ -1,3 +1,277 @@
-## Dynamic Forms
+# Dynamic Forms
+
+`Warning:` Before getting into this document, be sure that you have clearly understood [abp form elements](Form-elements.md) document.
+
+## Introduction
+
+`abp-dynamic-form` creates a bootstrap form for a given c# model. 
+
+Basic usage:
+
+````xml
+<abp-dynamic-form abp-model="@Model.MyDetailedModel"/>
+````
+Model:
+````csharp
+public class DynamicFormsModel : PageModel
+    {
+        [BindProperty]
+        public DetailedModel MyDetailedModel { get; set; }
+
+        public List<SelectListItem> CountryList { get; set; } = new List<SelectListItem>
+        {
+            new SelectListItem { Value = "CA", Text = "Canada"},
+            new SelectListItem { Value = "US", Text = "USA"},
+            new SelectListItem { Value = "UK", Text = "United Kingdom"},
+            new SelectListItem { Value = "RU", Text = "Russia"}
+        };
+
+        public void OnGet()
+        {
+                MyDetailedModel = new DetailedModel
+                {
+                    Name = "",
+                    Description = "Lorem ipsum dolor sit amet.",
+                    IsActive = true,
+                    Age = 65,
+                    Day = DateTime.Now,
+                    MyCarType = CarType.Coupe,
+                    YourCarType = CarType.Sedan,
+                    Country = "RU",
+                    NeighborCountries = new List<string>() { "UK", "CA" }
+                };
+        }
+
+        public class DetailedModel
+        {
+            [Required]
+            [Placeholder("Enter your name...")]
+            [Display(Name = "Name")]
+            public string Name { get; set; }
+            
+            [TextArea(Rows = 4)]
+            [Display(Name = "Description")]
+            [InputInfoText("Describe Yourself")]
+            public string Description { get; set; }
+
+            [Required]
+            [DataType(DataType.Password)]
+            [Display(Name = "Password")]
+            public string Password { get; set; }
+
+            [Display(Name = "Is Active")]
+            public bool IsActive { get; set; }
+
+            [Required]
+            [Display(Name = "Age")]
+            public int Age { get; set; }
+
+            [Required]
+            [Display(Name = "My Car Type")]
+            public CarType MyCarType { get; set; }
+
+            [Required]
+            [AbpRadioButton(Inline = true)]
+            [Display(Name = "Your Car Type")]
+            public CarType YourCarType { get; set; }
+
+            [DataType(DataType.Date)]
+            [Display(Name = "Day")]
+            public DateTime Day { get; set; }
+            
+            [SelectItems(nameof(CountryList))]
+            [Display(Name = "Country")]
+            public string Country { get; set; }
+            
+            [SelectItems(nameof(CountryList))]
+            [Display(Name = "Neighbor Countries")]
+            public List<string> NeighborCountries { get; set; }
+        }
+
+        public enum CarType
+        {
+            Sedan,
+            Hatchback,
+            StationWagon,
+            Coupe
+        }
+    }
+````
+## Demo
+
+See the [dynamic forms demo page](https://bootstrap-taghelpers.abp.io/Components/DynamicForms) to see it in action.
+
+## Attributes
+
+### abp-model
+
+Sets the c# model for dynamic form. Properties of this modal are turned into inputs in the form.
+
+### submit-button
+
+Can be `True` or `False`. 
+
+If `True`, a submit button will be generated at the bottom of the form. 
+
+Default value is `False`.
+
+### required-symbols
+
+Can be `True` or `False`.  
+
+If `True`, required inputs will have a symbol (*) that indicates they are required. 
+
+Default value is `True`.
+
+## Form Content Placement
+
+By default, `abp-dynamicform` clears the inner html and places the inputs into itself. If you want to add additional content to dynamic form or place the inputs to some specific area, you can use ` <abp-form-content />` tag. This tag will be replaced by form content and rest of the inner html of `abp-dynamic-form` tag will be unchanged.
+
+Usage:
+
+````xml
+<abp-dynamic-form abp-model="@Model.MyExampleModel">
+    <div>
+        Some content....
+    </div>
+    <div class="input-area">
+        <abp-form-content />
+    </div>
+    <div>
+        Some more content....
+    </div>
+</abp-dynamic-form>
+````
+
+## Input Order
+
+`abp-dynamic-form` orders the properties by their `DisplayOrder` attribute and then their property order in model class.
+
+Default `DisplayOrder` attribute number is 10000 for every property. 
+
+See example below:
+
+````csharp
+        public class OrderExampleModel
+        {
+            [DisplayOrder(10004)]
+            public string Name{ get; set; }
+            
+            [DisplayOrder(10005)]
+            public string Surname{ get; set; }
+
+            //Default 10000
+            public string EmailAddress { get; set; }
+
+            [DisplayOrder(10003)]
+            public string PhoneNumber { get; set; }
+
+            [DisplayOrder(9999)]
+            public string City { get; set; }
+        }
+````
+
+In this example, input fields will be displayed with this order: `City` > `EmailAddress` > `PhoneNumber` > `Name` > `Surname`.
+
+## Ignoring a property
+
+By default, `abp-dynamic-form` generates input for every property in model class. If you want to ignore a property, use `DynamicFormIgnore` attribute.
+
+See example below:
+
+````csharp
+        public class MyModel
+        {
+            public string Name { get; set; }
+
+            [DynamicFormIgnore]
+            public string Surname { get; set; }
+        }
+````
+
+In this example, no input will be generated for `Surname` property.
+
+## Indicating Text box, Radio Group and Combobox
+
+If you have read the [Form elements document](Form-elements.md), you noticed that  `abp-radio` and `abp-select`  tags are very similar on c# model. So we have to use `[AbpRadioButton()]` attribute to tell `abp-dynamic-form` which of your properties will be radio group and which will be combobox. See example below:
+
+````xml
+<abp-dynamic-form abp-model="@Model.MyDetailedModel"/>
+````
+Model:
+````csharp
+public class DynamicFormsModel : PageModel
+    {
+        [BindProperty]
+        public DetailedModel MyDetailedModel { get; set; }
+
+        public List<SelectListItem> CountryList { get; set; } = new List<SelectListItem>
+        {
+            new SelectListItem { Value = "CA", Text = "Canada"},
+            new SelectListItem { Value = "US", Text = "USA"},
+            new SelectListItem { Value = "UK", Text = "United Kingdom"},
+            new SelectListItem { Value = "RU", Text = "Russia"}
+        };
+
+        public void OnGet()
+        {
+                MyDetailedModel = new DetailedModel
+                {
+                    ComboCarType = CarType.Coupe,
+                    RadioCarType = CarType.Sedan,
+                    ComboCountry = "RU",
+                    RadioCountry = "UK"
+                };
+        }
+
+        public class DetailedModel
+        {
+            public CarType ComboCarType { get; set; }
+
+            [AbpRadioButton(Inline = true)]
+            public CarType RadioCarType { get; set; }
+            
+            [SelectItems(nameof(CountryList))]
+            public string ComboCountry { get; set; }
+            
+            [AbpRadioButton()]
+            [SelectItems(nameof(CountryList))]
+            public string RadioCountry { get; set; }
+        }
+
+        public enum CarType
+        {
+            Sedan,
+            Hatchback,
+            StationWagon,
+            Coupe
+        }
+    }
+````
+
+As you see in example above:
+
+* If `[AbpRadioButton()]` are used on a **Enum** property, it will be a radio group. Otherwise, combobox.
+* If `[SelectItems()]` and `[AbpRadioButton()]` are used on a property, it will be a radio group.
+* If just `[SelectItems()]` is used on a property, it will be a combobox.
+* If none of these attributes are used on a property, it will be a text box.
+
+## Localization
+
+`abp-dynamic-form` handles localization as well. 
+
+By default, it will try to find "DisplayName:{PropertyName}" or "{PropertyName}" localization keys and set the localization value as input label.
+
+You can set it yourself by using `[Display()]` attribute of Asp.Net Core. You can use a localization key in this attribute. See example below:
+
+````csharp
+            [Display(Name = "Name")]
+            public string Name { get; set; }
+````
+
+
+
+
+
+
 
-This is not documented yet. You can see a [demo](http://bootstrap-taghelpers.abp.io/Components/DynamicForms) for now.

docs/en/UI/AspNetCore/Tag-Helpers/Form-elements.md

@@ -0,0 +1,261 @@
+# Form Elements
+
+## Introduction
+
+Abp provides form input tag helpers to make building forms easier.
+
+## Demo
+
+See the [form elements demo page](https://bootstrap-taghelpers.abp.io/Components/FormElements) to see it in action.
+
+## abp-input
+
+`abp-input` tag creates a Bootstrap form input for a given c# property. It uses [Asp.Net Core Input Tag Helper](https://docs.microsoft.com/tr-tr/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-3.1#the-input-tag-helper) in background, so every data annotation attribute of `input` tag helper of Asp.Net Core is also valid for `abp-input`.
+
+Usage:
+
+````xml
+<abp-input asp-for="@Model.MyModel.Name"/>
+<abp-input asp-for="@Model.MyModel.Description"/>
+<abp-input asp-for="@Model.MyModel.Password"/>
+<abp-input asp-for="@Model.MyModel.IsActive"/>
+````
+
+Model:
+
+````csharp
+    public class FormElementsModel : PageModel
+    {
+        public SampleModel MyModel { get; set; }
+
+        public void OnGet()
+        {
+            MyModel = new SampleModel();
+        }
+
+        public class SampleModel
+        {
+            [Required]
+            [Placeholder("Enter your name...")]
+            [InputInfoText("What is your name?")]
+            public string Name { get; set; }
+            
+            [Required]
+            [FormControlSize(AbpFormControlSize.Large)]
+            public string SurName { get; set; }
+
+            [TextArea(Rows = 4)]
+            public string Description { get; set; }
+            
+            [Required]
+            [DataType(DataType.Password)]
+            public string Password { get; set; }
+
+            public bool IsActive { get; set; }
+        }
+    }
+````
+
+### Attributes
+
+You can set some of the attributes on your c# property, or directly on html tag. If you are going to use this property in a [abp-dynamic-form](Dynamic-forms.md), then you can only set these properties via property attributes.
+
+#### Property Attributes
+
+- `[TextArea()]`: Converts the input into a text area.
+
+* `[Placeholder()]`: Sets placeholder for input. You can use a localization key directly.
+* `[InputInfoText()]`: Sets a small info text for input. You can use a localization key directly.
+* `[FormControlSize()]`: Sets size of form-control wrapper element. Available values are
+  -  `AbpFormControlSize.Default`
+  -  `AbpFormControlSize.Small`
+  -  `AbpFormControlSize.Medium`
+  -  `AbpFormControlSize.Large`
+* `[DisabledInput]` :  Input is disabled.
+* `[ReadOnlyInput]`: Input is read-only.
+
+#### Tag Attributes
+
+* `info`: Sets a small info text for input. You can use a localization key directly.
+* `auto-focus`: If true, browser auto focuses on the element.
+* `size`: Sets size of form-control wrapper element. Available values are
+  - `AbpFormControlSize.Default`
+  - `AbpFormControlSize.Small`
+  - `AbpFormControlSize.Medium`
+  - `AbpFormControlSize.Large`
+* `disabled`: Input is disabled.
+* `readonly`: Input is read-only.
+* `label`: Sets the label for input.
+* `display-required-symbol`: Adds the required symbol (*) to label if input is required. Default `True`.
+
+### Label & Localization
+
+You can set label of your input in different ways:
+
+- You can use `Label` attribute and directly set the label. But it doesn't auto localize your localization key. So use it as `label="@L["{LocalizationKey}"].Value"`.
+- You can set it using `[Display(name="{LocalizationKey}")]` attribute of Asp.Net Core.
+- You can just let **abp** find the localization key for the property. It will try to find "DisplayName:{PropertyName}" or "{PropertyName}" localization keys, if `label` or `[DisplayName]` attributes are not set.
+
+## abp-select
+
+`abp-select` tag creates a Bootstrap form select for a given c# property. It uses [Asp.Net Core Select Tag Helper](https://docs.microsoft.com/tr-tr/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-3.1#the-select-tag-helper) in background, so every data annotation attribute of `select` tag helper of Asp.Net Core is also valid for `abp-select`.
+
+`abp-select` tag needs a list of `Microsoft.AspNetCore.Mvc.Rendering.SelectListItem ` to work. It can be provided by `asp-items` attriube on the tag or `[SelectItems()]` attribute on c# property. (if you are using [abp-dynamic-form](Dynamic-forms.md), c# attribute is the only way.)
+
+`abp-select` supports multiple selection.
+
+`abp-select` auto-creates a select list for **Enum** properties. No extra data is needed. If property is nullable, an empty key and value is added to top of the auto-generated list.
+
+Usage:
+
+````xml
+<abp-select asp-for="@Model.MyModel.City" asp-items="@Model.CityList"/>
+
+<abp-select asp-for="@Model.MyModel.AnotherCity"/>
+
+<abp-select asp-for="@Model.MyModel.MultipleCities" asp-items="@Model.CityList"/>
+
+<abp-select asp-for="@Model.MyModel.MyCarType"/>
+
+<abp-select asp-for="@Model.MyModel.MyNullableCarType"/>
+````
+
+Model:
+
+````csharp
+ public class FormElementsModel : PageModel
+    {
+        public SampleModel MyModel { get; set; }
+                    
+        public List<SelectListItem> CityList { get; set; }
+
+        public void OnGet()
+        {
+            MyModel = new SampleModel();
+            
+            CityList = new List<SelectListItem>
+            {
+                new SelectListItem { Value = "NY", Text = "New York"},
+                new SelectListItem { Value = "LDN", Text = "London"},
+                new SelectListItem { Value = "IST", Text = "Istanbul"},
+                new SelectListItem { Value = "MOS", Text = "Moscow"}
+            };
+        }
+
+        public class SampleModel
+        {
+            public string City { get; set; }
+            
+            [SelectItems(nameof(CityList))]
+            public string AnotherCity { get; set; }
+
+            public List<string> MultipleCities { get; set; }
+            
+            public CarType MyCarType { get; set; }
+
+            public CarType? MyNullableCarType { get; set; }
+        }
+        
+        public enum CarType
+        {
+            Sedan,
+            Hatchback,
+            StationWagon,
+            Coupe
+        }
+    }
+````
+
+### Attributes
+
+You can set some of the attributes on your c# property, or directly on html tag. If you are going to use this property in a [abp-dynamic-form](Dynamic-forms.md), then you can only set these properties via property attributes.
+
+#### Property Attributes
+
+* `[SelectItems()]`: Sets the select data. Parameter should be the name of the data list. (see example above)
+
+- `[InputInfoText()]`: Sets a small info text for input. You can use a localization key directly.
+- `[FormControlSize()]`: Sets size of form-control wrapper element. Available values are
+  - `AbpFormControlSize.Default`
+  - `AbpFormControlSize.Small`
+  - `AbpFormControlSize.Medium`
+  - `AbpFormControlSize.Large`
+
+#### Tag Attributes
+
+- `asp-items`: Sets the select data. This Should be a list of SelectListItem.
+- `info`: Sets a small info text for input. You can use a localization key directly.
+- `size`: Sets size of form-control wrapper element. Available values are
+  - `AbpFormControlSize.Default`
+  - `AbpFormControlSize.Small`
+  - `AbpFormControlSize.Medium`
+  - `AbpFormControlSize.Large`
+- `label`: Sets the label for input.
+- `display-required-symbol`: Adds the required symbol (*) to label if input is required. Default `True`.
+
+### Label & Localization
+
+You can set label of your input in different ways:
+
+- You can use `Label` attribute and directly set the label. But it doesn't auto localize your localization key. So use it as `label="@L["{LocalizationKey}"].Value".`
+- You can set it using `[Display(name="{LocalizationKey}")]` attribute of Asp.Net Core.
+- You can just let **abp** find the localization key for the property. It will try to find "DisplayName:{PropertyName}" or "{PropertyName}" localization keys.
+
+Localizations of combobox values are set by `abp-select` for **Enum** property. It searches for "{EnumTypeName}.{EnumPropertyName}" or "{EnumPropertyName}" localization keys. For instance, in the example above, it will use "CarType.StationWagon" or "StationWagon" keys for localization when it localizes combobox values.
+
+## abp-radio
+
+`abp-radio` tag creates a Bootstrap form radio group for a given c# property. Usage is very similar to `abp-select` tag.
+
+Usage:
+
+````xml
+<abp-radio asp-for="@Model.MyModel.CityRadio" asp-items="@Model.CityList" inline="true"/>
+
+<abp-radio asp-for="@Model.MyModel.CityRadio2"/>
+````
+
+Model:
+
+````csharp
+ public class FormElementsModel : PageModel
+    {
+        public SampleModel MyModel { get; set; }
+
+        public List<SelectListItem> CityList { get; set; } = new List<SelectListItem>
+        {
+            new SelectListItem { Value = "NY", Text = "New York"},
+            new SelectListItem { Value = "LDN", Text = "London"},
+            new SelectListItem { Value = "IST", Text = "Istanbul"},
+            new SelectListItem { Value = "MOS", Text = "Moscow"}
+        };
+        
+        public void OnGet()
+        {
+            MyModel = new SampleModel();
+            MyModel.CityRadio = "IST";
+            MyModel.CityRadio2 = "MOS";
+        }
+
+        public class SampleModel
+        {
+            public string CityRadio { get; set; }
+            
+            [SelectItems(nameof(CityList))]
+            public string CityRadio2 { get; set; }
+        }
+    }
+````
+
+### Attributes
+
+You can set some of the attributes on your c# property, or directly on html tag. If you are going to use this property in a [abp-dynamic-form](Dynamic-forms.md), then you can only set these properties via property attributes.
+
+#### Property Attributes
+
+- `[SelectItems()]`: Sets the select data. Parameter should be the name of the data list. (see example above)
+
+#### Tag Attributes
+
+- `asp-items`: Sets the select data. This Should be a list of SelectListItem.
+- `Inline`: If true, radio buttons will be in single line, next to each other. If false, they will be under each other.

docs/en/UI/AspNetCore/Tag-Helpers/Index.md

@@ -31,8 +31,8 @@ Here, the list of components those are wrapped by the ABP Framework:
 
 ## Form Elements
 
-See [demo](https://bootstrap-taghelpers.abp.io/Components/FormElements).
+**Abp Tag Helpers** add new features to standard **Asp.Net Core MVC input & select Tag Helpers** and wrap them with **Bootstrap** form controls. See [Form Elements documentation](Form-elements.md) .
 
-## Dynamic Inputs
+## Dynamic Forms
 
-See [demo](https://bootstrap-taghelpers.abp.io/Components/DynamicForms).
+**Abp Tag helpers** offer an easy way to build complete **Bootstrap forms**. See [Dynamic Forms documentation](Dynamic-Forms.md).

docs/en/docs-nav.json

@@ -5,17 +5,7 @@
       "items": [
         {
           "text": "From Startup Templates",
-          "path": "Getting-Started-With-Startup-Templates.md",
-          "items": [
-            {
-              "text": "Application with MVC (Razor Pages) UI",
-              "path": "Getting-Started-AspNetCore-MVC-Template.md"
-            },
-            {
-              "text": "Application with Angular UI",
-              "path": "Getting-Started-Angular-Template.md"
-            }
-          ]
+          "path": "Getting-Started.md"
         },
         {
           "text": "From Empty Projects",
@@ -302,7 +292,17 @@
             },
             {
               "text": "Tag Helpers",
-              "path": "UI/AspNetCore/Tag-Helpers/Index.md"
+              "path": "UI/AspNetCore/Tag-Helpers/Index.md",
+              "items": [
+                {
+                  "text": "Form Elements",
+                  "path": "UI/AspNetCore/Tag-Helpers/Form-elements.md"
+                },
+                {
+                  "text": "Dynamic Forms",
+                  "path": "UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md"
+                }
+              ]
             },
             {
               "text": "Widgets",

docs/zh-Hans/Entities.md

@@ -379,10 +379,10 @@ public static class IdentityUserExtensions
 * 这些属性**不容易[自动映射](Object-To-Object-Mapping.md)到其他对象**.
 * 它**不会**为EF Core在数据库表中**创建字段**,因此在数据库中针对这个字段创建索引或搜索/排序并不容易.
 
-###　额外属性背后的实体
+### 额外属性背后的实体
 
 `IHasExtraProperties` 不限于与实体一起使用. 你可以为任何类型的类实现这个接口,使用 `GetProperty`,`SetProperty` 和其他相关方法.
 
 ## 另请参阅
 
-* [实体设计最佳实践指南](Best-Practices/Entities.md)
+* [实体设计最佳实践指南](Best-Practices/Entities.md)

docs/zh-Hans/Modules/Index.md

@@ -16,6 +16,7 @@ ABP是一个 **模块化的应用程序框架** 由十多个 **nuget packages**
 * **Background Jobs**: 用于在使用默认后台作业管理器时保存后台作业.
 * **Blogging**: 用于创建精美的博客. ABP的[博客](https://blog.abp.io/) 就使用了此模块.
 * [**Docs**](Docs.md): 用于创建技术文档页面. ABP的[文档](https://abp.io/documents/) 就使用了此模块.
+* **Feature Management**: 用于保存和管理功能.
 * **Identity**: 基于Microsoft Identity管理角色,用户和他们的权限.
 * **Identity Server**: 集成了IdentityServer4.
 * **Permission Management**: 用于保存权限.
@@ -27,4 +28,4 @@ ABP是一个 **模块化的应用程序框架** 由十多个 **nuget packages**
 
 ## 商业应用模块
 
-[ABP商业](https://commercial.abp.io/)许可证在ABP框架上提供了额外的预构建应用程序模块. 参见ABP商业版提供的[模块列表](https://commercial.abp.io/module).
+[ABP商业](https://commercial.abp.io/)许可证在ABP框架上提供了额外的预构建应用程序模块. 参见ABP商业版提供的[模块列表](https://commercial.abp.io/module).

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

@@ -139,7 +139,7 @@ ABP是一个模块化的框架,理想的设计是让每个模块都有自己的
 
 初始化种子数据很重要,ABP具有模块化的种子数据基础设施. 种子数据的更多信息,请参阅[文档](../Data-Seeding.md).
 
-虽然创建数据库和应用迁移似乎只对关系数据库有用,但即使您选择NoSQL数据库提供程序(如MongoDB),也会生成此项目. 这时,它会为应用程序提供必要的初始数据.
+虽然创建数据库和应用迁移似乎只对关系数据库有用,但即使你选择NoSQL数据库提供程序(如MongoDB),也会生成此项目. 这时,它会为应用程序提供必要的初始数据.
 
 * 它依赖 `.EntityFrameworkCore.DbMigrations` 项目 (针对EF Core),因为它需要访问迁移文件.
 * 它依赖 `.Application.Contracts` 项目,因为它需要访问权限定义在初始化种子数据时为管理员用户赋予所有权限.
@@ -270,6 +270,159 @@ ABP使用开源的[IdentityServer4](https://identityserver.io/)框架做应用
 
 `angular/src/environments` 文件夹下的文件含有应用程序的基础配置.
 
+#### AppModule（应用程序模块）
+
+`AppModule` 是应用程序的根模块. 一些ABP模块和一些基本模块导入到 `AppModule` 中.
+
+ABP 配置模块也已经导入到 `AppModule` 中, 以满足可延迟加载 ABP 模块的初始需求. 
+
+#### AppRoutingModule（应用程序路由模块）
+
+在 `AppRoutingModule` 中有可延迟加载的 ABP 模块作为路由. 
+
+> 不应更改ABP模块的路径. 
+
+你应该在 `data` 对象中添加 `routes` 属性, 以便在菜单中添加一个链接来重定向到自定义页面. 
+
+```js
+{
+   path: 'dashboard',
+   loadChildren: () => import('./dashboard/dashboard.module').then(m => m.DashboardModule),
+   canActivate: [AuthGuard, PermissionGuard],
+   data: {
+      routes: {
+         name: 'ProjectName::Menu:Dashboard',
+         order: 2,
+         iconClass: 'fa fa-dashboard',
+         requiredPolicy: 'ProjectName.Dashboard.Host'
+      } as ABP.Route
+   }
+}
+```
+在上面的例子中;
+*  如果用户没有登录,  AuthGuard 会阻塞访问并重定向到登录页面. 
+*  PermissionGuard 使用 `rotues` 对象的 `requiredPolicy` 属性检查用户的权限. 如果用户未被授权访问该页, 则显示403页. 
+*  `routes` 的 `name` 属性是菜单链接标签. 可以定义本地化 key. 
+*  `routes` 对象的 `iconClass` 属性是菜单链接图标类. 
+*  `routes` 对象的 `requiredPolicy` 属性是访问页面所需的策略 key. 
+
+在上述 `routes` 定义之后, 如果用户被授权, 仪表盘链接将出现在菜单上. 
+
+#### Shared Module（共享模块）
+
+所有模块可能需要的模块已导入到 `SharedModule`. 你应该将 `SharedModule` 导入所有模块. 
+
+参见 [Sharing Modules（共享模块）](https://angular.io/guide/sharing-ngmodules) 文档. 
+
+#### Environments（环境）
+
+`src/environments` 文件夹下的文件包含应用程序的基本配置. 
+
+#### Home Module
+
+Home模块是一个可延迟加载的模块, 它加载应用程序的根地址. 
+
+#### Styles（样式）
+
+在 `angular.json` 中向 `styles` 数组添加所需的样式文件. `AppComponent` 在主包加载后通过 `LazyLoadService` 加载一些样式文件, 以缩短第一次绘制的时间. 
+
+#### Testing（测试）
+
+你应该在与要测试的文件相同的文件夹中创建测试. 
+
+参见[测试文档](https://angular.io/guide/testing/).
+
+#### Depended Packages（依赖包）
+
+* [NG Bootstrap](https://ng-bootstrap.github.io/) 被用作UI组件库. 
+* [NGXS](https://www.ngxs.io/) 被用作状态管理库. 
+* [angular-oauth2-oidc](https://github.com/manfredsteyer/angular-oauth2-oidc) 用于支持OAuth 2和OpenId Connect (OIDC). 
+* [Chart.js](https://www.chartjs.org/) 用于创建小部件. 
+* [ngx-validate](https://github.com/ng-turkey/ngx-validate) 用于对交互表单进行动态验证. 
+
+### React Native
+
+解决方案将[React Native](https://reactnative.dev/)应用程序作为默认值包含在 `react-native` 文件夹中. 
+
+服务器端类似于上面描述的解决方案. `*.HttpApi.Host` 的项目提供 API, 所以 React 本机应用程序使用它. 
+
+React 本机应用程序是用 [Expo](https://expo.io/)生成的. Expo 是一套基于 React Native 构建的工具, 帮助你快速启动一个应用程序, 尽管它有很多功能. 
+
+React Native 应用文件夹结构, 如下图所示：
+
+![react-native-folder-structure](../images/react-native-folder-structure.png)
+
+* `App.js` 是应用程序的引导组件. 
+* `Environment.js` f文件有应用程序的基本配置. 在这个文件中定义了 `prod` and `dev` 配置. 
+* [Contexts](https://reactjs.org/docs/context.html) 是在 `src/contexts` 文件夹中创建的. 
+* [Higher order components](https://reactjs.org/docs/higher-order-components.html) 是在 `src/hocs` 文件夹中创建的. 
+* [Custom hooks](https://reactjs.org/docs/hooks-custom.html#extracting-a-custom-hook) 是在 `src/hooks` 中创建的. 
+* [Axios interceptors](https://github.com/axios/axios#interceptors) 是在 `src/interceptors` 文件夹中创建. 
+* 工具函数从 `src/utils` 文件夹导出. 
+
+#### Components（组件）
+
+可以在所有屏幕上使用的组件是在 `src/components` 文件夹中创建的. 所有组件都是作为一个能够使用 [hooks](https://reactjs.org/docs/hooks-intro.html) 的函数创建的. 
+
+#### Screens（屏幕）
+
+![react-native-navigation-structure](../images/react-native-navigation-structure.png)
+
+Screens 是通过在 `src/screens` 文件夹中创建将名称分开的文件夹来创建的. 某些 screens 的某些部分可以拆分为组件. 
+
+每个 screen 都在 `src/navigators` 文件夹中的导航器中使用. 
+
+#### Navigation（导航）
+
+[React Navigation](https://reactnavigation.org/) 被用作导航库. 导航器是在 `src/navigators` 中创建的. 一个 [drawer](https://reactnavigation.org/docs/drawer-based-navigation/) 导航器和几个 [stack](https://reactnavigation.org/docs/hello-react-navigation/#installing-the-stack-navigator-library) 导航器在此文件夹中创建. 查看 [上图](#screens) 中的导航结构. 
+
+#### State Management（状态管理）
+
+[Redux](https://redux.js.org/) 被用作状态管理库. [Redux Toolkit](https://redux-toolkit.js.org/) 库被用作高效Redux开发的工具集. 
+
+在 `src/store` 文件夹中创建 Actions, reducers, sagas, selectors. 存储文件夹如下：
+
+![react-native-store-folder](../images/react-native-store-folder.png)
+
+* [**Store**](https://redux.js.org/basics/store) 在 `src/store/index.js` 文件中定义. 
+* [**Actions**](https://redux.js.org/basics/actions/) 是将数据从应用程序发送到存储的有效信息负载. 
+* [**Reducers**](https://redux.js.org/basics/reducers) 指定应用程序的状态如何更改以响应发送到存储的操作. 
+* [**Redux-Saga**](https://redux-saga.js.org/) 是一个库, 旨在使应用程序的副作用(即异步的事情, 如数据获取和不纯的事情, 如访问浏览器缓存)更容易管理. Sagas 是在 `src/store/sagas` 文件夹中创建的. 
+* [**Reselect**](https://github.com/reduxjs/reselect) 库用于创建缓存的选择器. 选择器是在 `src/store/selectors` 文件夹中创建的. 
+
+#### APIs
+
+[Axios](https://github.com/axios/axios) 用作HTTP客户端库. Axios 实例从 `src/api/API.js` 导出 . 使用相同的配置进行HTTP调用. `src/api` 文件夹中还有为 API 调用创建的 API 文件. 
+
+#### Theming（主题）
+
+[Native Base](https://nativebase.io/) 被用作UI组件库. 本地基本组件可以很容易地进行自定义。参见 [Native Base customize](https://docs.nativebase.io/Customize.html#Customize) 文档。我们沿着同样的路走。
+
+* Native Base 主题变量在 `src/theme/variables` 文件夹中。
+* Native Base 组件样式在 `src/theme/components` 文件夹中。这些文件是用 Native Base's `ejectTheme` 脚本生成的。
+* 组件样式用 `src/theme/overrides` 文件夹下的文件覆盖。
+
+#### Testing（单元测试）
+
+将创建单元测试。
+
+参见[测试概述](https://reactjs.org/docs/testing.html)文档。
+
+#### Depended Libraries（依赖库）
+
+* [Native Base](https://nativebase.io/) 用作UI组件库。
+* [React Navigation](https://reactnavigation.org/) 用作导航库。
+* [Axios](https://github.com/axios/axios) 用作HTTP客户端库。
+* [Redux](https://redux.js.org/) 用作状态管理库。
+* [Redux Toolkit](https://redux-toolkit.js.org/) 库被用作高效Redux开发的工具集。
+* [Redux-Saga](https://redux-saga.js.org/) 用于管理异步进程。
+* [Redux Persist](https://github.com/rt2zz/redux-persist) 被用作状态持久化。
+* [Reselect](https://github.com/reduxjs/reselect) 用于创建缓存的选择器。
+* [i18n-js](https://github.com/fnando/i18n-js) 作为国际化库使用。
+* [expo-font](https://docs.expo.io/versions/latest/sdk/font/) 库可以轻松加载字体。
+* [Formik](https://github.com/jaredpalmer/formik) 用于构建表单。
+* [Yup](https://github.com/jquense/yup) 用于表单验证。
+
 ## 下一步是什么?
 
 * 参阅[ASP.NET Core MVC 模板入门](../Getting-Started-AspNetCore-MVC-Template.md)创建此模板的新解决方案并运行它.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/ru.json

@@ -0,0 +1,12 @@
+{
+  "culture": "ru",
+  "texts": {
+    "GivenTenantIsNotAvailable": "Данный арендатор недоступен: {0}",
+    "Tenant": "Арендатор",
+    "Switch": "переключиться",
+    "Name": "Имя",
+    "SwitchTenantHint": "Оставьте поле Имя пустым, чтобы переключиться на администратора.",
+    "SwitchTenant": "Сменить арендатора",
+    "NotSelected": "Не выбрано"
+  }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs

@@ -18,6 +18,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module
 
             DeleteUnrelatedProjects(context, steps);
             RandomizeSslPorts(context, steps);
+            UpdateNuGetConfig(context, steps);
             CleanupFolderHierarchy(context, steps);
 
             return steps;
@@ -58,6 +59,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module
             }));
         }
 
+        private static void UpdateNuGetConfig(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            steps.Add(new UpdateNuGetConfigStep("/aspnet-core/NuGet.Config"));
+        }
+        
         private void CleanupFolderHierarchy(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
         {
             steps.Add(new MoveFolderStep("/aspnet-core/", "/"));

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/UpdateNuGetConfigStep.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/UpdateNuGetConfigStep.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.Cli.ProjectBuilding.Files;
 
-namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
+namespace Volo.Abp.Cli.ProjectBuilding.Templates
 {
     public class UpdateNuGetConfigStep : ProjectBuildPipelineStep
     {

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Localization/Resources/AbpDdd/ru.json

@@ -0,0 +1,6 @@
+{
+  "culture": "ru",
+  "texts": {
+    "MaxResultCountExceededExceptionMessage": "{0} не может быть больше {1}! Увеличьте {2}.{3} на стороне сервера, чтобы получить больше результатов."
+  }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/ru.json

@@ -0,0 +1,23 @@
+{
+  "culture": "ru",
+  "texts": {
+    "DisplayName:Abp.Mailing.DefaultFromAddress": "Адрес отправления по умолчанию",
+    "DisplayName:Abp.Mailing.DefaultFromDisplayName": "Имя отправителя по умолчанию",
+    "DisplayName:Abp.Mailing.Smtp.Host": "Сервер",
+    "DisplayName:Abp.Mailing.Smtp.Port": "Порт",
+    "DisplayName:Abp.Mailing.Smtp.UserName": "Имя пользователя",
+    "DisplayName:Abp.Mailing.Smtp.Password": "Пароль",
+    "DisplayName:Abp.Mailing.Smtp.Domain": "Домен",
+    "DisplayName:Abp.Mailing.Smtp.EnableSsl": "Включить SSL",
+    "DisplayName:Abp.Mailing.Smtp.UseDefaultCredentials": "Использовать учетные данные по умолчанию",
+    "Description:Abp.Mailing.DefaultFromAddress": "Отправление по умолчанию от адреса.",
+    "Description:Abp.Mailing.DefaultFromDisplayName": "Имя отправителя по умолчанию.",
+    "Description:Abp.Mailing.Smtp.Host": "Имя или IP- адрес сервера, используемого для отправки по протоколу SMTP.",
+    "Description:Abp.Mailing.Smtp.Port": "Порт, используемый для отправки по протоколу SMTP.",
+    "Description:Abp.Mailing.Smtp.UserName": "Имя пользователя для SMTP-сервера.",
+    "Description:Abp.Mailing.Smtp.Password": "Пароль для SMTP-сервера.",
+    "Description:Abp.Mailing.Smtp.Domain": "Домен или имя компьютера, от которого производится SMTP-запрос.",
+    "Description:Abp.Mailing.Smtp.EnableSsl": "Использовать SSL для подключения к SMTP-серверу.",
+    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "Использовать учетные данные для SMTP по умолчанию."
+  }
+}

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

@@ -155,7 +155,6 @@ namespace Volo.Abp.EntityFrameworkCore
             }
 
             ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges;
-            ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
 
             ChangeTracker.Tracked += ChangeTracker_Tracked;
         }

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -106,18 +106,10 @@ namespace Volo.Abp.Http.Client.DynamicProxying
         private async Task<T> MakeRequestAndGetResultAsync<T>(IAbpMethodInvocation invocation)
         {
             var responseAsString = await MakeRequestAsync(invocation);
-
-            //TODO: Think on that
-            if (TypeHelper.IsPrimitiveExtended(typeof(T), true))
+            
+            if (typeof(T) == typeof(string))
             {
-                if (typeof(DateTime).IsAssignableFrom(typeof(T)))
-                {
-                    return (T)(object)DateTime.Parse(responseAsString.Trim('\"'), CultureInfo.InvariantCulture);
-                }
-                else
-                {
-                    return (T)Convert.ChangeType(responseAsString, typeof(T));
-                }
+                return (T)Convert.ChangeType(responseAsString, typeof(T));
             }
 
             return JsonSerializer.Deserialize<T>(responseAsString);

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs

@@ -6,6 +6,7 @@ using System.Text;
 using JetBrains.Annotations;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.Http.ProxyScripting.Generators;
+using Volo.Abp.Localization;
 using Volo.Abp.Reflection;
 
 namespace Volo.Abp.Http.Client.DynamicProxying
@@ -104,12 +105,15 @@ namespace Volo.Abp.Http.Client.DynamicProxying
 
         private static string ConvertValueToString([NotNull] object value)
         {
-            if (value is DateTime dateTimeValue)
+            using (CultureHelper.Use(CultureInfo.InvariantCulture))
             {
-                return dateTimeValue.ToUniversalTime().ToString("u");
-            }
+                if (value is DateTime dateTimeValue)
+                {
+                    return dateTimeValue.ToUniversalTime().ToString("u");
+                }
 
-            return value.ToString();
+                return value.ToString();
+            }
         }
     }
 }

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpLocalization/ru.json

@@ -0,0 +1,7 @@
+{
+  "culture": "ru",
+  "texts": {
+    "DisplayName:Abp.Localization.DefaultLanguage": "Язык по умолчанию",
+    "Description:Abp.Localization.DefaultLanguage": "Язык приложения по умолчанию."
+  }
+}

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Localization/Resource/ru.json

@@ -0,0 +1,6 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Menu:Administration": "Администрирование"
+  }
+}

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json

@@ -0,0 +1,62 @@
+{
+  "culture": "ru",
+  "texts": {
+    "InternalServerErrorMessage": "Во время запроса произошла внутренняя ошибка!",
+    "ValidationErrorMessage": "Ваш запрос недействителен!",
+    "ValidationNarrativeErrorMessageTitle": "При проверке были обнаружены следующие ошибки.",
+    "DefaultErrorMessage": "Произошла ошибка!",
+    "DefaultErrorMessageDetail": "Сведения об ошибке не были предоставлены сервером.",
+    "DefaultErrorMessage401": "Вы не авторизированы!",
+    "DefaultErrorMessage401Detail": "Вы должны Войти, чтобы выполнить эту операцию.",
+    "DefaultErrorMessage403": "Вы не авторизованы!",
+    "DefaultErrorMessage403Detail": "У вас нет доступа к выполнению этой операции!",
+    "DefaultErrorMessage404": "Ресурс не найден!",
+    "DefaultErrorMessage404Detail": "Запрошенный ресурс не удалось найти на сервере!",
+    "EntityNotFoundErrorMessage": "Нет объекта {0} с id = {1}!",
+    "Languages": "Языки",
+    "Error": "Ошибка",
+    "AreYouSure": "Вы уверены?",
+    "Cancel": "Отмена",
+    "Yes": "Да",
+    "No": "Нет",
+    "Ok": "ОК",
+    "Close": "Закрыть",
+    "Save": "Сохранить",
+    "SavingWithThreeDot": "Сохранение...",
+    "Actions": "Действия",
+    "Delete": "Удалить",
+    "Edit": "Редактировать",
+    "Refresh": "Обновить",
+    "Language": "Язык",
+    "LoadMore": "Загрузить еще",
+    "ProcessingWithThreeDot": "Обработка...",
+    "LoadingWithThreeDot": "Загрузка...",
+    "Welcome": "Добро пожаловать",
+    "Login": "Войти",
+    "Register": "Зарегистрироваться",
+    "Logout": "Выйти",
+    "Submit": "Подтвердить",
+    "Back": "Назад",
+    "PagerSearch": "Поиск",
+    "PagerNext": "Следующее",
+    "PagerPrevious": "Предыдущее",
+    "PagerFirst": "Первая",
+    "PagerLast": "Последняя",
+    "PagerInfo": "Записи с _START_ до _END_ из _TOTAL_ записей",
+    "PagerInfoEmpty": "Записи с 0 до 0 из 0 записей.",
+    "PagerInfoFiltered": "(отфильтровано из _MAX_ записей)",
+    "NoDataAvailableInDatatable": "Данные в таблице отсутствуют",
+    "PagerShowMenuEntries": "Показать _MENU_ записей",
+    "DatatableActionDropdownDefaultText": "Действия",
+    "ChangePassword": "Изменить пароль",
+    "PersonalInfo": "Мой профиль",
+    "AreYouSureYouWantToCancelEditingWarningMessage": "У вас есть несохраненные изменения.",
+    "UnhandledException": "Непредвиденная ошибка!",
+    "401Message": "Неавторизованный",
+    "403Message": "В доступе отказано",
+    "404Message": "Страница не найдена",
+    "500Message": "Внутренняя ошибка сервера",
+    "GoHomePage": "Вернуться на главную страницу",
+    "GoBack": "Вернуться назад"
+  }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/ru.json

@@ -0,0 +1,34 @@
+{
+  "culture": "ru",
+  "texts": {
+    "'{0}' and '{1}' do not match.": "'{0}' и '{1}' не совпадают.",
+    "The {0} field is not a valid credit card number.": "Поле {0} не содержит действительный номер кредитной карты.",
+    "{0} is not valid.": "Значение {0} недействительно.",
+    "The {0} field is not a valid e-mail address.": "Поле {0} не содержит действительный адрес электронной почты.",
+    "The {0} field only accepts files with the following extensions: {1}": "В поле {0} вы можете загрузить файлы следующих форматов: {1}",
+    "The field {0} must be a string or array type with a maximum length of '{1}'.": "Поле {0} должно иметь тип строки или массива с максимальной длиной '{1}'.",
+    "The field {0} must be a string or array type with a minimum length of '{1}'.": "Поле {0} должно иметь тип строки или массива с минимальной длиной '{1}'.",
+    "The {0} field is not a valid phone number.": "Поле {0} не содержит действительный номер телефона.",
+    "The field {0} must be between {1} and {2}.": "Поле {0} должно находиться между {1} и {2}.",
+    "The field {0} must match the regular expression '{1}'.": "Поле {0} должно соответствовать регулярному выражению '{1}'.",
+    "The {0} field is required.": "Поле {0} необходимо заполнить.",
+    "The field {0} must be a string with a maximum length of {1}.": "Поле {0} должно быть строкой с максимальной длиной {1}.",
+    "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "Поле {0} должно быть строкой с минимальной длиной {2} и максимальной длиной {1}.",
+    "The {0} field is not a valid fully-qualified http, https, or ftp URL.": "Поле {0} не является действительным полным http, https или ftp адресом.",
+    "The field {0} is invalid.": "Значение в поле {0} недопустимо.",
+    "ThisFieldIsNotAValidCreditCardNumber.": "Это поле не содержит действительный номер кредитной карты.",
+    "ThisFieldIsNotValid.": "Значение в этом поле недействительно.",
+    "ThisFieldIsNotAValidEmailAddress.": "Это поле не содержит действительный адрес электронной почты.",
+    "ThisFieldOnlyAcceptsFilesWithTheFollowingExtensions:{0}": "Вы можете загрузить файлы только следующих форматов: {0}",
+    "ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthoOf{0}": "Это поле должно иметь тип строки или массива с максимальной длиной '{0}'.",
+    "ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}": "Это поле должно иметь тип строки или массива с минимальной длиной '{0}'.",
+    "ThisFieldIsNotAValidPhoneNumber.": "Это поле не содержит действительный номер телефона.",
+    "ThisFieldMustBeBetween{0}And{1}": "Это поле должно быть между {0} и {1}.",
+    "ThisFieldMustMatchTheRegularExpression{0}": "Это поле должно соответствовать регулярному выражению '{0}'.",
+    "ThisFieldIsRequired.": "Это обязательное поле.",
+    "ThisFieldMustBeAStringWithAMaximumLengthOf{0}": "Это поле должно быть строкой с максимальной длиной {0}.",
+    "ThisFieldMustBeAStringWithAMinimumLengthOf{1}AndAMaximumLengthOf{0}": "Это поле должно быть строкой с минимальной длиной {1} и максимальной длиной {0}.",
+    "ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl": "Значение в поле не является действительным полным http, https или ftp адресом.",
+    "ThisFieldIsInvalid.": "Значение в этом поле недопустимо."
+  }
+}

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -38,6 +38,11 @@ namespace Volo.Abp.EntityFrameworkCore
                 {
                     opt.DefaultWithDetailsFunc = q => q.Include(p => p.Phones);
                 });
+                
+                options.Entity<Author>(opt =>
+                {
+                    opt.DefaultWithDetailsFunc = q => q.Include(p => p.Books);
+                });
             });
 
             var sqliteConnection = CreateDatabaseAndGetConnection();

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/SoftDelete_Tests.cs

@@ -1,9 +1,49 @@
-using Volo.Abp.TestApp.Testing;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.TestApp;
+using Volo.Abp.TestApp.Domain;
+using Volo.Abp.TestApp.Testing;
+using Volo.Abp.Uow;
+using Xunit;
 
 namespace Volo.Abp.EntityFrameworkCore.DataFiltering
 {
+    /// <summary>
+    /// This is just to test the cascade delete behavior of EF Core's navigation properties.
+    /// Soft delete is usually only used in the aggregate root entity instead <see cref="Book" />.
+    /// </summary>
     public class SoftDelete_Tests : SoftDelete_Tests<AbpEntityFrameworkCoreTestModule>
     {
-
+        [Fact]
+        public async Task Navigation_Properties_Cascade_Delete_Test()
+        {
+            var authorRepository = GetRequiredService<IRepository<Author, Guid>>();
+            var authorId = Guid.NewGuid();
+            
+            var author = new Author(authorId, "tom");
+            author.Books.Add(new Book(authorId,  Guid.NewGuid(), "asp net core"));
+            author.Books.Add(new Book(authorId, Guid.NewGuid(),"c#"));
+            await authorRepository.InsertAsync(author);
+            
+            await WithUnitOfWorkAsync(async () =>
+            {
+                var author = await authorRepository.GetAsync(authorId);
+                author.Books.ShouldNotBeEmpty();
+                author.Books.Count.ShouldBe(2);
+                
+                author.Books.Clear();
+                await authorRepository.UpdateAsync(author);
+            });
+            
+            using (DataFilter.Disable<ISoftDelete>())
+            {
+                author = await authorRepository.GetAsync(authorId);
+                author.Books.ShouldNotBeEmpty();
+                author.Books.ShouldAllBe(x => x.IsDeleted);
+            }
+        }
     }
 }

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

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.TestApp.SecondContext;
 using Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext;
 using Volo.Abp.TestApp.Domain;
@@ -16,7 +16,9 @@ namespace Volo.Abp.EntityFrameworkCore
         public DbSet<BookInSecondDbContext> Books { get; set; }
 
         public DbSet<EntityWithIntPk> EntityWithIntPks { get; set; }
-
+        
+        public DbSet<Author> Author { get; set; }
+        
         public TestMigrationsDbContext(DbContextOptions<TestMigrationsDbContext> options) 
             : base(options)
         {

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/Domain/Author.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.Abp.TestApp.Domain
+{
+    public class Author : AggregateRoot<Guid>
+    {
+        public string Name { get; set; }
+        
+        public ICollection<Book> Books { get; set; }
+
+        private Author()
+        {
+
+        }
+        
+        public Author(Guid id, string name)
+            : base(id)
+        {
+            Name = name;
+            Books = new List<Book>();
+        }
+    }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/Domain/Book.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.Abp.TestApp.Domain
+{
+    public class Book : Entity<Guid>, ISoftDelete
+    {
+        public Guid AuthorId { get; set; }
+        
+        public string Title { get; set; }
+
+        private Book()
+        {
+
+        }
+        
+        public Book(Guid authorId, Guid id, string title)
+        {
+            Id = id;
+            AuthorId = authorId;
+            Title = title;
+        }
+
+        public bool IsDeleted { get; set; }
+    }
+}

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

@@ -17,6 +17,8 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
 
         public DbSet<EntityWithIntPk> EntityWithIntPks { get; set; }
         
+        public DbSet<Author> Author { get; set; }
+
         public TestAppDbContext(DbContextOptions<TestAppDbContext> options) 
             : base(options)
         {

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/ExtraProperties_Tests.cs

@@ -1,8 +1,10 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Shouldly;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
 using Volo.Abp.TestApp.Domain;
+using Volo.Abp.Timing;
 using Xunit;
 
 namespace Volo.Abp.TestApp.Testing
@@ -50,5 +52,45 @@ namespace Volo.Abp.TestApp.Testing
             london2.HasProperty("Population").ShouldBeTrue();
             london2.GetProperty<int>("Population").ShouldBe(11_000_042);
         }
+
+        [Fact]
+        public async Task Testing_With_Different_Primitive_Types()
+        {
+            var clock = GetRequiredService<IClock>();
+
+            var london = await CityRepository.FindByNameAsync("London");
+            
+            london.SetProperty("IntProp", 42);
+            london.SetProperty("DateTimeProp",
+                DateTime.SpecifyKind(new DateTime(
+                        2020,
+                        04,
+                        16,
+                        22,
+                        05,
+                        41,
+                        999
+                    ),
+                    DateTimeKind.Utc
+                )
+            );
+            
+            await CityRepository.UpdateAsync(london);
+
+            var london2 = await CityRepository.FindByNameAsync("London");
+            
+            london2.HasProperty("IntProp").ShouldBeTrue();
+            london2.GetProperty<int>("IntProp").ShouldBe(42);
+
+            london2.HasProperty("DateTimeProp").ShouldBeTrue();
+            var dateTimeProp = london2.GetProperty<DateTime>("DateTimeProp");
+            dateTimeProp.Year.ShouldBe(2020);
+            dateTimeProp.Month.ShouldBe(04);
+            dateTimeProp.Day.ShouldBe(16);
+            dateTimeProp.Hour.ShouldBe(22);
+            dateTimeProp.Minute.ShouldBe(05);
+            dateTimeProp.Second.ShouldBe(41);
+            dateTimeProp.Millisecond.ShouldBe(999);
+        }
     }
 }

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json

@@ -0,0 +1,45 @@
+{
+  "culture": "ru",
+  "texts": {
+    "UserName": "Имя пользователя",
+    "EmailAddress": "Адрес электронной почты",
+    "UserNameOrEmailAddress": "Имя пользователя или адрес электронной почты",
+    "Password": "Пароль",
+    "RememberMe": "Запомнить меня",
+    "UseAnotherServiceToLogin": "Использовать сторонний сервис для входа",
+    "UserLockedOutMessage": "Пользователь заблокирован из-за большого количества попыток входа. Пожалуйста, попробуйте позднее.",
+    "InvalidUserNameOrPassword": "Неправильные имя пользователя и/или пароль!",
+    "LoginIsNotAllowed": "Вы не можете войти. Вам необходимо подтвердить электронную почту или телефон.",
+    "SelfRegistrationDisabledMessage": "Самостоятельная регистрация не предусмотрена. Пожалуйста, свяжитесь с администраром для получения доступа.",
+    "LocalLoginDisabledMessage": "Локальный вход отключен.",
+    "Login": "Войти",
+    "Cancel": "Отмена",
+    "Register": "Регистрация",
+    "AreYouANewUser": "Новый пользователь?",
+    "AlreadyRegistered": "Уже зарегистрированы?",
+    "InvalidLoginRequest": "Неправильный запрос",
+    "ThereAreNoLoginSchemesConfiguredForThisClient": "Не найдено схемы для входа с текущим клиентским приложением.",
+    "LogInUsingYourProviderAccount": "Войти использую свой {0} аккаунт",
+    "DisplayName:CurrentPassword": "Текущий пароль",
+    "DisplayName:NewPassword": "Новый пароль",
+    "DisplayName:NewPasswordConfirm": "Повторите новый пароль",
+    "PasswordChangedMessage": "Ваш пароль успешно изменен.",
+    "DisplayName:UserName": "Имя пользователя",
+    "DisplayName:Email": "Email",
+    "DisplayName:Name": "Имя",
+    "DisplayName:Surname": "Фамилия",
+    "DisplayName:Password": "Пароль",
+    "DisplayName:EmailAddress": "Электронная почта",
+    "DisplayName:PhoneNumber": "Номер телефона",
+    "PersonalSettings": "Персональные настройки",
+    "PersonalSettingsSaved": "Персональные настройки сохранены",
+    "PasswordChanged": "Пароль изменен",
+    "NewPasswordConfirmFailed": "Пожалуйста подтвердите новый пароль.",
+    "Manage": "Управление учетной записью",
+    "ManageYourProfile": "Настройки",
+    "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Самостоятельная регистрация включена",
+    "Description:Abp.Account.IsSelfRegistrationEnabled": "Позволяет новым пользователям регистрироваться самостоятельно.",
+    "DisplayName:Abp.Account.EnableLocalLogin": "Вход с помощью локальной учетной записи приложения",
+    "Description:Abp.Account.EnableLocalLogin": "Указывает на то, разрешено ли пользователям входить с помощью локальной учетной записи приложения."
+  }
+}

modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs

@@ -42,7 +42,7 @@ namespace Volo.Abp.Account.Web.Pages
             _resourceStore = resourceStore;
         }
 
-        public virtual async Task OnGet()
+        public virtual async Task<IActionResult> OnGet()
         {
             var request = await _interaction.GetAuthorizationContextAsync(ReturnUrl);
             if (request == null)
@@ -74,6 +74,8 @@ namespace Volo.Abp.Account.Web.Pages
             {
                 ConsentInput.ApiScopes.Add(GetOfflineAccessScope(true));
             }
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPost(string userDecision)

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs

@@ -24,9 +24,9 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return RedirectToPage("/Account/Login");
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Volo.Abp.Identity;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Volo.Abp.Account.Web.Pages.Account
 {
@@ -17,16 +18,18 @@ namespace Volo.Abp.Account.Web.Pages.Account
             ProfileAppService = profileAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var user = await ProfileAppService.GetAsync();
 
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
+
+            return Page();
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs

@@ -31,9 +31,11 @@ namespace Volo.Abp.Account.Web.Pages.Account
             AccountAppService = accountAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             await CheckSelfRegistrationAsync();
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()

modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs

@@ -41,9 +41,9 @@ namespace Volo.Abp.Account.Web.Pages.Account
             //);
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }

modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/ru.json

@@ -0,0 +1,47 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Menu:Blogs": "Блоги",
+    "Menu:BlogManagement": "Управление блогом",
+    "Title": "Заголовок",
+    "Delete": "Удалить",
+    "Reply": "Ответить",
+    "ReplyTo": "Ответить {0}",
+    "ContinueReading": "Продолжить чтение",
+    "DaysAgo": "{0} дней назад",
+    "YearsAgo": "{0} лет назад",
+    "MonthsAgo": "{0} месяцев назад",
+    "WeeksAgo": "{0} недель назад",
+    "MinutesAgo": "{0} минут назад",
+    "SecondsAgo": "{0} секунд назад",
+    "HoursAgo": "{0} часов назад",
+    "Now": "сейчас",
+    "Content": "Содержание",
+    "SeeAll": "Увидеть все",
+    "PopularTags": "Популярные тэги",
+    "WiewsWithCount": "{0} просмотров",
+    "LastPosts": "Последние записи",
+    "LeaveComment": "Оставить комментарий",
+    "TagsInThisArticle": "Теги в этой статье",
+    "Posts": "Записи",
+    "Edit": "Редактировать",
+    "BLOG": "БЛОГ",
+    "CommentDeletionWarningMessage": "Комментарий будет удален.",
+    "PostDeletionWarningMessage": "Запись будет удалена.",
+    "BlogDeletionWarningMessage": "Блог будет удален.",
+    "AreYouSure": "Вы уверены?",
+    "CommentWithCount": "{0} комментариев",
+    "Comment": "Комментарий",
+    "ShareOnTwitter": "Поделиться в Twitter",
+    "CoverImage": "Обложка",
+    "CreateANewPost": "Создать новый пост",
+    "CreateANewBlog": "Создать новый блог",
+    "WhatIsNew": "Что нового?",
+    "Name": "Имя",
+    "ShortName": "Фамилия",
+    "CreationTime": "Время создания",
+    "Description": "Описание",
+    "Blogs": "Блоги",
+    "Tags": "Теги"
+  }
+}

modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs

@@ -24,7 +24,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Create))
             {
@@ -34,7 +34,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             var blogDto = ObjectMapper.Map<BlogCreateModalView, CreateBlogDto>(Blog);
 

modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs

@@ -29,7 +29,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Update))
             {
@@ -43,7 +43,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs
             return Page();
         }
 
-        public async Task OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             await _blogAppService.Update(Blog.Id, new UpdateBlogDto()
             {
@@ -51,6 +51,8 @@ namespace Volo.Blogging.Pages.Admin.Blogs
                 ShortName = Blog.ShortName,
                 Description = Blog.Description
             });
+
+            return Page();
         }
 
         public class BlogEditViewModel

modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs

@@ -15,7 +15,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Management))
             {

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs

@@ -19,7 +19,7 @@ namespace Volo.Blogging.Pages.Blog
             _blogAppService = blogAppService;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var result = await _blogAppService.GetListAsync();
 

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs

@@ -46,12 +46,14 @@ namespace Volo.Blogging.Pages.Blog.Posts
             _commentAppService = commentAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             await GetData();
+
+            return Page();
         }
 
-        public async Task OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             var comment = await _commentAppService.CreateAsync(new CreateCommentDto()
             {
@@ -63,6 +65,8 @@ namespace Volo.Blogging.Pages.Blog.Posts
             FocusCommentId = comment.Id;
 
             await GetData();
+
+            return Page();
         }
 
         private async Task GetData()

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs

@@ -33,7 +33,7 @@ namespace Volo.Blogging.Pages.Blog.Posts
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Posts.Update))
             {
@@ -47,7 +47,7 @@ namespace Volo.Blogging.Pages.Blog.Posts
             return Page();
         }
 
-        public async Task<ActionResult> OnPostAsync()
+        public virtual async Task<ActionResult> OnPostAsync()
         {
             var post = new UpdatePostDto
             {

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs

@@ -35,11 +35,13 @@ namespace Volo.Blogging.Pages.Blog.Posts
             _tagAppService = tagAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             Blog = await _blogAppService.GetByShortNameAsync(BlogShortName);
             Posts = (await _postAppService.GetListByBlogIdAndTagName(Blog.Id, TagName)).Items;
             PopularTags = (await _tagAppService.GetPopularTags(Blog.Id, new GetPopularTagsInput {ResultCount = 10, MinimumPostCount = 2}));
+
+            return Page();
         }
     }
 }

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs

@@ -35,7 +35,7 @@ namespace Volo.Blogging.Pages.Blog.Posts
             _blogOptions = blogOptions.Value;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Posts.Create))
             {
@@ -51,7 +51,7 @@ namespace Volo.Blogging.Pages.Blog.Posts
             return Page();
         }
 
-        public async Task<ActionResult> OnPost()
+        public virtual async Task<ActionResult> OnPost()
         {
             var blog = await _blogAppService.GetAsync(Post.BlogId);
 

modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs

@@ -1,13 +1,14 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace Volo.ClientSimulation.Pages.ClientSimulation
 {
     public class IndexModel : PageModel
     {
-        public async Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }

modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs

@@ -16,19 +16,19 @@ namespace Volo.ClientSimulation.Pages.ClientSimulation
             Simulation = simulation;
         }
 
-        public Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
             Snapshot = Simulation.CreateSnapshot();
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
-        public async Task<IActionResult> OnPostStartAsync()
+        public virtual async Task<IActionResult> OnPostStartAsync()
         {
             Simulation.Start();
             return new NoContentResult();
         }
 
-        public async Task<IActionResult> OnPostStopAsync()
+        public virtual async Task<IActionResult> OnPostStopAsync()
         {
             Simulation.Stop();
             return new NoContentResult();

modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/ru.json

@@ -0,0 +1,10 @@
+{
+  "culture": "ru",
+  "texts": {
+    "DocsTitle": "VoloDocs",
+    "WelcomeVoloDocs": "Добро пожаловать в VoloDocs!",
+    "NoProjectWarning": "Отсутствует определение проекта!",
+    "CreateYourFirstProject": "Нажмите здесь, чтобы добавить свой первый проект",
+    "NoProject": "Нет проекта!"
+  }
+}

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

@@ -24,7 +24,7 @@ namespace VoloDocs.Web.Pages
             _urlUiOptions = urlOptions.Value;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var projects = await _projectAppService.GetListAsync();
 

modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/utils/abp-utils.umd.js

@@ -0,0 +1,600 @@
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('just-compare')) :
+    typeof define === 'function' && define.amd ? define('@abp/utils', ['exports', 'just-compare'], factory) :
+    (global = global || self, factory((global.abp = global.abp || {}, global.abp.utils = global.abp.utils || {}, global.abp.utils.common = {}), global.compare));
+}(this, (function (exports, compare) { 'use strict';
+
+    compare = compare && Object.prototype.hasOwnProperty.call(compare, 'default') ? compare['default'] : compare;
+
+    /*! *****************************************************************************
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain a copy of the
+    License at http://www.apache.org/licenses/LICENSE-2.0
+
+    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+    MERCHANTABLITY OR NON-INFRINGEMENT.
+
+    See the Apache Version 2.0 License for specific language governing permissions
+    and limitations under the License.
+    ***************************************************************************** */
+    /* global Reflect, Promise */
+
+    var extendStatics = function(d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+
+    function __extends(d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    }
+
+    var __assign = function() {
+        __assign = Object.assign || function __assign(t) {
+            for (var s, i = 1, n = arguments.length; i < n; i++) {
+                s = arguments[i];
+                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+            }
+            return t;
+        };
+        return __assign.apply(this, arguments);
+    };
+
+    function __rest(s, e) {
+        var t = {};
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+            t[p] = s[p];
+        if (s != null && typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+                if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                    t[p[i]] = s[p[i]];
+            }
+        return t;
+    }
+
+    function __decorate(decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    }
+
+    function __param(paramIndex, decorator) {
+        return function (target, key) { decorator(target, key, paramIndex); }
+    }
+
+    function __metadata(metadataKey, metadataValue) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+    }
+
+    function __awaiter(thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    }
+
+    function __generator(thisArg, body) {
+        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+        function verb(n) { return function (v) { return step([n, v]); }; }
+        function step(op) {
+            if (f) throw new TypeError("Generator is already executing.");
+            while (_) try {
+                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+                if (y = 0, t) op = [op[0] & 2, t.value];
+                switch (op[0]) {
+                    case 0: case 1: t = op; break;
+                    case 4: _.label++; return { value: op[1], done: false };
+                    case 5: _.label++; y = op[1]; op = [0]; continue;
+                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                    default:
+                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                        if (t[2]) _.ops.pop();
+                        _.trys.pop(); continue;
+                }
+                op = body.call(thisArg, _);
+            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+        }
+    }
+
+    function __exportStar(m, exports) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+
+    function __values(o) {
+        var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+        if (m) return m.call(o);
+        if (o && typeof o.length === "number") return {
+            next: function () {
+                if (o && i >= o.length) o = void 0;
+                return { value: o && o[i++], done: !o };
+            }
+        };
+        throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+    }
+
+    function __read(o, n) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator];
+        if (!m) return o;
+        var i = m.call(o), r, ar = [], e;
+        try {
+            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+        }
+        catch (error) { e = { error: error }; }
+        finally {
+            try {
+                if (r && !r.done && (m = i["return"])) m.call(i);
+            }
+            finally { if (e) throw e.error; }
+        }
+        return ar;
+    }
+
+    function __spread() {
+        for (var ar = [], i = 0; i < arguments.length; i++)
+            ar = ar.concat(__read(arguments[i]));
+        return ar;
+    }
+
+    function __spreadArrays() {
+        for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+        for (var r = Array(s), k = 0, i = 0; i < il; i++)
+            for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+                r[k] = a[j];
+        return r;
+    };
+
+    function __await(v) {
+        return this instanceof __await ? (this.v = v, this) : new __await(v);
+    }
+
+    function __asyncGenerator(thisArg, _arguments, generator) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var g = generator.apply(thisArg, _arguments || []), i, q = [];
+        return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+        function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+        function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+        function fulfill(value) { resume("next", value); }
+        function reject(value) { resume("throw", value); }
+        function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+    }
+
+    function __asyncDelegator(o) {
+        var i, p;
+        return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+    }
+
+    function __asyncValues(o) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var m = o[Symbol.asyncIterator], i;
+        return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+        function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+        function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+    }
+
+    function __makeTemplateObject(cooked, raw) {
+        if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+        return cooked;
+    };
+
+    function __importStar(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+        result.default = mod;
+        return result;
+    }
+
+    function __importDefault(mod) {
+        return (mod && mod.__esModule) ? mod : { default: mod };
+    }
+
+    function __classPrivateFieldGet(receiver, privateMap) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to get private field on non-instance");
+        }
+        return privateMap.get(receiver);
+    }
+
+    function __classPrivateFieldSet(receiver, privateMap, value) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to set private field on non-instance");
+        }
+        privateMap.set(receiver, value);
+        return value;
+    }
+
+    /* tslint:disable:no-non-null-assertion */
+    var ListNode = /** @class */ (function () {
+        function ListNode(value) {
+            this.value = value;
+        }
+        return ListNode;
+    }());
+    var LinkedList = /** @class */ (function () {
+        function LinkedList() {
+            this.size = 0;
+        }
+        Object.defineProperty(LinkedList.prototype, "head", {
+            get: function () {
+                return this.first;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(LinkedList.prototype, "tail", {
+            get: function () {
+                return this.last;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(LinkedList.prototype, "length", {
+            get: function () {
+                return this.size;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        LinkedList.prototype.attach = function (value, previousNode, nextNode) {
+            if (!previousNode)
+                return this.addHead(value);
+            if (!nextNode)
+                return this.addTail(value);
+            var node = new ListNode(value);
+            node.previous = previousNode;
+            previousNode.next = node;
+            node.next = nextNode;
+            nextNode.previous = node;
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.attachMany = function (values, previousNode, nextNode) {
+            if (!values.length)
+                return [];
+            if (!previousNode)
+                return this.addManyHead(values);
+            if (!nextNode)
+                return this.addManyTail(values);
+            var list = new LinkedList();
+            list.addManyTail(values);
+            list.first.previous = previousNode;
+            previousNode.next = list.first;
+            list.last.next = nextNode;
+            nextNode.previous = list.last;
+            this.size += values.length;
+            return list.toNodeArray();
+        };
+        LinkedList.prototype.detach = function (node) {
+            if (!node.previous)
+                return this.dropHead();
+            if (!node.next)
+                return this.dropTail();
+            node.previous.next = node.next;
+            node.next.previous = node.previous;
+            this.size--;
+            return node;
+        };
+        LinkedList.prototype.add = function (value) {
+            var _this = this;
+            return {
+                after: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addAfter).call.apply(_a, __spread([_this, value], params));
+                },
+                before: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addBefore).call.apply(_a, __spread([_this, value], params));
+                },
+                byIndex: function (position) { return _this.addByIndex(value, position); },
+                head: function () { return _this.addHead(value); },
+                tail: function () { return _this.addTail(value); },
+            };
+        };
+        LinkedList.prototype.addMany = function (values) {
+            var _this = this;
+            return {
+                after: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addManyAfter).call.apply(_a, __spread([_this, values], params));
+                },
+                before: function () {
+                    var _a;
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return (_a = _this.addManyBefore).call.apply(_a, __spread([_this, values], params));
+                },
+                byIndex: function (position) { return _this.addManyByIndex(values, position); },
+                head: function () { return _this.addManyHead(values); },
+                tail: function () { return _this.addManyTail(values); },
+            };
+        };
+        LinkedList.prototype.addAfter = function (value, previousValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var previous = this.find(function (node) { return compareFn(node.value, previousValue); });
+            return previous ? this.attach(value, previous, previous.next) : this.addTail(value);
+        };
+        LinkedList.prototype.addBefore = function (value, nextValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var next = this.find(function (node) { return compareFn(node.value, nextValue); });
+            return next ? this.attach(value, next.previous, next) : this.addHead(value);
+        };
+        LinkedList.prototype.addByIndex = function (value, position) {
+            if (position < 0)
+                position += this.size;
+            else if (position >= this.size)
+                return this.addTail(value);
+            if (position <= 0)
+                return this.addHead(value);
+            var next = this.get(position);
+            return this.attach(value, next.previous, next);
+        };
+        LinkedList.prototype.addHead = function (value) {
+            var node = new ListNode(value);
+            node.next = this.first;
+            if (this.first)
+                this.first.previous = node;
+            else
+                this.last = node;
+            this.first = node;
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.addTail = function (value) {
+            var node = new ListNode(value);
+            if (this.first) {
+                node.previous = this.last;
+                this.last.next = node;
+                this.last = node;
+            }
+            else {
+                this.first = node;
+                this.last = node;
+            }
+            this.size++;
+            return node;
+        };
+        LinkedList.prototype.addManyAfter = function (values, previousValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var previous = this.find(function (node) { return compareFn(node.value, previousValue); });
+            return previous ? this.attachMany(values, previous, previous.next) : this.addManyTail(values);
+        };
+        LinkedList.prototype.addManyBefore = function (values, nextValue, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var next = this.find(function (node) { return compareFn(node.value, nextValue); });
+            return next ? this.attachMany(values, next.previous, next) : this.addManyHead(values);
+        };
+        LinkedList.prototype.addManyByIndex = function (values, position) {
+            if (position < 0)
+                position += this.size;
+            if (position <= 0)
+                return this.addManyHead(values);
+            if (position >= this.size)
+                return this.addManyTail(values);
+            var next = this.get(position);
+            return this.attachMany(values, next.previous, next);
+        };
+        LinkedList.prototype.addManyHead = function (values) {
+            var _this = this;
+            return values.reduceRight(function (nodes, value) {
+                nodes.unshift(_this.addHead(value));
+                return nodes;
+            }, []);
+        };
+        LinkedList.prototype.addManyTail = function (values) {
+            var _this = this;
+            return values.map(function (value) { return _this.addTail(value); });
+        };
+        LinkedList.prototype.drop = function () {
+            var _this = this;
+            return {
+                byIndex: function (position) { return _this.dropByIndex(position); },
+                byValue: function () {
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return _this.dropByValue.apply(_this, params);
+                },
+                byValueAll: function () {
+                    var params = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        params[_i] = arguments[_i];
+                    }
+                    return _this.dropByValueAll.apply(_this, params);
+                },
+                head: function () { return _this.dropHead(); },
+                tail: function () { return _this.dropTail(); },
+            };
+        };
+        LinkedList.prototype.dropMany = function (count) {
+            var _this = this;
+            return {
+                byIndex: function (position) { return _this.dropManyByIndex(count, position); },
+                head: function () { return _this.dropManyHead(count); },
+                tail: function () { return _this.dropManyTail(count); },
+            };
+        };
+        LinkedList.prototype.dropByIndex = function (position) {
+            if (position < 0)
+                position += this.size;
+            var current = this.get(position);
+            return current ? this.detach(current) : undefined;
+        };
+        LinkedList.prototype.dropByValue = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var position = this.findIndex(function (node) { return compareFn(node.value, value); });
+            return position < 0 ? undefined : this.dropByIndex(position);
+        };
+        LinkedList.prototype.dropByValueAll = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            var dropped = [];
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (compareFn(current.value, value)) {
+                    dropped.push(this.dropByIndex(position - dropped.length));
+                }
+            }
+            return dropped;
+        };
+        LinkedList.prototype.dropHead = function () {
+            var head = this.first;
+            if (head) {
+                this.first = head.next;
+                if (this.first)
+                    this.first.previous = undefined;
+                else
+                    this.last = undefined;
+                this.size--;
+                return head;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.dropTail = function () {
+            var tail = this.last;
+            if (tail) {
+                this.last = tail.previous;
+                if (this.last)
+                    this.last.next = undefined;
+                else
+                    this.first = undefined;
+                this.size--;
+                return tail;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.dropManyByIndex = function (count, position) {
+            if (count <= 0)
+                return [];
+            if (position < 0)
+                position = Math.max(position + this.size, 0);
+            else if (position >= this.size)
+                return [];
+            count = Math.min(count, this.size - position);
+            var dropped = [];
+            while (count--) {
+                var current = this.get(position);
+                dropped.push(this.detach(current));
+            }
+            return dropped;
+        };
+        LinkedList.prototype.dropManyHead = function (count) {
+            if (count <= 0)
+                return [];
+            count = Math.min(count, this.size);
+            var dropped = [];
+            while (count--)
+                dropped.unshift(this.dropHead());
+            return dropped;
+        };
+        LinkedList.prototype.dropManyTail = function (count) {
+            if (count <= 0)
+                return [];
+            count = Math.min(count, this.size);
+            var dropped = [];
+            while (count--)
+                dropped.push(this.dropTail());
+            return dropped;
+        };
+        LinkedList.prototype.find = function (predicate) {
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (predicate(current, position, this))
+                    return current;
+            }
+            return undefined;
+        };
+        LinkedList.prototype.findIndex = function (predicate) {
+            for (var current = this.first, position = 0; current; position++, current = current.next) {
+                if (predicate(current, position, this))
+                    return position;
+            }
+            return -1;
+        };
+        LinkedList.prototype.forEach = function (callback) {
+            for (var node = this.first, position = 0; node; position++, node = node.next) {
+                callback(node, position, this);
+            }
+        };
+        LinkedList.prototype.get = function (position) {
+            return this.find(function (_, index) { return position === index; });
+        };
+        LinkedList.prototype.indexOf = function (value, compareFn) {
+            if (compareFn === void 0) { compareFn = compare; }
+            return this.findIndex(function (node) { return compareFn(node.value, value); });
+        };
+        LinkedList.prototype.toArray = function () {
+            var array = new Array(this.size);
+            this.forEach(function (node, index) { return (array[index] = node.value); });
+            return array;
+        };
+        LinkedList.prototype.toNodeArray = function () {
+            var array = new Array(this.size);
+            this.forEach(function (node, index) { return (array[index] = node); });
+            return array;
+        };
+        LinkedList.prototype.toString = function (mapperFn) {
+            if (mapperFn === void 0) { mapperFn = JSON.stringify; }
+            return this.toArray()
+                .map(function (value) { return mapperFn(value); })
+                .join(' <-> ');
+        };
+        // Cannot use Generator type because of ng-packagr
+        LinkedList.prototype[Symbol.iterator] = function () {
+            var node, position;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        node = this.first, position = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!node) return [3 /*break*/, 4];
+                        return [4 /*yield*/, node.value];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        position++, node = node.next;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        };
+        return LinkedList;
+    }());
+
+    exports.LinkedList = LinkedList;
+    exports.ListNode = ListNode;
+
+    Object.defineProperty(exports, '__esModule', { value: true });
+
+})));
+//# sourceMappingURL=abp-utils.umd.js.map

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/ru.json

@@ -0,0 +1,37 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Permission:DocumentManagement": "Управление документацией",
+    "Permission:Projects": "Проекты",
+    "Permission:Edit": "Редактировать",
+    "Permission:Delete": "Удалить",
+    "Permission:Create": "Создать",
+    "Permission:Documents": "Документы",
+    "Menu:DocumentManagement": "Документы",
+    "Menu:ProjectManagement": "Проекты",
+    "CreateANewProject": "Создать проекты",
+    "Edit": "Редактировать",
+    "Create": "Создать",
+    "Pull": "Получить",
+    "Projects": "Проекты",
+    "Name": "Название",
+    "ShortName": "Сокращенное название",
+    "DocumentStoreType": "Тип системы хранения",
+    "Format": "Формат",
+    "ShortNameInfoText": "Будет использоваться для уникального URL.",
+    "DisplayName:Name": "Название",
+    "DisplayName:ShortName": "Сокращенное название",
+    "DisplayName:Format": "Формат",
+    "DisplayName:DefaultDocumentName": "Имя документа по умолчанию",
+    "DisplayName:NavigationDocumentName": "Имя документа для навигации",
+    "DisplayName:MinimumVersion": "Минимальная версия",
+    "DisplayName:MainWebsiteUrl": "URL основного веб-сайта",
+    "DisplayName:LatestVersionBranchName": "Название ветки последней версии",
+    "DisplayName:GitHubRootUrl": "Корневой URL-адрес GitHub",
+    "DisplayName:GitHubAccessToken": "Маркер доступа для GitHub",
+    "DisplayName:GitHubUserAgent": "Заголовок User-Agent для GitHub",
+    "DisplayName:All": "Получить все",
+    "DisplayName:LanguageCode": "Код языка",
+    "DisplayName:Version": "Версия"
+  }
+}

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs

@@ -29,7 +29,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
             _projectAppService = projectAppService;
         }
 
-        public async Task<ActionResult> OnGetAsync(string source)
+        public virtual async Task<ActionResult> OnGetAsync(string source)
         {
             if (source != null && source.ToLowerInvariant() == "github")
             {
@@ -42,7 +42,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
             }
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             if (GithubProject != null)
             {

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs

@@ -29,7 +29,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
             _projectAppService = projectAppService;
         }
 
-        public async Task<ActionResult> OnGetAsync(Guid id)
+        public virtual async Task<ActionResult> OnGetAsync(Guid id)
         {
             var project = await _projectAppService.GetAsync(id);
 
@@ -42,7 +42,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
             throw new BusinessException("UnknowDocumentSourceExceptionMessage");
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             if (GithubProject != null)
             {

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs

@@ -1,4 +1,6 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
@@ -6,8 +8,9 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
     [Authorize(DocsAdminPermissions.Projects.Default)]
     public class IndexModel : DocsAdminPageModel
     {
-        public void OnGet()
+        public virtual Task<IActionResult> OnGet()
         {
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs

@@ -23,7 +23,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
             _documentAppService = documentAppService;
         }
 
-        public async Task<ActionResult> OnGetAsync(Guid id)
+        public virtual async Task<ActionResult> OnGetAsync(Guid id)
         {
             var project = await _projectAppService.GetAsync(id);
 
@@ -36,7 +36,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             if (PullDocument.All)
             {

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

@@ -25,7 +25,7 @@ namespace Volo.Docs.Pages.Documents
             _uiOptions = urlOptions.Value;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             DocumentsUrlPrefix = _uiOptions.RoutePrefix;
 

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

@@ -92,7 +92,7 @@ namespace Volo.Docs.Pages.Documents.Project
             _uiOptions = options.Value;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             try
             {
@@ -597,6 +597,11 @@ namespace Volo.Docs.Pages.Documents.Project
 
         public string GetDescription()
         {
+            if (Document == null || Document.Content.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
             var firstParagraph = new Regex(@"<p>(.*?)</p>", RegexOptions.IgnoreCase);
             var match = firstParagraph.Match(Document.Content);
             if (!match.Success)

modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs

@@ -39,7 +39,7 @@ namespace Volo.Docs.Pages.Documents
 
         public List<DocumentSearchOutput> SearchOutputs { get; set; } = new List<DocumentSearchOutput>();
 
-        public async Task<IActionResult> OnGetAsync(string keyword)
+        public virtual async Task<IActionResult> OnGetAsync(string keyword)
         {
             if (!await _documentAppService.FullSearchEnabledAsync())
             {

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json

@@ -0,0 +1,7 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Features": "Функциональные возможности",
+    "NoFeatureFoundMessage": "Нет доступных функциональных возможностей."
+  }
+}

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json

@@ -0,0 +1,102 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Menu:IdentityManagement": "Управление идентификацией",
+    "Users": "Пользователи",
+    "NewUser": "Новый пользователь",
+    "UserName": "Имя пользователя",
+    "EmailAddress": "Адрес электронной почты",
+    "PhoneNumber": "Номер телефона",
+    "UserInformations": "Информация о пользователе",
+    "DisplayName:IsDefault": "По умолчанию",
+    "DisplayName:IsStatic": "Статичная",
+    "DisplayName:IsPublic": "Доступно",
+    "Roles": "Роли",
+    "Password": "Пароль",
+    "PersonalInfo": "Мой профиль",
+    "PersonalSettings": "Персональные настройки",
+    "UserDeletionConfirmationMessage": "Пользователь '{0}' будет удален. Вы подтверждаете это?",
+    "RoleDeletionConfirmationMessage": "Роль '{0}' будет удалена. Вы подтверждаете это?",
+    "DisplayName:RoleName": "Название роли",
+    "DisplayName:UserName": "Имя пользователя",
+    "DisplayName:Name": "Имя",
+    "DisplayName:Surname": "Фамилия",
+    "DisplayName:Password": "Пароль",
+    "DisplayName:Email": "Адрес электронной почты",
+    "DisplayName:PhoneNumber": "Номер телефона",
+    "DisplayName:TwoFactorEnabled": "Двухфакторная проверка подлинности",
+    "DisplayName:LockoutEnabled": "Заблокировать учетную запись после неудачных попыток входа",
+    "NewRole": "Новая роль",
+    "RoleName": "Имя роли",
+    "CreationTime": "Время создания",
+    "Permissions": "Разрешения",
+    "DisplayName:CurrentPassword": "Текущий пароль",
+    "DisplayName:NewPassword": "Новый пароль",
+    "DisplayName:NewPasswordConfirm": "Подтверждение нового пароля",
+    "PasswordChangedMessage": "Ваш пароль был успешно изменен.",
+    "PersonalSettingsSavedMessage": "Ваши персональные настройки были успешно сохранены.",
+    "Identity.DefaultError": "Возникла непредвиденная ошибка.",
+    "Identity.ConcurrencyFailure": "Ошибка оптимального управления многопоточностью, объект был изменен.",
+    "Identity.DuplicateEmail": "Электронная почта '{0}' уже зарегистрирована.",
+    "Identity.DuplicateRoleName": "Имя роли '{0}' уже занято.",
+    "Identity.DuplicateUserName": "Имя пользователя '{0}' уже занято.",
+    "Identity.InvalidEmail": "Адрес электронной почты '{0}' недействителен.",
+    "Identity.InvalidPasswordHasherCompatibilityMode": "Предоставленный PasswordHasherCompatibilityMode недействителен.",
+    "Identity.InvalidPasswordHasherIterationCount": "Число итераций должно быть положительным целым числом.",
+    "Identity.InvalidRoleName": "Имя роли '{0}' недопустимо.",
+    "Identity.InvalidToken": "Недопустимый маркер.",
+    "Identity.InvalidUserName": "Имя пользователя '{0}' недопустимо и может содержать только буквы или цифры.",
+    "Identity.LoginAlreadyAssociated": "Пользователь с таким логином уже существует.",
+    "Identity.PasswordMismatch": "Неверный пароль.",
+    "Identity.PasswordRequiresDigit": "Пароль должен содержать по крайней мере одну цифру.",
+    "Identity.PasswordRequiresLower": "Пароль должен содержать хотя бы одну строчную букву.",
+    "Identity.PasswordRequiresNonAlphanumeric": "Пароль должен иметь по крайней мере один не буквенно-цифровой символ.",
+    "Identity.PasswordRequiresUpper": "Пароль должен иметь хотя бы одну букву верхнего регистра.",
+    "Identity.PasswordTooShort": "Пароль должен содержать не менее {0} символов.",
+    "Identity.RoleNotFound": "Роль {0} не существует.",
+    "Identity.UserAlreadyHasPassword": "У пользователя уже установлен пароль.",
+    "Identity.UserAlreadyInRole": "Пользователь уже имеет роль '{0}'.",
+    "Identity.UserLockedOut": "Пользователь временно заблокирован.",
+    "Identity.UserLockoutNotEnabled": "Блокировка не активирована для этого пользователя.",
+    "Identity.UserNameNotFound": "Пользователь {0} не существует.",
+    "Identity.UserNotInRole": "Пользователь не имеет роль '{0}'.",
+    "Identity.PasswordConfirmationFailed": "Пароли не совпадают.",
+    "Identity.StaticRoleRenamingErrorMessage": "Статические роли не могут быть переименованы.",
+    "Identity.StaticRoleDeletionErrorMessage": "Статические роли не могут быть удалены.",
+    "Volo.Abp.Identity:010001": "Вы не можете удалить свой собственный аккаунт!",
+    "Permission:IdentityManagement": "Управление идентификацией",
+    "Permission:RoleManagement": "Управление ролями",
+    "Permission:Create": "Создать",
+    "Permission:Edit": "Редактировать",
+    "Permission:Delete": "Удалить",
+    "Permission:ChangePermissions": "Изменить разрешения",
+    "Permission:UserManagement": "Управление пользователями",
+    "Permission:UserLookup": "Поиск пользователя",
+    "DisplayName:Abp.Identity.Password.RequiredLength": "Требуемая длина",
+    "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "Обязательное количество уникальных символов",
+    "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "Обязательный не буквенно-цифровой символ",
+    "DisplayName:Abp.Identity.Password.RequireLowercase": "Обязательный символ нижнего регистра",
+    "DisplayName:Abp.Identity.Password.RequireUppercase": "Обязательный символ верхнего регистра",
+    "DisplayName:Abp.Identity.Password.RequireDigit": "Требуемая цифра",
+    "DisplayName:Abp.Identity.Lockout.AllowedForNewUsers": "Включено для новых пользователей",
+    "DisplayName:Abp.Identity.Lockout.LockoutDuration": "Длительность блокировки (секунды)",
+    "DisplayName:Abp.Identity.Lockout.MaxFailedAccessAttempts": "Максимальное количество неудачных попыток доступа",
+    "DisplayName:Abp.Identity.SignIn.RequireConfirmedEmail": "Требуется подтверждение электронной почты",
+    "DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Требуется подтверждение номера телефона",
+    "DisplayName:Abp.Identity.User.IsUserNameUpdateEnabled": "Пользователь может изменять имя",
+    "DisplayName:Abp.Identity.User.IsEmailUpdateEnabled": "Электронная почта может быть изменена",
+    "Description:Abp.Identity.Password.RequiredLength": "Минимальная длина пароля.",
+    "Description:Abp.Identity.Password.RequiredUniqueChars": "Минимальное количество уникальных символов, которые должен содержать пароль.",
+    "Description:Abp.Identity.Password.RequireNonAlphanumeric": "Если пароли должны содержать не буквенно- цифровой символ.",
+    "Description:Abp.Identity.Password.RequireLowercase": "Если пароли должны содержать строчные символы ASCII.",
+    "Description:Abp.Identity.Password.RequireUppercase": "Если пароли должны содержать символ ASCII в верхнем регистре.",
+    "Description:Abp.Identity.Password.RequireDigit": "Если пароли должны содержать цифру.",
+    "Description:Abp.Identity.Lockout.AllowedForNewUsers": "Может ли новый пользователь быть заблокирован.",
+    "Description:Abp.Identity.Lockout.LockoutDuration": "Длительность блокировки пользователя.",
+    "Description:Abp.Identity.Lockout.MaxFailedAccessAttempts": "Число неудачных попыток доступа, после которых пользователь будет заблокирован.",
+    "Description:Abp.Identity.SignIn.RequireConfirmedEmail": "Требуется ли для входа подтвержденный адрес электронной почты.",
+    "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Требуется ли для входа в систему подтвержденный номер телефона.",
+    "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Может ли пользователь обновить имя пользователя.",
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Может ли электронная почта быть обновлена пользователем."
+  }
+}

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs

@@ -16,9 +16,9 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
             IdentityRoleAppService = identityRoleAppService;
         }
 
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
         public virtual async Task<IActionResult> OnPostAsync()

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs

@@ -1,17 +1,18 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
 {
     public class IndexModel : IdentityPageModel
     {
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs

@@ -25,7 +25,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             IdentityRoleAppService = identityRoleAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             UserInfo = new UserInfoViewModel();
 
@@ -37,6 +37,8 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             {
                 role.IsAssigned = role.IsDefault;
             }
+
+            return Page();
         }
 
         public virtual async Task<NoContentResult> OnPostAsync()

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

@@ -27,7 +27,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             IdentityRoleAppService = identityRoleAppService;
         }
 
-        public virtual async Task OnGetAsync(Guid id)
+        public virtual async Task<IActionResult> OnGetAsync(Guid id)
         {
             UserInfo = ObjectMapper.Map<IdentityUserDto, UserInfoViewModel>(await IdentityUserAppService.GetAsync(id));
 
@@ -41,6 +41,8 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
                     role.IsAssigned = true;
                 }
             }
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs

@@ -1,17 +1,18 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Volo.Abp.Identity.Web.Pages.Identity.Users
 {
     public class IndexModel : IdentityPageModel
     {
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }

modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/ru.json

@@ -0,0 +1,12 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Volo.IdentityServer:DuplicateIdentityResourceName": "Имя ресурса идентификации уже существует: {Name}",
+    "Volo.IdentityServer:DuplicateApiResourceName": "Имя ресурса API уже существует: {Name}",
+    "Volo.IdentityServer:DuplicateClientId": "Параметр ClientID уже существует: {ClientId}",
+    "UserLockedOut": "Учетная запись пользователя была заблокирована из-за неудачных попыток входа в систему. Пожалуйста, попробуйте позже.",
+    "InvalidUserNameOrPassword": "Неверное имя пользователя или пароль!",
+    "LoginIsNotAllowed": "У вас нет разрешения на вход в систему. Необходимо подтвердить свой адрес электронной почты/номер телефона.",
+    "InvalidUsername": "Неверное имя пользователя или пароль!"
+  }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ru.json

@@ -0,0 +1,10 @@
+{
+  "culture": "ru",
+  "texts": {
+    "Permissions": "Разрешения",
+    "OnlyProviderPermissons": "Только этот провайдер",
+    "All": "Все",
+    "SelectAllInAllTabs": "Предоставить все разрешения",
+    "SelectAllInThisTab": "Выбрать все"
+  }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs

@@ -38,7 +38,7 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
             PermissionAppService = permissionAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             ValidateModel();
 
@@ -62,6 +62,8 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
             }
 
             SelectAllInAllTabs = Groups.All(g => g.IsAllPermissionsGranted);
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()