Upgrade to ABP 9.0.2

EasyAbp · Dec 29, 2024 · 202af80 · 202af80
1 parent f30a063
commit 202af80
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 34 deletions.
diff --git 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
@@ -1,8 +1,7 @@
 <Project>
     <PropertyGroup>
 
-        <AbpVersion>8.3.2</AbpVersion>
-        <MicrosoftNetTestSdkVersion>17.8.0</MicrosoftNetTestSdkVersion>
+        <AbpVersion>9.0.2</AbpVersion>
 
     </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
-        <Version>3.3.0</Version>
+        <Version>3.4.0</Version>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>EasyAbp Team</Authors>

diff --git a/...mmon/EasyAbp.Abp.WeChat.Common.Abstractions/EasyAbp.Abp.WeChat.Common.Abstractions.csproj b/...mmon/EasyAbp.Abp.WeChat.Common.Abstractions/EasyAbp.Abp.WeChat.Common.Abstractions.csproj
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Common</RootNamespace>
         <Description>ABP vNext微信模块，定义了微信公众号与微信支付公用的组件。</Description>
     </PropertyGroup>

diff --git a/...dCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj b/...dCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis</RootNamespace>
     <Description>ABP vNext微信模块，基于StackExchangeRedis提供多服务间共享access_token等缓存数据的功能扩展。</Description>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Common</RootNamespace>
         <Description>ABP vNext微信模块，定义了微信公众号与微信支付公用的组件。</Description>
     </PropertyGroup>
@@ -12,7 +12,7 @@
         <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" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...bp.Abp.WeChat.MiniProgram.Abstractions/EasyAbp.Abp.WeChat.MiniProgram.Abstractions.csproj b/...bp.Abp.WeChat.MiniProgram.Abstractions/EasyAbp.Abp.WeChat.MiniProgram.Abstractions.csproj
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.MiniProgram</RootNamespace>
         <Description>ABP vNext微信模块，提供对微信小程序业务的支持。</Description>
     </PropertyGroup>

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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.MiniProgram</RootNamespace>
         <Description>ABP vNext微信模块，提供对微信小程序业务的支持。</Description>
     </PropertyGroup>

diff --git a/.../EasyAbp.Abp.WeChat.Official.Abstractions/EasyAbp.Abp.WeChat.Official.Abstractions.csproj b/.../EasyAbp.Abp.WeChat.Official.Abstractions/EasyAbp.Abp.WeChat.Official.Abstractions.csproj
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Official</RootNamespace>
         <Description>ABP vNext微信公众号模块，提供对微信公众号业务的支持。</Description>
     </PropertyGroup>

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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Official</RootNamespace>
         <Description>ABP vNext微信公众号模块，提供对微信公众号业务的支持。</Description>
     </PropertyGroup>

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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Official</RootNamespace>
         <Description>ABP vNext微信公众号模块，提供对微信公众号业务的支持。</Description>
     </PropertyGroup>

diff --git a/....Abp.WeChat.OpenPlatform.Abstractions/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions.csproj b/....Abp.WeChat.OpenPlatform.Abstractions/EasyAbp.Abp.WeChat.OpenPlatform.Abstractions.csproj
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.OpenPlatform</RootNamespace>
         <Description>ABP vNext开放平台模块，提供对微信开放平台业务的支持。</Description>
     </PropertyGroup>

diff --git a/...rm/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj b/...rm/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi/EasyAbp.Abp.WeChat.OpenPlatform.HttpApi.csproj
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.OpenPlatform</RootNamespace>
         <Description>ABP vNext开放平台模块，提供对微信开放平台业务的支持。</Description>
     </PropertyGroup>

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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.OpenPlatform</RootNamespace>
         <Description>ABP vNext开放平台模块，提供对微信开放平台业务的支持。</Description>
     </PropertyGroup>

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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Pay</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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Pay</RootNamespace>
         <Description>ABP vNext微信模块，提供对微信支付业务的支持。</Description>
     </PropertyGroup>

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
@@ -3,7 +3,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.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
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.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.8.0" />
+        <PackageReference Include="Bogus" Version="35.6.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
         <PackageReference Include="Shouldly" Version="4.2.1" />

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
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3"/>
         <PackageReference Include="xunit" Version="2.4.1"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.MiniProgram.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Official.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
           <PrivateAssets>all</PrivateAssets>

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.OpenPlatform.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>EasyAbp.Abp.WeChat.Pay.Tests</RootNamespace>
     </PropertyGroup>
 
@@ -11,10 +11,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="NETStandard.Library" Version="2.0.3" />
         <PackageReference Include="Volo.Abp.BlobStoring.FileSystem" Version="$(AbpVersion)" />
-        <PackageReference Include="Volo.Abp.Json.Newtonsoft" Version="8.0.1" />
+        <PackageReference Include="Volo.Abp.Json.Newtonsoft" Version="$(AbpVersion)" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>