更新 .editorconfig

.editorconfig

@@ -1,6 +1,18 @@
 # 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
 root = true
 
+# 不使用制表符进行缩进。 
+[*]
+indent_style = space
+
+# XML 项目文件
+[*.{csproj,props}]
+indent_size = 2
+
+# JSON 文件
+[*.json]
+indent_size = 2
+
 # c# 文件
 [*.cs]
 
@@ -220,12 +232,12 @@ dotnet_naming_style.begins_with_i.required_suffix =
 dotnet_naming_style.begins_with_i.word_separator = 
 dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
-# csproj 文件
-[*.csproj]
-charset = utf-8-bom
-indent_style = space
-indent_size = 4
+# 实例字段使用驼峰式大小写命名，并以 _ 开头。
+dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
+dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
 
-# sln 文件
-[*.sln]
-charset = utf-8-bom
+dotnet_naming_symbols.instance_fields.applicable_kinds = field
+
+dotnet_naming_style.instance_field_style.capitalization = camel_case
+dotnet_naming_style.instance_field_style.required_prefix = _

Directory.Build.props

@@ -1,35 +1,35 @@
 <Project>
 
-	<PropertyGroup>
-		<Copyright>Copyright (c) Essensoft and Contributors</Copyright>
-		<Authors>Essensoft</Authors>
-		<Product>Paylink</Product>
-		<Version>4.0.4</Version>
-		<NoWarn>$(NoWarn);CS1591</NoWarn>
-		<PackageIcon>logo.png</PackageIcon>
-		<PackageProjectUrl>https://github.com/essensoft/paylink</PackageProjectUrl>
-		<RepositoryType>git</RepositoryType>
-		<RepositoryUrl>https://github.com/essensoft/paylink</RepositoryUrl>
-		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Paylink.snk</AssemblyOriginatorKeyFile>
-		<GenerateDocumentationFile Condition="'$(Configuration)' == 'Release'">true</GenerateDocumentationFile>
-		<GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
-		<LangVersion>latest</LangVersion>
-	</PropertyGroup>
+  <PropertyGroup>
+    <Copyright>Copyright (c) Essensoft and Contributors</Copyright>
+    <Authors>Essensoft</Authors>
+    <Product>Paylink</Product>
+    <Version>4.0.4</Version>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <PackageIcon>logo.png</PackageIcon>
+    <PackageProjectUrl>https://github.com/essensoft/paylink</PackageProjectUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/essensoft/paylink</RepositoryUrl>
+    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Paylink.snk</AssemblyOriginatorKeyFile>
+    <GenerateDocumentationFile Condition="'$(Configuration)' == 'Release'">true</GenerateDocumentationFile>
+    <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)logo.png" Pack="true" Visible="false" PackagePath="" />
-		<None Include="$(MSBuildThisFileDirectory)LICENSE.md" Pack="true" Visible="false" PackagePath="" />
-	</ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)logo.png" Pack="true" Visible="false" PackagePath="" />
+    <None Include="$(MSBuildThisFileDirectory)LICENSE.md" Pack="true" Visible="false" PackagePath="" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
 
 </Project>

samples/WebApplicationSample/WebApplicationSample.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-    <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
-        <UserSecretsId>a59ca38e-9b52-44fe-b3d2-8cb5a1641623</UserSecretsId>
-        <SignAssembly>false</SignAssembly>
-        <GenerateDocumentationFile>false</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <DockerfileContext>..\..</DockerfileContext>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <UserSecretsId>a59ca38e-9b52-44fe-b3d2-8cb5a1641623</UserSecretsId>
+    <SignAssembly>false</SignAssembly>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..</DockerfileContext>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
-        <PackageReference Include="QRCoder" Version="1.4.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
+    <PackageReference Include="QRCoder" Version="1.4.1" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Essensoft.Paylink.Alipay\Essensoft.Paylink.Alipay.csproj" />
-        <ProjectReference Include="..\..\src\Essensoft.Paylink.WeChatPay\Essensoft.Paylink.WeChatPay.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Essensoft.Paylink.Alipay\Essensoft.Paylink.Alipay.csproj" />
+    <ProjectReference Include="..\..\src\Essensoft.Paylink.WeChatPay\Essensoft.Paylink.WeChatPay.csproj" />
+  </ItemGroup>
 
 </Project>

src/Essensoft.Paylink.Alipay/Essensoft.Paylink.Alipay.csproj

@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-        <PackageId>Essensoft.Paylink.Alipay</PackageId>
-        <PackageTags>Essensoft;Paylink;Alipay;支付宝</PackageTags>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <PackageId>Essensoft.Paylink.Alipay</PackageId>
+    <PackageTags>Essensoft;Paylink;Alipay;支付宝</PackageTags>
+  </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-        <PackageReference Include="System.Text.Json" Version="5.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+  </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Essensoft.Paylink.Security\Essensoft.Paylink.Security.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Essensoft.Paylink.Security\Essensoft.Paylink.Security.csproj" />
+  </ItemGroup>
 
 </Project>

src/Essensoft.Paylink.Security/Essensoft.Paylink.Security.csproj

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

src/Essensoft.Paylink.WeChatPay/Essensoft.Paylink.WeChatPay.csproj

@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-        <PackageId>Essensoft.Paylink.WeChatPay</PackageId>
-        <PackageTags>Essensoft;Paylink;WeChatPay;微信支付</PackageTags>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <PackageId>Essensoft.Paylink.WeChatPay</PackageId>
+    <PackageTags>Essensoft;Paylink;WeChatPay;微信支付</PackageTags>
+  </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-        <PackageReference Include="System.Text.Json" Version="5.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+  </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Essensoft.Paylink.Security\Essensoft.Paylink.Security.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Essensoft.Paylink.Security\Essensoft.Paylink.Security.csproj" />
+  </ItemGroup>
 
 </Project>