From 5730c204ac9976067426a91a9831f3799067c58d Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 13 Nov 2025 12:12:33 -0800 Subject: [PATCH] Support shared .NET installation --- .../eng/pipelines/templates/stages/vmr-scan.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml index 29ba06160e46..964b84144b3f 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml @@ -16,26 +16,30 @@ stages: - script: | source ./eng/common/tools.sh InitializeDotNetCli true - cd src/sdk - ../../.dotnet/dotnet tool restore - displayName: Initialize tooling + echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli" + displayName: Initialize .NET CLI workingDirectory: $(Build.SourcesDirectory) + - script: | + $(DotNetPath)/dotnet tool restore + displayName: Restore tools + workingDirectory: $(Build.SourcesDirectory)/src/sdk + - script: | set -e - sha=`../../.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" sdk` + sha=`$(DotNetPath)/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" sdk` echo "##vso[build.addbuildtag]$sha" displayName: Tag the build workingDirectory: $(Build.SourcesDirectory)/src/sdk - script: | - ./eng/detect-binaries.sh + ./eng/detect-binaries.sh --with-sdk $(DotNetPath) displayName: Scan for binaries workingDirectory: $(Build.SourcesDirectory) continueOnError: true - script: > - ../../.dotnet/dotnet darc vmr scan-cloaked-files + $(DotNetPath)/dotnet darc vmr scan-cloaked-files --vmr "$(Build.SourcesDirectory)" --tmp "$(Agent.TempDirectory)" || (echo '##[error]Found cloaked files in the VMR' && exit 1)