From 9c4f428109fd3ec5694be6c4a52e1eefb28b915f Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Thu, 6 Jun 2024 18:09:50 +0800 Subject: [PATCH] Upgraded to Blazorise v1.5.2 --- dotnet/Directory.Build.props | 2 +- dotnet/common.props | 2 +- .../UpdateCheck/UpdateCheckAppService.cs | 9 ++------- dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json | 6 +++--- .../wwwroot/libs/timeago/locales/jquery.timeago.uz.js | 0 dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock | 8 ++++---- electron/package.json | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) mode change 100644 => 100755 dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/wwwroot/libs/timeago/locales/jquery.timeago.uz.js diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props index e8b950f..5ace397 100644 --- a/dotnet/Directory.Build.props +++ b/dotnet/Directory.Build.props @@ -3,7 +3,7 @@ 8.1.3 3.1.*-* - 1.5.0 + 1.5.2 \ No newline at end of file diff --git a/dotnet/common.props b/dotnet/common.props index c8f5e59..edb34a9 100644 --- a/dotnet/common.props +++ b/dotnet/common.props @@ -1,7 +1,7 @@ latest - 2.12.0 + 2.12.1 $(NoWarn);CS1591;CS0436 app diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application/UpdateCheck/UpdateCheckAppService.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application/UpdateCheck/UpdateCheckAppService.cs index ab5c3dd..aa9228b 100644 --- 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 _cache; public UpdateCheckAppService( - IJsonSerializer jsonSerializer, IHttpClientFactory httpClientFactory, IDistributedCache cache) { - _jsonSerializer = jsonSerializer; _httpClientFactory = httpClientFactory; _cache = cache; } @@ -59,8 +54,8 @@ protected virtual async Task RequestLatestVersionFromGithubRepositoryAsy client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("product", "1")); var str = await client.GetStringAsync(LatestReleaseUri); - var data = _jsonSerializer.Deserialize(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 index f6e67cf..a71e839 100644 --- 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" } } \ No newline at end of file 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 old mode 100644 new mode 100755 diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock index 87ca02c..f71e2de 100644 --- 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 index 1c74bc4..8b234d2 100644 --- 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",