Merge pull request #69 from EasyAbp/abp-8.0

Upgrade to ABP 8.0.0
EasyAbp · Dec 27, 2023 · cfe8a95 · cfe8a95
2 parents b4a4dcd + 29032d1
commit cfe8a95
Show file tree

Hide file tree

Showing 74 changed files with 502 additions and 401 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: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: read common.props
         id: commonProps

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>7.4.0</AbpVersion>
-    <EasyAbpAbpWeChatModuleVersion>2.8.0</EasyAbpAbpWeChatModuleVersion>
+    <AbpVersion>8.0.0</AbpVersion>
+    <EasyAbpAbpWeChatModuleVersion>2.9.0</EasyAbpAbpWeChatModuleVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.9.1</Version>
+    <Version>2.10.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.5.3">
+    <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/docs/Prepayment/README.md b/docs/Prepayment/README.md
@@ -8,10 +8,6 @@
 
 Prepayment implementation of the EasyAbp.PaymentService module.
 
-## Online Demo
-
-We have launched an online demo for this module: [https://pay.samples.easyabp.io](https://pay.samples.easyabp.io)
-
 ## Installation
 
 > Should also install the [PaymentService module](/docs/README.md#getting-started) since this module depends on it.

diff --git a/docs/README.md b/docs/README.md
@@ -8,10 +8,6 @@
 
 An abp application module that provides payment service.
 
-## Online Demo
-
-We have launched an online demo for this module: [https://pay.samples.easyabp.io](https://pay.samples.easyabp.io)
-
 ## Installation
 
 1. Install the following NuGet packages. ([see how](https://github.com/EasyAbp/EasyAbpGuide/blob/master/docs/How-To.md#add-nuget-packages))

diff --git a/docs/WeChatPay/README.md b/docs/WeChatPay/README.md
@@ -8,10 +8,6 @@
 
 WeChatPay implementation of the EasyAbp.PaymentService module.
 
-## Online Demo
-
-We have launched an online demo for this module: [https://pay.samples.easyabp.io](https://pay.samples.easyabp.io)
-
 ## Installation
 
 > Should also install the [PaymentService module](/docs/README.md#getting-started) since this module depends on it.

diff --git a/...ment.Application.Contracts/EasyAbp.PaymentService.Prepayment.Application.Contracts.csproj b/...ment.Application.Contracts/EasyAbp.PaymentService.Prepayment.Application.Contracts.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...aymentService.Prepayment.Application/EasyAbp.PaymentService.Prepayment.Application.csproj b/...aymentService.Prepayment.Application/EasyAbp.PaymentService.Prepayment.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...ntService.Prepayment.Domain.Shared/EasyAbp.PaymentService.Prepayment.Domain.Shared.csproj b/...ntService.Prepayment.Domain.Shared/EasyAbp.PaymentService.Prepayment.Domain.Shared.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <RootNamespace />
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/.../EasyAbp.PaymentService.Prepayment.Domain/EasyAbp.PaymentService.Prepayment.Domain.csproj b/.../EasyAbp.PaymentService.Prepayment.Domain/EasyAbp.PaymentService.Prepayment.Domain.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...epayment.EntityFrameworkCore/EasyAbp.PaymentService.Prepayment.EntityFrameworkCore.csproj b/...epayment.EntityFrameworkCore/EasyAbp.PaymentService.Prepayment.EntityFrameworkCore.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...Service.Prepayment.HttpApi.Client/EasyAbp.PaymentService.Prepayment.HttpApi.Client.csproj b/...Service.Prepayment.HttpApi.Client/EasyAbp.PaymentService.Prepayment.HttpApi.Client.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...asyAbp.PaymentService.Prepayment.HttpApi/EasyAbp.PaymentService.Prepayment.HttpApi.csproj b/...asyAbp.PaymentService.Prepayment.HttpApi/EasyAbp.PaymentService.Prepayment.HttpApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...asyAbp.PaymentService.Prepayment.MongoDB/EasyAbp.PaymentService.Prepayment.MongoDB.csproj b/...asyAbp.PaymentService.Prepayment.MongoDB/EasyAbp.PaymentService.Prepayment.MongoDB.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...nt/src/EasyAbp.PaymentService.Prepayment.Web/EasyAbp.PaymentService.Prepayment.Web.csproj b/...nt/src/EasyAbp.PaymentService.Prepayment.Web/EasyAbp.PaymentService.Prepayment.Web.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...e.Prepayment.Application.Tests/EasyAbp.PaymentService.Prepayment.Application.Tests.csproj b/...e.Prepayment.Application.Tests/EasyAbp.PaymentService.Prepayment.Application.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>EasyAbp.PaymentService.Prepayment</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\EasyAbp.PaymentService\src\EasyAbp.PaymentService.Application\EasyAbp.PaymentService.Application.csproj" />
     <ProjectReference Include="..\..\src\EasyAbp.PaymentService.Prepayment.Application\EasyAbp.PaymentService.Prepayment.Application.csproj" />
     <ProjectReference Include="..\EasyAbp.PaymentService.Prepayment.Domain.Tests\EasyAbp.PaymentService.Prepayment.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
 </Project>