From 202af80c4fc8455099c1f7c95f99f0823298cf80 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Sun, 29 Dec 2024 19:24:58 +0800 Subject: [PATCH] Upgrade to ABP 9.0.2 --- .github/workflows/publish.yml | 2 +- Directory.Build.props | 3 +-- common.props | 2 +- .../EasyAbp.Abp.WeChat.Common.Abstractions.csproj | 2 +- ....Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj | 4 ++-- .../EasyAbp.Abp.WeChat.Common.csproj | 4 ++-- .../EasyAbp.Abp.WeChat.MiniProgram.Abstractions.csproj | 2 +- .../EasyAbp.Abp.WeChat.MiniProgram.csproj | 2 +- .../EasyAbp.Abp.WeChat.Official.Abstractions.csproj | 2 +- .../EasyAbp.Abp.WeChat.Official.HttpApi.csproj | 2 +- .../EasyAbp.Abp.WeChat.Official.csproj | 2 +- .../EasyAbp.Abp.WeChat.OpenPlatform.Abstractions.csproj | 2 +- .../EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj | 2 +- .../EasyAbp.Abp.WeChat.OpenPlatform.csproj | 2 +- .../EasyAbp.Abp.WeChat.Pay.Abstractions.csproj | 2 +- .../EasyAbp.Abp.WeChat.Pay.HttpApi.csproj | 2 +- .../EasyAbp.Abp.WeChat.Pay/EasyAbp.Abp.WeChat.Pay.csproj | 2 +- .../EasyAbp.Abp.WeChat.Common.Tests.csproj | 6 +++--- .../EasyAbp.Abp.WeChat.HttpApi.Tests.csproj | 4 ++-- .../EasyAbp.Abp.WeChat.MiniProgram.Tests.csproj | 4 ++-- .../EasyAbp.Abp.WeChat.Official.Tests.csproj | 4 ++-- .../EasyAbp.Abp.WeChat.OpenPlatform.Tests.csproj | 4 ++-- .../EasyAbp.Abp.WeChat.Pay.Tests.csproj | 6 +++--- 23 files changed, 33 insertions(+), 34 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4629827..8251ce0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: - uses: NuGet/setup-nuget@v1 - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - name: read common.props id: commonProps diff --git a/Directory.Build.props b/Directory.Build.props index 27ce33d..015d2b3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,7 @@ - 8.3.2 - 17.8.0 + 9.0.2 diff --git a/common.props b/common.props index 54a8c79..9ae8cca 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 3.3.0 + 3.4.0 $(NoWarn);CS1591 true EasyAbp Team diff --git a/src/Common/EasyAbp.Abp.WeChat.Common.Abstractions/EasyAbp.Abp.WeChat.Common.Abstractions.csproj b/src/Common/EasyAbp.Abp.WeChat.Common.Abstractions/EasyAbp.Abp.WeChat.Common.Abstractions.csproj index 0e16af9..20fafda 100644 --- a/src/Common/EasyAbp.Abp.WeChat.Common.Abstractions/EasyAbp.Abp.WeChat.Common.Abstractions.csproj +++ b/src/Common/EasyAbp.Abp.WeChat.Common.Abstractions/EasyAbp.Abp.WeChat.Common.Abstractions.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Common ABP vNext微信模块,定义了微信公众号与微信支付公用的组件。 diff --git a/src/Common/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj b/src/Common/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj index e63d73f..21b74af 100644 --- a/src/Common/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj +++ b/src/Common/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis ABP vNext微信模块,基于StackExchangeRedis提供多服务间共享access_token等缓存数据的功能扩展。 true @@ -20,7 +20,7 @@ - + diff --git a/src/Common/EasyAbp.Abp.WeChat.Common/EasyAbp.Abp.WeChat.Common.csproj b/src/Common/EasyAbp.Abp.WeChat.Common/EasyAbp.Abp.WeChat.Common.csproj index f03d9d3..a523e72 100644 --- a/src/Common/EasyAbp.Abp.WeChat.Common/EasyAbp.Abp.WeChat.Common.csproj +++ b/src/Common/EasyAbp.Abp.WeChat.Common/EasyAbp.Abp.WeChat.Common.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Common ABP vNext微信模块,定义了微信公众号与微信支付公用的组件。 @@ -12,7 +12,7 @@ - + diff --git a/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.Abstractions/EasyAbp.Abp.WeChat.MiniProgram.Abstractions.csproj b/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.Abstractions/EasyAbp.Abp.WeChat.MiniProgram.Abstractions.csproj index 980d464..046a606 100644 --- a/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.Abstractions/EasyAbp.Abp.WeChat.MiniProgram.Abstractions.csproj +++ b/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.Abstractions/EasyAbp.Abp.WeChat.MiniProgram.Abstractions.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.MiniProgram ABP vNext微信模块,提供对微信小程序业务的支持。 diff --git a/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.csproj b/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.csproj index d0ef908..4d418af 100644 --- a/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.csproj +++ b/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram/EasyAbp.Abp.WeChat.MiniProgram.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.MiniProgram ABP vNext微信模块,提供对微信小程序业务的支持。 diff --git a/src/Official/EasyAbp.Abp.WeChat.Official.Abstractions/EasyAbp.Abp.WeChat.Official.Abstractions.csproj b/src/Official/EasyAbp.Abp.WeChat.Official.Abstractions/EasyAbp.Abp.WeChat.Official.Abstractions.csproj index dfef04c..23f6df0 100644 --- a/src/Official/EasyAbp.Abp.WeChat.Official.Abstractions/EasyAbp.Abp.WeChat.Official.Abstractions.csproj +++ b/src/Official/EasyAbp.Abp.WeChat.Official.Abstractions/EasyAbp.Abp.WeChat.Official.Abstractions.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Official ABP vNext微信公众号模块,提供对微信公众号业务的支持。 diff --git a/src/Official/EasyAbp.Abp.WeChat.Official.HttpApi/EasyAbp.Abp.WeChat.Official.HttpApi.csproj b/src/Official/EasyAbp.Abp.WeChat.Official.HttpApi/EasyAbp.Abp.WeChat.Official.HttpApi.csproj index 7627269..d8bd93e 100644 --- a/src/Official/EasyAbp.Abp.WeChat.Official.HttpApi/EasyAbp.Abp.WeChat.Official.HttpApi.csproj +++ b/src/Official/EasyAbp.Abp.WeChat.Official.HttpApi/EasyAbp.Abp.WeChat.Official.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Official ABP vNext微信公众号模块,提供对微信公众号业务的支持。 diff --git a/src/Official/EasyAbp.Abp.WeChat.Official/EasyAbp.Abp.WeChat.Official.csproj b/src/Official/EasyAbp.Abp.WeChat.Official/EasyAbp.Abp.WeChat.Official.csproj index 1522094..54a3075 100644 --- a/src/Official/EasyAbp.Abp.WeChat.Official/EasyAbp.Abp.WeChat.Official.csproj +++ b/src/Official/EasyAbp.Abp.WeChat.Official/EasyAbp.Abp.WeChat.Official.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Official ABP vNext微信公众号模块,提供对微信公众号业务的支持。 diff --git a/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions.csproj b/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions.csproj index 7fd2ce0..dc5ddfc 100644 --- a/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions.csproj +++ b/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.OpenPlatform ABP vNext开放平台模块,提供对微信开放平台业务的支持。 diff --git a/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj b/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj index da1fe63..6f053cf 100644 --- a/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj +++ b/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.OpenPlatform ABP vNext开放平台模块,提供对微信开放平台业务的支持。 diff --git a/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.csproj b/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.csproj index 084f95b..ecd4ec6 100644 --- a/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.csproj +++ b/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.OpenPlatform ABP vNext开放平台模块,提供对微信开放平台业务的支持。 diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay.Abstractions/EasyAbp.Abp.WeChat.Pay.Abstractions.csproj b/src/Pay/EasyAbp.Abp.WeChat.Pay.Abstractions/EasyAbp.Abp.WeChat.Pay.Abstractions.csproj index 342b415..d8ebd57 100644 --- a/src/Pay/EasyAbp.Abp.WeChat.Pay.Abstractions/EasyAbp.Abp.WeChat.Pay.Abstractions.csproj +++ b/src/Pay/EasyAbp.Abp.WeChat.Pay.Abstractions/EasyAbp.Abp.WeChat.Pay.Abstractions.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Pay ABP vNext微信模块,提供对微信支付业务的支持。 diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay.HttpApi/EasyAbp.Abp.WeChat.Pay.HttpApi.csproj b/src/Pay/EasyAbp.Abp.WeChat.Pay.HttpApi/EasyAbp.Abp.WeChat.Pay.HttpApi.csproj index c7cb12b..db1151e 100644 --- a/src/Pay/EasyAbp.Abp.WeChat.Pay.HttpApi/EasyAbp.Abp.WeChat.Pay.HttpApi.csproj +++ b/src/Pay/EasyAbp.Abp.WeChat.Pay.HttpApi/EasyAbp.Abp.WeChat.Pay.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Pay ABP vNext微信模块,提供对微信支付业务的支持。 diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/EasyAbp.Abp.WeChat.Pay.csproj b/src/Pay/EasyAbp.Abp.WeChat.Pay/EasyAbp.Abp.WeChat.Pay.csproj index 5dab9ba..98000b6 100644 --- a/src/Pay/EasyAbp.Abp.WeChat.Pay/EasyAbp.Abp.WeChat.Pay.csproj +++ b/src/Pay/EasyAbp.Abp.WeChat.Pay/EasyAbp.Abp.WeChat.Pay.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.Pay ABP vNext微信模块,提供对微信支付业务的支持。 diff --git a/tests/EasyAbp.Abp.WeChat.Common.Tests/EasyAbp.Abp.WeChat.Common.Tests.csproj b/tests/EasyAbp.Abp.WeChat.Common.Tests/EasyAbp.Abp.WeChat.Common.Tests.csproj index a6e083f..b00ddea 100644 --- a/tests/EasyAbp.Abp.WeChat.Common.Tests/EasyAbp.Abp.WeChat.Common.Tests.csproj +++ b/tests/EasyAbp.Abp.WeChat.Common.Tests/EasyAbp.Abp.WeChat.Common.Tests.csproj @@ -1,14 +1,14 @@  - net8.0 + net9.0 false EasyAbp.Abp.WeChat.Common.Tests - - + + diff --git a/tests/EasyAbp.Abp.WeChat.HttpApi.Tests/EasyAbp.Abp.WeChat.HttpApi.Tests.csproj b/tests/EasyAbp.Abp.WeChat.HttpApi.Tests/EasyAbp.Abp.WeChat.HttpApi.Tests.csproj index f48f615..e21b322 100644 --- a/tests/EasyAbp.Abp.WeChat.HttpApi.Tests/EasyAbp.Abp.WeChat.HttpApi.Tests.csproj +++ b/tests/EasyAbp.Abp.WeChat.HttpApi.Tests/EasyAbp.Abp.WeChat.HttpApi.Tests.csproj @@ -1,12 +1,12 @@  - net8.0 + net9.0 false - + diff --git a/tests/EasyAbp.Abp.WeChat.MiniProgram.Tests/EasyAbp.Abp.WeChat.MiniProgram.Tests.csproj b/tests/EasyAbp.Abp.WeChat.MiniProgram.Tests/EasyAbp.Abp.WeChat.MiniProgram.Tests.csproj index 45945d4..817ef57 100644 --- a/tests/EasyAbp.Abp.WeChat.MiniProgram.Tests/EasyAbp.Abp.WeChat.MiniProgram.Tests.csproj +++ b/tests/EasyAbp.Abp.WeChat.MiniProgram.Tests/EasyAbp.Abp.WeChat.MiniProgram.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.MiniProgram.Tests @@ -11,7 +11,7 @@ - + all diff --git a/tests/EasyAbp.Abp.WeChat.Official.Tests/EasyAbp.Abp.WeChat.Official.Tests.csproj b/tests/EasyAbp.Abp.WeChat.Official.Tests/EasyAbp.Abp.WeChat.Official.Tests.csproj index 7914909..bae7aeb 100644 --- a/tests/EasyAbp.Abp.WeChat.Official.Tests/EasyAbp.Abp.WeChat.Official.Tests.csproj +++ b/tests/EasyAbp.Abp.WeChat.Official.Tests/EasyAbp.Abp.WeChat.Official.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 EasyAbp.Abp.WeChat.Official.Tests @@ -11,7 +11,7 @@ - + all diff --git a/tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests.csproj b/tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests.csproj index 83540f7..1390455 100644 --- a/tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests.csproj +++ b/tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests/EasyAbp.Abp.WeChat.OpenPlatform.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 EasyAbp.Abp.WeChat.OpenPlatform.Tests @@ -11,7 +11,7 @@ - + all diff --git a/tests/EasyAbp.Abp.WeChat.Pay.Tests/EasyAbp.Abp.WeChat.Pay.Tests.csproj b/tests/EasyAbp.Abp.WeChat.Pay.Tests/EasyAbp.Abp.WeChat.Pay.Tests.csproj index d716c2d..2f0aa59 100644 --- a/tests/EasyAbp.Abp.WeChat.Pay.Tests/EasyAbp.Abp.WeChat.Pay.Tests.csproj +++ b/tests/EasyAbp.Abp.WeChat.Pay.Tests/EasyAbp.Abp.WeChat.Pay.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 EasyAbp.Abp.WeChat.Pay.Tests @@ -11,10 +11,10 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive