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

docs/en/Blob-Storing-Aliyun.md

@@ -23,18 +23,21 @@ Configuration is done in the `ConfigureServices` method of your [module](Module-
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAliyun(aliyun =>
+    options.Containers.ConfigureDefault(container =>
     {
-        aliyun.AccessKeyId = "your aliyun access key id";
-        aliyun.AccessKeySecret = "your aliyun access key secret";
-        aliyun.Endpoint = "your oss endpoint";
-        aliyun.RegionId = "your sts region id";
-        aliyun.RoleArn = "the arn of ram role";
-        aliyun.RoleSessionName = "the name of the certificate";
-        aliyun.Policy = "policy";
-        aliyun.DurationSeconds = "expiration date";
-        aliyun.ContainerName = "your aliyun container name";
-        aliyun.CreateContainerIfNotExists = false;
+        container.UseAliyun(aliyun =>
+        {
+            aliyun.AccessKeyId = "your aliyun access key id";
+            aliyun.AccessKeySecret = "your aliyun access key secret";
+            aliyun.Endpoint = "your oss endpoint";
+            aliyun.RegionId = "your sts region id";
+            aliyun.RoleArn = "the arn of ram role";
+            aliyun.RoleSessionName = "the name of the certificate";
+            aliyun.Policy = "policy";
+            aliyun.DurationSeconds = "expiration date";
+            aliyun.ContainerName = "your aliyun container name";
+            aliyun.CreateContainerIfNotExists = false;
+        });
     });
 });
 ````

docs/en/Blob-Storing-Aws.md

@@ -23,23 +23,27 @@ Configuration is done in the `ConfigureServices` method of your [module](Module-
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAws(Aws =>
+    options.Containers.ConfigureDefault(container =>
     {
-        Aws.AccessKeyId = "your Aws access key id";
-        Aws.SecretAccessKey = "your Aws access key secret";
-        Aws.UseCredentials = "set true to use credentials";
-        Aws.UseTemporaryCredentials = "set true to use temporary credentials";
-        Aws.UseTemporaryFederatedCredentials = "set true to use temporary federated credentials";
-        Aws.ProfileName = "the name of the profile to get credentials from";
-        Aws.ProfilesLocation = "the path to the aws credentials file to look at";
-        Aws.Region = "the system name of the service";
-        Aws.Name = "the name of the federated user";
-        Aws.Policy = "policy";
-        Aws.DurationSeconds = "expiration date";
-        Aws.ContainerName = "your Aws container name";
-        Aws.CreateContainerIfNotExists = false;
+        container.UseAws(Aws =>
+        {
+            Aws.AccessKeyId = "your Aws access key id";
+            Aws.SecretAccessKey = "your Aws access key secret";
+            Aws.UseCredentials = "set true to use credentials";
+            Aws.UseTemporaryCredentials = "set true to use temporary credentials";
+            Aws.UseTemporaryFederatedCredentials = "set true to use temporary federated credentials";
+            Aws.ProfileName = "the name of the profile to get credentials from";
+            Aws.ProfilesLocation = "the path to the aws credentials file to look at";
+            Aws.Region = "the system name of the service";
+            Aws.Name = "the name of the federated user";
+            Aws.Policy = "policy";
+            Aws.DurationSeconds = "expiration date";
+            Aws.ContainerName = "your Aws container name";
+            Aws.CreateContainerIfNotExists = false;
+        });
     });
 });
+
 ````
 
 > See the [BLOB Storing document](Blob-Storing.md) to learn how to configure this provider for a specific container.

docs/en/Blob-Storing-Azure.md

@@ -23,11 +23,14 @@ Configuration is done in the `ConfigureServices` method of your [module](Module-
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAzure(azure =>
+    options.Containers.ConfigureDefault(container =>
     {
-        azure.ConnectionString = "your azure connection string";
-        azure.ContainerName = "your azure container name";
-        azure.CreateContainerIfNotExists = false;
+        container.UseAzure(azure =>
+        {
+            azure.ConnectionString = "your azure connection string";
+            azure.ContainerName = "your azure container name";
+            azure.CreateContainerIfNotExists = false;
+        });
     });
 });
 ````

docs/en/Blob-Storing-Minio.md

@@ -23,12 +23,15 @@ Configuration is done in the `ConfigureServices` method of your [module](Module-
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseMinio(minio =>
-    {         
-        minio.EndPoint = "your minio endPoint";
-        minio.AccessKey = "your minio accessKey";
-        minio.SecretKey = "your minio secretKey";
-        minio.BucketName = "your minio bucketName";                    
+    options.Containers.ConfigureDefault(container =>
+    {
+        container.UseMinio(minio =>
+        {
+            minio.EndPoint = "your minio endPoint";
+            minio.AccessKey = "your minio accessKey";
+            minio.SecretKey = "your minio secretKey";
+            minio.BucketName = "your minio bucketName";
+        });
     });
 });
 ````

docs/en/Community-Articles/2020-05-29-Real-Time-Messaging-In-A-Distributed-Architecture-Using-Abp-Framework-SingalR-RabbitMQ/POST.md

@@ -21,7 +21,7 @@ For this example flow, we could send message from **Client 1** to **Client 2** d
 
 ### Startup template and initial run
 
-[Abp Framework](www.abp.io) offers startup templates to get into the business faster. We can download a new tiered startup template using [Abp CLI](https://docs.abp.io/en/abp/latest/CLI):
+[Abp Framework](https://www.abp.io) offers startup templates to get into the business faster. We can download a new tiered startup template using [Abp CLI](https://docs.abp.io/en/abp/latest/CLI):
 
 `abp new SignalRTieredDemo --tiered`
 
@@ -459,4 +459,4 @@ We can test with more user. All sent and incoming messages are displayed in the
 
 ### Source code
 
-Source code of the final application can be found on the [GitHub repository](https://github.com/abpframework/abp-samples/tree/master/SignalRTieredDemo).
+Source code of the final application can be found on the [GitHub repository](https://github.com/abpframework/abp-samples/tree/master/SignalRTieredDemo).

docs/zh-Hans/Blob-Storing-Aliyun.md

@@ -23,18 +23,21 @@ BLOB存储Aliyun提供程序可以将BLOB存储在[Aliyun Blob storage](https://
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAliyun(aliyun =>
+    options.Containers.ConfigureDefault(container =>
     {
-        aliyun.AccessKeyId = "your aliyun access key id";
-        aliyun.AccessKeySecret = "your aliyun access key secret";
-        aliyun.Endpoint = "your oss endpoint";
-        aliyun.RegionId = "your sts region id";
-        aliyun.RoleArn = "the arn of ram role";
-        aliyun.RoleSessionName = "the name of the certificate";
-        aliyun.Policy = "policy";
-        aliyun.DurationSeconds = "expiration date";
-        aliyun.ContainerName = "your aliyun container name";
-        aliyun.CreateContainerIfNotExists = false;
+        container.UseAliyun(aliyun =>
+        {
+            aliyun.AccessKeyId = "your aliyun access key id";
+            aliyun.AccessKeySecret = "your aliyun access key secret";
+            aliyun.Endpoint = "your oss endpoint";
+            aliyun.RegionId = "your sts region id";
+            aliyun.RoleArn = "the arn of ram role";
+            aliyun.RoleSessionName = "the name of the certificate";
+            aliyun.Policy = "policy";
+            aliyun.DurationSeconds = "expiration date";
+            aliyun.ContainerName = "your aliyun container name";
+            aliyun.CreateContainerIfNotExists = false;
+        });
     });
 });
 ````

docs/zh-Hans/Blob-Storing-Aws.md

@@ -23,21 +23,24 @@ BLOB存储Aws提供程序可以将BLOB存储在[Amazon Simple Storage Service](h
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAws(Aws =>
+    options.Containers.ConfigureDefault(container =>
     {
-        Aws.AccessKeyId = "your Aws access key id";
-        Aws.SecretAccessKey = "your Aws access key secret";
-        Aws.UseCredentials = "set true to use credentials";
-        Aws.UseTemporaryCredentials = "set true to use temporary credentials";
-        Aws.UseTemporaryFederatedCredentials = "set true to use temporary federated credentials";
-        Aws.ProfileName = "the name of the profile to get credentials from";
-        Aws.ProfilesLocation = "the path to the aws credentials file to look at";
-        Aws.Region = "the system name of the service";
-        Aws.Name = "the name of the federated user";
-        Aws.Policy = "policy";
-        Aws.DurationSeconds = "expiration date";
-        Aws.ContainerName = "your Aws container name";
-        Aws.CreateContainerIfNotExists = false;
+        container.UseAws(Aws =>
+        {
+            Aws.AccessKeyId = "your Aws access key id";
+            Aws.SecretAccessKey = "your Aws access key secret";
+            Aws.UseCredentials = "set true to use credentials";
+            Aws.UseTemporaryCredentials = "set true to use temporary credentials";
+            Aws.UseTemporaryFederatedCredentials = "set true to use temporary federated credentials";
+            Aws.ProfileName = "the name of the profile to get credentials from";
+            Aws.ProfilesLocation = "the path to the aws credentials file to look at";
+            Aws.Region = "the system name of the service";
+            Aws.Name = "the name of the federated user";
+            Aws.Policy = "policy";
+            Aws.DurationSeconds = "expiration date";
+            Aws.ContainerName = "your Aws container name";
+            Aws.CreateContainerIfNotExists = false;
+        });
     });
 });
 ````

docs/zh-Hans/Blob-Storing-Azure.md

@@ -23,11 +23,14 @@ BLOB存储Azure提供程序可以将BLOB存储在[Azure Blob storage](https://az
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAzure(azure =>
+    options.Containers.ConfigureDefault(container =>
     {
-        azure.ConnectionString = "your azure connection string";
-        azure.ContainerName = "your azure container name";
-        azure.CreateContainerIfNotExists = false;
+        container.UseAzure(azure =>
+        {
+            azure.ConnectionString = "your azure connection string";
+            azure.ContainerName = "your azure container name";
+            azure.CreateContainerIfNotExists = false;
+        });
     });
 });
 ````

docs/zh-Hans/Blob-Storing-Minio.md

@@ -23,12 +23,15 @@ BLOB Storing Minio提供程序帮助你存储对象到 [MinIO Object storage](ht
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseMinio(minio =>
-    {         
-        minio.EndPoint = "你的 minio endPoint";
-        minio.AccessKey = "你的 minio accessKey";
-        minio.SecretKey = "你的 minio secretKey";
-        minio.BucketName = "你的 minio bucketName";                    
+    options.Containers.ConfigureDefault(container =>
+    {
+        container.UseMinio(minio =>
+        {
+            minio.EndPoint = "你的 minio endPoint";
+            minio.AccessKey = "你的 minio accessKey";
+            minio.SecretKey = "你的 minio secretKey";
+            minio.BucketName = "你的 minio bucketName";
+        });
     });
 });
 ````

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/ElasticDocumentFullSearch.cs

@@ -73,7 +73,7 @@ namespace Volo.Docs.Documents.FullSearch.Elastic
                 FileName = document.FileName,
                 Content = document.Content,
                 LanguageCode = ConvertLanguageCode(document.LanguageCode),
-                Version = document.Version
+                Version = ConvertVersion(document.Version)
             };
 
             if (!existsResponse.Exists)
@@ -173,7 +173,7 @@ namespace Volo.Docs.Documents.FullSearch.Elastic
                                 new TermQuery
                                 {
                                     Field = "version",
-                                    Value = version
+                                    Value = ConvertVersion(version)
                                 },
                                 new TermQuery
                                 {
@@ -237,5 +237,10 @@ namespace Volo.Docs.Documents.FullSearch.Elastic
         {
             return languageCode.Replace("-", "").ToLower();
         }
+
+        protected string ConvertVersion(string version)
+        {
+            return version.Replace("-", "").ToLower();
+        }
     }
 }

samples/MicroserviceDemo/applications/AuthServer.Host/package.json

@@ -1,8 +0,0 @@
-{
-  "version": "0.1.0",
-  "name": "msdemo-authserver-host",
-  "private": true,
-  "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
-  }
-}

samples/MicroserviceDemo/applications/BackendAdminApp.Host/package.json

@@ -1,8 +0,0 @@
-{
-  "version": "0.1.0",
-  "name": "msdemo-backend-admin-app-host",
-  "private": true,
-  "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
-  }
-}

samples/MicroserviceDemo/applications/PublicWebSite.Host/package.json

@@ -1,9 +0,0 @@
-{
-  "version": "0.1.0",
-  "name": "msdemo-backend-admin-app-host",
-  "private": true,
-  "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5",
-    "@abp/blogging": "^3.0.5"
-  }
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs

@@ -5,6 +5,7 @@ using Volo.Abp.FeatureManagement;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer;
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.SettingManagement;
@@ -44,9 +45,14 @@ namespace MyCompanyName.MyProjectName
                     .Add<MyProjectNameResource>("en")
                     .AddBaseTypes(typeof(AbpValidationResource))
                     .AddVirtualJson("/Localization/MyProjectName");
-                
+
                 options.DefaultResourceType = typeof(MyProjectNameResource);
             });
+            
+            Configure<AbpExceptionLocalizationOptions>(options =>
+            {
+                options.MapCodeNamespace("MyProjectName", typeof(MyProjectNameResource));
+            });
         }
     }
 }