From 967cbe357bdd0faa00a55ac4f9209ef8fdb30972 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Thu, 19 Oct 2023 22:07:37 +0800 Subject: [PATCH] Upgrade to ABP 7.4.0 --- Directory.Build.props | 2 +- common.props | 2 +- .../EasyAbp.SharedResources.HttpApi.Host.csproj | 10 +++++----- .../EasyAbp.SharedResources.IdentityServer.csproj | 6 +++--- .../package.json | 2 +- host/EasyAbp.SharedResources.IdentityServer/yarn.lock | 8 ++++---- .../EasyAbp.SharedResources.Web.Host.csproj | 8 ++++---- host/EasyAbp.SharedResources.Web.Host/package.json | 2 +- host/EasyAbp.SharedResources.Web.Host/yarn.lock | 8 ++++---- .../EasyAbp.SharedResources.Web.Unified.csproj | 6 +++--- host/EasyAbp.SharedResources.Web.Unified/package.json | 2 +- host/EasyAbp.SharedResources.Web.Unified/yarn.lock | 8 ++++---- ...asyAbp.SharedResources.Application.Contracts.csproj | 2 +- .../EasyAbp.SharedResources.Domain.Shared.csproj | 4 ++-- .../EasyAbp.SharedResources.Domain.csproj | 2 +- .../EasyAbp.SharedResources.HttpApi.Client.csproj | 2 +- .../EasyAbp.SharedResources.MongoDB.csproj | 2 +- .../EasyAbp.SharedResources.Web.csproj | 2 +- ...bp.SharedResources.EntityFrameworkCore.Tests.csproj | 2 +- .../EasyAbp.SharedResources.TestBase.csproj | 2 +- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7c9adc8..e81b043 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 7.3.0 + 7.4.0 \ No newline at end of file diff --git a/common.props b/common.props index ee36443..6c6dd80 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.15.0 + 0.16.0 $(NoWarn);CS1591 true EasyAbp Team diff --git a/host/EasyAbp.SharedResources.HttpApi.Host/EasyAbp.SharedResources.HttpApi.Host.csproj b/host/EasyAbp.SharedResources.HttpApi.Host/EasyAbp.SharedResources.HttpApi.Host.csproj index 42ad144..532fe3b 100644 --- a/host/EasyAbp.SharedResources.HttpApi.Host/EasyAbp.SharedResources.HttpApi.Host.csproj +++ b/host/EasyAbp.SharedResources.HttpApi.Host/EasyAbp.SharedResources.HttpApi.Host.csproj @@ -10,13 +10,13 @@ - + - - + + - - + + diff --git a/host/EasyAbp.SharedResources.IdentityServer/EasyAbp.SharedResources.IdentityServer.csproj b/host/EasyAbp.SharedResources.IdentityServer/EasyAbp.SharedResources.IdentityServer.csproj index dc6aa3b..6de5a19 100644 --- a/host/EasyAbp.SharedResources.IdentityServer/EasyAbp.SharedResources.IdentityServer.csproj +++ b/host/EasyAbp.SharedResources.IdentityServer/EasyAbp.SharedResources.IdentityServer.csproj @@ -8,11 +8,11 @@ - + - - + + diff --git a/host/EasyAbp.SharedResources.IdentityServer/package.json b/host/EasyAbp.SharedResources.IdentityServer/package.json index 1dfe228..b3186d4 100644 --- a/host/EasyAbp.SharedResources.IdentityServer/package.json +++ b/host/EasyAbp.SharedResources.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" } } \ No newline at end of file diff --git a/host/EasyAbp.SharedResources.IdentityServer/yarn.lock b/host/EasyAbp.SharedResources.IdentityServer/yarn.lock index d521b89..d135a7c 100644 --- a/host/EasyAbp.SharedResources.IdentityServer/yarn.lock +++ b/host/EasyAbp.SharedResources.IdentityServer/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": - version "2.3.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" - integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== +"@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/host/EasyAbp.SharedResources.Web.Host/EasyAbp.SharedResources.Web.Host.csproj b/host/EasyAbp.SharedResources.Web.Host/EasyAbp.SharedResources.Web.Host.csproj index ebcb0c2..b88cbf2 100644 --- a/host/EasyAbp.SharedResources.Web.Host/EasyAbp.SharedResources.Web.Host.csproj +++ b/host/EasyAbp.SharedResources.Web.Host/EasyAbp.SharedResources.Web.Host.csproj @@ -10,18 +10,18 @@ - + - + - + - + diff --git a/host/EasyAbp.SharedResources.Web.Host/package.json b/host/EasyAbp.SharedResources.Web.Host/package.json index 24d9c85..2f90441 100644 --- a/host/EasyAbp.SharedResources.Web.Host/package.json +++ b/host/EasyAbp.SharedResources.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" } } \ No newline at end of file diff --git a/host/EasyAbp.SharedResources.Web.Host/yarn.lock b/host/EasyAbp.SharedResources.Web.Host/yarn.lock index d521b89..d135a7c 100644 --- a/host/EasyAbp.SharedResources.Web.Host/yarn.lock +++ b/host/EasyAbp.SharedResources.Web.Host/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": - version "2.3.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" - integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== +"@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/host/EasyAbp.SharedResources.Web.Unified/EasyAbp.SharedResources.Web.Unified.csproj b/host/EasyAbp.SharedResources.Web.Unified/EasyAbp.SharedResources.Web.Unified.csproj index a09bbe8..cdbddee 100644 --- a/host/EasyAbp.SharedResources.Web.Unified/EasyAbp.SharedResources.Web.Unified.csproj +++ b/host/EasyAbp.SharedResources.Web.Unified/EasyAbp.SharedResources.Web.Unified.csproj @@ -13,11 +13,11 @@ - + - + - + diff --git a/host/EasyAbp.SharedResources.Web.Unified/package.json b/host/EasyAbp.SharedResources.Web.Unified/package.json index 24d9c85..2f90441 100644 --- a/host/EasyAbp.SharedResources.Web.Unified/package.json +++ b/host/EasyAbp.SharedResources.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" } } \ No newline at end of file diff --git a/host/EasyAbp.SharedResources.Web.Unified/yarn.lock b/host/EasyAbp.SharedResources.Web.Unified/yarn.lock index d521b89..d135a7c 100644 --- a/host/EasyAbp.SharedResources.Web.Unified/yarn.lock +++ b/host/EasyAbp.SharedResources.Web.Unified/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": - version "2.3.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" - integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== +"@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/src/EasyAbp.SharedResources.Application.Contracts/EasyAbp.SharedResources.Application.Contracts.csproj b/src/EasyAbp.SharedResources.Application.Contracts/EasyAbp.SharedResources.Application.Contracts.csproj index aa8fec2..691d3a1 100644 --- a/src/EasyAbp.SharedResources.Application.Contracts/EasyAbp.SharedResources.Application.Contracts.csproj +++ b/src/EasyAbp.SharedResources.Application.Contracts/EasyAbp.SharedResources.Application.Contracts.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp.SharedResources.Domain.Shared.csproj b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp.SharedResources.Domain.Shared.csproj index 6cb048b..c29842d 100644 --- a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp.SharedResources.Domain.Shared.csproj +++ b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp.SharedResources.Domain.Shared.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 true @@ -19,7 +19,7 @@ - + diff --git a/src/EasyAbp.SharedResources.Domain/EasyAbp.SharedResources.Domain.csproj b/src/EasyAbp.SharedResources.Domain/EasyAbp.SharedResources.Domain.csproj index 6ed5719..8534c5c 100644 --- a/src/EasyAbp.SharedResources.Domain/EasyAbp.SharedResources.Domain.csproj +++ b/src/EasyAbp.SharedResources.Domain/EasyAbp.SharedResources.Domain.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.SharedResources.HttpApi.Client/EasyAbp.SharedResources.HttpApi.Client.csproj b/src/EasyAbp.SharedResources.HttpApi.Client/EasyAbp.SharedResources.HttpApi.Client.csproj index 01a7a9e..bffcb03 100644 --- a/src/EasyAbp.SharedResources.HttpApi.Client/EasyAbp.SharedResources.HttpApi.Client.csproj +++ b/src/EasyAbp.SharedResources.HttpApi.Client/EasyAbp.SharedResources.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.SharedResources.MongoDB/EasyAbp.SharedResources.MongoDB.csproj b/src/EasyAbp.SharedResources.MongoDB/EasyAbp.SharedResources.MongoDB.csproj index 255987f..6509fa3 100644 --- a/src/EasyAbp.SharedResources.MongoDB/EasyAbp.SharedResources.MongoDB.csproj +++ b/src/EasyAbp.SharedResources.MongoDB/EasyAbp.SharedResources.MongoDB.csproj @@ -3,7 +3,7 @@ - net7.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.SharedResources.Web/EasyAbp.SharedResources.Web.csproj b/src/EasyAbp.SharedResources.Web/EasyAbp.SharedResources.Web.csproj index d724eed..2309d31 100644 --- a/src/EasyAbp.SharedResources.Web/EasyAbp.SharedResources.Web.csproj +++ b/src/EasyAbp.SharedResources.Web/EasyAbp.SharedResources.Web.csproj @@ -22,7 +22,7 @@ - + diff --git a/test/EasyAbp.SharedResources.EntityFrameworkCore.Tests/EasyAbp.SharedResources.EntityFrameworkCore.Tests.csproj b/test/EasyAbp.SharedResources.EntityFrameworkCore.Tests/EasyAbp.SharedResources.EntityFrameworkCore.Tests.csproj index 6ddadc7..3a1ff9a 100644 --- a/test/EasyAbp.SharedResources.EntityFrameworkCore.Tests/EasyAbp.SharedResources.EntityFrameworkCore.Tests.csproj +++ b/test/EasyAbp.SharedResources.EntityFrameworkCore.Tests/EasyAbp.SharedResources.EntityFrameworkCore.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/EasyAbp.SharedResources.TestBase/EasyAbp.SharedResources.TestBase.csproj b/test/EasyAbp.SharedResources.TestBase/EasyAbp.SharedResources.TestBase.csproj index 8cdf377..4c8692c 100644 --- a/test/EasyAbp.SharedResources.TestBase/EasyAbp.SharedResources.TestBase.csproj +++ b/test/EasyAbp.SharedResources.TestBase/EasyAbp.SharedResources.TestBase.csproj @@ -8,7 +8,7 @@ - +