Skip to content

Commit 9781145

Browse files
committed
[release/8.0.1xx] Support shared .NET installation
1 parent f19ad8e commit 9781145

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,18 @@ jobs:
106106
107107
eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
108108
109+
source ./eng/common/tools.sh
110+
InitializeDotNetCli true
111+
109112
echo "##vso[task.setvariable variable=Platform]$platform"
110113
echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
111114
echo "##vso[task.setvariable variable=SdkTarballPath]$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name"
115+
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
112116
displayName: Prepare Tests
113117
workingDirectory: $(Build.SourcesDirectory)
114118
115119
- script: >
116-
.dotnet/dotnet test
120+
$(DotNetPath)/dotnet test
117121
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
118122
--filter "Category=SdkContent"
119123
--logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx'
@@ -169,6 +173,7 @@ jobs:
169173
- ${{ if and(eq(parameters.publishTestResultsPr, 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))) }}:
170174
- template: ../steps/create-baseline-update-pr.yml
171175
parameters:
176+
dotnetPath: $(DotNetPath)
172177
pipeline: sdk
173178
repo: dotnet/installer
174179
originalFilesDirectory: src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,23 @@ stages:
2626
- script: |
2727
source ./eng/common/tools.sh
2828
InitializeDotNetCli true
29-
./.dotnet/dotnet tool restore
30-
displayName: Initialize tooling
29+
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
30+
displayName: Install .NET CLI
31+
32+
- script: |
33+
$(DotNetPath)/dotnet tool restore
34+
displayName: Restore tools
3135
workingDirectory: $(Build.SourcesDirectory)/src/installer
3236
3337
- script: |
3438
set -e
35-
sha=`./.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" installer`
39+
sha=`$(DotNetPath)/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" installer`
3640
echo "##vso[build.addbuildtag]$sha"
3741
displayName: Tag the build
3842
workingDirectory: $(Build.SourcesDirectory)/src/installer
3943
4044
- script: >
41-
./.dotnet/dotnet darc vmr scan-binary-files
45+
$(DotNetPath)/dotnet darc vmr scan-binary-files
4246
--vmr "$(Build.SourcesDirectory)"
4347
--tmp "$(Agent.TempDirectory)"
4448
--baseline-file "src/VirtualMonoRepo/allowed-binaries.txt"
@@ -48,7 +52,7 @@ stages:
4852
continueOnError: true
4953
5054
- script: >
51-
./.dotnet/dotnet darc vmr scan-cloaked-files
55+
$(DotNetPath)/dotnet darc vmr scan-cloaked-files
5256
--vmr "$(Build.SourcesDirectory)"
5357
--tmp "$(Agent.TempDirectory)"
5458
|| (echo '##[error]Found cloaked files in the VMR' && exit 1)

src/SourceBuild/content/eng/pipelines/templates/steps/create-baseline-update-pr.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
parameters:
2+
- name: dotnetPath
3+
type: string
4+
default: '$(Build.SourcesDirectory)/.dotnet'
5+
26
# The pipeline that is being run
37
# Used to determine the correct baseline update tool to run
48
# Currently only supports "sdk" and "license"
@@ -31,7 +35,7 @@ steps:
3135
3236
branchName=$(echo "$(Build.SourceBranch)" | sed 's/refs\/heads\///g')
3337
34-
.dotnet/dotnet run \
38+
$(DotNetPath)/dotnet run \
3539
--project eng/tools/CreateBaselineUpdatePR/ \
3640
--property:RestoreSources="$restoreSources" \
3741
"${{ parameters.pipeline }}" \

src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ jobs:
144144
- script: |
145145
source ./eng/common/tools.sh
146146
InitializeDotNetCli true
147+
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
147148
displayName: Install .NET SDK
148149
workingDirectory: $(Build.SourcesDirectory)
149150
@@ -167,6 +168,7 @@ jobs:
167168
168169
- template: templates/steps/create-baseline-update-pr.yml
169170
parameters:
171+
dotnetPath: $(DotNetPath)
170172
pipeline: license
171173
repo: dotnet/installer
172174
originalFilesDirectory: src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses

0 commit comments

Comments
 (0)