diff --git a/.editorconfig b/.editorconfig index e241561..694ec45 100644 --- a/.editorconfig +++ b/.editorconfig @@ -43,44 +43,48 @@ indent_size = 2 ## Language conventions # Dotnet code style settings: [*.{cs,vb}] +# Rule format +dotnet_diagnostic.IDE0005.severity = error + # "This." and "Me." qualifiers -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_event = false:suggestion +dotnet_style_qualification_for_field = false:error +dotnet_style_qualification_for_property = false:error +dotnet_style_qualification_for_method = false:error +dotnet_style_qualification_for_event = false:error # Language keywords instead of framework type names for type references -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion -dotnet_style_predefined_type_for_member_access = true:suggestion +dotnet_style_predefined_type_for_locals_parameters_members = true:error +dotnet_style_predefined_type_for_member_access = true:error # Modifier preferences -dotnet_style_require_accessibility_modifiers = always:suggestion -dotnet_style_readonly_field = true:warning +dotnet_style_require_accessibility_modifiers = always:error +dotnet_style_readonly_field = true:error # Parentheses preferences -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:error +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:error +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:error +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:error # Expression-level preferences -dotnet_style_object_initializer = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_explicit_tuple_names = true:suggestion -dotnet_style_prefer_inferred_tuple_names = true:suggestion -dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion -dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:error +dotnet_style_collection_initializer = true:error +dotnet_style_explicit_tuple_names = true:error +dotnet_style_prefer_inferred_tuple_names = true:error +dotnet_style_prefer_inferred_anonymous_type_member_names = true:error +dotnet_style_prefer_auto_properties = true:error dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion dotnet_style_prefer_conditional_expression_over_return = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:error # Null-checking preferences -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_null_propagation = true:suggestion +dotnet_style_coalesce_expression = true:error +dotnet_style_null_propagation = true:error # CSharp code style settings: [*.cs] # Modifier preferences -csharp_preferred_modifier_order = public,private,protected,internal,const,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion +csharp_preferred_modifier_order = public,private,protected,internal,const,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:error # Implicit and explicit types csharp_style_var_for_built_in_types = true:suggestion @@ -91,29 +95,29 @@ csharp_style_var_elsewhere = true:suggestion # Explicitly disabled due to difference in coding style between source and tests #csharp_style_expression_bodied_methods = false:silent #csharp_style_expression_bodied_constructors = false:silent -csharp_style_expression_bodied_operators = false:silent -csharp_style_expression_bodied_properties = true:suggestion -csharp_style_expression_bodied_indexers = true:suggestion -csharp_style_expression_bodied_accessors = true:suggestion +csharp_style_expression_bodied_operators = when_on_single_line:suggestion +csharp_style_expression_bodied_properties = when_on_single_line:suggestion +csharp_style_expression_bodied_indexers = when_on_single_line:suggestion +csharp_style_expression_bodied_accessors = when_on_single_line:suggestion # Pattern matching -csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion -csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_pattern_matching_over_is_with_cast_check = true:error +csharp_style_pattern_matching_over_as_with_null_check = true:error # Inlined variable declarations -csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_inlined_variable_declaration = true:error # Expression-level preferences -csharp_prefer_simple_default_expression = true:suggestion -csharp_style_deconstructed_variable_declaration = true:suggestion -csharp_style_pattern_local_over_anonymous_function = true:suggestion +csharp_prefer_simple_default_expression = true:error +csharp_style_deconstructed_variable_declaration = true:error +csharp_style_pattern_local_over_anonymous_function = true:error # Null-checking preference -csharp_style_throw_expression = true:suggestion -csharp_style_conditional_delegate_call = true:suggestion +csharp_style_throw_expression = true:none +csharp_style_conditional_delegate_call = true:error # Code block preferences -csharp_prefer_braces = true:suggestion +csharp_prefer_braces = true:error ## Formatting conventions # Dotnet formatting settings: @@ -166,7 +170,7 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = false csharp_space_between_square_brackets = false # Wrap options -csharp_preserve_single_line_statements = true +csharp_preserve_single_line_statements = false csharp_preserve_single_line_blocks = true ## Naming conventions @@ -195,15 +199,15 @@ dotnet_naming_symbols.interface_symbol.applicable_kinds = interface dotnet_naming_symbols.interface_symbol.applicable_accessibilities = * dotnet_naming_rule.interface_naming.symbols = interface_symbol dotnet_naming_rule.interface_naming.style = interface_style -dotnet_naming_rule.interface_naming.severity = suggestion +dotnet_naming_rule.interface_naming.severity = error # Classes, Structs, Enums, Properties, Methods, Local Functions, Events, Namespaces -dotnet_naming_symbols.class_symbol.applicable_kinds = class, struct, enum, property, method, local_function, event, namespace +dotnet_naming_symbols.class_symbol.applicable_kinds = class, struct, enum, property, method, local_function, event, namespace, delegate dotnet_naming_symbols.class_symbol.applicable_accessibilities = * dotnet_naming_rule.class_naming.symbols = class_symbol dotnet_naming_rule.class_naming.style = pascal_case_style -dotnet_naming_rule.class_naming.severity = suggestion +dotnet_naming_rule.class_naming.severity = error # Type Parameters dotnet_naming_symbols.type_parameter_symbol.applicable_kinds = type_parameter @@ -211,46 +215,36 @@ dotnet_naming_symbols.type_parameter_symbol.applicable_accessibilities = * dotnet_naming_rule.type_parameter_naming.symbols = type_parameter_symbol dotnet_naming_rule.type_parameter_naming.style = type_parameter_style -dotnet_naming_rule.type_parameter_naming.severity = suggestion +dotnet_naming_rule.type_parameter_naming.severity = error -# Private const fields -dotnet_naming_symbols.const_field_symbol.applicable_kinds = field -dotnet_naming_symbols.const_field_symbol.applicable_accessibilities = private -dotnet_naming_symbols.const_field_symbol.required_modifiers = const +# Private Fields +dotnet_naming_symbols.private_field_symbol.applicable_kinds = field +dotnet_naming_symbols.private_field_symbol.applicable_accessibilities = private -dotnet_naming_rule.const_field_naming.symbols = const_field_symbol -dotnet_naming_rule.const_field_naming.style = _camelCase -dotnet_naming_rule.const_field_naming.severity = suggestion +dotnet_naming_rule.private_field_naming.symbols = private_field_symbol +dotnet_naming_rule.private_field_naming.style = _camelCase +dotnet_naming_rule.private_field_naming.severity = error -# Other const fields -dotnet_naming_symbols.const_field_symbol.applicable_kinds = field -dotnet_naming_symbols.const_field_symbol.applicable_accessibilities = * -dotnet_naming_symbols.const_field_symbol.required_modifiers = const - -dotnet_naming_rule.const_field_naming.symbols = const_field_symbol -dotnet_naming_rule.const_field_naming.style = pascal_case_style -dotnet_naming_rule.const_field_naming.severity = suggestion - -# Public fields +# Visible Fields dotnet_naming_symbols.public_field_symbol.applicable_kinds = field dotnet_naming_symbols.public_field_symbol.applicable_accessibilities = public, internal, protected, protected_internal, private_protected dotnet_naming_rule.public_field_naming.symbols = public_field_symbol dotnet_naming_rule.public_field_naming.style = pascal_case_style -dotnet_naming_rule.public_field_naming.severity = suggestion +dotnet_naming_rule.public_field_naming.severity = error -# Other fields -dotnet_naming_symbols.other_field_symbol.applicable_kinds = field -dotnet_naming_symbols.other_field_symbol.applicable_accessibilities = * +# Parameters +dotnet_naming_symbols.parameter_symbol.applicable_kinds = parameter +dotnet_naming_symbols.parameter_symbol.applicable_accessibilities = * -dotnet_naming_rule.other_field_naming.symbols = other_field_symbol -dotnet_naming_rule.other_field_naming.style = _camelCase -dotnet_naming_rule.other_field_naming.severity = suggestion +dotnet_naming_rule.parameter_naming.symbols = parameter_symbol +dotnet_naming_rule.parameter_naming.style = camel_case_style +dotnet_naming_rule.parameter_naming.severity = error -# Everything Else -dotnet_naming_symbols.everything_else.applicable_kinds = * +# Everything Local +dotnet_naming_symbols.everything_else.applicable_kinds = local dotnet_naming_symbols.everything_else.applicable_accessibilities = * dotnet_naming_rule.everything_else_naming.symbols = everything_else dotnet_naming_rule.everything_else_naming.style = camel_case_style -dotnet_naming_rule.everything_else_naming.severity = suggestion +dotnet_naming_rule.everything_else_naming.severity = error \ No newline at end of file diff --git a/README.md b/README.md index 3de754f..92e0a43 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,8 @@ PaySharp.Qpay | [![NuGet](https://img.shields.io/nuget/v/PaySharp.Qpay.svg)](htt # 开发环境 * Windows 10 -* Visual Studio 2019(16.3) -* .NET Core SDK 3.0 +* Visual Studio 2019(16.4) +* .NET Core SDK 3.1 # 如何使用 --- @@ -109,4 +109,4 @@ https://qpay.qq.com/qpaywiki.shtml [stulzq](https://github.com/stulzq) -[EssenRoc](https://github.com/EssenRoc) +[Essensoft-Roc](https://github.com/Essensoft-Roc) diff --git a/global.json b/global.json index 79422f0..e9aac8c 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.0.100" + "version": "3.1.100" } } diff --git a/package.props b/package.props index ae7fb58..ab7e6c3 100644 --- a/package.props +++ b/package.props @@ -1,7 +1,7 @@ - 2.0.0 + 1.0.8 true https://github.com/Varorbc/PaySharp Varorbc @@ -10,14 +10,21 @@ Varorbc true PaySharp.snk - https://github.com/Varorbc/PaySharp/raw/master/logo.png + logo.png true true snupkg - + + True + + + + + + diff --git a/sample/PaySharp.Demo/PaySharp.Demo.csproj b/sample/PaySharp.Demo/PaySharp.Demo.csproj index 7e95134..5f28d92 100644 --- a/sample/PaySharp.Demo/PaySharp.Demo.csproj +++ b/sample/PaySharp.Demo/PaySharp.Demo.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 diff --git a/src/PaySharp.Alipay/AlipayGateway.cs b/src/PaySharp.Alipay/AlipayGateway.cs index 97a6a0e..954d53b 100644 --- a/src/PaySharp.Alipay/AlipayGateway.cs +++ b/src/PaySharp.Alipay/AlipayGateway.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using Microsoft.Extensions.Options; #endif using System.Threading.Tasks; @@ -34,7 +34,7 @@ namespace PaySharp.Alipay _merchant = merchant; } -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 /// /// 初始化支付宝网关 diff --git a/src/PaySharp.Alipay/PaySharp.Alipay.csproj b/src/PaySharp.Alipay/PaySharp.Alipay.csproj index 5757fef..f1cdcb5 100644 --- a/src/PaySharp.Alipay/PaySharp.Alipay.csproj +++ b/src/PaySharp.Alipay/PaySharp.Alipay.csproj @@ -3,7 +3,7 @@ - net45;netcoreapp3.0 + net45;netcoreapp3.1 PaySharp.Alipay 支付宝支付 dotnetcore;pay;alipay; diff --git a/src/PaySharp.Alipay/ServiceCollectionExtensions.cs b/src/PaySharp.Alipay/ServiceCollectionExtensions.cs index 0bac194..e6d916d 100644 --- a/src/PaySharp.Alipay/ServiceCollectionExtensions.cs +++ b/src/PaySharp.Alipay/ServiceCollectionExtensions.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using System; using Microsoft.Extensions.Configuration; using PaySharp.Alipay; diff --git a/src/PaySharp.Core/Gateways/GatewayData.cs b/src/PaySharp.Core/Gateways/GatewayData.cs index 8e6cc5f..ca156d2 100644 --- a/src/PaySharp.Core/Gateways/GatewayData.cs +++ b/src/PaySharp.Core/Gateways/GatewayData.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using Microsoft.AspNetCore.Http; #endif using System; @@ -406,7 +406,7 @@ namespace PaySharp.Core } } -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 /// /// 将表单数据转换为网关数据 diff --git a/src/PaySharp.Core/Notify/NotifyProcess.cs b/src/PaySharp.Core/Notify/NotifyProcess.cs index fcc189c..47d01c8 100644 --- a/src/PaySharp.Core/Notify/NotifyProcess.cs +++ b/src/PaySharp.Core/Notify/NotifyProcess.cs @@ -95,7 +95,7 @@ namespace PaySharp.Core { try { -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 gatewayData.FromForm(HttpUtil.Form); #else gatewayData.FromNameValueCollection(HttpUtil.Form); diff --git a/src/PaySharp.Core/PaySharp.Core.csproj b/src/PaySharp.Core/PaySharp.Core.csproj index c1d8805..2953168 100644 --- a/src/PaySharp.Core/PaySharp.Core.csproj +++ b/src/PaySharp.Core/PaySharp.Core.csproj @@ -3,7 +3,7 @@ - net45;netcoreapp3.0 + net45;netcoreapp3.1 PaySharp.Core 支付核心 dotnetcore;pay; @@ -18,7 +18,7 @@ - + diff --git a/src/PaySharp.Core/ServiceCollectionExtensions.cs b/src/PaySharp.Core/ServiceCollectionExtensions.cs index 794319b..93378ea 100644 --- a/src/PaySharp.Core/ServiceCollectionExtensions.cs +++ b/src/PaySharp.Core/ServiceCollectionExtensions.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; diff --git a/src/PaySharp.Core/Utils/EncryptUtil.cs b/src/PaySharp.Core/Utils/EncryptUtil.cs index 7760ae4..c74595c 100644 --- a/src/PaySharp.Core/Utils/EncryptUtil.cs +++ b/src/PaySharp.Core/Utils/EncryptUtil.cs @@ -97,7 +97,7 @@ namespace PaySharp.Core.Utils if ("RSA2".Equals(signType)) { -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 signatureBytes = rsaCsp.SignData(dataBytes, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); #else signatureBytes = ((RSACryptoServiceProvider)rsaCsp).SignData(dataBytes, "SHA256"); @@ -105,7 +105,7 @@ namespace PaySharp.Core.Utils } else { -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 signatureBytes = rsaCsp.SignData(dataBytes, HashAlgorithmName.SHA1, RSASignaturePadding.Pkcs1); #else signatureBytes = ((RSACryptoServiceProvider)rsaCsp).SignData(dataBytes, "SHA1"); @@ -148,7 +148,7 @@ namespace PaySharp.Core.Utils if ("RSA2".Equals(signType)) { -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 bVerifyResultOriginal = rsa.VerifyData(Encoding.GetEncoding(charset).GetBytes(signContent), Convert.FromBase64String(sign), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); #else @@ -158,7 +158,7 @@ namespace PaySharp.Core.Utils } else { -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 bVerifyResultOriginal = rsa.VerifyData(Encoding.GetEncoding(charset).GetBytes(signContent), Convert.FromBase64String(sign), HashAlgorithmName.SHA1, RSASignaturePadding.Pkcs1); #else diff --git a/src/PaySharp.Core/Utils/HttpUtil.cs b/src/PaySharp.Core/Utils/HttpUtil.cs index 58b987e..4eb72e1 100644 --- a/src/PaySharp.Core/Utils/HttpUtil.cs +++ b/src/PaySharp.Core/Utils/HttpUtil.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using Microsoft.AspNetCore.Http; #else using System.Collections.Specialized; @@ -21,7 +21,7 @@ namespace PaySharp.Core.Utils { #region 属性 -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 private static IHttpContextAccessor _httpContextAccessor; @@ -242,7 +242,7 @@ namespace PaySharp.Core.Utils { Current.Response.ContentType = "text/plain;charset=utf-8"; -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 Task.Run(async () => { await Current.Response.WriteAsync(text); @@ -272,7 +272,7 @@ namespace PaySharp.Core.Utils Current.Response.Headers.Add("Content-Disposition", "attachment;filename=" + WebUtility.UrlEncode(Path.GetFileName(stream.Name))); Current.Response.Headers.Add("Content-Length", size.ToString()); -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 Task.Run(async () => { await Current.Response.Body.WriteAsync(buffer, 0, (int)size); diff --git a/src/PaySharp.Qpay/PaySharp.Qpay.csproj b/src/PaySharp.Qpay/PaySharp.Qpay.csproj index 75fb9d0..d3c027e 100644 --- a/src/PaySharp.Qpay/PaySharp.Qpay.csproj +++ b/src/PaySharp.Qpay/PaySharp.Qpay.csproj @@ -3,7 +3,7 @@ - net45;netcoreapp3.0 + net45;netcoreapp3.1 PaySharp.Qpay QQ钱包支付 dotnetcore;pay;qpay; diff --git a/src/PaySharp.Qpay/QpayGateway.cs b/src/PaySharp.Qpay/QpayGateway.cs index 90a212d..f179a07 100644 --- a/src/PaySharp.Qpay/QpayGateway.cs +++ b/src/PaySharp.Qpay/QpayGateway.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using Microsoft.Extensions.Options; #endif using System.Threading.Tasks; @@ -33,7 +33,7 @@ namespace PaySharp.Qpay _merchant = merchant; } -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 /// /// 初始化QQ钱包网关 diff --git a/src/PaySharp.Qpay/ServiceCollectionExtensions.cs b/src/PaySharp.Qpay/ServiceCollectionExtensions.cs index 9f1b2aa..3555919 100644 --- a/src/PaySharp.Qpay/ServiceCollectionExtensions.cs +++ b/src/PaySharp.Qpay/ServiceCollectionExtensions.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using System; using Microsoft.Extensions.Configuration; using PaySharp.Core; diff --git a/src/PaySharp.Unionpay/PaySharp.Unionpay.csproj b/src/PaySharp.Unionpay/PaySharp.Unionpay.csproj index 2e1e179..ce02a4e 100644 --- a/src/PaySharp.Unionpay/PaySharp.Unionpay.csproj +++ b/src/PaySharp.Unionpay/PaySharp.Unionpay.csproj @@ -3,7 +3,7 @@ - net45;netcoreapp3.0 + net45;netcoreapp3.1 PaySharp.Unionpay 银联支付 dotnetcore;pay;unionpay; diff --git a/src/PaySharp.Unionpay/ServiceCollectionExtensions.cs b/src/PaySharp.Unionpay/ServiceCollectionExtensions.cs index 81b94f0..414e0d2 100644 --- a/src/PaySharp.Unionpay/ServiceCollectionExtensions.cs +++ b/src/PaySharp.Unionpay/ServiceCollectionExtensions.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using System; using Microsoft.Extensions.Configuration; using PaySharp.Core; diff --git a/src/PaySharp.Unionpay/UnionpayGateway.cs b/src/PaySharp.Unionpay/UnionpayGateway.cs index ab24f76..846752e 100644 --- a/src/PaySharp.Unionpay/UnionpayGateway.cs +++ b/src/PaySharp.Unionpay/UnionpayGateway.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using Microsoft.Extensions.Options; #endif using System; @@ -37,7 +37,7 @@ namespace PaySharp.Unionpay _merchant.CertKey = Util.GetCertKey(merchant.CertPath, merchant.CertPwd); } -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 /// /// 初始化银联支付网关 diff --git a/src/PaySharp.Wechatpay/PaySharp.Wechatpay.csproj b/src/PaySharp.Wechatpay/PaySharp.Wechatpay.csproj index 352f589..fa24066 100644 --- a/src/PaySharp.Wechatpay/PaySharp.Wechatpay.csproj +++ b/src/PaySharp.Wechatpay/PaySharp.Wechatpay.csproj @@ -3,7 +3,7 @@ - net45;netcoreapp3.0 + net45;netcoreapp3.1 PaySharp.Wechatpay 微信支付 dotnetcore;pay;wechatpay; diff --git a/src/PaySharp.Wechatpay/ServiceCollectionExtensions.cs b/src/PaySharp.Wechatpay/ServiceCollectionExtensions.cs index a16094a..ea3f078 100644 --- a/src/PaySharp.Wechatpay/ServiceCollectionExtensions.cs +++ b/src/PaySharp.Wechatpay/ServiceCollectionExtensions.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using System; using Microsoft.Extensions.Configuration; using PaySharp.Core; diff --git a/src/PaySharp.Wechatpay/WechatpayGateway.cs b/src/PaySharp.Wechatpay/WechatpayGateway.cs index 8188ce3..8c9c98f 100644 --- a/src/PaySharp.Wechatpay/WechatpayGateway.cs +++ b/src/PaySharp.Wechatpay/WechatpayGateway.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 using Microsoft.Extensions.Options; #endif using System.Threading.Tasks; @@ -35,7 +35,7 @@ namespace PaySharp.Wechatpay _merchant = merchant; } -#if NETCOREAPP3_0 +#if NETCOREAPP3_1 /// /// 初始化微信支付网关 diff --git a/test/PaySharp.UnitTest/PaySharp.UnitTest.csproj b/test/PaySharp.UnitTest/PaySharp.UnitTest.csproj index 5aea150..758d534 100644 --- a/test/PaySharp.UnitTest/PaySharp.UnitTest.csproj +++ b/test/PaySharp.UnitTest/PaySharp.UnitTest.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false @@ -14,8 +14,8 @@ - - + + all