Merge branch 'dev' of https://github.com/abpframework/abp

# Conflicts:
#	.gitignore
#	README.md
#	modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/AccountController.cs
#	modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj
#	modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj
#	modules/docs/app/VoloDocs.Web/Program.cs
#	modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj
#	modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
#	modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Styles/vs.min.css
#	modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj
#	modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs
#	modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
#	modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs
#	modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs
#	modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs
#	modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/IdentityUserAppService_Tests.cs
#	templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml

.github/labeler.yml

@@ -0,0 +1,15 @@
+ui-angular:
+  - npm/ng-packs/*
+  - npm/ng-packs/**/*
+  - npm/ng-packs/**/**/*
+  - npm/ng-packs/**/**/**/*
+  - npm/ng-packs/**/**/**/**/*
+  - npm/ng-packs/**/**/**/**/**/*
+  - templates/app/angular/*
+  - templates/app/angular/**/*
+  - templates/app/angular/**/**/*
+  - templates/app/angular/**/**/**/*
+  - templates/module/angular/*
+  - templates/module/angular/**/*
+  - templates/module/angular/**/**/*
+  - templates/module/angular/**/**/**/*

.github/workflows/angular.yml

@@ -0,0 +1,24 @@
+name: 'Angular'
+on:
+  pull_request:
+    paths:
+      - 'npm/ng-packs/**'
+    branches:
+      #- master
+      - dev
+  push:
+    paths:
+      - 'npm/ng-packs/**'
+    branches:
+      #- master
+      - dev
+jobs:
+  build-test-lint:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '10.x'
+      - run: yarn && yarn ci
+        working-directory: npm/ng-packs

.github/workflows/labeler.yml

@@ -0,0 +1,12 @@
+name: Pull request labeler
+on:
+  schedule:
+    - cron: '0 12 */1 * *'
+jobs:
+  labeler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: paulfantom/periodic-labeler@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}

.gitignore

@@ -297,6 +297,7 @@ samples/Microservice/gateways/BackendAdminAppGateway.Host/Logs/logs.txt
 samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.xml
 samples/Microservice/microservices/AuditLogging.Host/Logs/logs.txt
 samples/Microservice/microservices/BaseManagement.Host/Logs/logs.txt
+samples/MicroserviceDemo/applications/ConsoleClientDemo/Logs/logs.txt
 modules/docs/app/Volo.DocsTestApp/Logs/logs.txt
 samples/Microservice/microservices/OrganizationService.Host/Logs/logs.txt
 abp_io/src/Volo.AbpWebSite.Web/TemplateFiles/abp-mvc-app-0.17.0.0.zip

README.md

@@ -5,7 +5,7 @@
 [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core)
 [![MyGet (with prereleases)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.Core.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds)
 
-This project is the next generation of the [ASP.NET Boilerplate](https://aspnetboilerplate.com/) web application framework. See [the announcement](https://abp.io/blog/abp/Abp-vNext-Announcement).
+This project is the next generation of the [ASP.NET Boilerplate](https://aspnetboilerplate.com/) web application framework. See [the announcement](https://blog.abp.io/abp/Abp-vNext-Announcement).
 
 See the official [web site (abp.io)](https://abp.io/) for more information.
 
@@ -64,7 +64,7 @@ See the <a href="https://docs.abp.io/" target="_blank">documentation</a>.
 
 #### Pre Requirements
 
-- Visual Studio 2019 16.1.0+
+- Visual Studio 2019 16.3.0+
 
 #### Framework
 

abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalization.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
+    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.Validation\Volo.Abp.Validation.csproj" />
   </ItemGroup>
 
   <ItemGroup>

abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs

@@ -8,23 +8,24 @@
 using AbpIoLocalization.Www;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
-using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
+using Volo.Abp.Validation;
+using Volo.Abp.Validation.Localization;
 using Volo.Abp.VirtualFileSystem;
 
 namespace AbpIoLocalization
 {
-    [DependsOn(typeof(AbpLocalizationModule))]
+    [DependsOn(typeof(AbpValidationModule))]
     public class AbpIoLocalizationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<AbpIoLocalizationModule>("AbpIoLocalization");
             });
 
-            Configure<ExceptionLocalizationOptions>(options =>
+            Configure<AbpExceptionLocalizationOptions>(options =>
             {
                 options.MapCodeNamespace("Volo.AbpIo.Commercial", typeof(AbpIoCommercialResource));
                 options.MapCodeNamespace("Volo.AbpIo.Domain", typeof(AbpIoBaseResource));

abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/pt-BR.json

@@ -0,0 +1,13 @@
+{
+  "culture": "pt-BR",
+  "texts": {
+    "Account": "Conta",
+    "Welcome": "Bem-vindo",
+    "UseOneOfTheFollowingLinksToContinue": "Use um dos seguintes links para continuar",
+    "FrameworkHomePage": "Página inicial do Framework",
+    "FrameworkDocumentation": " Documentação do Framework",
+    "OfficialBlog": "Blog oficial",
+    "CommercialHomePage": "Página inicial comercial",
+    "CommercialSupportWebSite": "Site de suporte comercial"
+  }
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/zh-Hans.json

@@ -1,5 +1,13 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "Account": "账户",
+    "Welcome": "欢迎",
+    "UseOneOfTheFollowingLinksToContinue": "使用下面的链接继续",
+    "FrameworkHomePage": "框架首页",
+    "FrameworkDocumentation": "框架文档",
+    "OfficialBlog": "官方博客",
+    "CommercialHomePage": "商业版首页",
+    "CommercialSupportWebSite": "商业版支持网站"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/pt-BR.json

@@ -0,0 +1,60 @@
+{
+  "culture": "pt-BR",
+  "texts": {
+    "Permission:NpmPackages": "Pacotes NPM",
+    "Permission:NugetPackages": "Pacotes Nuget",
+    "Permission:Maintenance": "Manutenção",
+    "Permission:Maintain": "Manter",
+    "Permission:ClearCaches": "Limpar caches",
+    "Permission:Modules": "Módulos",
+    "Permission:Packages": "Pacotes",
+    "Permission:Edit": "Editar",
+    "Permission:Delete": "Excluir",
+    "Permission:Create": "Criar",
+    "Menu:Packages": "Pacotes",
+    "NpmPackageDeletionWarningMessage": "Este pacote NPM será excluído. Você confirma isso?",
+    "NugetPackageDeletionWarningMessage": "Este pacote Nuget será excluído. Você confirma isso?",
+    "ModuleDeletionWarningMessage": "Este módulo será excluído. Você confirma isso?",
+    "Name": "Nome",
+    "DisplayName": "Mostrar nome",
+    "ShortDescription": "Breve descrição",
+    "NameFilter": "Nome",
+    "CreationTime": "Hora da criação",
+    "IsPro": "É profissional",
+    "EfCoreConfigureMethodName": "Configurar nome do método",
+    "IsProFilter": "É profissional",
+    "ApplicationType": "Tipo de aplicativo",
+    "Target": "Objetivo",
+    "TargetFilter": "Objetivo",
+    "ModuleClass": "Classe do módulo",
+    "NugetPackageTarget.DomainShared": "Domínio compartilhado",
+    "NugetPackageTarget.Domain": "Domínio",
+    "NugetPackageTarget.Application": "Aplicativo",
+    "NugetPackageTarget.ApplicationContracts": "Contratos de aplicativos",
+    "NugetPackageTarget.HttpApi": "Http Api",
+    "NugetPackageTarget.HttpApiClient": "Cliente HTTP da API",
+    "NugetPackageTarget.Web": "Web",
+    "NugetPackageTarget.EntityFrameworkCore": "EntityFramework Core",
+    "NugetPackageTarget.MongoDB": "MongoDB",
+    "Edit": "Editar",
+    "Delete": "Excluir",
+    "Refresh": "Atualizar",
+    "NpmPackages": "Pacotes NPM",
+    "NugetPackages": "Pacotes Nuget",
+    "NpmPackageCount": "Contagem de pacotes NPM",
+    "NugetPackageCount": "Contagem de pacotes Nuget",
+    "Module": "Módulos",
+    "ModuleInfo": "Informações do módulo",
+    "CreateANpmPackage": "Criar um pacote NPM",
+    "CreateAModule": "Criar um módulo",
+    "CreateANugetPackage": "Criar um pacote Nuget",
+    "AddNew": "Adicionar novo",
+    "PackageAlreadyExist{0}": "\"{0}\" o pacote já foi adicionado.",
+    "ClearCache": "Limpar cache",
+    "SuccessfullyCleared": "Limpo com sucesso",
+    "Menu:NpmPackages": "Pacotes NPM",
+    "Menu:Modules": "Módulos",
+    "Menu:Maintenance": "Manutenção",
+    "Menu:NugetPackages": "Pacotes Nuget"
+  }
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json

@@ -1,5 +1,60 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "Permission:NpmPackages": "NPM包",
+    "Permission:NugetPackages": "Nuget包",
+    "Permission:Maintenance": "维护",
+    "Permission:Maintain": "维护",
+    "Permission:ClearCaches": "清除缓存",
+    "Permission:Modules": "模块",
+    "Permission:Packages": "包",
+    "Permission:Edit": "编辑",
+    "Permission:Delete": "删除",
+    "Permission:Create": "创建",
+    "Menu:Packages": "包",
+    "NpmPackageDeletionWarningMessage": "该NPM包将会被删除. 你确定吗?",
+    "NugetPackageDeletionWarningMessage": "该Nuget包将会被删除. 你确定吗?",
+    "ModuleDeletionWarningMessage": "该模块将会被删除. 你确定吗?",
+    "Name": "名称",
+    "DisplayName": "显示名称",
+    "ShortDescription": "简述",
+    "NameFilter": "名称",
+    "CreationTime": "创建时间",
+    "IsPro": "是否为专业版",
+    "EfCoreConfigureMethodName": "配置方法法",
+    "IsProFilter": "是否为专业版",
+    "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": "EntityFramework 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}\"已经被添加.",
+    "ClearCache": "清除缓存",
+    "SuccessfullyCleared": "清除成功",
+    "Menu:NpmPackages": "NPM包",
+    "Menu:Modules": "模块",
+    "Menu:Maintenance": "维护",
+    "Menu:NugetPackages": "Nuget包"
   }
 }

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

@@ -8,8 +8,8 @@
     "Volo.AbpIo.Domain:010008": "Allowed Developer Count can not be less then current developer count!",
     "Volo.AbpIo.Domain:010009": "Allowed Developer Count can not be less then 0!",
     "Volo.AbpIo.Domain:010010": "Maximum mac address count is exceeded!",
-	"Volo.AbpIo.Domain:010011": "Personal license can't have more than 1 developer!",
-	"Volo.AbpIo.Domain:010012": "License can't be extended one month after license expires!",
+    "Volo.AbpIo.Domain:010011": "Personal license can't have more than 1 developer!",
+    "Volo.AbpIo.Domain:010012": "License can't be extended one month after license expires!",
     "Volo.AbpIo.Domain:020001": "Could not delete this NPM Package because \"{NugetPackages}\" Nuget Packages are dependent to this package.",
     "Volo.AbpIo.Domain:020002": "Could not delete this NPM Package because \"{Modules}\" Modules are using this package.",
     "Volo.AbpIo.Domain:020003": "Could not delete this NPM Package because \"{Modules}\" Modules are using this package and \"{NugetPackages}\" Nuget Packages are dependent to this package.",

abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/pt-BR.json

@@ -0,0 +1,31 @@
+{
+  "culture": "pt-BR",
+  "texts": {
+    "Volo.AbpIo.Domain:010004": "Número máximo de membros atingido!",
+    "Volo.AbpIo.Domain:010005": "Número máximo de proprietários atingido!",
+    "Volo.AbpIo.Domain:010006": "Este usuário já é proprietário desta organização!",
+    "Volo.AbpIo.Domain:010007": "Este usuário já é desenvolvedor desta organização!",
+    "Volo.AbpIo.Domain:010008": "A contagem permitida de desenvolvedores não pode ser inferior à contagem atual de desenvolvedores!",
+    "Volo.AbpIo.Domain:010009": "A contagem permitida de desenvolvedores não pode ser inferior a 0!",
+    "Volo.AbpIo.Domain:010010": "A contagem máxima de endereços mac foi excedida!",
+    "Volo.AbpIo.Domain:010011": "A licença pessoal não pode ter mais de um desenvolvedor!",
+    "Volo.AbpIo.Domain:010012": "A licença não pode ser estendida um mês após a expiração da licença!",
+    "Volo.AbpIo.Domain:020001": "Não foi possível excluir este pacote NPM porque \"{NugetPackages}\" Os pacotes Nuget dependem deste pacote.",
+    "Volo.AbpIo.Domain:020002": "Não foi possível excluir este pacote NPM porque \"{Modules}\" Módulos estão usando este pacote.",
+    "Volo.AbpIo.Domain:020003": "Não foi possível excluir este pacote NPM porque \"{Modules}\" Módulos estão usando este pacote e \"{NugetPackages}\" Os pacotes Nuget dependem deste pacote.",
+    "Volo.AbpIo.Domain:020004": "Não foi possível excluir este pacote Nuget porque \"{Modules}\" Módulos estão usando este pacote.",
+    "WantToLearn?": "Quer aprender?",
+    "ReadyToGetStarted?": "Pronto para começar?",
+    "JoinOurCommunity": "Participe da nossa comunidade",
+    "GetStartedUpper": "INICIAR",
+    "ForkMeOnGitHub": "Bifurque-me no GitHub",
+    "Features": "Recursos",
+    "GetStarted": "Introdução",
+    "Documents": "Documentos",
+    "Community": "Comunidade",
+    "ContributionGuide": "Guia de contribuição",
+    "Blog": "Blog",
+    "Commercial": "Comercial",
+    "SeeDocuments": "Ver documentos"
+  }
+}