Skip to content

Commit 7e40fad

Browse files
authored
Use global.json with rollforward instead of pipeline versions (#8722)
2 parents 16baa90 + f62153e commit 7e40fad

File tree

13 files changed

+36
-49
lines changed

13 files changed

+36
-49
lines changed

azure-pipelines-official.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ parameters:
2727
- auto
2828
default: auto
2929

30-
variables:
31-
- template: /azure-pipelines/dotnet-variables.yml@self
32-
3330
resources:
3431
repositories:
3532
- repository: 1ESPipelineTemplates
@@ -66,4 +63,3 @@ extends:
6663
isOfficial: true
6764
channel: ${{ parameters.channel }}
6865
signType: ${{ parameters.signType }}
69-
dotnetVersion: $(defaultDotnetVersion)

azure-pipelines.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ schedules:
5555
- main
5656

5757
variables:
58-
- template: /azure-pipelines/dotnet-variables.yml@self
5958
- name: testVSCodeVersion
6059
${{ if eq( variables['Build.Reason'], 'Schedule' ) }}:
6160
value: insiders
@@ -67,11 +66,8 @@ stages:
6766
parameters:
6867
isOfficial: false
6968
signType: test
70-
dotnetVersion: $(defaultDotnetVersion)
7169

7270
- template: azure-pipelines/validate-build.yml
73-
parameters:
74-
dotnetVersion: $(defaultDotnetVersion)
7571

7672
- stage:
7773
displayName: Test Linux (.NET 8)
@@ -81,7 +77,7 @@ stages:
8177
parameters:
8278
os: linux
8379
# Prefer the dotnet from the container.
84-
dotnetVersion: ''
80+
installDotNet: false
8581
testVSCodeVersion: $(testVSCodeVersion)
8682
installAdditionalLinuxDependencies: true
8783
pool:
@@ -97,7 +93,7 @@ stages:
9793
parameters:
9894
os: linux
9995
# Prefer the dotnet from the container.
100-
dotnetVersion: ''
96+
installDotNet: false
10197
testVSCodeVersion: $(testVSCodeVersion)
10298
installAdditionalLinuxDependencies: true
10399
pool:
@@ -112,7 +108,7 @@ stages:
112108
- template: azure-pipelines/test-matrix.yml
113109
parameters:
114110
os: windows
115-
dotnetVersion: $(defaultDotnetVersion)
111+
installDotNet: true
116112
testVSCodeVersion: $(testVSCodeVersion)
117113
pool:
118114
name: NetCore-Public
@@ -125,7 +121,7 @@ stages:
125121
- template: azure-pipelines/test-matrix.yml
126122
parameters:
127123
os: macos
128-
dotnetVersion: $(defaultDotnetVersion)
124+
installDotNet: true
129125
testVSCodeVersion: $(testVSCodeVersion)
130126
pool:
131127
name: Azure Pipelines
@@ -148,5 +144,5 @@ stages:
148144
steps:
149145
- template: azure-pipelines/test-omnisharp.yml
150146
parameters:
151-
dotnetVersion: $(defaultDotnetVersion)
147+
installDotNet: true
152148
testVSCodeVersion: $(testVSCodeVersion)

azure-pipelines/build-vsix.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ parameters:
44
default: 'default'
55
- name: isOfficial
66
type: boolean
7-
- name: dotnetVersion
8-
type: string
97
- name: channel
108
values:
119
- release
@@ -128,7 +126,7 @@ stages:
128126
- template: /azure-pipelines/prereqs.yml@self
129127
parameters:
130128
versionNumberOverride: ${{ parameters.versionNumberOverride }}
131-
dotnetVersion: ${{ parameters.dotnetVersion}}
129+
installDotNet: true
132130

133131
- task: UsePythonVersion@0
134132
displayName: 'Use Python 3.11'

azure-pipelines/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
- name: dotnetVersion
3-
type: string
2+
- name: installDotNet
3+
type: boolean
44

55
steps:
66
- checkout: self
@@ -10,7 +10,7 @@ steps:
1010
fetchDepth: 0
1111
- template: /azure-pipelines/prereqs.yml@self
1212
parameters:
13-
dotnetVersion: ${{ parameters.dotnetVersion}}
13+
installDotNet: ${{ parameters.installDotNet }}
1414

1515
- pwsh: npm run package
1616
displayName: 'Build'

azure-pipelines/dotnet-variables.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

azure-pipelines/prereqs.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ parameters:
22
- name: versionNumberOverride
33
type: string
44
default: 'default'
5-
- name: dotnetVersion
6-
type: string
5+
- name: installDotNet
6+
type: boolean
77

88
steps:
99

@@ -14,11 +14,13 @@ steps:
1414

1515
# Some tests use predefined docker images with a specific version of .NET installed.
1616
# So we avoid installing .NET in those cases.
17-
- ${{ if parameters.dotnetVersion }}:
17+
- ${{ if parameters.installDotNet }}:
1818
- task: UseDotNet@2
1919
displayName: 'Install .NET SDK'
2020
inputs:
21-
version: ${{ parameters.dotnetVersion }}
21+
useGlobalJson: true
22+
workingDirectory: $(Build.SourcesDirectory)/msbuild
23+
2224

2325
- script: dotnet --info
2426
displayName: Display dotnet info

azure-pipelines/profiling.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ variables:
1414
value: $(Build.SourcesDirectory)/out/profiling/merged/
1515
- name: LOGS_DIRECTORY
1616
value: $(Build.SourcesDirectory)/out/logs/
17-
- template: /azure-pipelines/dotnet-variables.yml@self
18-
1917

2018
resources:
2119
repositories:
@@ -54,7 +52,7 @@ extends:
5452
steps:
5553
- template: /azure-pipelines/test.yml@self
5654
parameters:
57-
dotnetVersion: $(defaultDotnetVersion)
55+
installDotNet: true
5856
npmCommand: profiling
5957
testVSCodeVersion: stable
6058
isIntegration: true

azure-pipelines/test-matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ parameters:
66
- name: containerName
77
type: string
88
default: ''
9-
- name: dotnetVersion
10-
type: string
9+
- name: installDotNet
10+
type: boolean
1111
- name: installAdditionalLinuxDependencies
1212
type: boolean
1313
default: false
@@ -40,7 +40,7 @@ jobs:
4040
steps:
4141
- template: /azure-pipelines/test.yml@self
4242
parameters:
43-
dotnetVersion: ${{ parameters.dotnetVersion }}
43+
installDotNet: ${{ parameters.installDotNet }}
4444
installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}
4545
npmCommand: $(npmCommand)
4646
testVSCodeVersion: ${{ parameters.testVSCodeVersion }}

azure-pipelines/test-omnisharp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
- name: dotnetVersion
2+
- name: installDotNet
33
type: string
44
- name: testVSCodeVersion
55
type: string
@@ -13,7 +13,7 @@ steps:
1313

1414
- template: prereqs.yml
1515
parameters:
16-
dotnetVersion: ${{ parameters.dotnetVersion }}
16+
installDotNet: ${{ parameters.installDotNet }}
1717

1818
- template: test-prereqs.yml
1919

azure-pipelines/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
- name: dotnetVersion
3-
type: string
2+
- name: installDotNet
3+
type: boolean
44
- name: installAdditionalLinuxDependencies
55
type: boolean
66
default: false
@@ -20,7 +20,7 @@ steps:
2020

2121
- template: prereqs.yml
2222
parameters:
23-
dotnetVersion: ${{ parameters.dotnetVersion }}
23+
installDotNet: ${{ parameters.installDotNet }}
2424

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

0 commit comments

Comments
 (0)