Merge branch 'rel-7.0' of https://github.com/abpframework/abp into rel-7.0

framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj

@@ -14,10 +14,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise" Version="1.1.3.1" />
+        <PackageReference Include="Blazorise" Version="1.1.4.1" />
-        <PackageReference Include="Blazorise.DataGrid" Version="1.1.3.1" />
+        <PackageReference Include="Blazorise.DataGrid" Version="1.1.4.1" />
-        <PackageReference Include="Blazorise.Snackbar" Version="1.1.3.1" />
+        <PackageReference Include="Blazorise.Snackbar" Version="1.1.4.1" />
-        <PackageReference Include="Blazorise.Components" Version="1.1.3.1" />
+        <PackageReference Include="Blazorise.Components" Version="1.1.4.1" />
     </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@@ -261,6 +261,12 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
         }
         catch (Exception ex)
         {
+            if(ex is UserFriendlyException)
+            {
+                Logger.LogWarning(ex.Message);
+                throw;
+            }
+
             Console.WriteLine("Error occured while downloading source-code from {0} : {1}{2}{3}", url,
                 responseMessage?.ToString(), Environment.NewLine, ex.Message);
             throw;

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs

@@ -1,6 +1,9 @@
-using Volo.Abp.AspNetCore.Components.Web.Theming;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Components.Web.Theming;
 using Volo.Abp.FeatureManagement.Blazor.Settings;
+using Volo.Abp.FeatureManagement.Localization;
 using Volo.Abp.Features;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.SettingManagement.Blazor;
 
@@ -20,5 +23,12 @@ public class AbpFeatureManagementBlazorModule : AbpModule
         {
             options.Contributors.Add(new FeatureSettingManagementComponentContributor());
         });
+        
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Get<AbpFeatureManagementResource>()
+                .AddBaseTypes(typeof(AbpUiResource));
+        });
     }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json

@@ -7,6 +7,9 @@
     "Permission:FeatureManagement": "Feature management",
     "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} feature value is not valid!",
-    "Menu:FeatureManagement": "Feature Management"
+    "Menu:FeatureManagement": "Feature Management",
+    "ResetToDefault": "Reset to default",
+    "ResetedToDefault": "Reseted to default",
+    "AreYouSureToResetToDefault": "Are you sure to reset to default?"
   }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json

@@ -1,12 +1,15 @@
 {
-	"culture": "zh-Hans",
+  "culture": "zh-Hans",
-	"texts": {
+  "texts": {
-		"Features": "功能",
+    "Features": "功能",
-		"NoFeatureFoundMessage": "没有可用的功能.",
+    "NoFeatureFoundMessage": "没有可用的功能.",
-		"ManageHostFeatures": "管理Host功能",
+    "ManageHostFeatures": "管理Host功能",
-		"Permission:FeatureManagement": "功能管理",
+    "Permission:FeatureManagement": "功能管理",
-		"Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
+    "Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
-		"Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值无效!",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0}功能的值无效!",
-		"Menu:FeatureManagement": "功能管理"
+    "Menu:FeatureManagement": "功能管理",
-	}
+    "ResetToDefault": "重置为默认值",
-}
+    "ResetedToDefault": "已重置为默认值",
+    "AreYouSureToResetToDefault": "你确定要重置为默认值吗？"
+  }
+}

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json

@@ -1,12 +1,15 @@
 {
-	"culture": "zh-Hant",
+  "culture": "zh-Hant",
-	"texts": {
+  "texts": {
-		"Features": "功能",
+    "Features": "功能",
-		"NoFeatureFoundMessage": "沒有可用的功能.",
+    "NoFeatureFoundMessage": "沒有可用的功能.",
-		"ManageHostFeatures": "管理Host功能",
+    "ManageHostFeatures": "管理Host功能",
-		"Permission:FeatureManagement": "功能管理",
+    "Permission:FeatureManagement": "功能管理",
-		"Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
+    "Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
-		"Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值無效!",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0}功能的值無效!",
-		"Menu:FeatureManagement": "功能管理"
+    "Menu:FeatureManagement": "功能管理",
-	}
+    "ResetToDefault": "重置為預設值",
-}
+    "ResetedToDefault": "已重置為預設值",
+    "AreYouSureToResetToDefault": "是否確定重置為預設值？"
+  }
+}

modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs

@@ -1,7 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
+using Localization.Resources.AbpUi;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.BlazoriseUI;
+using Volo.Abp.Identity.Localization;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectExtending.Modularity;
@@ -39,6 +42,15 @@ public class AbpIdentityBlazorModule : AbpModule
         {
             options.AdditionalAssemblies.Add(typeof(AbpIdentityBlazorModule).Assembly);
         });
+        
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Get<IdentityResource>()
+                .AddBaseTypes(
+                    typeof(AbpUiResource)
+                );
+        });
     }
 
     public override void PostConfigureServices(ServiceConfigurationContext context)

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs

@@ -1,6 +1,9 @@
-using Volo.Abp.AspNetCore.Components.Web.Theming;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Components.Web.Theming;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.Localization;
 
 namespace Volo.Abp.PermissionManagement.Blazor;
 
@@ -11,5 +14,15 @@ namespace Volo.Abp.PermissionManagement.Blazor;
     )]
 public class AbpPermissionManagementBlazorModule : AbpModule
 {
-
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Get<AbpPermissionManagementResource>()
+                .AddBaseTypes(
+                    typeof(AbpUiResource)
+                );
+        });
+    }
 }

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

@@ -1,10 +1,13 @@
-using Microsoft.Extensions.DependencyInjection;
+using Localization.Resources.AbpUi;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.Web.Theming;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.SettingManagement.Blazor.Menus;
 using Volo.Abp.SettingManagement.Blazor.Settings;
+using Volo.Abp.SettingManagement.Localization;
 using Volo.Abp.UI.Navigation;
 
 namespace Volo.Abp.SettingManagement.Blazor;
@@ -39,5 +42,14 @@ public class AbpSettingManagementBlazorModule : AbpModule
         {
             options.Contributors.Add(new EmailingPageContributor());
         });
+        
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Get<AbpSettingManagementResource>()
+                .AddBaseTypes(
+                    typeof(AbpUiResource)
+                );
+        });
     }
 }

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

@@ -1,11 +1,15 @@
-using Microsoft.Extensions.DependencyInjection;
+using Localization.Resources.AbpUi;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.FeatureManagement.Blazor;
+using Volo.Abp.FeatureManagement.Localization;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectExtending.Modularity;
 using Volo.Abp.TenantManagement.Blazor.Navigation;
+using Volo.Abp.TenantManagement.Localization;
 using Volo.Abp.Threading;
 using Volo.Abp.UI.Navigation;
 
@@ -38,6 +42,15 @@ public class AbpTenantManagementBlazorModule : AbpModule
         {
             options.AdditionalAssemblies.Add(typeof(AbpTenantManagementBlazorModule).Assembly);
         });
+        
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Get<AbpTenantManagementResource>()
+                .AddBaseTypes(
+                    typeof(AbpFeatureManagementResource),
+                    typeof(AbpUiResource));
+        });
     }
 
     public override void PostConfigureServices(ServiceConfigurationContext context)

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj

@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj

@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
   </ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=638042184565255290" rel="stylesheet"/>
+    <link href="global.css?_v=638052471030912513" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@@ -29,7 +29,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=638042184568471262"></script>
+    <script src="global.js?_v=638052471033872019"></script>
     <!--/ABP:Scripts-->
 
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly"  Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
   </ItemGroup>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=638042184864919740" rel="stylesheet"/>
+    <link href="global.css?_v=638052471297777080" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
 </head>
@@ -22,7 +22,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=638042184865781315"></script>
+    <script src="global.js?_v=638052471298772781"></script>
     <!--/ABP:Scripts-->
 </body>
 </html>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj

@@ -12,8 +12,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.3.1" />
+        <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
         <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />