diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/SKIT.FlurlHttpClient.Wechat.TenpayV2.csproj b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/SKIT.FlurlHttpClient.Wechat.TenpayV2.csproj index 572fa7fc..a2082223 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/SKIT.FlurlHttpClient.Wechat.TenpayV2.csproj +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/SKIT.FlurlHttpClient.Wechat.TenpayV2.csproj @@ -1,7 +1,7 @@ - net462; net471; netstandard2.0; net6.0 + net462; net471; netstandard2.0; net6.0; net9.0 10.0 enable true diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Settings/WechatpayHttpHandler.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Settings/WechatpayHttpHandler.cs index 2e9c6f3b..03b73aad 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Settings/WechatpayHttpHandler.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Settings/WechatpayHttpHandler.cs @@ -28,6 +28,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Settings { X509Certificate x509; +#if NET9_0_OR_GREATER + x509 = X509CertificateLoader.LoadPkcs12(certificateBytes, certificatePassword, X509KeyStorageFlags.UserKeySet | X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.PersistKeySet); +#else #if NET471_OR_GREATER || NETCOREAPP2_1_OR_GREATER || NET5_0_OR_GREATER if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) #else @@ -44,6 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Settings ? new X509Certificate2(certificateBytes) : new X509Certificate2(certificateBytes, certificatePassword, X509KeyStorageFlags.UserKeySet | X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.PersistKeySet); } +#endif #if NETCOREAPP2_1_OR_GREATER || NET5_0_OR_GREATER handler.SslOptions.ClientCertificates = new X509CertificateCollection() { x509 }; diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests.csproj b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests.csproj index 89dd0b78..14295b24 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests.csproj +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests.csproj @@ -1,7 +1,7 @@ - net472; net6.0 + net472; net6.0; net9.0 latest enable true