Browse Source

升级到 .NET Core 3.1 LTS

Roc 5 years ago
parent
commit
21d4d1722f
35 changed files with 84 additions and 89 deletions
  1. 2 7
      README.MD
  2. 1 1
      samples/WebApplicationSample/WebApplicationSample.csproj
  3. 7 7
      src/Essensoft.AspNetCore.Payment.Alipay/AlipayNotifyClient.cs
  4. 1 1
      src/Essensoft.AspNetCore.Payment.Alipay/AlipayNotifyResult.cs
  5. 4 4
      src/Essensoft.AspNetCore.Payment.Alipay/Essensoft.AspNetCore.Payment.Alipay.csproj
  6. 1 1
      src/Essensoft.AspNetCore.Payment.Alipay/IAlipayNotifyClient.cs
  7. 1 1
      src/Essensoft.AspNetCore.Payment.Alipay/ServiceCollectionExtensions.cs
  8. 4 4
      src/Essensoft.AspNetCore.Payment.JDPay/Essensoft.AspNetCore.Payment.JDPay.csproj
  9. 1 1
      src/Essensoft.AspNetCore.Payment.JDPay/IJDPayNotifyClient.cs
  10. 1 1
      src/Essensoft.AspNetCore.Payment.JDPay/JDPayNotifyClient.cs
  11. 1 1
      src/Essensoft.AspNetCore.Payment.JDPay/JDPayNotifyResult.cs
  12. 1 1
      src/Essensoft.AspNetCore.Payment.JDPay/ServiceCollectionExtensions.cs
  13. 1 1
      src/Essensoft.AspNetCore.Payment.JDPay/Utility/JDPayUtility.cs
  14. 4 4
      src/Essensoft.AspNetCore.Payment.LianLianPay/Essensoft.AspNetCore.Payment.LianLianPay.csproj
  15. 1 1
      src/Essensoft.AspNetCore.Payment.LianLianPay/ILianLianPayNotifyClient.cs
  16. 7 7
      src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayNotifyClient.cs
  17. 1 1
      src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayNotifyResult.cs
  18. 1 1
      src/Essensoft.AspNetCore.Payment.LianLianPay/ServiceCollectionExtensions.cs
  19. 1 1
      src/Essensoft.AspNetCore.Payment.LianLianPay/Utility/LianLianPayUtility.cs
  20. 4 4
      src/Essensoft.AspNetCore.Payment.QPay/Essensoft.AspNetCore.Payment.QPay.csproj
  21. 1 1
      src/Essensoft.AspNetCore.Payment.QPay/IQPayNotifyClient.cs
  22. 7 7
      src/Essensoft.AspNetCore.Payment.QPay/QPayNotifyClient.cs
  23. 1 1
      src/Essensoft.AspNetCore.Payment.QPay/QPayNotifyResult.cs
  24. 1 1
      src/Essensoft.AspNetCore.Payment.QPay/ServiceCollectionExtensions.cs
  25. 1 1
      src/Essensoft.AspNetCore.Payment.Security/Essensoft.AspNetCore.Payment.Security.csproj
  26. 4 4
      src/Essensoft.AspNetCore.Payment.UnionPay/Essensoft.AspNetCore.Payment.UnionPay.csproj
  27. 1 1
      src/Essensoft.AspNetCore.Payment.UnionPay/IUnionPayNotifyClient.cs
  28. 1 1
      src/Essensoft.AspNetCore.Payment.UnionPay/ServiceCollectionExtensions.cs
  29. 7 7
      src/Essensoft.AspNetCore.Payment.UnionPay/UnionPayNotifyClient.cs
  30. 1 1
      src/Essensoft.AspNetCore.Payment.UnionPay/UnionPayNotifyResult.cs
  31. 4 4
      src/Essensoft.AspNetCore.Payment.WeChatPay/Essensoft.AspNetCore.Payment.WeChatPay.csproj
  32. 1 1
      src/Essensoft.AspNetCore.Payment.WeChatPay/IWeChatPayNotifyClient.cs
  33. 1 1
      src/Essensoft.AspNetCore.Payment.WeChatPay/ServiceCollectionExtensions.cs
  34. 7 7
      src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayNotifyClient.cs
  35. 1 1
      src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayNotifyResult.cs

+ 2 - 7
README.MD

@@ -24,15 +24,12 @@ Essensoft.AspNetCore.Payment.Security       | [![NuGet](https://img.shields.io/n
 ## 支持渠道
 
 ### 支付宝 [文档中心](https://docs.open.alipay.com/catalog)
-
 * 当面付、APP支付、手机网站支付、电脑网站支付、单笔转账到支付宝账户...
 
 ### 微信支付 [开发文档](https://pay.weixin.qq.com/wiki/doc/api/index.html)
-
 * 付款码支付(刷卡)、JSAPI支付(公众号)、Native支付(扫码)、APP支付、H5支付、小程序支付、企业付款(零钱/银行卡)、现金红包、酒店押金、人脸支付、委托扣款、分账
 
 ### QQ钱包 [开发文档](https://qpay.qq.com/buss/doc.shtml)
-
 * 付款码支付、扫码支付、公众号支付、APP支付、企业付款
 
 ### 京东支付 [开发文档](http://payapi.jd.com)
@@ -46,10 +43,8 @@ Essensoft.AspNetCore.Payment.Security       | [![NuGet](https://img.shields.io/n
 
 ## 开发环境
 * Windows 10
-* VS2019
-
-## 运行环境
-* .NET Core 3.0
+* VS 2019 16.4.0
+* .NET Core 3.1
 
 ## 使用方式
 

+ 1 - 1
samples/WebApplicationSample/WebApplicationSample.csproj

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

+ 7 - 7
src/Essensoft.AspNetCore.Payment.Alipay/AlipayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System;
 using System.Collections.Generic;
@@ -12,16 +12,16 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 {
     public class AlipayNotifyClient : IAlipayNotifyClient
     {
-#region AlipayNotifyClient Constructors
+        #region AlipayNotifyClient Constructors
 
         public AlipayNotifyClient()
         {
 
         }
 
-#endregion
+        #endregion
 
-#region IAlipayNotifyClient Members
+        #region IAlipayNotifyClient Members
 
         public Task<T> ExecuteAsync<T>(HttpRequest request, AlipayOptions options) where T : AlipayNotify
         {
@@ -47,9 +47,9 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             return Task.FromResult(rsp);
         }
 
-#endregion
+        #endregion
 
-#region Common Method
+        #region Common Method
 
         private Dictionary<string, string> GetParameters(HttpRequest request)
         {
@@ -109,7 +109,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             return sb.Remove(sb.Length - 1, 1).ToString();
         }
 
-#endregion
+        #endregion
     }
 }
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.Alipay/AlipayNotifyResult.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using Microsoft.AspNetCore.Mvc;
 

+ 4 - 4
src/Essensoft.AspNetCore.Payment.Alipay/Essensoft.AspNetCore.Payment.Alipay.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <PackageId>Essensoft.AspNetCore.Payment.Alipay</PackageId>
     <PackageTags>Essensoft;AspNetCore;Payment;Alipay;支付宝;</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.Alipay/IAlipayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

+ 1 - 1
src/Essensoft.AspNetCore.Payment.Alipay/ServiceCollectionExtensions.cs

@@ -20,7 +20,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             services.AddSingleton<AlipayCertificateManager>();
             services.AddSingleton<IAlipayClient, AlipayClient>();
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
             services.AddSingleton<IAlipayNotifyClient, AlipayNotifyClient>();
 #endif

+ 4 - 4
src/Essensoft.AspNetCore.Payment.JDPay/Essensoft.AspNetCore.Payment.JDPay.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <PackageId>Essensoft.AspNetCore.Payment.JDPay</PackageId>
     <PackageTags>Essensoft;AspNetCore;Payment;JDPay;京东支付;</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.JDPay/IJDPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

+ 1 - 1
src/Essensoft.AspNetCore.Payment.JDPay/JDPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System;
 using System.IO;

+ 1 - 1
src/Essensoft.AspNetCore.Payment.JDPay/JDPayNotifyResult.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using Microsoft.AspNetCore.Mvc;
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.JDPay/ServiceCollectionExtensions.cs

@@ -19,7 +19,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
 
             services.AddSingleton<IJDPayClient, JDPayClient>();
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
             services.AddSingleton<IJDPayNotifyClient, JDPayNotifyClient>();
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.JDPay/Utility/JDPayUtility.cs

@@ -32,7 +32,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay.Utility
             return content.ToString().Substring(0, content.Length - 1);
         }
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
         internal static bool HasTextXmlContentType(this Microsoft.AspNetCore.Http.HttpRequest request)
         {

+ 4 - 4
src/Essensoft.AspNetCore.Payment.LianLianPay/Essensoft.AspNetCore.Payment.LianLianPay.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <PackageId>Essensoft.AspNetCore.Payment.LianLianPay</PackageId>
     <PackageTags>Essensoft;AspNetCore;Payment;LianLianPay;连连支付;</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.LianLianPay/ILianLianPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

+ 7 - 7
src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.IO;
 using System.Threading.Tasks;
@@ -14,15 +14,15 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
     /// </summary>
     public class LianLianPayNotifyClient : ILianLianPayNotifyClient
     {
-#region LianLianPayNotifyClient Constructors
+        #region LianLianPayNotifyClient Constructors
 
         public LianLianPayNotifyClient()
         {
         }
 
-#endregion
+        #endregion
 
-#region ILianLianPayNotifyClient Members
+        #region ILianLianPayNotifyClient Members
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request) where T : LianLianPayNotify
         {
@@ -53,9 +53,9 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
             throw new LianLianPayException("content type is not supported");
         }
 
-#endregion
+        #endregion
 
-#region Common Method
+        #region Common Method
 
         private async Task<LianLianPayDictionary> GetParametersAsync(HttpRequest request)
         {
@@ -87,7 +87,7 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
             }
         }
 
-#endregion
+        #endregion
     }
 }
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayNotifyResult.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using Microsoft.AspNetCore.Mvc;
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.LianLianPay/ServiceCollectionExtensions.cs

@@ -19,7 +19,7 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
 
             services.AddSingleton<ILianLianPayClient, LianLianPayClient>();
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
             services.AddSingleton<ILianLianPayNotifyClient, LianLianPayNotifyClient>();
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.LianLianPay/Utility/LianLianPayUtility.cs

@@ -29,7 +29,7 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay.Utility
             return content.ToString().Substring(0, content.Length - 1);
         }
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
         internal static bool HasTextJsonContentType(this Microsoft.AspNetCore.Http.HttpRequest request)
         {

+ 4 - 4
src/Essensoft.AspNetCore.Payment.QPay/Essensoft.AspNetCore.Payment.QPay.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <PackageId>Essensoft.AspNetCore.Payment.QPay</PackageId>
     <PackageTags>Essensoft;AspNetCore;Payment;QPay;QQ钱包;</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.QPay/IQPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

+ 7 - 7
src/Essensoft.AspNetCore.Payment.QPay/QPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System;
 using System.IO;
@@ -12,15 +12,15 @@ namespace Essensoft.AspNetCore.Payment.QPay
 {
     public class QPayNotifyClient : IQPayNotifyClient
     {
-#region QPayNotifyClient Constructors
+        #region QPayNotifyClient Constructors
 
         public QPayNotifyClient()
         {
         }
 
-#endregion
+        #endregion
 
-#region IQPayNotifyClient Members
+        #region IQPayNotifyClient Members
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, QPayOptions options) where T : QPayNotify
         {
@@ -42,9 +42,9 @@ namespace Essensoft.AspNetCore.Payment.QPay
             return rsp;
         }
 
-#endregion
+        #endregion
 
-#region Common Method
+        #region Common Method
 
         private void CheckNotifySign(QPayNotify response, QPayOptions options)
         {
@@ -70,7 +70,7 @@ namespace Essensoft.AspNetCore.Payment.QPay
             }
         }
 
-#endregion
+        #endregion
     }
 }
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.QPay/QPayNotifyResult.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using Microsoft.AspNetCore.Mvc;
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.QPay/ServiceCollectionExtensions.cs

@@ -24,7 +24,7 @@ namespace Essensoft.AspNetCore.Payment.QPay
             services.AddSingleton<QPayCertificateManager>();
             services.AddSingleton<IQPayClient, QPayClient>();
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
             services.AddSingleton<IQPayNotifyClient, QPayNotifyClient>();
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.Security/Essensoft.AspNetCore.Payment.Security.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.5.2" />
   </ItemGroup>
 
 </Project>

+ 4 - 4
src/Essensoft.AspNetCore.Payment.UnionPay/Essensoft.AspNetCore.Payment.UnionPay.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <PackageId>Essensoft.AspNetCore.Payment.UnionPay</PackageId>
     <PackageTags>Essensoft;AspNetCore;Payment;UnionPay;银联支付;</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.UnionPay/IUnionPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

+ 1 - 1
src/Essensoft.AspNetCore.Payment.UnionPay/ServiceCollectionExtensions.cs

@@ -19,7 +19,7 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
 
             services.AddSingleton<IUnionPayClient, UnionPayClient>();
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
             services.AddSingleton<IUnionPayNotifyClient, UnionPayNotifyClient>();
 #endif

+ 7 - 7
src/Essensoft.AspNetCore.Payment.UnionPay/UnionPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.Threading.Tasks;
 using Essensoft.AspNetCore.Payment.UnionPay.Parser;
@@ -9,15 +9,15 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
 {
     public class UnionPayNotifyClient : IUnionPayNotifyClient
     {
-#region UnionPayNotifyClient Constructors
+        #region UnionPayNotifyClient Constructors
 
         public UnionPayNotifyClient()
         {
         }
 
-#endregion
+        #endregion
 
-#region IUnionPayNotifyClient Members
+        #region IUnionPayNotifyClient Members
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request) where T : UnionPayNotify
         {
@@ -33,9 +33,9 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
             return rsp;
         }
 
-#endregion
+        #endregion
 
-#region Common Method
+        #region Common Method
 
         private async Task<UnionPayDictionary> GetParametersAsync(HttpRequest request)
         {
@@ -62,7 +62,7 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
             }
         }
 
-#endregion
+        #endregion
     }
 }
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.UnionPay/UnionPayNotifyResult.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using Microsoft.AspNetCore.Mvc;
 

+ 4 - 4
src/Essensoft.AspNetCore.Payment.WeChatPay/Essensoft.AspNetCore.Payment.WeChatPay.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <PackageId>Essensoft.AspNetCore.Payment.WeChatPay</PackageId>
     <PackageTags>Essensoft;AspNetCore;Payment;WeChatPay;微信支付;</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/IWeChatPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/ServiceCollectionExtensions.cs

@@ -24,7 +24,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddSingleton<WeChatPayCertificateManager>();
             services.AddSingleton<IWeChatPayClient, WeChatPayClient>();
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
             services.AddSingleton<IWeChatPayNotifyClient, WeChatPayNotifyClient>();
 #endif
 

+ 7 - 7
src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayNotifyClient.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System;
 using System.IO;
@@ -16,15 +16,15 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
 {
     public class WeChatPayNotifyClient : IWeChatPayNotifyClient
     {
-#region WeChatPayNotifyClient Constructors
+        #region WeChatPayNotifyClient Constructors
 
         public WeChatPayNotifyClient()
         {
         }
 
-#endregion
+        #endregion
 
-#region IWeChatPayNotifyClient Members
+        #region IWeChatPayNotifyClient Members
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, WeChatPayOptions options) where T : WeChatPayNotify
         {
@@ -60,9 +60,9 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
             return notify;
         }
 
-#endregion
+        #endregion
 
-#region Common Method
+        #region Common Method
 
         private void CheckNotifySign(WeChatPayNotify notify, WeChatPayOptions options)
         {
@@ -88,7 +88,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
             }
         }
 
-#endregion
+        #endregion
     }
 }
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayNotifyResult.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using Microsoft.AspNetCore.Mvc;