Update to ASP.NET Core 9

.vscode/launch.json

@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/SignInWithApple/bin/Debug/net8.0/MartinCostello.SignInWithApple.dll",
+      "program": "${workspaceFolder}/src/SignInWithApple/bin/Debug/net9.0/MartinCostello.SignInWithApple.dll",
       "args": [],
       "cwd": "${workspaceFolder}/src/SignInWithApple",
       "stopAtEntry": false,

.vsconfig

@@ -3,7 +3,7 @@
   "components": [
     "Microsoft.VisualStudio.Component.CoreEditor",
     "Microsoft.VisualStudio.Workload.CoreEditor",
-    "Microsoft.NetCore.Component.Runtime.8.0",
+    "Microsoft.NetCore.Component.Runtime.9.0",
     "Microsoft.NetCore.Component.SDK",
     "Microsoft.VisualStudio.Component.Roslyn.Compiler",
     "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",

Directory.Build.props

@@ -4,7 +4,7 @@
     <Company>Martin Costello</Company>
     <Copyright>Martin Costello (c) $([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/martincostello/SignInWithAppleSample.git</RepositoryUrl>

NuGet.config

@@ -2,9 +2,13 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="aspnet-contrib" value="https://www.myget.org/F/aspnet-contrib/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
+    <packageSource key="aspnet-contrib">
+      <package pattern="AspNet.Security.OAuth.Apple" />
+    </packageSource>
     <packageSource key="NuGet">
       <package pattern="*" />
     </packageSource>

build.ps1

@@ -4,10 +4,6 @@ param(
     [Parameter(Mandatory = $false)][string] $Runtime = ""
 )
 
-if ($null -eq $env:MSBUILDTERMINALLOGGER) {
-    $env:MSBUILDTERMINALLOGGER = "auto"
-}
-
 $solutionPath = $PSScriptRoot
 $sdkFile = Join-Path $solutionPath "global.json"
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.302",
+    "version": "9.0.100-preview.5.24307.3",
     "allowPrerelease": false
   }
 }

src/SignInWithApple/SecurityHeadersMiddleware.cs

@@ -9,25 +9,23 @@ internal sealed class SecurityHeadersMiddleware(RequestDelegate next)
 {
     private static readonly string ContentSecurityPolicy = string.Join(
         ';',
-        [
-            "default-src 'self'",
-            "script-src 'self' cdnjs.cloudflare.com",
-            "script-src-elem 'self' cdnjs.cloudflare.com",
-            "style-src 'self' cdnjs.cloudflare.com use.fontawesome.com",
-            "style-src-elem 'self' cdnjs.cloudflare.com",
-            "img-src 'self' data:",
-            "font-src 'self' cdnjs.cloudflare.com",
-            "connect-src 'self'",
-            "media-src 'none'",
-            "object-src 'none'",
-            "child-src 'none'",
-            "frame-ancestors 'none'",
-            "form-action 'self' appleid.apple.com",
-            "block-all-mixed-content",
-            "base-uri 'self'",
-            "manifest-src 'self'",
-            "upgrade-insecure-requests",
-        ]);
+        "default-src 'self'",
+        "script-src 'self' cdnjs.cloudflare.com",
+        "script-src-elem 'self' cdnjs.cloudflare.com",
+        "style-src 'self' cdnjs.cloudflare.com use.fontawesome.com",
+        "style-src-elem 'self' cdnjs.cloudflare.com",
+        "img-src 'self' data:",
+        "font-src 'self' cdnjs.cloudflare.com",
+        "connect-src 'self'",
+        "media-src 'none'",
+        "object-src 'none'",
+        "child-src 'none'",
+        "frame-ancestors 'none'",
+        "form-action 'self' appleid.apple.com",
+        "block-all-mixed-content",
+        "base-uri 'self'",
+        "manifest-src 'self'",
+        "upgrade-insecure-requests");
 
     public Task Invoke(HttpContext context)
     {

src/SignInWithApple/SignInWithApple.csproj

@@ -11,15 +11,15 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <PublishSelfContained>true</PublishSelfContained>
     <RootNamespace>MartinCostello.SignInWithApple</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>MartinCostello.SignInWithApple</UserSecretsId>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>4.0.0</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AspNet.Security.OAuth.Apple" Version="8.1.0" />
+    <PackageReference Include="AspNet.Security.OAuth.Apple" Version="9.0.0-preview.5.24311.76" />
     <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
-    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="9.0.0-preview.5.24306.11" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.6.2" />
   </ItemGroup>
   <ItemGroup>

tests/SignInWithApple.Tests/SignInWithApple.Tests.csproj

@@ -7,7 +7,7 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <RootNamespace>MartinCostello.SignInWithApple</RootNamespace>
     <Summary>$(Description)</Summary>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="test.p8;xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />