Update to ASP.NET Core 9 (#354)

* Update to ASP.NET Core 9 preview 1 Update to preview 1 of ASP.NET Core 9. * Update .NET SDK to 9.0.100-preview.2.24157.14 (#356) * Update .NET SDK to 9.0.100-preview.3.24204.13 (#368) * Update .NET SDK Update .NET SDK to version 9.0.100-preview.3.24204.13. --- 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.2.24128.4 to 9.0.0-preview.3.24172.13 Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.2.24128.4 to 9.0.0-preview.3.24172.13. --- 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> --------- 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> * Update .NET SDK to 9.0.100-preview.4.24267.66 (#392) * Update .NET SDK Update .NET SDK to version 9.0.100-preview.4.24267.66. --- 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.3.24172.13 to 9.0.0-preview.4.24267.6 Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.3.24172.13 to 9.0.0-preview.4.24267.6. --- 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> --------- 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> * Update .NET SDK to 9.0.100-preview.5.24307.3 (#403) * Update .NET SDK Update .NET SDK to version 9.0.100-preview.5.24307.3. --- 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.4.24267.6 to 9.0.0-preview.5.24306.11 Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.4.24267.6 to 9.0.0-preview.5.24306.11. --- 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> --------- 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> * Update .NET SDK to 9.0.100-preview.6.24328.19 (#413) * Update .NET SDK Update .NET SDK to version 9.0.100-preview.6.24328.19. --- 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.5.24306.11 to 9.0.0-preview.6.24328.4 Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.5.24306.11 to 9.0.0-preview.6.24328.4. --- 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> --------- 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> * Update .NET SDK to 9.0.100-preview.7.24407.12 (#429) * 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 <[email protected]> * Update .NET SDK (#440) Update .NET SDK to version 9.0.100-rc.1.24452.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> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Update NuGet package Update NuGet package for RC1. * Update .NET SDK to 9.0.100-rc.2.24474.11 (#457) * Update .NET SDK Update .NET SDK to version 9.0.100-rc.2.24474.11. --- 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-rc.1.24452.1 to 9.0.0-rc.2.24474.3 Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-rc.1.24452.1 to 9.0.0-rc.2.24474.3. --- 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> --------- 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> * Update .NET SDK to 9.0.100 (#472) * Update .NET SDK Update .NET SDK to version 9.0.100. --- 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-rc.2.24474.3 to 9.0.0 Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-rc.2.24474.3 to 9.0.0. --- 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> --------- 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> --------- 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>
justeattakeaway · Nov 12, 2024 · e0ad669 · e0ad669
1 parent 2537350
commit e0ad669
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceRoot}/src/ApplePayJS/bin/Debug/net8.0/JustEat.ApplePayJS.dll",
+      "program": "${workspaceRoot}/src/ApplePayJS/bin/Debug/net9.0/JustEat.ApplePayJS.dll",
       "args": [],
       "cwd": "${workspaceRoot}/src/ApplePayJS",
       "stopAtEntry": false,

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,7 +15,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
     <TypeScriptToolsVersion>latest</TypeScriptToolsVersion>
-    <VersionPrefix>8.0.0</VersionPrefix>
+    <VersionPrefix>9.0.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.404",
+    "version": "9.0.100",
     "allowPrerelease": false
   }
 }
diff --git a/src/ApplePayJS/ApplePayJS.csproj b/src/ApplePayJS/ApplePayJS.csproj
@@ -12,7 +12,7 @@
     <PackageTags>applepay</PackageTags>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <RootNamespace>JustEat.ApplePayJS</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <TypeScriptToolsVersion>latest</TypeScriptToolsVersion>
     <UserSecretsId>JustEat.ApplePayJS</UserSecretsId>
   </PropertyGroup>

diff --git a/src/ApplePayJS/Clients/MerchantCertificate.cs b/src/ApplePayJS/Clients/MerchantCertificate.cs
@@ -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."),
         };
     }
@@ -71,7 +71,7 @@ private static X509Certificate2 LoadCertificateFromDisk(string? fileName, string
     {
         try
         {
-            return new X509Certificate2(
+            return X509CertificateLoader.LoadPkcs12FromFile(
                 fileName ?? string.Empty,
                 password);
         }

diff --git a/src/ApplePayJS/package-lock.json b/src/ApplePayJS/package-lock.json
diff --git a/src/ApplePayJS/package.json b/src/ApplePayJS/package.json
@@ -1,7 +1,7 @@
 {
   "name": "justeatapplepayjs",
   "private": true,
-  "version": "8.0.0",
+  "version": "9.0.0",
   "devDependencies": {
     "@types/applepayjs": "3.0.0",
     "@types/jquery": "3.3.34",

diff --git a/tests/ApplePayJS.Tests/ApplePayJS.Tests.csproj b/tests/ApplePayJS.Tests/ApplePayJS.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -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="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Microsoft.Playwright" Version="1.48.0" />
     <PackageReference Include="Shouldly" Version="4.2.1" />

diff --git a/tests/ApplePayJS.Tests/TestFixture.cs b/tests/ApplePayJS.Tests/TestFixture.cs
@@ -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");