[automated] Merge branch 'release/8.0.2xx' => 'main' (#17742)

eng/pipelines/templates/jobs/vmr-build.yml

@@ -94,7 +94,10 @@ jobs:
   steps:
   - template: ../steps/vmr-prepare.yml
     parameters:
-      vmrBranch: ${{ parameters.vmrBranch }}
+      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+        vmrBranch: $(System.PullRequest.TargetBranch)
+      ${{ else }}:
+        vmrBranch: ${{ parameters.vmrBranch }}
       isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
       skipComponentGovernanceDetection: true
 

eng/pipelines/templates/steps/vmr-prepare.yml

@@ -28,11 +28,11 @@ steps:
     path: vmr
     clean: true
 
-- ${{ if or(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal')) }}:
+- script: |
-  - script: |
+    git checkout --track origin/${{ parameters.vmrBranch }}
-      git switch -c ${{ parameters.vmrBranch }}
+    echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
-    displayName: Checkout ${{ parameters.vmrBranch }}
+  displayName: Check out ${{ parameters.vmrBranch }}
-    workingDirectory: $(Agent.BuildDirectory)/vmr
+  workingDirectory: $(Agent.BuildDirectory)/vmr
 
 # TODO (https://github.com/dotnet/arcade/issues/11332): Allow full CG?
 # Currently, we ignore dirs of individual repos - they have been scanned before

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff

@@ -48,7 +48,6 @@ index ------------
  ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll
  ./sdk-manifests/
  ./sdk-manifests/x.y.z/
--./sdk-manifests/x.y.z/
 -./sdk-manifests/x.y.z/
  ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/
  ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/