Skip to content

Commit

Permalink
Update .NET SDK to 9.0.100-preview.7.24407.12 (#429)
Browse files Browse the repository at this point in the history
* Update .NET SDK

Update .NET SDK to version 9.0.100-preview.7.24407.12.

---
updated-dependencies:
- dependency-name: Microsoft.NET.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com>

* Bump Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.6.24328.4 to 9.0.0-preview.7.24406.2

Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.6.24328.4 to 9.0.0-preview.7.24406.2.

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Mvc.Testing
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com>

* Fix SYSLIB0057 warnings
Fix new SYSLIB0057 warnings.

* Fix method name

Use the right method for a `byte[]`.

---------

Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com>
Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com>
Co-authored-by: Martin Costello <martin@martincostello.com>
  • Loading branch information
1 parent 502fea9 commit c7d157f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100-preview.6.24328.19",
"version": "9.0.100-preview.7.24407.12",
"allowPrerelease": false
}
}
4 changes: 2 additions & 2 deletions src/ApplePayJS/Clients/MerchantCertificate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static X509Certificate2 LoadCertificateFromBase64String(string encoded,

return X509Certificate2.GetCertContentType(rawData) switch
{
X509ContentType.Pfx => new X509Certificate2(rawData, password),
X509ContentType.Pfx => X509CertificateLoader.LoadPkcs12(rawData, password),
_ => throw new NotSupportedException("The format of the encoded Apple Pay merchant certificate is not supported."),
};
}
Expand All @@ -71,7 +71,7 @@ private static X509Certificate2 LoadCertificateFromDisk(string? fileName, string
{
try
{
return new X509Certificate2(
return X509CertificateLoader.LoadPkcs12FromFile(
fileName ?? string.Empty,
password);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ApplePayJS.Tests/ApplePayJS.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageReference Include="JustEat.HttpClientInterception" Version="4.3.0" />
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.6.24328.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.7.24406.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.Playwright" Version="1.46.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
Expand Down
2 changes: 1 addition & 1 deletion tests/ApplePayJS.Tests/TestFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)

builder.ConfigureKestrel(
(kestrelOptions) => kestrelOptions.ConfigureHttpsDefaults(
(connectionOptions) => connectionOptions.ServerCertificate = new X509Certificate2("localhost-dev.pfx", "Pa55w0rd!")));
(connectionOptions) => connectionOptions.ServerCertificate = X509CertificateLoader.LoadPkcs12FromFile("localhost-dev.pfx", "Pa55w0rd!")));

// Configure the server address for the server to listen on for HTTP requests
builder.UseUrls("https://127.0.0.1:0");
Expand Down

0 comments on commit c7d157f

Please sign in to comment.