[main] Source code updates from dotnet/dotnet

eng/Version.Details.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="12b51dc5eb3ed9e10e0d08c3bccccffe9419b72f" BarId="332790" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="24ec68a958554a6e43243aaa2e1e2be6f254d726" BarId="335450" />
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>

eng/common/build.ps1

@@ -181,10 +181,6 @@ try {
     if (-not $PSBoundParameters.ContainsKey('nodeReuse')) {
       $nodeReuse = $false
     }
-    # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded.
-    if (-not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) {
-      $msbuildMultiThreaded = $false
-    }
   }
 
   if (-not [string]::IsNullOrEmpty($binaryLogName)) {

eng/common/core-templates/steps/astred-artifacts.yml

@@ -21,7 +21,7 @@ steps:
     FeedUrl: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet-internal-FoSSE/nuget/v3/index.json'
 
 - pwsh: |
-    $ErrorActionPreference = 'Continue'
+    $ErrorActionPreference = 'Stop'
     $apjOut = Join-Path $env:ASTRED_CAPTURE_PATH 'apj'
     New-Item -ItemType Directory -Force -Path $apjOut | Out-Null
 
@@ -34,10 +34,13 @@ steps:
 
     $project = Join-Path $apjOut '.astred.project.json'
     $binlogPaths = @($binlogs.FullName)
+    $responseFile = Join-Path $apjOut 'binlogs.rsp'
+    $binlogPaths | ForEach-Object { '"{0}"' -f $_ } |
+      Set-Content -LiteralPath $responseFile -Encoding utf8
     Write-Host "astproj: processing $($binlogPaths.Count) binlog(s)"
-    astred astproj -nofolders @binlogPaths "-o:$project"
+    astred astproj -nofolders "@$responseFile" "-o:$project"
     if ($LASTEXITCODE -ne 0) {
-      Write-Host "##vso[task.logissue type=warning]astproj failed (exit $LASTEXITCODE)"
+      throw "astproj failed (exit $LASTEXITCODE)"
     }
   displayName: Generate Astred Project Files
   workingDirectory: ${{ parameters.sourcesPath }}

eng/common/msbuild.ps1

@@ -19,11 +19,6 @@ try {
     $nodeReuse = $false
   }
 
-  # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded.
-  if ($ci -and -not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) {
-    $msbuildMultiThreaded = $false
-  }
-
   MSBuild @extraArgs
 } 
 catch {

eng/common/tools.ps1

@@ -31,8 +31,9 @@
 # Set to true to reuse msbuild nodes. Recommended to not reuse on CI.
 [bool]$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { !$ci }
 
-# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI.
-[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { !$ci }
+# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds.
+# Not applied when building with msbuild.exe (VS MSBuild).
+[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { $true }
 
 # Configures warning treatment in msbuild.
 [bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true }
@@ -812,8 +813,9 @@ function MSBuild() {
 
   $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
 
-  # Build with MSBuild's multi-threaded mode.
-  if ($msbuildMultiThreaded) {
+  # Build with MSBuild's multi-threaded mode, but not with msbuild.exe (VS MSBuild) for now.
+  # TODO: Enable for VS MSBuild as well: https://github.com/dotnet/dotnet/issues/9989
+  if ($msbuildMultiThreaded -and [System.IO.Path]::GetFileName($buildTool.Path) -ne 'msbuild.exe') {
     $cmdArgs += ' -mt'
   }
 

eng/common/tools.sh

@@ -60,13 +60,9 @@ else
   node_reuse=${node_reuse:-true}
 fi
 
-# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI.
+# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds.
 msbuild_multi_threaded=$(NormalizeBoolArg "${msbuild_multi_threaded:-}")
-if [[ "$ci" == true ]]; then
-  msbuild_multi_threaded=${msbuild_multi_threaded:-false}
-else
-  msbuild_multi_threaded=${msbuild_multi_threaded:-true}
-fi
+msbuild_multi_threaded=${msbuild_multi_threaded:-true}
 
 # Configures warning treatment in msbuild.
 warn_as_error=$(NormalizeBoolArg "${warn_as_error:-}")

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "11.0.100-rc.1.26420.103",
+    "version": "12.0.100-alpha.1.26480.102",
     "rollForward": "latestFeature",
     "paths": [
       ".dotnet",
@@ -9,7 +9,7 @@
     "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
   },
   "tools": {
-    "dotnet": "11.0.100-rc.1.26420.103"
+    "dotnet": "12.0.100-alpha.1.26480.102"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26501.3",

src/Microsoft.DotNet.Arcade.Sdk/tools/TargetingPacks.BeforeCommonTargets.targets

@@ -72,7 +72,12 @@
     <KnownFrameworkReference
       Include="@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.NETCore.App')->WithMetadataValue('TargetFramework', '$(TargetingPackBaselineTargetFramework)'))"
       TargetFramework="$(TargetingPackCurrentTargetFramework)"
-      Condition="'@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(TargetingPackCurrentTargetFramework)'))' != 'true'" />
+      Condition="'@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.NETCore.App')->AnyHaveMetadataValue('TargetFramework', '$(TargetingPackCurrentTargetFramework)'))' != 'true'" />
+
+    <KnownFrameworkReference
+      Include="@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->WithMetadataValue('TargetFramework', '$(TargetingPackBaselineTargetFramework)'))"
+      TargetFramework="$(TargetingPackCurrentTargetFramework)"
+      Condition="'@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->AnyHaveMetadataValue('TargetFramework', '$(TargetingPackCurrentTargetFramework)'))' != 'true'" />
 
     <KnownRuntimePack
       Include="@(KnownRuntimePack->WithMetadataValue('Identity', 'Microsoft.NETCore.App')->WithMetadataValue('TargetFramework', '$(TargetingPackBaselineTargetFramework)')->WithMetadataValue('RuntimePackLabels', 'Mono'))"