Skip to content

Commit 06f40fb

Browse files
Support shared .NET installation (#51725)
1 parent fc8afa0 commit 06f40fb

File tree

1 file changed

+10
-6
lines changed
  • src/SourceBuild/content/eng/pipelines/templates/stages

1 file changed

+10
-6
lines changed

src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,30 @@ stages:
1616
- script: |
1717
source ./eng/common/tools.sh
1818
InitializeDotNetCli true
19-
cd src/sdk
20-
../../.dotnet/dotnet tool restore
21-
displayName: Initialize tooling
19+
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
20+
displayName: Initialize .NET CLI
2221
workingDirectory: $(Build.SourcesDirectory)
2322
23+
- script: |
24+
$(DotNetPath)/dotnet tool restore
25+
displayName: Restore tools
26+
workingDirectory: $(Build.SourcesDirectory)/src/sdk
27+
2428
- script: |
2529
set -e
26-
sha=`../../.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" sdk`
30+
sha=`$(DotNetPath)/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" sdk`
2731
echo "##vso[build.addbuildtag]$sha"
2832
displayName: Tag the build
2933
workingDirectory: $(Build.SourcesDirectory)/src/sdk
3034
3135
- script: |
32-
./eng/detect-binaries.sh
36+
./eng/detect-binaries.sh --with-sdk $(DotNetPath)
3337
displayName: Scan for binaries
3438
workingDirectory: $(Build.SourcesDirectory)
3539
continueOnError: true
3640
3741
- script: >
38-
../../.dotnet/dotnet darc vmr scan-cloaked-files
42+
$(DotNetPath)/dotnet darc vmr scan-cloaked-files
3943
--vmr "$(Build.SourcesDirectory)"
4044
--tmp "$(Agent.TempDirectory)"
4145
|| (echo '##[error]Found cloaked files in the VMR' && exit 1)

0 commit comments

Comments
 (0)