Merge remote-tracking branch 'remote/main' into merge/release/8.0-to-main

Author: RussKie

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.visualstudio.slngen.tool": {
-      "version": "9.5.3",
+      "version": "10.4.0",
       "commands": [
         "slngen"
       ]

.github/fabricbot.json

@@ -637,7 +637,7 @@
           {
             "name": "addMilestone",
             "parameters": {
-              "milestoneName": "8.0 RC1"
+              "milestoneName": "9.0-preview1"
             }
           }
         ],

.github/workflows/backport.yml

@@ -0,0 +1,35 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # once a day at 13:00 UTC to cleanup old runs
+    - cron: '0 13 * * *'
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  backport:
+    if: ${{ contains(github.event.comment.body, '/backport to') || github.event_name == 'schedule' }}
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@main
+    with:
+      pr_description_template: |
+        Backport of #%source_pr_number% to %target_branch%
+
+        /cc %cc_users%
+
+        ## Customer Impact
+
+        ## Testing
+
+        ## Risk
+
+        **IMPORTANT**: If this backport is for a servicing release, please verify that:
+
+        - The PR target branch is `release/X.0-staging`, not `release/X.0`.
+
+        - If the change touches code that ships in a NuGet package, you have added the necessary [package authoring](https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md) and gotten it explicitly reviewed.

.gitignore

@@ -38,6 +38,7 @@ bld/
 .vs/
 .build/
 .vscode
+!.vscode/settings.json
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -308,4 +309,4 @@ BenchmarkDotNet.artifacts/
 
 /_TEST
 
-*.binlog
+*.binlog

.spelling

@@ -368,5 +368,4 @@ Workstream
 Workstreams
 xmls
 xUnit
-xxHash
 Zipkin

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "dotnet.automaticallyCreateSolutionInWorkspace": false
+}

Directory.Build.props

@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="$(MSBuildThisFileDirectory)\eng\Net9Workarounds.props" />
 
   <!-- TFMs and their permutations -->
   <PropertyGroup>
     <TargetFrameworkName>net</TargetFrameworkName>
-    <TargetFrameworkMajorVersion>8</TargetFrameworkMajorVersion>
+    <TargetFrameworkMajorVersion>9</TargetFrameworkMajorVersion>
     <TargetFrameworkMinorVersion>0</TargetFrameworkMinorVersion>
     <TargetFrameworkVersion>$(TargetFrameworkMajorVersion).$(TargetFrameworkMinorVersion)</TargetFrameworkVersion>
 
     <!-- The latest TFM we're targeting overall -->
     <LatestTargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</LatestTargetFramework>
     <!-- All the .NET TFMs we're building -->
     <SupportedNetCoreTargetFrameworks>$(LatestTargetFramework)</SupportedNetCoreTargetFrameworks>
-    <NetCoreTargetFrameworks>$(SupportedNetCoreTargetFrameworks);net6.0</NetCoreTargetFrameworks>
+    <NetCoreTargetFrameworks>$(SupportedNetCoreTargetFrameworks);net8.0</NetCoreTargetFrameworks>
 
     <!-- The minimum supported .NET version for external consumers. This is used for packaging control, see Packaging.targets -->
-    <MinimumSupportedTfmForPackaging>net6.0</MinimumSupportedTfmForPackaging>
+    <MinimumSupportedTfmForPackaging>net8.0</MinimumSupportedTfmForPackaging>
 
     <!-- Limit the .NET TFMs when .targetframeworks is defined -->
     <!--
@@ -27,7 +28,7 @@
     <CustomTargetFrameworks Condition="Exists('$(MSBuildThisFileDirectory)\.targetframeworks')">$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)\.targetframeworks').Trim())</CustomTargetFrameworks>
     <SupportedNetCoreTargetFrameworks Condition="'$(CustomTargetFrameworks)' != ''">$(LatestTargetFramework)</SupportedNetCoreTargetFrameworks>
     <NetCoreTargetFrameworks Condition="'$(CustomTargetFrameworks)' != ''">$(SupportedNetCoreTargetFrameworks)</NetCoreTargetFrameworks>
-    <NetCoreTargetFrameworks Condition="'$(CustomTargetFrameworks)' != '' AND $(CustomTargetFrameworks.Contains('net6.0'))">$(NetCoreTargetFrameworks);net6.0</NetCoreTargetFrameworks>
+    <NetCoreTargetFrameworks Condition="'$(CustomTargetFrameworks)' != '' AND $(CustomTargetFrameworks.Contains('net8.0'))">$(NetCoreTargetFrameworks);net8.0</NetCoreTargetFrameworks>
     <ConditionalNet462 Condition="'$(CustomTargetFrameworks)' == '' OR $(CustomTargetFrameworks.Contains('net462'))">;net462</ConditionalNet462>
 
     <!-- All the .NET TFMs we're testing against -->

Directory.Build.targets

@@ -8,6 +8,8 @@
   <Import Project="$(MSBuildThisFileDirectory)\eng\MSBuild\Generators.targets" />
   <Import Project="$(MSBuildThisFileDirectory)\eng\MSBuild\ProjectStaging.targets" />
 
+  <Import Project="$(MSBuildThisFileDirectory)\eng\Net9Workarounds.targets" />
+
   <!-- Warning stuff -->
   <PropertyGroup>
     <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1138;MSB3270</MSBuildWarningsAsMessages>

NuGet.config

@@ -8,6 +8,8 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <!-- Used for the Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>
@@ -29,6 +31,12 @@
     <packageSource key="dotnet8-transport">
       <package pattern="*" />
     </packageSource>
+    <packageSource key="dotnet9">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet9-transport">
+      <package pattern="*" />
+    </packageSource>
     <packageSource key="richnav">
       <package pattern="*" />
     </packageSource>

docs/building.md

@@ -45,7 +45,7 @@ Here are few commands that you will likely use the most:
     - `build.sh --restore`: to install the required .NET SDK, .NET tools and the toolset. This is equivalent to running `./restore.sh`.
     - `build.sh --build`: to build the solution<sup>1</sup>.
     - `build.sh --test`: to run all unit tests in the solution<sup>1</sup>.
-    - `build.sh --vs <keywords>`: to generate a "filtered" solution and save it as `SDK.sln`. It also performs the "restore" operation. For example: `./build.sh --vs Http,Fakes`.<br />
+    - `build.sh --vs <keywords>`: to generate a "filtered" solution and save it as `SDK.sln`. It also performs the "restore" operation. Keywords can be any part of the name or path of project files you want to include. For example: `./build.sh --vs Http,Fakes,AspNetCore`.<br />
     If for some reason you wish to generate a solution with all projects you can pass `*` for the keyword, e.g.: `./build.sh --vs '*'` (Note: you have to escape the asterisk or use `set -f` to turn off expansion).<br />
       > Under the hood, this invokes `scripts/Slngen.ps1` script, which in turn executes [slngen tool][slngen-tool]. If you want to customize how the "filtered" solution is generated, you will need to invoke `scripts/Slngen.ps1` script directly.<br />
         Run `./scripts/Slngen.ps1 -help` for more details.