[main] Source code updates from dotnet/dotnet

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.helix.jobmonitor": {
-      "version": "11.0.0-beta.26325.102",
+      "version": "11.0.0-beta.26359.117",
       "commands": [
         "dotnet-helix-job-monitor"
       ]

Directory.Packages.props

@@ -15,7 +15,7 @@
     <PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsPackageVersion)" />
     <PackageVersion Include="JsonSchema.Net" Version="7.3.2" />
-    <PackageVersion Include="MessagePack" Version="3.1.4" />
+    <PackageVersion Include="MessagePack" Version="3.1.8" />
     <PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />

NuGet.config

@@ -46,4 +46,8 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>
+  <auditSources>
+    <clear />
+    <add key="nuget.org" value="https://data.nuget.org/v3/index.json" />
+  </auditSources>
 </configuration>

eng/MSBuildTaskAuthoringAnalyzer.props

@@ -14,12 +14,14 @@
   via .editorconfig as the multithreaded-task migration (IMultiThreadableTask / TaskEnvironment) proceeds.
 
   The analyzer package is produced by the msbuild repo and flows to this repo via eng/Version.Details.xml
-  (dotnet/dotnet), so it is available in source build as well and does not need to be excluded there.
+  (dotnet/dotnet). It is report-only and analyzers do not affect build output, so it is excluded from
+  source-only builds (DotNetBuildSourceOnly), where the package is not produced from source and would
+  otherwise be flagged as a prebuilt.
 -->
 <Project>
 
   <PropertyGroup>
-    <_UseMSBuildTaskAuthoringAnalyzer Condition="'$(IsMSBuildTaskProject)' == 'true'">true</_UseMSBuildTaskAuthoringAnalyzer>
+    <_UseMSBuildTaskAuthoringAnalyzer Condition="'$(IsMSBuildTaskProject)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'">true</_UseMSBuildTaskAuthoringAnalyzer>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(_UseMSBuildTaskAuthoringAnalyzer)' == 'true'">

eng/common/core-templates/job/helix-job-monitor.yml

@@ -57,6 +57,14 @@ parameters:
   type: number
   default: 30
 
+# When 'true' (the default), Helix work items that exit 0 but have failed AzDO test results
+# are treated as failed: they count toward the monitor's exit code and are resubmitted by a
+# later invocation's retry pass. Set to 'false' to fall back to exit-code-only outcomes.
+# Forwarded as --fail-on-failed-tests.
+- name: failWorkItemsWithFailedTests
+  type: boolean
+  default: true
+
 # Advanced: optional pipeline artifact (produced earlier in this run) that contains the tool
 # nupkg. When set, the artifact is downloaded and the tool is installed from the nupkg into
 # a local tool-path; this bypasses the repo's .config/dotnet-tools.json manifest and is
@@ -170,6 +178,7 @@ jobs:
       toolArgs=(
         --helix-base-uri           '${{ parameters.helixBaseUri }}'
         --polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
+        --fail-on-failed-tests     '${{ parameters.failWorkItemsWithFailedTests }}'
         --max-wait-minutes         "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
         --stage-name               '$(System.StageName)'
       )

eng/common/tools.ps1

@@ -741,13 +741,6 @@ function MSBuild() {
       Write-PipelineTelemetryError -Category 'Build' -Message 'Binary log must be enabled in CI build, or explicitly opted-out from with the -excludeCIBinarylog switch.'
       ExitWithExitCode 1
     }
-
-    # Node reuse must be disabled in CI builds unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
-    # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
-    if ($nodeReuse -and $env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
-      Write-PipelineTelemetryError -Category 'Build' -Message 'Node reuse must be disabled in CI build.'
-      ExitWithExitCode 1
-    }
   }
 
   $buildTool = InitializeBuildTool

eng/common/tools.sh

@@ -423,7 +423,7 @@ function InitializeToolset {
   if [[ -z "$nuget_config" ]]; then
     # Search for any variation of nuget.config in the RepoRoot
     local found_config
-    found_config=$(find "$repo_root" -maxdepth 1 -type f -iname "nuget.config" -print -quit)
+    found_config=$(find "$repo_root" -maxdepth 1 -type f -iname nuget.config | head -n 1)
 
     if [[ -n "$found_config" ]]; then
       nuget_config="$found_config"
@@ -494,14 +494,7 @@ function DotNet {
 function MSBuild {
   if [[ "$ci" == true ]]; then
     if [[ "$binary_log" != true && "$exclude_ci_binary_log" != true ]]; then
-      Write-PipelineTelemetryError -category 'Build'  "Binary log must be enabled in CI build, or explicitly opted-out from with the -noBinaryLog switch."
-      ExitWithExitCode 1
-    fi
-
-    # Node reuse must be disabled in CI builds unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
-    # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
-    if [[ "$node_reuse" == true && "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
-      Write-PipelineTelemetryError -category 'Build'  "Node reuse must be disabled in CI build."
+      Write-PipelineTelemetryError -category 'Build'  "Binary log must be enabled in CI build, or explicitly opted-out from with the --excludeCIBinarylog switch."
       ExitWithExitCode 1
     fi
   fi

global.json

@@ -24,11 +24,11 @@
     "runner": "Microsoft.Testing.Platform"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26325.102",
-    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26325.102",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26359.117",
+    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26359.117",
     "Microsoft.Build.NoTargets": "3.7.134",
     "Microsoft.Build.Traversal": "4.1.82",
-    "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4",
+    "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6",
     "MSTest.Sdk": "4.3.0-preview.26325.12"
   }
 }

src/Layout/redist/targets/BundledDotnetTools.targets

@@ -9,25 +9,25 @@
 
   <ItemGroup Condition="'$(IncludeAspNetCoreRuntime)' != 'false'">
     <BundledDotnetTool Include="aspnetcoretools"
-                       Condition="'$(DotNetBuildSourceOnly)' != 'true'"
+                       Condition="'$(DotNetBuildUseMonoRuntime)' != 'true'"
                        Version="$(MicrosoftAspNetCoreAppRefPackageVersion)"
                        ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools"
                        RidSpecificPackageRids="$(AspNetCoreRidSpecificToolPackageRids)"
                        RidSpecificPackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" />
-    <!-- Source-only builds do not publish the Native AOT aggregate executable. -->
+    <!-- Native AOT requires the CoreCLR runtime; the Mono runtime build cannot publish the Native AOT aggregate executable, so bundle the individual tools instead. -->
     <!-- RID-specific tool packages are produced by aspnetcore and use the current aspnetcore package version. -->
     <BundledDotnetTool Include="dotnet-dev-certs"
-                       Condition="'$(DotNetBuildSourceOnly)' == 'true'"
+                       Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'"
                        Version="$(DotnetDevCertsPackageVersion)"
                        RidSpecificPackageRids="$(AspNetCoreRidSpecificToolPackageRids)"
                        RidSpecificPackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" />
     <BundledDotnetTool Include="dotnet-user-jwts"
-                       Condition="'$(DotNetBuildSourceOnly)' == 'true'"
+                       Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'"
                        Version="$(DotnetUserJwtsPackageVersion)"
                        RidSpecificPackageRids="$(AspNetCoreRidSpecificToolPackageRids)"
                        RidSpecificPackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" />
     <BundledDotnetTool Include="dotnet-user-secrets"
-                       Condition="'$(DotNetBuildSourceOnly)' == 'true'"
+                       Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'"
                        Version="$(DotnetUserSecretsPackageVersion)"
                        ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools"
                        RidSpecificPackageRids="$(AspNetCoreRidSpecificToolPackageRids)"
@@ -52,7 +52,7 @@
           Condition="'@(BundledDotnetTool)' != ''">
     <ItemGroup>
       <_RidSpecificBundledDotnetTool Include="@(BundledDotnetTool)"
-                                      Condition="'$(DotNetBuildSourceOnly)' != 'true' and '%(BundledDotnetTool.RidSpecificPackageRids)' != ''">
+                                      Condition="'$(DotNetBuildUseMonoRuntime)' != 'true' and '%(BundledDotnetTool.RidSpecificPackageRids)' != ''">
         <ToolId>%(BundledDotnetTool.Identity)</ToolId>
         <ToolVersion>%(BundledDotnetTool.RidSpecificPackageVersion)</ToolVersion>
         <ToolVersion Condition="'%(BundledDotnetTool.RidSpecificPackageVersion)' == ''">%(BundledDotnetTool.Version)</ToolVersion>

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs

@@ -343,6 +343,11 @@ public void It_resolves_assembly_conflicts_with_a_NETFramework_library()
                 TargetFrameworks = "net462",
             };
 
+            // The conflict-resolution packages this test references are intentionally old and
+            // trigger NuGet audit warnings, which break the "no warnings" assertions below. We
+            // don't want to maintain those dependencies, so disable auditing for this project.
+            project.AdditionalProperties["NuGetAudit"] = "false";
+
             project.SourceFiles[project.Name + ".cs"] = $@"
 using System;
 public static class {project.Name}