Merge branch 'release/10.0.2xx' into dev/jorobich/backport_48512

Author: JoeRobich

.github/copilot-instructions.md

@@ -1,10 +1,17 @@
+Use the instructions from the main branch if available: @dotnet/sdk/files/.github/copilot-instructions.md
+
+If the instructions from main are not available, use the following as a fallback:
+
 Coding Style and Changes:
 - Code should match the style of the file it's in.
 - Changes should be minimal to resolve a problem in a clean way.
 - User-visible changes to behavior should be considered carefully before committing. They should always be flagged.
 - When generating code, run `dotnet format` to ensure uniform formatting.
 - Prefer using file-based namespaces for new code.
 - Do not allow unused `using` directives to be committed.
+- Commit your changes, and then format them.
+- Add the format commit SHA to the .git-blame-ignore-revs file so that the commit doesn't dirty git blame in the future
+- Use `#if NET` blocks for .NET Core specific code, and `#if NETFRAMEWORK` for .NET Framework specific code.
 
 Testing:
 - Large changes should always include test changes.

Directory.Packages.props

@@ -82,8 +82,6 @@
     <PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
-    <PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
-    <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="$(MicrosoftVisualStudioSolutionPersistenceVersion)" />
     <PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
@@ -116,6 +114,7 @@
     <PackageVersion Include="runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
+    <PackageVersion Include="Spectre.Console" Version="0.54.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
     <PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />

NuGet.config

@@ -4,6 +4,9 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-pub-dotnet-dotnet-b0f34d5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-b0f34d51/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-dotnet-b0f34d5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-dotnet-b0f34d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from microsoft-testfx -->
     <!--  End: Package sources from microsoft-testfx -->
@@ -29,8 +32,6 @@
     <add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
-    <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
-    <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <!-- Used for Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
@@ -40,6 +41,10 @@
   <disabledPackageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-int-dotnet-dotnet-b0f34d5-1" value="true" />
+    <add key="darc-int-dotnet-dotnet-b0f34d5" value="true" />
+    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

build/RunTestsOnHelix.cmd

@@ -10,6 +10,9 @@ set PATH=%DOTNET_ROOT%;%PATH%
 set DOTNET_MULTILEVEL_LOOKUP=0
 set TestFullMSBuild=%1
 
+REM Ensure Visual Studio instances allow preview SDKs
+PowerShell -ExecutionPolicy ByPass -NoProfile -File "%HELIX_CORRELATION_PAYLOAD%\t\eng\enable-preview-sdks.ps1"
+
 REM Use powershell to call partical Arcade logic to get full framework msbuild path and assign it
 if "%TestFullMSBuild%"=="true" (
     FOR /F "tokens=*" %%g IN ('PowerShell -ExecutionPolicy ByPass -File "%HELIX_CORRELATION_PAYLOAD%\t\eng\print-full-msbuild-path.ps1"') do (SET DOTNET_SDK_TEST_MSBUILD_PATH=%%g)

documentation/general/decouple-vs-and-net-sdk.md

@@ -145,7 +145,7 @@ Based on the value of the `RoslynCompilerType` property, the SDK (or compiler to
 
 These values are recognized for property `RoslynCompilerType`:
 - `Core`: use the compiler that comes with the .NET SDK
-- `Framework`: use the compiler that comes with .NET Framework MSBuild
+- `Framework`: use the compiler that comes with .NET Framework MSBuild (this option is [deprecated and will be removed in .NET 11](https://aka.ms/roslyn-compiler-type-framework))
 - `FrameworkPackage`: download the Microsoft.Net.Sdk.Compilers.Toolset package which contains the .NET Framework compiler corresponding to the .NET SDK version
 - `Custom`: the SDK will not override `RoslynTasksAssembly` and the other properties listed above - used for example by Microsoft.Net.Compilers.Toolset package which injects its own version of the build task
 

documentation/general/dotnet-run-file.md

@@ -248,6 +248,16 @@ The directives are processed as follows:
   (because `ProjectReference` items don't support directory paths).
   An error is reported if zero or more than one projects are found in the directory, just like `dotnet reference add` would do.
 
+Directive values support MSBuild variables (like `$(..)`) normally as they are translated literally and left to MSBuild engine to process.
+However, in `#:project` directives, variables might not be preserved during [grow up](#grow-up),
+because there is additional processing of those directives that makes it technically challenging to preserve variables in all cases
+(project directive values need to be resolved to be relative to the target directory
+and also to point to a project file rather than a directory).
+Note that it is not expected that variables inside the path change their meaning during the conversion,
+so for example `#:project ../$(LibName)` is translated to `<ProjectReference Include="../../$(LibName)/Lib.csproj" />` (i.e., the variable is preserved).
+However, variables at the start can change, so for example `#:project $(ProjectDir)../Lib` is translated to `<ProjectReference Include="../../Lib/Lib.csproj" />` (i.e., the variable is expanded).
+In other directives, all variables are preserved during conversion.
+
 Because these directives are limited by the C# language to only appear before the first "C# token" and any `#if`,
 dotnet CLI can look for them via a regex or Roslyn lexer without any knowledge of defined conditional symbols
 and can do that efficiently by stopping the search when it sees the first "C# token".

documentation/manpages/sdk/dotnet-build-server.1

@@ -14,11 +14,11 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-build-server" "1" "2025-06-13" "" ".NET Documentation"
+.TH "dotnet-build-server" "1" "2025-10-30" "" ".NET Documentation"
 .hy
 .SH dotnet build-server
 .PP
-\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET Core 3.1 SDK and later versions
+\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET 6 SDK and later versions
 .SH NAME
 .PP
 dotnet-build-server - Interacts with servers started by a build.

documentation/manpages/sdk/dotnet-build.1

@@ -14,11 +14,11 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-build" "1" "2025-09-30" "" ".NET Documentation"
+.TH "dotnet-build" "1" "2025-10-30" "" ".NET Documentation"
 .hy
 .SH dotnet build
 .PP
-\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET 6 and later versions
+\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET 6 SDK and later versions
 .SH NAME
 .PP
 dotnet-build - Builds a project, solution, or file-based app and all of its dependencies.
@@ -28,15 +28,13 @@ dotnet-build - Builds a project, solution, or file-based app and all of its depe
 \f[C]
 dotnet build [<PROJECT>|<SOLUTION>|<FILE>] [-a|--arch <ARCHITECTURE>]
     [--artifacts-path <ARTIFACTS_DIR>]
-    [-c|--configuration <CONFIGURATION>] [-f|--framework <FRAMEWORK>]
-    [--disable-build-servers]
-    [--force] [--interactive] [--no-dependencies] [--no-incremental]
-    [--no-restore] [--nologo] [--no-self-contained] [--os <OS>]
-    [-o|--output <OUTPUT_DIRECTORY>]
-    [-p|--property:<PROPERTYNAME>=<VALUE>]
-    [-r|--runtime <RUNTIME_IDENTIFIER>]
-    [-sc|--self-contained [true|false]] [--source <SOURCE>]
-    [--tl:[auto|on|off]] [--use-current-runtime, --ucr [true|false]]
+    [-c|--configuration <CONFIGURATION>] [--disable-build-servers]
+    [-f|--framework <FRAMEWORK>] [--force] [--interactive]
+    [--no-dependencies] [--no-incremental] [--no-restore] [--nologo]
+    [--no-self-contained] [-o|--output <OUTPUT_DIRECTORY>] [--os <OS>]
+    [-p|--property:<PROPERTYNAME>=<VALUE>] [-r|--runtime <RUNTIME_IDENTIFIER>]
+    [--sc|--self-contained] [--source <SOURCE>]
+    [--tl:[auto|on|off]] [ --ucr|--use-current-runtime]
     [-v|--verbosity <LEVEL>] [--version-suffix <VERSION_SUFFIX>]
 
 dotnet build -h|--help
@@ -176,12 +174,6 @@ Forces all dependencies to be resolved even if the last restore was successful.
 Specifying this flag is the same as deleting the \f[I]project.assets.json\f[R] file.
 .RE
 .IP \[bu] 2
-\f[B]\f[VB]-?|-h|--help\f[B]\f[R]
-.RS 2
-.PP
-Prints out a description of how to use the command.
-.RE
-.IP \[bu] 2
 \f[B]\f[VB]--interactive\f[B]\f[R]
 .RS 2
 .PP
@@ -218,9 +210,7 @@ Doesn\[cq]t display the startup banner or the copyright message.
 \f[B]\f[VB]--no-self-contained\f[B]\f[R]
 .RS 2
 .PP
-Publishes the application as a framework dependent application.
-A compatible .NET runtime must be installed on the target machine to run the application.
-Available since .NET 6 SDK.
+Equivalent to \f[V]--self-contained false\f[R].
 .RE
 .IP \[bu] 2
 \f[B]\f[VB]-o|--output <OUTPUT_DIRECTORY>\f[B]\f[R]
@@ -272,12 +262,11 @@ If you use this option with .NET 6 SDK, use \f[V]--self-contained\f[R] or \f[V]-
 If not specified, the default is to build for the current OS and architecture.
 .RE
 .IP \[bu] 2
-\f[B]\f[VB]--self-contained [true|false]\f[B]\f[R]
+\f[B]\f[VB]--sc|--self-contained\f[B]\f[R]
 .RS 2
 .PP
-Publishes the .NET runtime with the application so the runtime doesn\[cq]t need to be installed on the target machine.
-The default is \f[V]true\f[R] if a runtime identifier is specified.
-Available since .NET 6.
+Publish the .NET runtime with your application so the runtime doesn\[cq]t need to be installed on the target machine.
+The default is \f[V]true\f[R].
 .RE
 .IP \[bu] 2
 \f[B]\f[VB]--source <SOURCE>\f[B]\f[R]
@@ -314,23 +303,18 @@ Any diagnostics generated for that project.
 This option is available starting in .NET 8.
 .RE
 .IP \[bu] 2
-\f[B]\f[VB]-v|--verbosity <LEVEL>\f[B]\f[R]
+\f[B]\f[VB]--ucr|--use-current-runtime\f[B]\f[R]
 .RS 2
 .PP
-Sets the verbosity level of the command.
-Allowed values are \f[V]q[uiet]\f[R], \f[V]m[inimal]\f[R], \f[V]n[ormal]\f[R], \f[V]d[etailed]\f[R], and \f[V]diag[nostic]\f[R].
-The default is \f[V]minimal\f[R].
-By default, MSBuild displays warnings and errors at all verbosity levels.
-To exclude warnings, use \f[V]/property:WarningLevel=0\f[R].
-For more information, see <xref:Microsoft.Build.Framework.LoggerVerbosity> and WarningLevel.
+Use the current runtime as the target runtime.
 .RE
 .IP \[bu] 2
-\f[B]\f[VB]--use-current-runtime, --ucr [true|false]\f[B]\f[R]
+\f[B]\f[VB]-v|--verbosity <LEVEL>\f[B]\f[R]
 .RS 2
 .PP
-Sets the \f[V]RuntimeIdentifier\f[R] to a platform portable \f[V]RuntimeIdentifier\f[R] based on the one of your machine.
-This happens implicitly with properties that require a \f[V]RuntimeIdentifier\f[R], such as \f[V]SelfContained\f[R], \f[V]PublishAot\f[R], \f[V]PublishSelfContained\f[R], \f[V]PublishSingleFile\f[R], and \f[V]PublishReadyToRun\f[R].
-If the property is set to false, that implicit resolution will no longer occur.
+Sets the verbosity level of the command.
+Allowed values are \f[V]q[uiet]\f[R], \f[V]m[inimal]\f[R], \f[V]n[ormal]\f[R], \f[V]d[etailed]\f[R], and \f[V]diag[nostic]\f[R].
+For more information, see <xref:Microsoft.Build.Framework.LoggerVerbosity>.
 .RE
 .IP \[bu] 2
 \f[B]\f[VB]--version-suffix <VERSION_SUFFIX>\f[B]\f[R]
@@ -340,6 +324,12 @@ Sets the value of the \f[V]$(VersionSuffix)\f[R] property to use when building t
 This only works if the \f[V]$(Version)\f[R] property isn\[cq]t set.
 Then, \f[V]$(Version)\f[R] is set to the \f[V]$(VersionPrefix)\f[R] combined with the \f[V]$(VersionSuffix)\f[R], separated by a dash.
 .RE
+.IP \[bu] 2
+\f[B]\f[VB]-?|-h|--help\f[B]\f[R]
+.RS 2
+.PP
+Prints out a description of how to use the command.
+.RE
 .SH EXAMPLES
 .IP \[bu] 2
 Build a project and its dependencies:

documentation/manpages/sdk/dotnet-clean.1

@@ -14,11 +14,11 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-clean" "1" "2025-09-30" "" ".NET Documentation"
+.TH "dotnet-clean" "1" "2025-10-30" "" ".NET Documentation"
 .hy
 .SH dotnet clean
 .PP
-\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET 6 and later versions
+\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET 6 SDK and later versions
 .SH NAME
 .PP
 dotnet-clean - Cleans the output of a project.

documentation/manpages/sdk/dotnet-dev-certs.1

@@ -15,11 +15,11 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-dev-certs" "1" "2025-06-13" "" ".NET Documentation"
+.TH "dotnet-dev-certs" "1" "2025-10-30" "" ".NET Documentation"
 .hy
 .SH dotnet dev-certs
 .PP
-\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET Core 3.1 SDK and later versions
+\f[B]This article applies to:\f[R] \[u2714]\[uFE0F] .NET 6 SDK and later versions
 .SH NAME
 .PP
 dotnet-dev-certs - Generates a self-signed certificate to enable HTTPS use in development.
@@ -28,7 +28,8 @@ dotnet-dev-certs - Generates a self-signed certificate to enable HTTPS use in de
 .nf
 \f[C]
 dotnet dev-certs https 
-  [-c|--check] [--clean] [-ep|--export-path <PATH>]
+  [-c|--check] [--check-trust-machine-readable] 
+  [--clean] [-ep|--export-path <PATH>]
   [--format] [-i|--import] [-np|--no-password]
   [-p|--password] [-q|--quiet] [-t|--trust]
   [-v|--verbose] [--version]
@@ -91,6 +92,12 @@ Checks for the existence of the development certificate but doesn\[cq]t perform
 Use this option with the \f[V]--trust\f[R] option to check if the certificate is not only valid but also trusted.
 .RE
 .IP \[bu] 2
+\f[B]\f[VB]--check-trust-machine-readable\f[B]\f[R]
+.RS 2
+.PP
+Same as running \f[V]--check --trust\f[R], but outputs the results in JSON.
+.RE
+.IP \[bu] 2
 \f[B]\f[VB]--clean\f[B]\f[R]
 .RS 2
 .PP