Skip to content

Commit 7a86dc2

Browse files
authored
Merge pull request #7775 from dibarbet/fix_dotnet_tests
Require .NET install value to always be passed
2 parents db252aa + 3004338 commit 7a86dc2

8 files changed

+38
-15
lines changed

azure-pipelines-official.yml

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ parameters:
2727
- auto
2828
default: auto
2929

30+
variables:
31+
defaultDotnetVersion: '8.0.403'
32+
3033
resources:
3134
repositories:
3235
- repository: 1ESPipelineTemplates
@@ -63,3 +66,4 @@ extends:
6366
isOfficial: true
6467
channel: ${{ parameters.channel }}
6568
signType: ${{ parameters.signType }}
69+
dotnetVersion: $(defaultDotnetVersion)

azure-pipelines.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ pr:
1818
exclude:
1919
- ./*.md
2020

21+
variables:
22+
defaultDotnetVersion: '8.0.403'
23+
2124
stages:
2225
- template: azure-pipelines/build-all.yml
2326
parameters:
2427
isOfficial: false
2528
signType: test
29+
dotnetVersion: $(defaultDotnetVersion)
2630

2731
- stage:
2832
displayName: Test Linux (.NET 6)
@@ -31,7 +35,7 @@ stages:
3135
- template: azure-pipelines/test-matrix.yml
3236
parameters:
3337
# Prefer the dotnet from the container.
34-
installDotNet: false
38+
dotnetVersion: ''
3539
installAdditionalLinuxDependencies: true
3640
pool:
3741
name: NetCore-Public
@@ -45,7 +49,7 @@ stages:
4549
- template: azure-pipelines/test-matrix.yml
4650
parameters:
4751
# Prefer the dotnet from the container.
48-
installDotNet: false
52+
dotnetVersion: ''
4953
installAdditionalLinuxDependencies: true
5054
pool:
5155
name: NetCore-Public
@@ -58,7 +62,7 @@ stages:
5862
jobs:
5963
- template: azure-pipelines/test-matrix.yml
6064
parameters:
61-
installDotNet: true
65+
dotnetVersion: $(defaultDotnetVersion)
6266
pool:
6367
name: NetCore-Public
6468
demands: ImageOverride -equals 1es-windows-2022-open
@@ -69,7 +73,7 @@ stages:
6973
jobs:
7074
- template: azure-pipelines/test-matrix.yml
7175
parameters:
72-
installDotNet: true
76+
dotnetVersion: $(defaultDotnetVersion)
7377
pool:
7478
name: Azure Pipelines
7579
vmImage: macOS-13
@@ -90,3 +94,5 @@ stages:
9094
demands: ImageOverride -equals $(demandsName)
9195
steps:
9296
- template: azure-pipelines/test-omnisharp.yml
97+
parameters:
98+
dotnetVersion: $(defaultDotnetVersion)

azure-pipelines/build-all.yml

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ parameters:
44
default: 'default'
55
- name: isOfficial
66
type: boolean
7+
- name: dotnetVersion
8+
type: string
79
- name: channel
810
values:
911
- release
@@ -96,6 +98,7 @@ stages:
9698
versionNumberOverride: ${{ parameters.versionNumberOverride }}
9799
platform: linux
98100
isOfficial: ${{ parameters.isOfficial }}
101+
dotnetVersion: ${{ parameters.dotnetVersion }}
99102
pool:
100103
${{ if eq(parameters.isOfficial, true) }}:
101104
name: netcore1espool-internal
@@ -109,6 +112,7 @@ stages:
109112
versionNumberOverride: ${{ parameters.versionNumberOverride }}
110113
platform: windows
111114
isOfficial: ${{ parameters.isOfficial }}
115+
dotnetVersion: ${{ parameters.dotnetVersion }}
112116
pool:
113117
${{ if eq(parameters.isOfficial, true) }}:
114118
name: netcore1espool-internal
@@ -122,6 +126,7 @@ stages:
122126
versionNumberOverride: ${{ parameters.versionNumberOverride }}
123127
platform: darwin
124128
isOfficial: ${{ parameters.isOfficial }}
129+
dotnetVersion: ${{ parameters.dotnetVersion }}
125130
pool:
126131
name: Azure Pipelines
127132
${{ if eq(parameters.isOfficial, true) }}:

azure-pipelines/build.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ parameters:
88
type: object
99
- name: isOfficial
1010
type: boolean
11+
- name: dotnetVersion
12+
type: string
1113

1214
jobs:
1315
- job: 'Build_${{ parameters.platform }}_vsixs'
@@ -27,6 +29,7 @@ jobs:
2729
- template: /azure-pipelines/prereqs.yml@self
2830
parameters:
2931
versionNumberOverride: ${{ parameters.versionNumberOverride }}
32+
dotnetVersion: ${{ parameters.dotnetVersion}}
3033

3134
- task: UsePythonVersion@0
3235
displayName: 'Use Python 3.11'

azure-pipelines/prereqs.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ parameters:
22
- name: versionNumberOverride
33
type: string
44
default: 'default'
5-
- name: installDotNet
6-
type: boolean
7-
default: true
5+
- name: dotnetVersion
6+
type: string
87

98
steps:
109

@@ -15,11 +14,11 @@ steps:
1514

1615
# Some tests use predefined docker images with a specific version of .NET installed.
1716
# So we avoid installing .NET in those cases.
18-
- ${{ if eq(parameters.installDotNet, true) }}:
17+
- ${{ if parameters.dotnetVersion }}:
1918
- task: UseDotNet@2
2019
displayName: 'Install .NET SDK'
2120
inputs:
22-
version: '8.0.403'
21+
version: ${{ parameters.dotnetVersion }}
2322

2423
- script: dotnet --info
2524
displayName: Display dotnet info

azure-pipelines/test-matrix.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ parameters:
44
- name: containerName
55
type: string
66
default: ''
7-
- name: installDotNet
8-
type: boolean
7+
- name: dotnetVersion
8+
type: string
99
- name: installAdditionalLinuxDependencies
1010
type: boolean
1111
default: false
@@ -24,6 +24,6 @@ jobs:
2424
steps:
2525
- template: /azure-pipelines/test.yml@self
2626
parameters:
27-
installDotNet: true
27+
dotnetVersion: ${{ parameters.dotnetVersion }}
2828
installAdditionalLinuxDependencies: true
2929
npmCommand: $(npmCommand)

azure-pipelines/test-omnisharp.yml

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
parameters:
2+
- name: dotnetVersion
3+
type: string
4+
15
steps:
26
- checkout: self
37
clean: true
@@ -6,6 +10,8 @@ steps:
610
fetchDepth: 1
711

812
- template: prereqs.yml
13+
parameters:
14+
dotnetVersion: ${{ parameters.dotnetVersion }}
915

1016
- template: test-prereqs.yml
1117

azure-pipelines/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
- name: installDotNet
3-
type: boolean
2+
- name: dotnetVersion
3+
type: string
44
- name: installAdditionalLinuxDependencies
55
type: boolean
66
default: false
@@ -16,7 +16,7 @@ steps:
1616

1717
- template: prereqs.yml
1818
parameters:
19-
installDotNet: ${{ parameters.installDotNet }}
19+
dotnetVersion: ${{ parameters.dotnetVersion }}
2020

2121
- ${{ if eq(parameters.installAdditionalLinuxDependencies, true) }}:
2222
- template: test-linux-docker-prereqs.yml

0 commit comments

Comments
 (0)