mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
v-wuzhai 2023-11-09 17:58:54 -08:00 • committed by GitHub
commit 686a27b3a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
eng/pipelines/templates/jobs/vmr-build.yml
View file

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

4
eng/pipelines/templates/steps/vmr-prepare.yml
View file

@ -28,9 +28,9 @@ steps:
path: vmr path: vmr
clean: true clean: true
- ${{ if or(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal')) }}:
- script: | - script: |
git switch -c ${{ parameters.vmrBranch }} git checkout --track origin/${{ parameters.vmrBranch }}
echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
displayName: Check out ${{ parameters.vmrBranch }} displayName: Check out ${{ parameters.vmrBranch }}
workingDirectory: $(Agent.BuildDirectory)/vmr workingDirectory: $(Agent.BuildDirectory)/vmr

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

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