[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'

NuGet.config

@@ -4,7 +4,6 @@
     <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-8d7e7d7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-8d7e7d73/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from microsoft-testfx -->
     <!--  End: Package sources from microsoft-testfx -->
@@ -39,6 +38,8 @@
   <disabledPackageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <!--  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.-->

eng/Versions.props

@@ -7,7 +7,7 @@
     <VersionMajor>10</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionSDKMinorPatch>5</VersionSDKMinorPatch>
+    <VersionSDKMinorPatch>6</VersionSDKMinorPatch>
     <VersionFeature>$([System.String]::Copy('$(VersionSDKMinorPatch)').PadLeft(2, '0'))</VersionFeature>
     <!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
          It should always be the hundreds-value of the current SDK version, never any
@@ -37,8 +37,8 @@
     <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
     <!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
-    <VersionFeature80>$([MSBuild]::Add($(VersionFeature), 21))</VersionFeature80>
-    <VersionFeature90>$([MSBuild]::Add($(VersionFeature), 10))</VersionFeature90>
+    <VersionFeature80>$([MSBuild]::Add($(VersionFeature), 20))</VersionFeature80>
+    <VersionFeature90>$([MSBuild]::Add($(VersionFeature), 9))</VersionFeature90>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

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

@@ -38,6 +38,27 @@ 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,7 +34,6 @@ 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,11 +824,6 @@ 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,13 +526,7 @@ function MSBuild-Core {
     }
   }
 
-  # 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 "$@"
+  RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
 }
 
 function GetDarc {

eng/common/vmr-sync.ps1

@@ -103,20 +103,12 @@ 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,
@@ -138,27 +130,9 @@ if ($LASTEXITCODE -eq 0) {
   Highlight "Synchronization succeeded"
 }
 else {
-  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
-  }
+  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,13 +186,6 @@ 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 \
@@ -206,22 +199,9 @@ export DOTNET_ROOT="$dotnetDir"
 if [[ $? == 0 ]]; then
   highlight "Synchronization succeeded"
 else
-  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
+  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

global.json

@@ -7,7 +7,7 @@
     "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
   },
   "tools": {
-    "dotnet": "10.0.103",
+    "dotnet": "10.0.102",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26125.123",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26125.123",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26120.103",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26120.103",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"

src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif

@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers",
-        "version": "10.0.105",
+        "version": "10.0.106",
         "language": "en-US"
       },
       "rules": {
@@ -708,7 +708,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.NetAnalyzers",
-        "version": "10.0.105",
+        "version": "10.0.106",
         "language": "en-US"
       },
       "rules": {
@@ -6503,7 +6503,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers",
-        "version": "10.0.105",
+        "version": "10.0.106",
         "language": "en-US"
       },
       "rules": {