Browse Source

升级到 .NET 7.0

Roc 2 years ago
parent
commit
852a3fc846

+ 2 - 2
Directory.Build.props

@@ -20,8 +20,8 @@
     <GenerateDocumentationFile Condition="'$(Configuration)' == 'Release'">true</GenerateDocumentationFile>
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
     <LangVersion>latest</LangVersion>
-    <SystemTextJsonPackageVersion>6.0.5</SystemTextJsonPackageVersion>
-    <MicrosoftExtensionsHttpPackageVersion>6.0.0</MicrosoftExtensionsHttpPackageVersion>
+    <SystemTextJsonPackageVersion>7.0.1</SystemTextJsonPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>7.0.0</MicrosoftExtensionsHttpPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

+ 3 - 1
README.md

@@ -44,12 +44,13 @@ Package  | NuGet | Downloads | TargetFrameworks
 
 * Windows 11
 * [Rider 2022](https://www.jetbrains.com/rider) / [Visual Studio 2022](https://visualstudio.microsoft.com)
-* [.NET 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
+* [.NET 7.0](https://dotnet.microsoft.com/download/dotnet/7.0)
 
 ## 运行环境
 
 - [.NET Core 3.1](https://dotnet.microsoft.com/download/dotnet/3.1)
 - [.NET 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
+- [.NET 7.0](https://dotnet.microsoft.com/download/dotnet/7.0)
 
 ## 使用方式
 
@@ -99,6 +100,7 @@ Package  | NuGet | Downloads | TargetFrameworks
     - 商户进件(服务商)
     - 基础支付(服务商)
     - 分账(服务商)
+    - 商家转账到零钱
     - ...
 
 ## 致谢

+ 1 - 1
global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.400",
+    "version": "7.0.101",
     "rollForward": "latestFeature"
   }
 }

+ 1 - 1
samples/WebApplicationSample/WebApplicationSample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>a59ca38e-9b52-44fe-b3d2-8cb5a1641623</UserSecretsId>
     <SignAssembly>false</SignAssembly>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>

+ 2 - 2
src/Essensoft.Paylink.Alipay/Essensoft.Paylink.Alipay.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <PackageId>Essensoft.Paylink.Alipay</PackageId>
     <PackageTags>Essensoft;Paylink;Alipay;支付宝</PackageTags>
   </PropertyGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

+ 1 - 1
src/Essensoft.Paylink.Security/Essensoft.Paylink.Security.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <PackageId>Essensoft.Paylink.Security</PackageId>
     <PackageTags>Essensoft;Paylink;Security</PackageTags>
   </PropertyGroup>

+ 2 - 2
src/Essensoft.Paylink.WeChatPay/Essensoft.Paylink.WeChatPay.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <PackageId>Essensoft.Paylink.WeChatPay</PackageId>
     <PackageTags>Essensoft;Paylink;WeChatPay;微信支付</PackageTags>
   </PropertyGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>