Merge pull request #13868 from abpframework/auto-merge/rel-6-0/1320

Merge branch dev with rel-6.0

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs

@@ -14,6 +14,16 @@ internal static class CommercialPackages
 
     public static bool IsCommercial(string packageId)
     {
-        return Packages.Contains(packageId.ToLowerInvariant());
+        return Packages.Contains(packageId.ToLowerInvariant()) || IsLeptonXPackage(packageId);
+    }
+
+    private static bool IsLeptonXPackage(string packageId)
+    {
+        return !IsLeptonXLitePackage(packageId) && packageId.Contains("LeptonX");
+    }
+
+    private static bool IsLeptonXLitePackage(string packageId)
+    {
+        return packageId.Contains("LeptonXLite");
     }
 }

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

@@ -39,6 +39,13 @@ public partial class RoleManagement
         ManagePermissionsPolicyName = IdentityPermissions.Roles.ManagePermissions;
     }
 
+    protected override ValueTask SetBreadcrumbItemsAsync()
+    {
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value));
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Roles"].Value));
+        return base.SetBreadcrumbItemsAsync();
+    }
+
     protected override ValueTask SetEntityActionsAsync()
     {
         EntityActions

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

@@ -66,6 +66,13 @@ public partial class UserManagement
         }
     }
 
+    protected override ValueTask SetBreadcrumbItemsAsync()
+    {
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value));
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Users"].Value));
+        return base.SetBreadcrumbItemsAsync();
+    }
+
     protected virtual async Task OnSearchTextChanged(string value)
     {
         GetListInput.Filter = value;

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs

@@ -31,6 +31,8 @@ public partial class SettingManagement
 
     protected async override Task OnInitializedAsync()
     {
+        BreadcrumbItems.Add(new BreadcrumbItem(@L["Settings"]));
+
         SettingComponentCreationContext = new SettingComponentCreationContext(ServiceProvider);
 
         foreach (var contributor in Options.Contributors)

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

@@ -40,6 +40,13 @@ public partial class TenantManagement
         ManageFeaturesPolicyName = TenantManagementPermissions.Tenants.ManageFeatures;
     }
 
+    protected override ValueTask SetBreadcrumbItemsAsync()
+    {
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:TenantManagement"]));
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Tenants"]));
+        return base.SetBreadcrumbItemsAsync();
+    }
+
     protected override async Task SetPermissionsAsync()
     {
         await base.SetPermissionsAsync();