Merge remote-tracking branch 'origin/master'

EasyAbp · Jun 6, 2024 · e1927da · e1927da
2 parents 405b3d0 + 3461074
commit e1927da
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 17 deletions.
diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
@@ -3,7 +3,7 @@
 
     <AbpVersion>8.1.3</AbpVersion>
     <AbpLeptonXThemeVersion>3.1.*-*</AbpLeptonXThemeVersion>
-    <BlazoriseVersion>1.5.0</BlazoriseVersion>
+    <BlazoriseVersion>1.5.2</BlazoriseVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/dotnet/common.props b/dotnet/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.12.0</Version>
+    <Version>2.12.1</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application/UpdateCheck/UpdateCheckAppService.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application/UpdateCheck/UpdateCheckAppService.cs
@@ -7,8 +7,6 @@
 using Newtonsoft.Json.Linq;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Json;
 
 namespace EasyAbp.AbpHelper.Gui.UpdateCheck
 {
@@ -17,16 +15,13 @@ public class UpdateCheckAppService : ApplicationService, IUpdateCheckAppService
         private const string LatestReleaseUri = "https://api.github.com/repos/EasyAbp/AbpHelper.GUI/releases/latest";
         private const int CacheExpirationMinutes = 10;
 
-        private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IDistributedCache<UpdateCheckCacheItem> _cache;
 
         public UpdateCheckAppService(
-            IJsonSerializer jsonSerializer,
             IHttpClientFactory httpClientFactory,
             IDistributedCache<UpdateCheckCacheItem> cache)
         {
-            _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
             _cache = cache;
         }
@@ -59,8 +54,8 @@ protected virtual async Task<string> RequestLatestVersionFromGithubRepositoryAsy
             client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("product", "1"));
 
             var str = await client.GetStringAsync(LatestReleaseUri);
-            var data = _jsonSerializer.Deserialize<JObject>(str);
-
+            var data = JObject.Parse(str);
+            
             var tagName = data["tag_name"]?.ToString() ?? "";
 
             return tagName.Replace("v", "");

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.12.0",
+  "version": "2.12.1",
   "name": "easyabp-abphelper-gui",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.1.0",
-    "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.1.3",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.1.3"
   }
 }
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/wwwroot/libs/timeago/locales/jquery.timeago.uz.js b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/wwwroot/libs/timeago/locales/jquery.timeago.uz.js
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.components.server.leptonxlitetheme@~3.1.0":
+"@abp/aspnetcore.components.server.leptonxlitetheme@~3.1.3":
   version "3.1.3"
-  resolved "https://registry.npmjs.org/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-3.1.3.tgz#d2abe0eea924cf4a52a84756c3c6091a903bb625"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-3.1.3.tgz#d2abe0eea924cf4a52a84756c3c6091a903bb625"
   integrity sha512-8XF7pQDRAvOTL8UQBMrpDMdHFTRlmosqUsFVg8XKY7kZkrGWEzuABLE0jbfviYlLuzHHMo/8VDqkDauMaCvILw==
   dependencies:
     "@abp/aspnetcore.components.server.theming" "~8.1.3"
@@ -17,9 +17,9 @@
     "@abp/bootstrap" "~8.1.3"
     "@abp/font-awesome" "~8.1.3"
 
-"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~3.1.0":
+"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~3.1.3":
   version "3.1.3"
-  resolved "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-3.1.3.tgz#c0096f346760a93e6b3ef5059704de388b7e9c60"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-3.1.3.tgz#c0096f346760a93e6b3ef5059704de388b7e9c60"
   integrity sha512-ztGbPTjrRzGtH+FNt0jwCnEMD60SjxQExi8WBgmeIzLViBk+F/jJhclZAQ2dkTe2IaPtpR7ftU6F8R9vAoXLdw==
   dependencies:
     "@abp/aspnetcore.mvc.ui.theme.shared" "~8.1.3"

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