Merge branch 'dev' into IAsyncEnumerable

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs

@@ -36,7 +36,6 @@ public class AngularSourceCodeAdder : ITransientDependency
 
             await AddPathsToTsConfigAsync(angularPath, angularProjectsPath, projects);
             await CreateTsConfigProdJsonAsync(angularPath);
-            await AddScriptsToPackageJsonAsync(angularPath);
             await AddProjectsToAngularJsonAsync(angularPath, projects);
         }
         catch (Exception e)
@@ -58,7 +57,6 @@ public class AngularSourceCodeAdder : ITransientDependency
 
             await AddPathsToTsConfigAsync(angularPath, angularProjectsPath, projects);
             await CreateTsConfigProdJsonAsync(angularPath);
-            await AddScriptsToPackageJsonAsync(angularPath);
             await AddProjectsToAngularJsonAsync(angularPath, projects);
         }
         catch (Exception e)
@@ -124,28 +122,6 @@ public class AngularSourceCodeAdder : ITransientDependency
         File.WriteAllText(angularJsonFilePath, json.ToString(Formatting.Indented));
     }
 
-    private async Task AddScriptsToPackageJsonAsync(string angularPath)
-    {
-        var packageJsonFilePath = Path.Combine(angularPath, "package.json");
-        var fileContent = File.ReadAllText(packageJsonFilePath);
-
-        var json = JObject.Parse(fileContent);
-
-        var scriptsJobject = (JObject)json["scripts"];
-
-        if (scriptsJobject == null || scriptsJobject["postinstall"] != null ||
-            scriptsJobject["compile:ivy"] != null)
-        {
-            return;
-        }
-
-        scriptsJobject["postinstall"] = "npm run compile:ivy";
-        scriptsJobject["compile:ivy"] =
-            "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules";
-
-        File.WriteAllText(packageJsonFilePath, json.ToString(Formatting.Indented));
-    }
-
     private async Task CreateTsConfigProdJsonAsync(string angularPath)
     {
         var tsConfigProdJsonFilePath = Path.Combine(angularPath, "tsconfig.prod.json");

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

@@ -9,6 +9,9 @@
 @using Volo.Abp.BlazoriseUI.Components.ObjectExtending
 @using Volo.Abp.AspNetCore.Components.Web.Theming.Layout
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.UI.Navigation.Localization.Resource
+@inject IStringLocalizer<AbpUiNavigationResource> LUiNavigation
 
 @inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>
 <Card>

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

@@ -41,6 +41,7 @@ public partial class RoleManagement
 
     protected override ValueTask SetBreadcrumbItemsAsync()
     {
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(LUiNavigation["Menu:Administration"].Value));
         BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value));
         BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Roles"].Value));
         return base.SetBreadcrumbItemsAsync();

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

@@ -6,6 +6,9 @@
 @using Volo.Abp.Identity.Localization
 @using Volo.Abp.AspNetCore.Components.Web.Theming.Layout
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.UI.Navigation.Localization.Resource
+@inject IStringLocalizer<AbpUiNavigationResource> LUiNavigation
 
 @inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
 

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

@@ -75,6 +75,7 @@ public partial class UserManagement
 
     protected override ValueTask SetBreadcrumbItemsAsync()
     {
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(LUiNavigation["Menu:Administration"].Value));
         BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value));
         BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Users"].Value));
         return base.SetBreadcrumbItemsAsync();

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

@@ -7,12 +7,15 @@
 @using Volo.Abp.Identity.Localization
 @using Volo.Abp.Identity.Web.Navigation
 @using Volo.Abp.Identity.Web.Pages.Identity.Roles
+@using Volo.Abp.UI.Navigation.Localization.Resource
 @model IndexModel
 @inject IHtmlLocalizer<IdentityResource> L
+@inject IHtmlLocalizer<AbpUiNavigationResource> LUiNavigation
 @inject IAuthorizationService Authorization
 @inject IPageLayout PageLayout
 @{
     PageLayout.Content.Title = L["Roles"].Value;
+    PageLayout.Content.BreadCrumb.Add(LUiNavigation["Menu:Administration"].Value);
     PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
     PageLayout.Content.MenuItemName = IdentityMenuNames.Roles;
 }

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

@@ -7,12 +7,15 @@
 @using Volo.Abp.Identity.Localization
 @using Volo.Abp.Identity.Web.Navigation
 @using Volo.Abp.Identity.Web.Pages.Identity.Users
+@using Volo.Abp.UI.Navigation.Localization.Resource
 @model IndexModel
 @inject IHtmlLocalizer<IdentityResource> L
+@inject IHtmlLocalizer<AbpUiNavigationResource> LUiNavigation
 @inject IAuthorizationService Authorization
 @inject IPageLayout PageLayout
 @{
     PageLayout.Content.Title = L["Users"].Value;
+    PageLayout.Content.BreadCrumb.Add(LUiNavigation["Menu:Administration"].Value);
     PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
     PageLayout.Content.MenuItemName = IdentityMenuNames.Users;
 }

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

@@ -4,7 +4,9 @@
 @using Volo.Abp.Features
 @attribute [Authorize]
 @attribute [RequiresFeature(SettingManagementFeatures.Enable)]
-
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.UI.Navigation.Localization.Resource
+@inject IStringLocalizer<AbpUiNavigationResource> LUiNavigation
 @* ************************* PAGE HEADER ************************* *@
 <PageHeader Title="@L["Settings"]" BreadcrumbItems="@BreadcrumbItems">
 

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

@@ -31,7 +31,8 @@ public partial class SettingManagement
 
     protected async override Task OnInitializedAsync()
     {
-        BreadcrumbItems.Add(new BreadcrumbItem(@L["Settings"]));
+        BreadcrumbItems.Add(new BreadcrumbItem(LUiNavigation["Menu:Administration"].Value));
+        BreadcrumbItems.Add(new BreadcrumbItem(@L["Menu:Settings"].Value));
 
         SettingComponentCreationContext = new SettingComponentCreationContext(ServiceProvider);
 

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "أرسلت بنجاح",
     "MailSendingFailed": "فشل إرسال البريد ، يرجى التحقق من تكوين البريد الإلكتروني الخاص بك والمحاولة مرة أخرى.",
     "Send": "يرسل",
+    "Menu:Settings": "الإعدادات",
     "Menu:Emailing": "إرسال بالبريد الإلكتروني",
     "Menu:TimeZone": "وحدة زمنية",
     "DisplayName:Timezone": "وحدة زمنية",
@@ -36,6 +37,6 @@
     "Feature:SettingManagementEnableDescription": "تفعيل إعداد نظام الإدارة في التطبيق.",
     "Feature:AllowChangingEmailSettings": "السماح لتغيير إعدادات البريد الإلكتروني.",
     "Feature:AllowChangingEmailSettingsDescription": "السماح لتغيير إعدادات البريد الإلكتروني.",
-    "SmtpPasswordPlaceholder": "أدخل قيمة لتحديث كلمة المرور",
+    "SmtpPasswordPlaceholder": "أدخل قيمة لتحديث كلمة المرور"
   }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Úspěšně odesláno",
     "MailSendingFailed": "Odesílání e-mailu se nezdařilo. Zkontrolujte konfiguraci e-mailu a zkuste to znovu.",
     "Send": "Poslat",
+    "Menu:Settings": "Nastavení",
     "Menu:Emailing": "Zasílání e-mailem",
     "Menu:TimeZone": "Časové Pásmo",
     "DisplayName:Timezone": "Časové pásmo",
@@ -36,6 +37,6 @@
     "Feature:SettingManagementEnableDescription": "Povolit systém správy nastavení v aplikaci.",
     "Feature:AllowChangingEmailSettings": "Povolit změnu nastavení e-mailu.",
     "Feature:AllowChangingEmailSettingsDescription": "Povolit změnu nastavení e-mailu.",
-    "SmtpPasswordPlaceholder": "Zadejte hodnotu pro aktualizaci hesla",
+    "SmtpPasswordPlaceholder": "Zadejte hodnotu pro aktualizaci hesla"
   }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Erfolgreich gesendet",
     "MailSendingFailed": "E-Mail-Versand fehlgeschlagen. Bitte überprüfen Sie Ihre E-Mail-Konfiguration und versuchen Sie es erneut.",
     "Send": "Senden",
+    "Menu:Settings": "Einstellungen",
     "Menu:Emailing": "E-Mail",
     "Menu:TimeZone": "Zeitzone",
     "DisplayName:Timezone": "Zeitzone",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Erfolgreich gesendet",
     "MailSendingFailed": "E-Mail-Versand fehlgeschlagen. Bitte überprüfen Sie Ihre E-Mail-Konfiguration und versuchen Sie es erneut.",
     "Send": "Schicken",
+    "Menu:Settings": "Einstellungen",
     "Menu:Emailing": "E-Mail senden",
     "Menu:TimeZone": "Zeitzone",
     "DisplayName:Timezone": "Zeitzone",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Στάλθηκε με επιτυχία",
     "MailSendingFailed": "Αποτυχία αποστολής email. Ελέγξτε τη διαμόρφωση του email σας και δοκιμάστε ξανά.",
     "Send": "Αποστολή",
+    "Menu:Settings": "Ρυθμίσεις",
     "Menu:Emailing": "Αποστολή email",
     "SmtpHost": "Διακομιστής",
     "SmtpPort": "Πόρτα",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Sent successfully",
     "MailSendingFailed": "Mail sending failed, please check your email configuration and try again.",
     "Send": "Send",
+    "Menu:Settings": "Settings",
     "Menu:Emailing": "Emailing",
     "Menu:TimeZone": "Time Zone",
     "DisplayName:Timezone": "Time zone",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Enviado exitosamente",
     "MailSendingFailed": "Error al enviar el correo, por favor revise su configuración de correo y vuelva a intentarlo.",
     "Send": "Enviar",
+    "Menu:Settings": "Configuraciones",
     "Menu:Emailing": "Configuración",
     "Menu:TimeZone": "Zona Horaria",
     "DisplayName:Timezone": "Zona horaria",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fa.json

@@ -5,6 +5,7 @@
     "SavedSuccessfully": "با موفقیت ذخیره شد",
     "Permission:SettingManagement": "مدیریت تنظیمات",
     "Permission:Emailing": "تنظیمات ایمیل",
+    "Menu:Settings": "تنظیمات",
     "Menu:Emailing": "تنظیمات ایمیل",
     "SmtpHost": "هاست",
     "SmtpPort": "پورت",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Lähetetty onnistuneesti",
     "MailSendingFailed": "Sähköpostin lähetys epäonnistui. Tarkista sähköpostiasetuksesi ja yritä uudelleen.",
     "Send": "Lähetä",
+    "Menu:Settings": "Asetukset",
     "Menu:Emailing": "Sähköpostiviestit",
     "Menu:TimeZone": "Aikavyöhyke",
     "DisplayName:Timezone": "Aikavyöhyke",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Envoyé avec succès",
     "MailSendingFailed": "L'envoi de courrier a échoué, veuillez vérifier votre configuration de courrier électronique et réessayer.",
     "Send": "Envoyer",
+    "Menu:Settings": "Paramètres",
     "Menu:Emailing": "Envoi par e-mail",
     "Menu:TimeZone": "Fuseau Horaire",
     "DisplayName:Timezone": "Fuseau horaire",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hi.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "सफलतापूर्वक भेज दिया गया",
     "MailSendingFailed": "मेल भेजने में विफल, कृपया अपनी ईमेल विन्यास की जाँच करें और पुनः प्रयास करें।",
     "Send": "भेजना",
+    "Menu:Settings": "समायोजन",
     "Menu:Emailing": "ईमेल से भेजना",
     "Menu:TimeZone": "समय क्षेत्र",
     "DisplayName:Timezone": "समय क्षेत्र",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hr.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Poslan uspješno",
     "MailSendingFailed": "Slanje e-pošte nije uspjelo, provjerite konfiguraciju e-pošte i pokušajte ponovo.",
     "Send": "Poslati",
+    "Menu:Settings": "Postavke",
     "Menu:Emailing": "Slanje e-poštom",
     "Menu:TimeZone": "Vremenska Zona",
     "DisplayName:Timezone": "Vremenska zona",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Sikeresen elküldve",
     "MailSendingFailed": "Az e-mail küldése sikertelen, ellenőrizze az e-mail konfigurációját, és próbálja újra.",
     "Send": "Küld",
+    "Menu:Settings": "Beállítások",
     "Menu:Emailing": "E-mailezés",
     "Menu:TimeZone": "Időzóna",
     "DisplayName:Timezone": "Időzóna",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Tókst að senda",
     "MailSendingFailed": "Tölvupóstur sendist ekki. Athugaðu tölvupóst stillingar þínar og reyndu aftur.",
     "Send": "Senda",
+    "Menu:Settings": "Stillingar",
     "Menu:Emailing": "Senda tölvupóst",
     "Menu:TimeZone": "Tímabelti",
     "DisplayName:Timezone": "Tímabelti",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Inviato con successo",
     "MailSendingFailed": "Invio della posta fallito, controlla la tua configurazione email e riprova.",
     "Send": "Inviare",
+    "Menu:Settings": "Impostazioni",
     "Menu:Emailing": "Invio di e-mail",
     "Menu:TimeZone": "Fuso Orario",
     "DisplayName:Timezone": "Fuso orario",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Succesvol verzonden",
     "MailSendingFailed": "E-mail verzenden mislukt. Controleer uw e-mailconfiguratie en probeer het opnieuw.",
     "Send": "Versturen",
+    "Menu:Settings": "Instellingen",
     "Menu:Emailing": "E-mail",
     "Menu:TimeZone": "Tijdzone",
     "DisplayName:Timezone": "Tijdzone",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Wysłano pomyślnie",
     "MailSendingFailed": "Wysyłanie e-maila nie powiodło się. Sprawdź konfigurację e-maila i spróbuj ponownie.",
     "Send": "Wysłać",
+    "Menu:Settings": "Ustawienia",
     "Menu:Emailing": "Wysyłanie e-maili",
     "Menu:TimeZone": "Strefa Czasowa",
     "DisplayName:Timezone": "Strefa czasowa",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Enviado com sucesso",
     "MailSendingFailed": "Falha no envio de e-mail, verifique sua configuração de e-mail e tente novamente.",
     "Send": "Enviar",
+    "Menu:Settings": "Configurações",
     "Menu:Emailing": "Enviando por e-mail",
     "Menu:TimeZone": "Fuso Horário",
     "DisplayName:Timezone": "Fuso horário",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Trimis cu succes",
     "MailSendingFailed": "Trimiterea e-mailului a eșuat. Verificați configurația e-mailului și încercați din nou.",
     "Send": "Trimite",
+    "Menu:Settings": "Setări",
     "Menu:Emailing": "Emailing",
     "Menu:TimeZone": "Fus Orar",
     "DisplayName:Timezone": "Fus orar",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "отправлено успешно",
     "MailSendingFailed": "Не удалось отправить письмо. Пожалуйста, проверьте настройки электронной почты и повторите попытку.",
     "Send": "Отправлять",
+    "Menu:Settings": "Настройки",
     "Menu:Emailing": "Отправка по электронной почте",
     "Menu:TimeZone": "Часовой пояс",
     "DisplayName:Timezone": "Часовой пояс",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Úspešne odoslané",
     "MailSendingFailed": "Odoslanie emailu zlyhalo. Skontrolujte konfiguráciu emailu a skúste to znova.",
     "Send": "Odoslať",
+    "Menu:Settings": "Nastavenia",
     "Menu:Emailing": "Posielanie emailov",
     "Menu:TimeZone": "Časové Pásmo",
     "DisplayName:Timezone": "Časové pásmo",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Poslano uspešno",
     "MailSendingFailed": "Pošiljanje e-pošte ni uspelo, preverite konfiguracijo e-pošte in poskusite znova.",
     "Send": "Pošlji",
+    "Menu:Settings": "Nastavitve",
     "Menu:Emailing": "Pošiljanje po e-pošti",
     "Menu:TimeZone": "Časovni Pas",
     "DisplayName:Timezone": "Časovni pas",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sv.json

@@ -16,6 +16,7 @@
     "TestEmailBody": "Testa e-postmeddelandets brödtext här",
     "SentSuccessfully": "Skickat framgångsrikt",
     "Send": "Skicka",
+    "Menu:Settings": "Inställningar",
     "Menu:Emailing": "E-post",
     "Menu:TimeZone": "Tidszon",
     "DisplayName:Timezone": "Tidszon",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Gönderildi",
     "MailSendingFailed": "E-posta gönderme başarısız, lütfen e-posta yapılandırmanızı kontrol edin ve tekrar deneyin.",
     "Send": "Gönder",
+    "Menu:Settings": "Ayarlar",
     "Menu:Emailing": "Email",
     "Menu:TimeZone": "Zaman Dilimi",
     "DisplayName:Timezone": "Zaman dilimi",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "Gửi thành công",
     "MailSendingFailed": "Gửi email thất bại. Vui lòng kiểm tra cấu hình email của bạn và thử lại.",
     "Send": "Gửi",
+    "Menu:Settings": "Cài đặt",
     "Menu:Emailing": "Gửi email",
     "Menu:TimeZone": "Múi Giờ",
     "DisplayName:Timezone": "Múi giờ",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "发送成功",
     "MailSendingFailed": "邮件发送失败，请检查您的电子邮件配置并重试。",
     "Send": "发送",
+    "Menu:Settings": "设置",
     "Menu:Emailing": "邮件",
     "Menu:TimeZone": "时区",
     "DisplayName:Timezone": "时区",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json

@@ -17,6 +17,7 @@
     "SentSuccessfully": "發送成功",
     "MailSendingFailed": "郵件發送失敗,請檢查你的郵件配置並重試.",
     "Send": "發送",
+    "Menu:Settings": "設置",
     "Menu:Emailing": "信箱",
     "Menu:TimeZone": "時區",
     "DisplayName:Timezone": "時區",

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml

@@ -4,11 +4,15 @@
 @using Volo.Abp.SettingManagement.Localization
 @using Volo.Abp.SettingManagement.Web.Navigation
 @using Volo.Abp.SettingManagement.Web.Pages.SettingManagement
+@using Volo.Abp.UI.Navigation.Localization.Resource
 @model IndexModel
 @inject IHtmlLocalizer<AbpSettingManagementResource> L
+@inject IHtmlLocalizer<AbpUiNavigationResource> LUiNavigation
 @inject IPageLayout PageLayout
 @{
     PageLayout.Content.Title = L["Settings"].Value;
+
+    PageLayout.Content.BreadCrumb.Add(LUiNavigation["Menu:Administration"].Value);
     PageLayout.Content.MenuItemName = SettingManagementMenuNames.GroupName;
 }
 @section scripts {

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

@@ -8,6 +8,9 @@
 @using Volo.Abp.BlazoriseUI.Components.ObjectExtending
 @using Volo.Abp.AspNetCore.Components.Web
 @inject AbpBlazorMessageLocalizerHelper<AbpTenantManagementResource> LH
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.UI.Navigation.Localization.Resource
+@inject IStringLocalizer<AbpUiNavigationResource> LUiNavigation
 @inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
 
 <Card>

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

@@ -41,6 +41,7 @@ public partial class TenantManagement
 
     protected override ValueTask SetBreadcrumbItemsAsync()
     {
+        BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(LUiNavigation["Menu:Administration"]));
         BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:TenantManagement"]));
         BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Tenants"]));
         return base.SetBreadcrumbItemsAsync();

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml

@@ -8,12 +8,15 @@
 @using Volo.Abp.TenantManagement.Localization
 @using Volo.Abp.TenantManagement.Web.Navigation
 @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
+@using Volo.Abp.UI.Navigation.Localization.Resource
 @model IndexModel
 @inject IHtmlLocalizer<AbpTenantManagementResource> L
+@inject IHtmlLocalizer<AbpUiNavigationResource> LUiNavigation
 @inject IAuthorizationService Authorization
 @inject IPageLayout PageLayout
 @{
     PageLayout.Content.Title = L["Tenants"].Value;
+    PageLayout.Content.BreadCrumb.Add(LUiNavigation["Menu:Administration"].Value);
     PageLayout.Content.BreadCrumb.Add(L["Menu:TenantManagement"].Value);
     PageLayout.Content.MenuItemName = TenantManagementMenuNames.Tenants;
 }

npm/ng-packs/package.json

@@ -29,8 +29,6 @@
     "workspace-generator": "nx workspace-generator",
     "dep-graph": "nx dep-graph",
     "help": "nx help",
-    "compile:ivy": "yarn ngcc --properties es2020 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules",
-    "postinstall2": "node ./decorate-angular-cli.js && yarn compile:ivy",
     "build:schematics": "cd scripts && yarn && yarn build:schematics && cd ..",
     "dev:schematics": "tsc -p packages/schematics/tsconfig.json -w",
     "mock:schematics": "cd scripts/mock-schematic && yarn && yarn start",

npm/ng-packs/scripts/build.ts

@@ -4,7 +4,6 @@ import fse from 'fs-extra';
 
 (async () => {
   program.option('-i, --noInstall', 'skip updating package.json and installation', false);
-  program.option('-c, --skipNgcc', 'skip ngcc', false);
 
   program.parse(process.argv);
 
@@ -66,8 +65,6 @@ import fse from 'fs-extra';
       ],
       { stdout: 'inherit', cwd: '../' },
     );
-
-    if (!program.skipNgcc) await execa('yarn', ['compile:ivy'], { stdout: 'inherit', cwd: '../' });
   } catch (error) {
     console.error(error.stderr);
     process.exit(1);

npm/packs/utils/.npmignore

@@ -1,4 +1,3 @@
 **/*
 !dist/**/*
 !abp.resourcemapping.js
-!ngcc.config.js

npm/packs/utils/angular.json

@@ -10,7 +10,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/utils/tsconfig.lib.json",
             "project": "projects/utils/ng-package.json"
@@ -40,6 +40,5 @@
   },
   "cli": {
     "analytics": false
-  },
-  "defaultProject": "utils"
+  }
 }

npm/packs/utils/ngcc.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  entryPoints: {
-    '.': { ignore: true },
-    './dist': {},
-  },
-};

npm/packs/utils/package.json

@@ -19,40 +19,36 @@
     "directory": "npm/packs/utils"
   },
   "module": "dist/fesm2015/abp-utils.js",
-  "es2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/abp-utils.js",
   "es2015": "dist/fesm2015/abp-utils.js",
   "esm2015": "dist/esm2015/abp-utils.js",
-  "fesm2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/abp-utils.js",
   "fesm2015": "dist/fesm2015/abp-utils.js",
   "typings": "dist/abp-utils.d.ts",
   "metadata": "dist/abp-utils.metadata.json",
   "sideEffects": false,
   "devDependencies": {
-    "@angular-builders/jest": "^9.0.0",
-    "@angular-devkit/build-ng-packagr": "~0.1000.0",
-    "@angular/cli": "~10.0.0",
-    "@angular/common": "~10.0.0",
-    "@angular/compiler": "~10.0.0",
-    "@angular/compiler-cli": "~10.0.0",
-    "@angular/core": "~10.0.0",
-    "@angular/platform-browser": "~10.0.0",
-    "@angular/platform-browser-dynamic": "~10.0.0",
-    "@types/execa": "^2.0.0",
-    "@types/fs-extra": "^8.1.0",
-    "@types/jest": "^25.1.4",
+    "@angular-builders/jest": "~20.0.0",
+    "@angular/cli": "~20.0.0",
+    "@angular/common": "~20.0.0",
+    "@angular/compiler": "~20.0.0",
+    "@angular/compiler-cli": "~20.0.0",
+    "@angular/core": "~20.0.0",
+    "@angular/platform-browser": "~20.0.0",
+    "@angular/platform-browser-dynamic": "~20.0.0",
+    "@angular-devkit/build-angular": "~20.0.0",
+    "@types/fs-extra": "~11.0.0",
+    "@types/jest": "^29.0.0",
     "@types/node": "^12.11.1",
     "codelyzer": "^5.1.2",
-    "execa": "^4.0.0",
-    "fs-extra": "^9.0.0",
-    "jest": "^25.2.4",
-    "jest-preset-angular": "^8.1.2",
-    "ng-packagr": "^10.0.0",
-    "protractor": "^7.0.0",
+    "execa": "~9.6.0",
+    "fs-extra": "~9.0.0",
+    "jest": "^29.0.0",
+    "jest-preset-angular": "^13.0.0",
+    "ng-packagr": "~20.0.0",
     "ts-node": "~8.3.0",
     "tslib": "~2.0.0",
     "tslint": "^6.1.0",
-    "typescript": "~3.9.5",
-    "zone.js": "~0.10.2"
+    "typescript": "~5.8.0",
+    "zone.js": "~0.15.0"
   },
   "dependencies": {
     "just-compare": "^2.3.0"

npm/packs/utils/prepublish.js

@@ -1,11 +1,11 @@
 const fse = require('fs-extra');
-const execa = require('execa');
+const { execaSync } = require('execa');
 
 fse.copyFileSync('./package.json', './projects/utils/package.json');
 fse.copyFileSync('./README.md', './projects/utils/README.md');
 
 try {
-  execa.sync('yarn', ['build'], { stdout: 'inherit' });
+  execaSync('yarn', ['build'], { stdio: 'inherit' });
   process.exit(0);
 } catch (error) {
   console.error(error);

npm/packs/utils/projects/utils/ng-package.json

@@ -3,8 +3,7 @@
   "dest": "../../dist",
   "deleteDestPath": true,
   "lib": {
-    "entryFile": "src/public-api.ts",
-    "umdId": "abp.utils.common"
+    "entryFile": "src/public-api.ts"
   },
-  "whitelistedNonPeerDependencies": ["just-compare"]
+  "allowedNonPeerDependencies": ["just-compare"]
 }

npm/packs/utils/projects/utils/tsconfig.lib.json

@@ -9,10 +9,7 @@
     "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
-    "skipTemplateCodegen": true,
-    "strictMetadataEmit": true,
-    "enableResourceInlining": true,
-    "enableIvy": false
+    "enableResourceInlining": true
   },
   "exclude": ["src/test.ts", "**/*.spec.ts"]
 }