Merge pull request #12332 from abpframework/auto-merge/rel-5-2/1006

Merge branch dev with rel-5.2

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs

@@ -14,6 +14,13 @@ public static class ModuleProjectBuildPipelineBuilder
         pipeline.Steps.Add(new ReplaceCommonPropsStep());
         pipeline.Steps.Add(new MakeProxyJsonFileEmbeddedStep());
         pipeline.Steps.Add(new ReplaceConfigureAwaitPropsStep());
+
+        if (context.Module.IsPro)
+        {
+            pipeline.Steps.Add(new CreateAppSettingsSecretsStep());
+            pipeline.Steps.Add(new LicenseCodeReplaceStep());
+        }
+        
         pipeline.Steps.Add(new UpdateNuGetConfigStep("/NuGet.Config"));
         pipeline.Steps.Add(new CreateProjectResultZipStep());
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs

@@ -40,7 +40,21 @@ public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep
 
     private static byte[] GetAppSettingsSecretJsonContent(ProjectBuildContext context)
     {
-        return context.Template.IsPro()
+        bool condition;
+        if (context.Template != null)
+        {
+            condition = context.Template.IsPro();
+        }
+        else if (context.Module != null)
+        {
+            condition = context.Module.IsPro;
+        }
+        else
+        {
+            condition = false;
+        }
+        
+        return condition
             ? $"{{{Environment.NewLine}  \"AbpLicenseCode\": \"{CliConsts.LicenseCodePlaceHolder}\" {Environment.NewLine}}}".GetBytes()
             : $"{{{Environment.NewLine}}}".GetBytes();
     }

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs

@@ -81,11 +81,12 @@ public partial class RoleManagement
                     new TableColumn
                     {
                         Title = L["Actions"],
-                        Actions = EntityActions.Get<RoleManagement>()
+                        Actions = EntityActions.Get<RoleManagement>(),
                     },
                     new TableColumn
                     {
                         Title = L["RoleName"],
+                        Sortable = true,
                         Data = nameof(IdentityRoleDto.Name),
                         Component = typeof(RoleNameComponent)
                     },

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@@ -182,22 +182,25 @@ public partial class UserManagement
                     new TableColumn
                     {
                         Title = L["Actions"],
-                        Actions = EntityActions.Get<UserManagement>()
+                        Actions = EntityActions.Get<UserManagement>(),
                     },
                     new TableColumn
                     {
                         Title = L["UserName"],
                         Data = nameof(IdentityUserDto.UserName),
+                        Sortable = true,
                     },
                     new TableColumn
                     {
                         Title = L["EmailAddress"],
                         Data = nameof(IdentityUserDto.Email),
+                        Sortable = true,
                     },
                     new TableColumn
                     {
                         Title = L["PhoneNumber"],
                         Data = nameof(IdentityUserDto.PhoneNumber),
+                        Sortable = true,
                     }
             });
 

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs

@@ -109,11 +109,12 @@ public partial class TenantManagement
                     new TableColumn
                     {
                         Title = L["Actions"],
-                        Actions = EntityActions.Get<TenantManagement>()
+                        Actions = EntityActions.Get<TenantManagement>(),
                     },
                     new TableColumn
                     {
                         Title = L["TenantName"],
+                        Sortable = true,
                         Data = nameof(TenantDto.Name),
                     },
             });