From 65aa4f62829c6fea0c51267cc450f16bcbb5e5e0 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Thu, 19 Oct 2023 22:09:17 +0800 Subject: [PATCH] Upgrade to ABP 7.4.0 --- Directory.Build.props | 2 +- common.props | 2 +- .../EasyAbp.UniappManagement.HttpApi.Host.csproj | 8 ++++---- .../EasyAbp.UniappManagement.IdentityServer.csproj | 6 +++--- host/EasyAbp.UniappManagement.IdentityServer/package.json | 2 +- host/EasyAbp.UniappManagement.IdentityServer/yarn.lock | 8 ++++---- .../EasyAbp.UniappManagement.Web.Host.csproj | 8 ++++---- host/EasyAbp.UniappManagement.Web.Host/package.json | 2 +- host/EasyAbp.UniappManagement.Web.Host/yarn.lock | 8 ++++---- .../EasyAbp.UniappManagement.Web.Unified.csproj | 6 +++--- host/EasyAbp.UniappManagement.Web.Unified/package.json | 2 +- host/EasyAbp.UniappManagement.Web.Unified/yarn.lock | 8 ++++---- .../EasyAbp.UniappManagement.Application.Contracts.csproj | 2 +- .../EasyAbp.UniappManagement.Domain.Shared.csproj | 4 ++-- .../EasyAbp.UniappManagement.Domain.csproj | 2 +- .../EasyAbp.UniappManagement.HttpApi.Client.csproj | 2 +- .../EasyAbp.UniappManagement.MongoDB.csproj | 2 +- .../EasyAbp.UniappManagement.Web.csproj | 2 +- ...yAbp.UniappManagement.EntityFrameworkCore.Tests.csproj | 2 +- .../EasyAbp.UniappManagement.TestBase.csproj | 2 +- 20 files changed, 40 insertions(+), 40 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 8ab7408..529604b 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.10.0 + 0.11.0 $(NoWarn);CS1591 true EasyAbp Team diff --git a/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj b/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj index 1bf06ad..964b831 100644 --- a/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj +++ b/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj @@ -10,12 +10,12 @@ - + - - + + - + diff --git a/host/EasyAbp.UniappManagement.IdentityServer/EasyAbp.UniappManagement.IdentityServer.csproj b/host/EasyAbp.UniappManagement.IdentityServer/EasyAbp.UniappManagement.IdentityServer.csproj index d0fef9b..4638a29 100644 --- a/host/EasyAbp.UniappManagement.IdentityServer/EasyAbp.UniappManagement.IdentityServer.csproj +++ b/host/EasyAbp.UniappManagement.IdentityServer/EasyAbp.UniappManagement.IdentityServer.csproj @@ -8,11 +8,11 @@ - + - - + + diff --git a/host/EasyAbp.UniappManagement.IdentityServer/package.json b/host/EasyAbp.UniappManagement.IdentityServer/package.json index 1dfe228..b3186d4 100644 --- a/host/EasyAbp.UniappManagement.IdentityServer/package.json +++ b/host/EasyAbp.UniappManagement.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.UniappManagement.IdentityServer/yarn.lock b/host/EasyAbp.UniappManagement.IdentityServer/yarn.lock index a84873d..4be5d86 100644 --- a/host/EasyAbp.UniappManagement.IdentityServer/yarn.lock +++ b/host/EasyAbp.UniappManagement.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.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj b/host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj index 96395b9..3831860 100644 --- a/host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj +++ b/host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj @@ -10,18 +10,18 @@ - + - + - + - + diff --git a/host/EasyAbp.UniappManagement.Web.Host/package.json b/host/EasyAbp.UniappManagement.Web.Host/package.json index 24d9c85..2f90441 100644 --- a/host/EasyAbp.UniappManagement.Web.Host/package.json +++ b/host/EasyAbp.UniappManagement.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.UniappManagement.Web.Host/yarn.lock b/host/EasyAbp.UniappManagement.Web.Host/yarn.lock index 641feb6..403e1a1 100644 --- a/host/EasyAbp.UniappManagement.Web.Host/yarn.lock +++ b/host/EasyAbp.UniappManagement.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.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj b/host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj index 5d1b32e..621c2b8 100644 --- a/host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj +++ b/host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj @@ -13,11 +13,11 @@ - + - + - + diff --git a/host/EasyAbp.UniappManagement.Web.Unified/package.json b/host/EasyAbp.UniappManagement.Web.Unified/package.json index 24d9c85..2f90441 100644 --- a/host/EasyAbp.UniappManagement.Web.Unified/package.json +++ b/host/EasyAbp.UniappManagement.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.UniappManagement.Web.Unified/yarn.lock b/host/EasyAbp.UniappManagement.Web.Unified/yarn.lock index d0ea9f3..6be285e 100644 --- a/host/EasyAbp.UniappManagement.Web.Unified/yarn.lock +++ b/host/EasyAbp.UniappManagement.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.UniappManagement.Application.Contracts/EasyAbp.UniappManagement.Application.Contracts.csproj b/src/EasyAbp.UniappManagement.Application.Contracts/EasyAbp.UniappManagement.Application.Contracts.csproj index 468d01a..863bf3f 100644 --- a/src/EasyAbp.UniappManagement.Application.Contracts/EasyAbp.UniappManagement.Application.Contracts.csproj +++ b/src/EasyAbp.UniappManagement.Application.Contracts/EasyAbp.UniappManagement.Application.Contracts.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj b/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj index c3e6d90..2a786a9 100644 --- a/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj +++ b/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.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.UniappManagement.Domain/EasyAbp.UniappManagement.Domain.csproj b/src/EasyAbp.UniappManagement.Domain/EasyAbp.UniappManagement.Domain.csproj index 9e25fac..ec74aa0 100644 --- a/src/EasyAbp.UniappManagement.Domain/EasyAbp.UniappManagement.Domain.csproj +++ b/src/EasyAbp.UniappManagement.Domain/EasyAbp.UniappManagement.Domain.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.UniappManagement.HttpApi.Client/EasyAbp.UniappManagement.HttpApi.Client.csproj b/src/EasyAbp.UniappManagement.HttpApi.Client/EasyAbp.UniappManagement.HttpApi.Client.csproj index caa35f9..e42ca71 100644 --- a/src/EasyAbp.UniappManagement.HttpApi.Client/EasyAbp.UniappManagement.HttpApi.Client.csproj +++ b/src/EasyAbp.UniappManagement.HttpApi.Client/EasyAbp.UniappManagement.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.UniappManagement.MongoDB/EasyAbp.UniappManagement.MongoDB.csproj b/src/EasyAbp.UniappManagement.MongoDB/EasyAbp.UniappManagement.MongoDB.csproj index 51ab363..3695b45 100644 --- a/src/EasyAbp.UniappManagement.MongoDB/EasyAbp.UniappManagement.MongoDB.csproj +++ b/src/EasyAbp.UniappManagement.MongoDB/EasyAbp.UniappManagement.MongoDB.csproj @@ -3,7 +3,7 @@ - net7.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.UniappManagement.Web/EasyAbp.UniappManagement.Web.csproj b/src/EasyAbp.UniappManagement.Web/EasyAbp.UniappManagement.Web.csproj index 480202f..06515ef 100644 --- a/src/EasyAbp.UniappManagement.Web/EasyAbp.UniappManagement.Web.csproj +++ b/src/EasyAbp.UniappManagement.Web/EasyAbp.UniappManagement.Web.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/EasyAbp.UniappManagement.EntityFrameworkCore.Tests/EasyAbp.UniappManagement.EntityFrameworkCore.Tests.csproj b/test/EasyAbp.UniappManagement.EntityFrameworkCore.Tests/EasyAbp.UniappManagement.EntityFrameworkCore.Tests.csproj index 0322cde..54fbd16 100644 --- a/test/EasyAbp.UniappManagement.EntityFrameworkCore.Tests/EasyAbp.UniappManagement.EntityFrameworkCore.Tests.csproj +++ b/test/EasyAbp.UniappManagement.EntityFrameworkCore.Tests/EasyAbp.UniappManagement.EntityFrameworkCore.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/EasyAbp.UniappManagement.TestBase/EasyAbp.UniappManagement.TestBase.csproj b/test/EasyAbp.UniappManagement.TestBase/EasyAbp.UniappManagement.TestBase.csproj index 2c33216..707e45d 100644 --- a/test/EasyAbp.UniappManagement.TestBase/EasyAbp.UniappManagement.TestBase.csproj +++ b/test/EasyAbp.UniappManagement.TestBase/EasyAbp.UniappManagement.TestBase.csproj @@ -8,7 +8,7 @@ - +