GithubStar/PaySharp
1
0
Fork 0
mirror of https://github.com/Varorbc/PaySharp.git synced 2026-10-16 20:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新至.Net Core 3.1 (#49)

Browse Source 
* 更新至.Net Core 3.1

* 更新版本号
This commit is contained in:
Varorbc
2019-12-16 19:50:21 +08:00
committed by GitHub
parent 2183351916
commit 41faa2c39e
24 changed files with 108 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+60 -66
View File
@@ -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
README.md
+3 -3
View File
@@ -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)
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100"
"version": "3.1.100"
}
}
package.props
+10 -3
View File
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<Version>2.0.0</Version>
<Version>1.0.8</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageProjectUrl>https://github.com/Varorbc/PaySharp</PackageProjectUrl>
<Authors>Varorbc</Authors>
@@ -10,14 +10,21 @@
<Copyright>Varorbc</Copyright>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>PaySharp.snk</AssemblyOriginatorKeyFile>
<PackageIconUrl>https://github.com/Varorbc/PaySharp/raw/master/logo.png</PackageIconUrl>
<PackageIcon>logo.png</PackageIcon>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
<None Include="..\..\logo.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
</ItemGroup>
</Project>
sample/PaySharp.Demo/PaySharp.Demo.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
src/PaySharp.Alipay/AlipayGateway.cs
+2 -2
View File
@@ -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
/// <summary>
/// 初始化支付宝网关
src/PaySharp.Alipay/PaySharp.Alipay.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<Import Project="../../package.props" />
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<Title>PaySharp.Alipay</Title>
<Description>支付宝支付</Description>
<PackageTags>dotnetcore;pay;alipay;</PackageTags>
src/PaySharp.Alipay/ServiceCollectionExtensions.cs
+1 -1
View File
@@ -1,4 +1,4 @@
#if NETCOREAPP3_0
#if NETCOREAPP3_1
using System;
using Microsoft.Extensions.Configuration;
using PaySharp.Alipay;
src/PaySharp.Core/Gateways/GatewayData.cs
+2 -2
View File
@@ -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
/// <summary>
/// 将表单数据转换为网关数据
src/PaySharp.Core/Notify/NotifyProcess.cs
+1 -1
View File
@@ -95,7 +95,7 @@ namespace PaySharp.Core
{
try
{
#if NETCOREAPP3_0
#if NETCOREAPP3_1
gatewayData.FromForm(HttpUtil.Form);
#else
gatewayData.FromNameValueCollection(HttpUtil.Form);
src/PaySharp.Core/PaySharp.Core.csproj
+2 -2
View File
@@ -3,7 +3,7 @@
<Import Project="../../package.props" />
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<Title>PaySharp.Core</Title>
<Description>支付核心</Description>
<PackageTags>dotnetcore;pay;</PackageTags>
@@ -18,7 +18,7 @@
<Reference Include="System.Configuration" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
src/PaySharp.Core/ServiceCollectionExtensions.cs
+1 -1
View File
@@ -1,4 +1,4 @@
#if NETCOREAPP3_0
#if NETCOREAPP3_1
using System;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
src/PaySharp.Core/Utils/EncryptUtil.cs
+4 -4
View File
@@ -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
src/PaySharp.Core/Utils/HttpUtil.cs
+4 -4
View File
@@ -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);
src/PaySharp.Qpay/PaySharp.Qpay.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<Import Project="../../package.props" />
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<Title>PaySharp.Qpay</Title>
<Description>QQ钱包支付</Description>
<PackageTags>dotnetcore;pay;qpay;</PackageTags>
src/PaySharp.Qpay/QpayGateway.cs
+2 -2
View File
@@ -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
/// <summary>
/// 初始化QQ钱包网关
src/PaySharp.Qpay/ServiceCollectionExtensions.cs
+1 -1
View File
@@ -1,4 +1,4 @@
#if NETCOREAPP3_0
#if NETCOREAPP3_1
using System;
using Microsoft.Extensions.Configuration;
using PaySharp.Core;
src/PaySharp.Unionpay/PaySharp.Unionpay.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<Import Project="../../package.props" />
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<Title>PaySharp.Unionpay</Title>
<Description>银联支付</Description>
<PackageTags>dotnetcore;pay;unionpay;</PackageTags>
src/PaySharp.Unionpay/ServiceCollectionExtensions.cs
+1 -1
View File
@@ -1,4 +1,4 @@
#if NETCOREAPP3_0
#if NETCOREAPP3_1
using System;
using Microsoft.Extensions.Configuration;
using PaySharp.Core;
src/PaySharp.Unionpay/UnionpayGateway.cs
+2 -2
View File
@@ -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
/// <summary>
/// 初始化银联支付网关
src/PaySharp.Wechatpay/PaySharp.Wechatpay.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<Import Project="../../package.props" />
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<Title>PaySharp.Wechatpay</Title>
<Description>微信支付</Description>
<PackageTags>dotnetcore;pay;wechatpay;</PackageTags>
src/PaySharp.Wechatpay/ServiceCollectionExtensions.cs
+1 -1
View File
@@ -1,4 +1,4 @@
#if NETCOREAPP3_0
#if NETCOREAPP3_1
using System;
using Microsoft.Extensions.Configuration;
using PaySharp.Core;
src/PaySharp.Wechatpay/WechatpayGateway.cs
+2 -2
View File
@@ -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
/// <summary>
/// 初始化微信支付网关
test/PaySharp.UnitTest/PaySharp.UnitTest.csproj
+3 -3
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
@@ -14,8 +14,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>