.NET 10 Preview 1

.config/dotnet-tools.json

@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "sign": {
-      "version": "0.9.1-beta.23530.1",
+      "version": "0.9.1-beta.25379.1",
       "commands": [
         "sign"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }

.devcontainer/devcontainer.json

@@ -20,7 +20,7 @@
   "remoteEnv": {
     "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
     "DOTNET_MULTILEVEL_LOOKUP": "0",
-    "TARGET": "net8.0",
+    "TARGET": "net10.0",
     "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
   },
   // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

.editorconfig

@@ -120,6 +120,13 @@ dotnet_diagnostic.SA1010.severity = none # Opening square brackets should be spa
 dotnet_diagnostic.ASP0022.severity = none # Route conflict detected between route handlers
 dotnet_diagnostic.ASP0023.severity = none # Route conflict detected between route handlers
 
+# TEMP: temporary suppression for false positives
+# BUG: https://github.com/dotnet/sdk/issues/51681
+# BUG: https://github.com/dotnet/sdk/issues/51716
+[*Extensions.cs]
+dotnet_diagnostic.CA1034.severity = none
+dotnet_diagnostic.CA1708.severity = none
+
 # test settings
 
 # Default severity for analyzer diagnostics with category 'Reliability'

.gitattributes

@@ -23,6 +23,8 @@
 # intervention with every merge. To do so, just uncomment the entries below
 ###############################################################################
 #*.sln       merge=binary
+#*.slnx      merge=binary
+#*.slnf      merge=binary
 #*.csproj    merge=binary
 #*.vbproj    merge=binary
 #*.vcxproj   merge=binary

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       with:
         queries: security-and-quality
         languages: csharp
@@ -31,7 +31,7 @@ jobs:
       uses: actions/setup-dotnet@v3
       id: installdotnet
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
 
     - name: Create temporary global.json
       run: echo '{"sdk":{"version":"${{ steps.installdotnet.outputs.dotnet-version }}"}}' > ./global.json
@@ -43,7 +43,7 @@ jobs:
       shell: pwsh
       run: |
         $start = (Get-Location).Path.Length + 1
-        $sln = Join-Path '..' 'asp.sln'
+        $sln = Join-Path '..' 'asp.slnx'
         $projects = Get-ChildItem src -Include src -Recurse | `
                     ForEach-Object { Get-ChildItem $_.FullName -Filter *.csproj -Recurse } | `
                     ForEach-Object { $_.FullName.Substring($start) }
@@ -54,4 +54,4 @@ jobs:
         dotnet build $slnf.FullName --configuration Release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4

README.md

@@ -4,9 +4,6 @@
 
 # ASP.NET API Versioning
 
-| :mega: Check out the [announcement](../../discussions/807) regarding upcoming changes |
-|-|
-
 <img align="right" width="100px" src="logo.svg" />
 
 The _"Asp"_ project, more formally known as ASP.NET API Versioning, gives you a powerful, but easy-to-use method for

asp.slnx

@@ -0,0 +1,154 @@
+<Solution>
+  <Folder Name="/.config/">
+    <File Path=".config/dotnet-tools.json" />
+  </Folder>
+  <Folder Name="/.devcontainer/">
+    <File Path=".devcontainer/Dockerfile" />
+    <File Path=".devcontainer/devcontainer.json" />
+  </Folder>
+  <Folder Name="/.devcontainer/scripts/">
+    <File Path=".devcontainer/scripts/container-creation.sh" />
+  </Folder>
+  <Folder Name="/.github/">
+    <File Path=".github/dependabot.yml" />
+    <File Path=".github/pull_request_template.md" />
+  </Folder>
+  <Folder Name="/.github/ISSUE_TEMPLATE/">
+    <File Path=".github/ISSUE_TEMPLATE/10_bug_report.yml" />
+    <File Path=".github/ISSUE_TEMPLATE/20_feature_request.yml" />
+    <File Path=".github/ISSUE_TEMPLATE/30_api_proposal.md" />
+    <File Path=".github/ISSUE_TEMPLATE/config.yml" />
+  </Folder>
+  <Folder Name="/.github/workflows/">
+    <File Path=".github/workflows/codeql-analysis.yml" />
+  </Folder>
+  <Folder Name="/.vscode/">
+    <File Path=".vscode/extensions.json" />
+    <File Path=".vscode/launch.json" />
+    <File Path=".vscode/project.code-snippets" />
+    <File Path=".vscode/settings.json" />
+    <File Path=".vscode/tasks.json" />
+  </Folder>
+  <Folder Name="/docs/">
+    <File Path="docs/CONTRIBUTING.md" />
+  </Folder>
+  <Folder Name="/(misc)/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="azure-pipelines.yml" />
+    <File Path="LICENSE.txt" />
+    <File Path="logo.svg" />
+    <File Path="nuget.config" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/build/">
+    <Project Path="build/assets.msbuildproj" Type="13b669be-bb05-4ddf-9536-439f39a36129" />
+  </Folder>
+  <Folder Name="/examples/">
+    <File Path="examples/.editorconfig" />
+    <File Path="examples/Directory.Build.props" />
+  </Folder>
+  <Folder Name="/examples/AspNet/">
+    <File Path="examples/AspNet/Directory.Build.props" />
+    <File Path="examples/AspNet/Startup.Newtonsoft.cs" />
+  </Folder>
+  <Folder Name="/examples/AspNet/OData/">
+    <Project Path="examples/AspNet/OData/AdvancedODataWebApiExample/AdvancedODataWebApiExample.csproj" />
+    <Project Path="examples/AspNet/OData/BasicODataWebApiExample/BasicODataWebApiExample.csproj" />
+    <Project Path="examples/AspNet/OData/ConventionsODataWebApiExample/ConventionsODataWebApiExample.csproj" />
+    <Project Path="examples/AspNet/OData/OpenApiODataWebApiExample/OpenApiODataWebApiExample.csproj" />
+    <Project Path="examples/AspNet/OData/SomeOpenApiODataWebApiExample/SomeOpenApiODataWebApiExample.csproj" />
+  </Folder>
+  <Folder Name="/examples/AspNet/WebApi/">
+    <Project Path="examples/AspNet/WebApi/BasicWebApiExample/BasicWebApiExample.csproj" />
+    <Project Path="examples/AspNet/WebApi/ByNamespaceWebApiExample/ByNamespaceWebApiExample.csproj" />
+    <Project Path="examples/AspNet/WebApi/ConventionsWebApiExample/ConventionsWebApiExample.csproj" />
+    <Project Path="examples/AspNet/WebApi/OpenApiWebApiExample/OpenApiWebApiExample.csproj" />
+  </Folder>
+  <Folder Name="/examples/AspNetCore/" />
+  <Folder Name="/examples/AspNetCore/OData/">
+    <File Path="examples/AspNetCore/OData/Directory.Build.props" />
+    <Project Path="examples/AspNetCore/OData/ODataAdvancedExample/ODataAdvancedExample.csproj" />
+    <Project Path="examples/AspNetCore/OData/ODataBasicExample/ODataBasicExample.csproj" />
+    <Project Path="examples/AspNetCore/OData/ODataConventionsExample/ODataConventionsExample.csproj" />
+    <Project Path="examples/AspNetCore/OData/ODataOpenApiExample/ODataOpenApiExample.csproj" />
+    <Project Path="examples/AspNetCore/OData/SomeODataOpenApiExample/SomeODataOpenApiExample.csproj" />
+  </Folder>
+  <Folder Name="/examples/AspNetCore/WebApi/">
+    <Project Path="examples/AspNetCore/WebApi/BasicExample/BasicExample.csproj" />
+    <Project Path="examples/AspNetCore/WebApi/ByNamespaceExample/ByNamespaceExample.csproj" />
+    <Project Path="examples/AspNetCore/WebApi/ConventionsExample/ConventionsExample.csproj" />
+    <Project Path="examples/AspNetCore/WebApi/MinimalApiExample/MinimalApiExample.csproj" />
+    <Project Path="examples/AspNetCore/WebApi/MinimalOpenApiExample/MinimalOpenApiExample.csproj" />
+    <Project Path="examples/AspNetCore/WebApi/OpenApiExample/OpenApiExample.csproj" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Directory.Build.targets" />
+  </Folder>
+  <Folder Name="/src/Abstractions/" />
+  <Folder Name="/src/Abstractions/src/">
+    <Project Path="src/Abstractions/src/Asp.Versioning.Abstractions/Asp.Versioning.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Abstractions/test/">
+    <Project Path="src/Abstractions/test/Asp.Versioning.Abstractions.Tests/Asp.Versioning.Abstractions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/AspNet/" />
+  <Folder Name="/src/AspNet/src/">
+    <Project Path="src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/Asp.Versioning.WebApi.OData.ApiExplorer.csproj" />
+    <Project Path="src/AspNet/OData/src/Asp.Versioning.WebApi.OData/Asp.Versioning.WebApi.OData.csproj" />
+    <Project Path="src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/Asp.Versioning.WebApi.ApiExplorer.csproj" />
+    <Project Path="src/AspNet/WebApi/src/Asp.Versioning.WebApi/Asp.Versioning.WebApi.csproj" />
+  </Folder>
+  <Folder Name="/src/AspNet/test/">
+    <Project Path="src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/Asp.Versioning.WebApi.Acceptance.Tests.csproj" />
+    <Project Path="src/AspNet/OData/test/Asp.Versioning.WebApi.OData.ApiExplorer.Tests/Asp.Versioning.WebApi.OData.ApiExplorer.Tests.csproj" />
+    <Project Path="src/AspNet/OData/test/Asp.Versioning.WebApi.OData.Tests/Asp.Versioning.WebApi.OData.Tests.csproj" />
+    <Project Path="src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/Asp.Versioning.WebApi.ApiExplorer.Tests.csproj" />
+    <Project Path="src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/Asp.Versioning.WebApi.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/AspNetCore/" />
+  <Folder Name="/src/AspNetCore/src/">
+    <Project Path="src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Asp.Versioning.OData.ApiExplorer.csproj" />
+    <Project Path="src/AspNetCore/OData/src/Asp.Versioning.OData/Asp.Versioning.OData.csproj" />
+    <Project Path="src/AspNetCore/WebApi/src/Asp.Versioning.Http/Asp.Versioning.Http.csproj" />
+    <Project Path="src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/Asp.Versioning.Mvc.ApiExplorer.csproj" />
+    <Project Path="src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/Asp.Versioning.Mvc.csproj" />
+    <Project Path="src/AspNetCore/WebApi/src/Asp.Versioning.OpenApi/Asp.Versioning.OpenApi.csproj" />
+  </Folder>
+  <Folder Name="/src/AspNetCore/test/">
+    <Project Path="src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/Asp.Versioning.Mvc.Acceptance.Tests.csproj" />
+    <Project Path="src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Asp.Versioning.OData.ApiExplorer.Tests.csproj" />
+    <Project Path="src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/Asp.Versioning.OData.Tests.csproj" />
+    <Project Path="src/AspNetCore/WebApi/test/Asp.Versioning.Http.Tests/Asp.Versioning.Http.Tests.csproj" />
+    <Project Path="src/AspNetCore/WebApi/test/Asp.Versioning.Mvc.ApiExplorer.Tests/Asp.Versioning.Mvc.ApiExplorer.Tests.csproj" />
+    <Project Path="src/AspNetCore/WebApi/test/Asp.Versioning.Mvc.Tests/Asp.Versioning.Mvc.Tests.csproj" />
+    <Project Path="src/AspNetCore/WebApi/test/Asp.Versioning.OpenApi.Tests/Asp.Versioning.OpenApi.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Client/" />
+  <Folder Name="/src/Client/src/">
+    <Project Path="src/Client/src/Asp.Versioning.Http.Client/Asp.Versioning.Http.Client.csproj" />
+  </Folder>
+  <Folder Name="/src/Client/test/">
+    <Project Path="src/Client/test/Asp.Versioning.Http.Client.Tests/Asp.Versioning.Http.Client.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Common/" />
+  <Folder Name="/src/Common/src/">
+    <Project Path="src/Common/src/Common.ApiExplorer/Common.ApiExplorer.shproj" />
+    <Project Path="src/Common/src/Common.Backport/Common.Backport.msbuildproj" Type="13b669be-bb05-4ddf-9536-439f39a36129" />
+    <Project Path="src/Common/src/Common.Mvc/Common.Mvc.shproj" />
+    <Project Path="src/Common/src/Common.OData.ApiExplorer/Common.OData.ApiExplorer.shproj" />
+    <Project Path="src/Common/src/Common.OData/Common.OData.shproj" />
+    <Project Path="src/Common/src/Common.ProblemDetails/Common.ProblemDetails.shproj" />
+    <Project Path="src/Common/src/Common.TypeInfo/Common.TypeInfo.shproj" />
+    <Project Path="src/Common/src/Common/Common.shproj" />
+  </Folder>
+  <Folder Name="/src/Common/test/">
+    <Project Path="src/Common/test/Common.Acceptance.Tests/Common.Acceptance.Tests.shproj" />
+    <Project Path="src/Common/test/Common.Mvc.Tests/Common.Mvc.Tests.shproj" />
+    <Project Path="src/Common/test/Common.OData.ApiExplorer.Tests/Common.OData.ApiExplorer.Tests.shproj" />
+    <Project Path="src/Common/test/Common.OData.Tests/Common.OData.Tests.shproj" />
+    <Project Path="src/Common/test/Common.Tests/Common.Tests.shproj" />
+  </Folder>
+</Solution>

build/nuget.props

@@ -36,7 +36,7 @@
  </PropertyGroup>
 
  <ItemGroup Label="SourceLink">
-  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0-*" PrivateAssets="All"/>
+  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.0-*" PrivateAssets="All"/>
  </ItemGroup>
 
 </Project>

build/steps-ci.yml

@@ -11,7 +11,7 @@ steps:
   displayName: Install .NET SDK
   inputs:
     packageType: sdk
-    version: 8.0.x # https://github.com/dotnet/core/blob/main/release-notes/releases-index.json
+    version: 10.0.x # https://github.com/dotnet/core/blob/main/release-notes/releases-index.json
 
 - task: DotNetCoreCLI@2
   displayName: Build and Test

build/test.props

@@ -2,9 +2,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
  <PropertyGroup>
+  <OutputType>Exe</OutputType>
   <IsPackable>false</IsPackable>
   <Nullable>disable</Nullable>
   <IsClsCompliant>false</IsClsCompliant>
+  <NoWarn>$(NoWarn);CA1515</NoWarn>
+  <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+  <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
   <AcceptanceTestPrefix Condition="$(MSBuildProjectName.Contains('Acceptance'))">acceptance.</AcceptanceTestPrefix>
  </PropertyGroup>
 

build/test.targets

@@ -1,40 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
- <PropertyGroup>
-  <FluentAssertionsVersion>6.8.0</FluentAssertionsVersion>
-
-  <!--
-   beware of other versions that may contain SponsorLink
-   REF: https://github.com/moq/moq/issues/1372
-   -->
-  <MoqVersion>4.20.69</MoqVersion>
-  <XunitRunnerVersion>2.5.0</XunitRunnerVersion>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
-  <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
-  <MoqVersion>4.17.2</MoqVersion>
-  <XunitRunnerVersion>2.4.3</XunitRunnerVersion>
- </PropertyGroup>
-
  <ItemGroup Condition=" '$(IsSharedProject)' == 'false' ">
-  <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0-*" />
-  <PackageReference Include="Moq" Version="$(MoqVersion)" />
-  <PackageReference Include="xunit" Version="2.5.0" />
-  <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
+  <PackageReference Include="FluentAssertions" Version="8.8.*" />
+  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.*" />
+  <PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="2.*" />
+  <PackageReference Include="Moq" Version="4.20.69" />
+  <PackageReference Include="xunit.v3.mtp-v2" Version="3.*" />
  </ItemGroup>
 
  <ItemGroup Condition=" '$(IsAspNetCore)' == 'true' ">
-  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(DotNetReleaseBasePackageVersion)" />
+  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(DotNetReleaseBasePackageVersion).*" />
  </ItemGroup>
 
  <ItemGroup>
   <Using Include="FluentAssertions" />
   <Using Include="Moq" />
   <Using Include="Xunit" />
-  <Using Include="Xunit.Abstractions" />
+  <Using Include="Xunit.Sdk" />
+  <Using Include="Xunit.v3" />
  </ItemGroup>
 
 </Project>

examples/AspNet/Directory.Build.props

@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
-  <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.9" />
+  <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.3.*" />
  </ItemGroup>
 
  <ItemGroup>

examples/AspNet/OData/AdvancedODataWebApiExample/Controllers/OrdersController.cs

@@ -10,7 +10,7 @@ public class OrdersController : ApiController
 {
     // GET ~/api/orders
     // GET ~/api/orders?api-version=1.0
-    public IHttpActionResult Get( ApiVersion version ) => 
+    public IHttpActionResult Get( ApiVersion version ) =>
         Ok( new[] { new Order() { Id = 1, Customer = $"Customer v{version}" } } );
 
     // GET ~/api/orders/{id}

examples/AspNet/OData/AdvancedODataWebApiExample/Controllers/PeopleController.cs

@@ -35,32 +35,32 @@ public IHttpActionResult Get( ODataQueryOptions<Person> options, ApiVersion vers
     [ODataRoute( "{id}" )]
     public IHttpActionResult Get( int id, ODataQueryOptions<Person> options, ApiVersion version ) =>
         Ok( new Person()
-        { 
-            Id = id, 
-            FirstName = "Bill", 
-            LastName = "Mei", 
-            Email = "bill.mei@somewhere.com", 
+        {
+            Id = id,
+            FirstName = "Bill",
+            LastName = "Mei",
+            Email = "bill.mei@somewhere.com",
             Phone = "555-555-5555",
         } );
 
     // PATCH ~/api/people/{id}?api-version=2.0
     [MapToApiVersion( "2.0" )]
     [ODataRoute( "{id}" )]
-    public IHttpActionResult Patch( 
-        int id, 
-        Delta<Person> delta, 
-        ODataQueryOptions<Person> options, 
+    public IHttpActionResult Patch(
+        int id,
+        Delta<Person> delta,
+        ODataQueryOptions<Person> options,
         ApiVersion version )
     {
         if ( !ModelState.IsValid )
             return BadRequest( ModelState );
 
         var person = new Person()
-        { 
-            Id = id, 
-            FirstName = "Bill", 
-            LastName = "Mei", 
-            Email = "bill.mei@somewhere.com", 
+        {
+            Id = id,
+            FirstName = "Bill",
+            LastName = "Mei",
+            Email = "bill.mei@somewhere.com",
             Phone = "555-555-5555",
         };