[main] Source code updates from dotnet/dotnet

eng/Version.Details.props

@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet-dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26527.117</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26531.102</MicrosoftDotNetArcadeSdkPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="cecil" Sha="3fbe5468804116bd8412d0998303162cb906eb9a" BarId="338665" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="cecil" Sha="e2a826638ffc3d7c2b3e72ccf827ddfe96269d57" BarId="339248" />
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26527.117">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>3fbe5468804116bd8412d0998303162cb906eb9a</Sha>
+      <Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/core-templates/job/onelocbuild.yml

@@ -106,7 +106,7 @@ jobs:
           outputVariableName: 'GitHubAppInstallationToken'
           condition: ${{ parameters.condition }}
 
-    - task: OneLocBuild@2
+    - task: OneLocBuild@3
       displayName: OneLocBuild
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)

eng/common/sdk-task.ps1

@@ -49,15 +49,16 @@ function Print-Usage() {
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
 }
 
-function Build([string]$target) {
-  $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
-  $log = Join-Path $LogDir "$task$logSuffix.binlog"
+# Restore is driven by MSBuild's /restore switch, which the shared MSBuild helper adds
+# whenever restore is enabled. No separate restore invocation is necessary.
+function Build() {
+  $log = Join-Path $LogDir "$task.binlog"
   $binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
   $outputPath = Join-Path $ToolsetDir "$task\"
 
   MSBuild $taskProject `
     $binaryLogArg `
-    /t:$target `
+    /t:Execute `
     /p:Configuration=$configuration `
     /p:RepoRoot=$RepoRoot `
     /p:BaseIntermediateOutputPath=$outputPath `
@@ -88,11 +89,7 @@ try {
     ExitWithExitCode 1
   }
 
-  if ($restore) {
-    Build 'Restore'
-  }
-
-  Build 'Execute'
+  Build
 }
 catch {
   Write-Host $_.ScriptStackTrace

eng/common/sdk-task.sh

@@ -28,18 +28,17 @@ while [[ -h "$source" ]]; do
 done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
+# Restore is driven by MSBuild's /restore switch, which the shared MSBuild helper adds
+# whenever restore is enabled. No separate restore invocation is necessary.
 Build() {
-    local target=$1
-    local log_suffix=""
-    [[ "$target" != "Execute" ]] && log_suffix=".$target"
-    local log="$log_dir/$task$log_suffix.binlog"
+    local log="$log_dir/$task.binlog"
     local binaryLogArg=""
     [[ $binary_log == true ]] && binaryLogArg="/bl:$log"
     local output_path="$toolset_dir/$task/"
 
     MSBuild "$taskProject" \
         $binaryLogArg \
-        /t:"$target" \
+        /t:Execute \
         /p:Configuration="$configuration" \
         /p:RepoRoot="$repo_root" \
         /p:BaseIntermediateOutputPath="$output_path" \
@@ -121,11 +120,7 @@ if [[ ! -e "$taskProject" ]]; then
     ExitWithExitCode 1
 fi
 
-if $restore; then
-    Build "Restore"
-fi
-
-Build "Execute"
+Build
 
 
 ExitWithExitCode 0

eng/common/tools.ps1

@@ -811,7 +811,9 @@ function MSBuild() {
     }
   }
 
-  $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
+  $restoreSwitch = if ($restore) { ' /restore' } else { '' }
+
+  $cmdArgs = "$($buildTool.Command)$restoreSwitch /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
 
   # 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

eng/common/tools.sh

@@ -615,7 +615,12 @@ function MSBuild {
     warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=${warn_not_as_error//;/%3B}"
   fi
 
-  RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch ${logger_switch[@]+"${logger_switch[@]}"} /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
+  local restore_switch=""
+  if [[ "$restore" == true ]]; then
+    restore_switch="/restore"
+  fi
+
+  RunBuildTool "$_InitializeBuildToolCommand" $restore_switch /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch ${logger_switch[@]+"${logger_switch[@]}"} /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
 }
 
 function GetDarc {

global.json

@@ -4,7 +4,7 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
-    "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26527.117"
+    "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26531.102"
   },
   "sdk": {
     "version": "12.0.100-alpha.1.26480.102",