Merge pull request #166 from EasyAbp/abp-7.4

Upgrade to ABP 7.4.0
EasyAbp · Oct 19, 2023 · 86684b6 · 86684b6
2 parents b1b8eb2 + 2797b5e
commit 86684b6
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 24 deletions.
diff --git a/AbpHelper.CLI b/AbpHelper.CLI
diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>7.3.0</AbpVersion>
-    <AbpLeptonXThemeVersion>2.3.*-*</AbpLeptonXThemeVersion>
-    <BlazoriseVersion>1.2.3</BlazoriseVersion>
+    <AbpVersion>7.4.0</AbpVersion>
+    <AbpLeptonXThemeVersion>2.4.1</AbpLeptonXThemeVersion>
+    <BlazoriseVersion>1.3.1</BlazoriseVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/dotnet/common.props b/dotnet/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.9.0</Version>
+    <Version>2.10.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>

diff --git a/...bp.AbpHelper.Gui.Application.Contracts/EasyAbp.AbpHelper.Gui.Application.Contracts.csproj b/...bp.AbpHelper.Gui.Application.Contracts/EasyAbp.AbpHelper.Gui.Application.Contracts.csproj
@@ -15,15 +15,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Localization\AbpUi\en.json" />
-    <EmbeddedResource Include="Localization\AbpUi\zh-Hans.json" />
-    <EmbeddedResource Include="Localization\AbpUi\zh-Hant.json" />
+    <EmbeddedResource Include="Localization\AbpUi\*.json" />
+    <Content Remove="Localization\AbpUi\*.json" />
     <EmbeddedResource Include="Localization\Gui\*.json" />
     <Content Remove="Localization\Gui\*.json" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/EasyAbp.AbpHelper.Gui.Blazor.csproj b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/EasyAbp.AbpHelper.Gui.Blazor.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Blazorx-Analytics" Version="1.0.0" />
     <PackageReference Include="Blazorise.Bootstrap5" Version="$(BlazoriseVersion)" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="$(BlazoriseVersion)" />
-    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
 

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json
@@ -1,9 +1,9 @@
 {
-  "version": "2.9.0",
+  "version": "2.10.0",
   "name": "easyabp-abphelper-gui",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0",
-    "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.1"
   }
 }
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.components.server.leptonxlitetheme@~2.2.0-rc.1":
-  version "2.2.0"
-  resolved "https://registry.npmmirror.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-2.2.0.tgz#e6ba4920906fd67f19338f4836fb487aae158932"
-  integrity sha512-cFlmbu3iCPHFuutsTG5wdtHivO5HBqtUpA0wkrnQSxQHeUnUMKWgIOTSOKA8Ij/qF3fOFjqfoQ7BQJ+Fd5jFqQ==
+"@abp/aspnetcore.components.server.leptonxlitetheme@~2.4.1":
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-2.4.1.tgz#48d29c8be8b392d61c42e85fbf53a1e9dd20b071"
+  integrity sha512-LlyNUVetmCFIGZcC9Y6Q2pAs5yWHcoUWtoeTMrXu5NI8fYGlPR2Pg6CP1jN/L7wwjRnQ0/WDpduy+X2Z4DGLLA==
   dependencies:
     "@abp/aspnetcore.components.server.theming" "~7.2.1"
 
@@ -17,10 +17,10 @@
     "@abp/bootstrap" "~7.2.1"
     "@abp/font-awesome" "~7.2.1"
 
-"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1":
-  version "2.2.0"
-  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628"
-  integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g==
+"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1":
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c"
+  integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA==
   dependencies:
     "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1"
 

diff --git a/dotnet/test/EasyAbp.AbpHelper.Gui.TestBase/EasyAbp.AbpHelper.Gui.TestBase.csproj b/dotnet/test/EasyAbp.AbpHelper.Gui.TestBase/EasyAbp.AbpHelper.Gui.TestBase.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NSubstitute" Version="4.3.0" />
-    <PackageReference Include="Shouldly" Version="4.0.1" />
+    <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/electron/package.json b/electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "abphelper-gui",
   "productName": "AbpHelper",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "license": "Apache-2.0",
   "description": "AbpHelper is a tool that helps you with developing Abp vNext applications.",
   "repository": "https://github.com/EasyAbp/AbpHelper.GUI",