Add .NET 9,.NET 10. Drop .NET 6. Upgrade to latest L3 specification draft.

.editorconfig

@@ -12,7 +12,7 @@ max_line_length = 999999999
 # Xml project files
 [*.csproj]
 indent_size = 2
-ij_formatter_enabled = false
+ij_formatter_enabled = true
 # Xml config files
 [*.props]
 indent_size = 2

.github/workflows/CI.yml

@@ -12,18 +12,25 @@ jobs:
             DOTNET_CLI_TELEMETRY_OPTOUT: true
         steps:
             -   name: Checkout
-                uses: actions/checkout@v5
-            -   name: Setup .NET SDK 6.0
+                uses: actions/checkout@v6
+            -   name: Setup .NET SDK 8.0
                 uses: actions/setup-dotnet@v5
                 with:
-                    dotnet-version: 6.0.425
+                    dotnet-version: 8.0.402
                     source-url: ${{ secrets.NUGET_SOURCE }}
                 env:
                     NUGET_AUTH_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
-            -   name: Setup .NET SDK 8.0
+            -   name: Setup .NET SDK 9.0
                 uses: actions/setup-dotnet@v5
                 with:
-                    dotnet-version: 8.0.402
+                    dotnet-version: 9.0.308
+                    source-url: ${{ secrets.NUGET_SOURCE }}
+                env:
+                    NUGET_AUTH_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
+            -   name: Setup .NET SDK 10.0
+                uses: actions/setup-dotnet@v5
+                with:
+                    dotnet-version: 10.0.100
                     source-url: ${{ secrets.NUGET_SOURCE }}
                 env:
                     NUGET_AUTH_TOKEN: ${{ secrets.PACKAGES_TOKEN }}

.github/workflows/Release.yml

@@ -13,22 +13,29 @@ jobs:
         environment: Production
         steps:
             -   name: Checkout
-                uses: actions/checkout@v5
+                uses: actions/checkout@v6
                 with:
                     ref: ${{ github.sha }}
             -   name: Set release version
                 run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-            -   name: Setup .NET SDK 6.0
+            -   name: Setup .NET SDK 8.0
                 uses: actions/setup-dotnet@v5
                 with:
-                    dotnet-version: 6.0.425
+                    dotnet-version: 8.0.402
                     source-url: ${{ secrets.NUGET_SOURCE }}
                 env:
                     NUGET_AUTH_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
-            -   name: Setup .NET SDK 8.0
+            -   name: Setup .NET SDK 9.0
                 uses: actions/setup-dotnet@v5
                 with:
-                    dotnet-version: 8.0.402
+                    dotnet-version: 9.0.308
+                    source-url: ${{ secrets.NUGET_SOURCE }}
+                env:
+                    NUGET_AUTH_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
+            -   name: Setup .NET SDK 10.0
+                uses: actions/setup-dotnet@v5
+                with:
+                    dotnet-version: 10.0.100
                     source-url: ${{ secrets.NUGET_SOURCE }}
                 env:
                     NUGET_AUTH_TOKEN: ${{ secrets.PACKAGES_TOKEN }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build-env
 
 COPY . ./app
 
@@ -7,7 +7,7 @@ WORKDIR /app/demo/WebAuthn.Net.Demo.Mvc
 RUN dotnet restore
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:10.0
 WORKDIR /app
 COPY --from=build-env /app/demo/WebAuthn.Net.Demo.Mvc/out .
 ENTRYPOINT ["dotnet", "WebAuthn.Net.Demo.Mvc.dll"]

README.md

@@ -1,6 +1,6 @@
 # WebAuthn.Net
 
-A production-ready, easy-to-use, extensible implementation of the [WebAuthn Level 3 standard](https://www.w3.org/TR/2023/WD-webauthn-3-20230927/), passing the [FIDO conformance test](https://fidoalliance.org/certification/functional-certification/conformance/), for the server side of web applications on .NET 6 and .NET 8.
+A production-ready, easy-to-use, extensible implementation of the [WebAuthn Level 3 standard](https://www.w3.org/TR/2023/WD-webauthn-3-20230927/), passing the [FIDO conformance test](https://fidoalliance.org/certification/functional-certification/conformance/), for the server side of web applications on .NET 8, .NET 9 and .NET 10.
 
 <a href="https://webauthn.dodo.dev"><img src="https://img.shields.io/badge/Demo-blue"/></a>
 <a href="https://www.nuget.org/packages/WebAuthn.Net/"><img src="https://img.shields.io/badge/NuGet-blue"/></a>
@@ -61,8 +61,9 @@ The documentation for each project is described in its README.md file.
 
 ### Required dependencies
 
-- [.NET SDK 6.0.425+](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
-- [.NET SDK 8.0.402+](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- [.NET SDK 8.0.416+](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- [.NET SDK 9.0.308+](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
+- [.NET SDK 10.0.100+](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
 
 ## Tips for Contribution
 

WebAuthn.Net.slnx

@@ -0,0 +1,34 @@
+<Solution>
+    <Folder Name="/root/">
+        <File Path=".editorconfig"/>
+        <File Path=".gitattributes"/>
+        <File Path=".gitignore"/>
+        <File Path="Directory.Build.props"/>
+        <File Path="global.json"/>
+        <File Path="NOTICE.md"/>
+        <File Path="README.md"/>
+    </Folder>
+    <Folder Name="/root/.config/">
+        <File Path=".config/dotnet-tools.json"/>
+    </Folder>
+    <Folder Name="/root/.github/"/>
+    <Folder Name="/root/.github/workflows/">
+        <File Path=".github/workflows/CI.yml"/>
+        <File Path=".github/workflows/Release.yml"/>
+    </Folder>
+    <Folder Name="/root/demo/">
+        <Project Path="demo/WebAuthn.Net.Demo.FidoConformance/WebAuthn.Net.Demo.FidoConformance.csproj"/>
+        <Project Path="demo/WebAuthn.Net.Demo.Mvc/WebAuthn.Net.Demo.Mvc.csproj"/>
+    </Folder>
+    <Folder Name="/root/src/">
+        <Project Path="src/WebAuthn.Net.OpenTelemetry/WebAuthn.Net.OpenTelemetry.csproj"/>
+        <Project Path="src/WebAuthn.Net.Storage.InMemory/WebAuthn.Net.Storage.InMemory.csproj"/>
+        <Project Path="src/WebAuthn.Net.Storage.MySql/WebAuthn.Net.Storage.MySql.csproj"/>
+        <Project Path="src/WebAuthn.Net.Storage.PostgreSql/WebAuthn.Net.Storage.PostgreSql.csproj"/>
+        <Project Path="src/WebAuthn.Net.Storage.SqlServer/WebAuthn.Net.Storage.SqlServer.csproj"/>
+        <Project Path="src/WebAuthn.Net/WebAuthn.Net.csproj"/>
+    </Folder>
+    <Folder Name="/root/tests/">
+        <Project Path="tests/WebAuthn.Net.Tests.Unit/WebAuthn.Net.Tests.Unit.csproj"/>
+    </Folder>
+</Solution>

demo/WebAuthn.Net.Demo.FidoConformance/Middleware/RequestLoggingMiddleware.cs

@@ -38,7 +38,19 @@
         var json = Encoding.UTF8.GetString(ms.ToArray());
         var element = JsonSerializer.Deserialize<JsonElement>(json);
         var intendedJson = JsonSerializer.Serialize(element, _jsonSerializerOptions);
-        _logger.LogInformation($"Request {context.Request.Method} {context.Request.GetEncodedPathAndQuery()}{Environment.NewLine}Body:{Environment.NewLine}{intendedJson}");
+        _logger.LogRequestInformation(context.Request.Method, context.Request.GetEncodedPathAndQuery(), intendedJson);
         await next(context);
     }
 }
+
+internal static partial class RequestLoggingMiddlewareLoggingExtensions
+{
+    [LoggerMessage(
+        Level = LogLevel.Information,
+        Message = "Request {Method} {PathAndQuery}\nBody:\n{Body}")]
+    public static partial void LogRequestInformation(
+        this ILogger logger,
+        string method,
+        string pathAndQuery,
+        string body);
+}

demo/WebAuthn.Net.Demo.FidoConformance/README.md

@@ -16,8 +16,8 @@ This project contains a demo application designed for passing the [FIDO conforma
 
 These steps need to be performed only if you have not done them before.
 
-1. Install .NET SDK versions [6.0.425+](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) and [8.0.402+](https://dotnet.microsoft.com/en-us/download/dotnet/8.0).
-2. [Trust the ASP.NET Core HTTPS development certificate](https://learn.microsoft.com/en-us/aspnet/core/security/enforcing-ssl?view=aspnetcore-8.0&tabs=visual-studio%2Clinux-ubuntu#trust-the-aspnet-core-https-development-certificate-on-windows-and-macos)
+1. Install .NET SDK versions [.NET SDK 8.0.416+](https://dotnet.microsoft.com/en-us/download/dotnet/8.0), [.NET SDK 9.0.308+](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) and [.NET SDK 10.0.100+](https://dotnet.microsoft.com/en-us/download/dotnet/10.0).
+2. [Trust the ASP.NET Core HTTPS development certificate](https://learn.microsoft.com/en-us/aspnet/core/security/enforcing-ssl?view=aspnetcore-10.0&tabs=visual-studio%2Clinux-sles#trust-the-aspnet-core-https-development-certificate)
 
 ### Starting the FIDO Conformance test
 

demo/WebAuthn.Net.Demo.FidoConformance/WebAuthn.Net.Demo.FidoConformance.csproj

@@ -1,41 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <LangVersion>12</LangVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>14</LangVersion>
+    <NoWarn>$(NoWarn);CA1515;</NoWarn>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.InMemory\WebAuthn.Net.Storage.InMemory.csproj" />
-        <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.MySql\WebAuthn.Net.Storage.MySql.csproj" />
-        <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.PostgreSql\WebAuthn.Net.Storage.PostgreSql.csproj" />
-        <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.SqlServer\WebAuthn.Net.Storage.SqlServer.csproj" />
-        <ProjectReference Include="..\..\src\WebAuthn.Net\WebAuthn.Net.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.InMemory\WebAuthn.Net.Storage.InMemory.csproj"/>
+    <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.MySql\WebAuthn.Net.Storage.MySql.csproj"/>
+    <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.PostgreSql\WebAuthn.Net.Storage.PostgreSql.csproj"/>
+    <ProjectReference Include="..\..\src\WebAuthn.Net.Storage.SqlServer\WebAuthn.Net.Storage.SqlServer.csproj"/>
+    <ProjectReference Include="..\..\src\WebAuthn.Net\WebAuthn.Net.csproj"/>
+  </ItemGroup>
 
-    <ItemGroup>
-        <None Update="ConformanceMetadata\Jwt\*">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-        <None Update="ConformanceMetadata\Jwt\.gitkeep">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </None>
-        <None Update="ConformanceMetadata\RootCertificate\*.*">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-        <None Update="ConformanceMetadata\MetadataStatements\.gitkeep">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </None>
-        <Content Remove="ConformanceMetadata\MetadataStatements\*.json" />
-        <None Include="ConformanceMetadata\MetadataStatements\*.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
+  <ItemGroup>
+    <None Update="ConformanceMetadata\Jwt\*">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ConformanceMetadata\Jwt\.gitkeep">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+    <None Update="ConformanceMetadata\RootCertificate\*.*">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ConformanceMetadata\MetadataStatements\.gitkeep">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+    <Content Remove="ConformanceMetadata\MetadataStatements\*.json"/>
+    <None Include="ConformanceMetadata\MetadataStatements\*.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Polly" Version="8.4.2" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Polly" Version="8.6.5"/>
+  </ItemGroup>
 
 </Project>