From 0ef93b0eecb0554956bd2909134cca64e8b05d7b Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Wed, 27 Dec 2023 00:03:50 +0800
Subject: [PATCH] Upgrade to ABP 8.0.0

---
 .github/workflows/publish.yml                      |  2 +-
 Directory.Build.props                              |  4 ++--
 common.props                                       |  6 +++---
 ...at.Common.SharedCache.StackExchangeRedis.csproj |  2 +-
 .../EasyAbp.Abp.WeChat.Common.csproj               |  2 +-
 .../EasyAbp.Abp.WeChat.Official.HttpApi.csproj     |  2 +-
 .../EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj |  2 +-
 .../EasyAbp.Abp.WeChat.Pay.HttpApi.csproj          |  2 +-
 .../EasyAbp.Abp.WeChat.Common.Tests.csproj         | 14 +++++++-------
 .../EasyAbp.Abp.WeChat.HttpApi.Tests.csproj        |  6 +++---
 .../EasyAbp.Abp.WeChat.MiniProgram.Tests.csproj    |  6 +++---
 .../EasyAbp.Abp.WeChat.Official.Tests.csproj       |  6 +++---
 .../EasyAbp.Abp.WeChat.OpenPlatform.Tests.csproj   |  6 +++---
 .../EasyAbp.Abp.WeChat.Pay.Tests.csproj            |  6 +++---
 14 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6f0a58c..4629827 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: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: read common.props
         id: commonProps
diff --git a/Directory.Build.props b/Directory.Build.props
index d4b44b9..1d924f5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
 
-        <AbpVersion>7.4.0</AbpVersion>
-        <MicrosoftNetTestSdkVersion>17.2.0</MicrosoftNetTestSdkVersion>
+        <AbpVersion>8.0.0</AbpVersion>
+        <MicrosoftNetTestSdkVersion>17.8.0</MicrosoftNetTestSdkVersion>
 
     </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
index 675c732..6026770 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
-        <Version>2.8.0</Version>
+        <Version>2.9.0</Version>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>EasyAbp Team</Authors>
@@ -19,8 +19,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All"/>
-        <PackageReference Include="Fody" Version="6.6.0">
+        <PackageReference Include="ConfigureAwait.Fody" Version="3.3.2" PrivateAssets="All"/>
+        <PackageReference Include="Fody" Version="6.8.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
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 ea5ab5f..b2612db 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
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
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 fc8970f..659c470 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
@@ -9,7 +9,7 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
         <PackageReference Include="Volo.Abp.Core" Version="$(AbpVersion)" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
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 5c8909d..7627269 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 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Official</RootNamespace>
         <Description>ABP vNext微信公众号模块，提供对微信公众号业务的支持。</Description>
     </PropertyGroup>
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 56b705f..da1fe63 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 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.OpenPlatform</RootNamespace>
         <Description>ABP vNext开放平台模块，提供对微信开放平台业务的支持。</Description>
     </PropertyGroup>
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 569dda6..85c044b 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 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Pay</RootNamespace>
         <Description>ABP vNext微信模块，提供对微信支付业务的支持。</Description>
     </PropertyGroup>
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 5dd64a0..a6e083f 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,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <RootNamespace>EasyAbp.Abp.WeChat.Common.Tests</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Bogus" Version="34.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-        <PackageReference Include="NSubstitute" Version="4.3.0" />
-        <PackageReference Include="Shouldly" Version="4.1.0" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="Shouldly" Version="4.2.1" />
         <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
         <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit" Version="2.6.1" />
+        <PackageReference Include="xunit.extensibility.execution" Version="2.6.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
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 e9254d8..f48f615 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,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3"/>
         <PackageReference Include="xunit" Version="2.4.1"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
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 e3cb4e1..45945d4 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.MiniProgram.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,9 +11,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
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 7998b4c..7914909 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Official.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,9 +11,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
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 5332ea8..83540f7 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.OpenPlatform.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,9 +11,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
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 4a2f7ce..c48dcca 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Pay.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,10 +11,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
         <PackageReference Include="Volo.Abp.BlobStoring.FileSystem" Version="$(AbpVersion)" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>