Update dependencies from build 303525 (#7180)

[release/7.0.x] Source code updates from dotnet/dotnet

Author: dotnet-maestro[bot]

eng/Version.Details.props

@@ -21,8 +21,8 @@ This file should be imported by eng/Versions.props
     <!-- dotnet/corefx dependencies -->
     <SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26122.102</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26122.102</MicrosoftDotNetXliffTasksPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26125.128</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26125.128</MicrosoftDotNetXliffTasksPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="e3f0655801bae4b7f1b7b5ceb3a1a60eb748e115" BarId="302854" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="f37535073ddded8cecd2e824cce25fbef9e39514" BarId="303525" />
   <!--
     Currently this file is required to publish builds to .NET build asset registry.
     See https://github.com/dotnet/arcade/issues/2396 for details.
@@ -56,13 +56,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26122.102">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26125.128">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>e3f0655801bae4b7f1b7b5ceb3a1a60eb748e115</Sha>
+      <Sha>f37535073ddded8cecd2e824cce25fbef9e39514</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26122.102">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26125.128">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>e3f0655801bae4b7f1b7b5ceb3a1a60eb748e115</Sha>
+      <Sha>f37535073ddded8cecd2e824cce25fbef9e39514</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/templates/steps/vmr-sync.yml

@@ -38,27 +38,6 @@ steps:
   displayName: Label PR commit
   workingDirectory: $(Agent.BuildDirectory)/repo
 
-- script: |
-    vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml)
-    echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
-  displayName: Obtain the vmr sha from Version.Details.xml (Unix)
-  condition: ne(variables['Agent.OS'], 'Windows_NT')
-  workingDirectory: $(Agent.BuildDirectory)/repo
-
-- powershell: |
-    [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml
-    $vmr_sha = $xml.SelectSingleNode("//Source").Sha
-    Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
-  displayName: Obtain the vmr sha from Version.Details.xml (Windows)
-  condition: eq(variables['Agent.OS'], 'Windows_NT')
-  workingDirectory: $(Agent.BuildDirectory)/repo
-
-- script: |
-    git fetch --all
-    git checkout $(vmr_sha)
-  displayName: Checkout VMR at correct sha for repo flow
-  workingDirectory: ${{ parameters.vmrPath }}
-
 - script: |
     git config --global user.name "dotnet-maestro[bot]"
     git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com"

eng/common/templates/vmr-build-pr.yml

@@ -34,6 +34,7 @@ resources:
     type: github
     name: dotnet/dotnet
     endpoint: dotnet
+    ref: refs/heads/main # Set to whatever VMR branch the PR build should insert into
 
 stages:
 - template: /eng/pipelines/templates/stages/vmr-build.yml@vmr

eng/common/tools.ps1

@@ -824,6 +824,11 @@ function MSBuild-Core() {
 
   $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
 
+  # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable
+  if ($env:MSBUILD_MT_ENABLED -eq "1") {
+    $cmdArgs += ' -mt'
+  }
+
   if ($warnAsError) {
     $cmdArgs += ' /warnaserror /p:TreatWarningsAsErrors=true'
   }

eng/common/tools.sh

@@ -526,7 +526,13 @@ function MSBuild-Core {
     }
   }
 
-  RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
+  # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable
+  local mt_switch=""
+  if [[ "${MSBUILD_MT_ENABLED:-}" == "1" ]]; then
+    mt_switch="-mt"
+  fi
+
+  RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
 }
 
 function GetDarc {

eng/common/vmr-sync.ps1

@@ -103,12 +103,20 @@ Set-StrictMode -Version Latest
 Highlight 'Installing .NET, preparing the tooling..'
 . .\eng\common\tools.ps1
 $dotnetRoot = InitializeDotNetCli -install:$true
+$env:DOTNET_ROOT = $dotnetRoot
 $darc = Get-Darc
-$dotnet = "$dotnetRoot\dotnet.exe"
 
 Highlight "Starting the synchronization of VMR.."
 
 # Synchronize the VMR
+$versionDetailsPath = Resolve-Path (Join-Path $PSScriptRoot '..\Version.Details.xml') | Select-Object -ExpandProperty Path
+[xml]$versionDetails = Get-Content -Path $versionDetailsPath
+$repoName = $versionDetails.SelectSingleNode('//Source').Mapping
+if (-not $repoName) {
+  Fail "Failed to resolve repo mapping from $versionDetailsPath"
+  exit 1
+}
+
 $darcArgs = (
   "vmr", "forwardflow",
   "--tmp", $tmpDir,
@@ -130,9 +138,27 @@ if ($LASTEXITCODE -eq 0) {
   Highlight "Synchronization succeeded"
 }
 else {
-  Fail "Synchronization of repo to VMR failed!"
-  Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)."
-  Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)."
-  Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
-  exit 1
+  Highlight "Failed to flow code into the local VMR. Falling back to resetting the VMR to match repo contents..."
+  git -C $vmrDir reset --hard
+
+  $resetArgs = (
+    "vmr", "reset",
+    "${repoName}:HEAD",
+    "--vmr", $vmrDir,
+    "--tmp", $tmpDir,
+    "--additional-remotes", "${repoName}:${repoRoot}"
+  )
+
+  & "$darc" $resetArgs
+
+  if ($LASTEXITCODE -eq 0) {
+    Highlight "Successfully reset the VMR using 'darc vmr reset'"
+  }
+  else {
+    Fail "Synchronization of repo to VMR failed!"
+    Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)."
+    Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)."
+    Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
+    exit 1
+  }
 }

eng/common/vmr-sync.sh

@@ -186,6 +186,13 @@ fi
 
 # Synchronize the VMR
 
+version_details_path=$(cd "$scriptroot/.."; pwd -P)/Version.Details.xml
+repo_name=$(grep -m 1 '<Source ' "$version_details_path" | sed -n 's/.*Mapping="\([^"]*\)".*/\1/p')
+if [[ -z "$repo_name" ]]; then
+  fail "Failed to resolve repo mapping from $version_details_path"
+  exit 1
+fi
+
 export DOTNET_ROOT="$dotnetDir"
 
 "$darc_tool" vmr forwardflow \
@@ -199,9 +206,22 @@ export DOTNET_ROOT="$dotnetDir"
 if [[ $? == 0 ]]; then
   highlight "Synchronization succeeded"
 else
-  fail "Synchronization of repo to VMR failed!"
-  fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)."
-  fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)."
-  fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
-  exit 1
+  highlight "Failed to flow code into the local VMR. Falling back to resetting the VMR to match repo contents..."
+  git -C "$vmr_dir" reset --hard
+
+  "$darc_tool" vmr reset \
+    "$repo_name:HEAD"                              \
+    --vmr "$vmr_dir"                               \
+    --tmp "$tmp_dir"                               \
+    --additional-remotes "$repo_name:$repo_root"
+
+  if [[ $? == 0 ]]; then
+    highlight "Successfully reset the VMR using 'darc vmr reset'"
+  else
+    fail "Synchronization of repo to VMR failed!"
+    fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)."
+    fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)."
+    fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
+    exit 1
+  fi
 fi

global.json

@@ -9,7 +9,7 @@
     "pinned": true
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26122.102",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26125.128",
     "Microsoft.Build.NoTargets": "3.7.0"
   }
 }