Skip to content

Commit 1d541b2

Browse files
TohronTohron
authored
Update Windows RS4 x64 micro_net461 Open LTS to windows-latest (dotnet#2148)
* Update all windows pools to windows-latest
1 parent b7537de commit 1d541b2

File tree

5 files changed

+82
-44
lines changed

5 files changed

+82
-44
lines changed

Diff for: ‎azure-pipelines-gc.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
osName: windows
2626
osVersion: RS5
2727
architecture: x64
28-
pool: Hosted VS2017
28+
pool:
29+
vmImage: windows-2019
2930
kind: scenarios
3031
queue: Windows.10.Amd64.ClientRS5.Open

Diff for: ‎azure-pipelines.yml

+64-32
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ jobs:
5050
osName: windows
5151
osVersion: 21H1
5252
architecture: x64
53-
pool: Hosted VS2017
53+
pool:
54+
vmImage: windows-2019
5455
kind: scenarios
5556
machinePool: Open
5657
queue: Windows.10.Amd64.Client21H1.Open
@@ -65,7 +66,8 @@ jobs:
6566
osVersion: 1804
6667
kind: scenarios
6768
architecture: x64
68-
pool: Azure Pipelines
69+
pool:
70+
vmImage: ubuntu-latest
6971
machinePool: Open
7072
queue: Ubuntu.1804.Amd64.Open
7173
container: ubuntu_x64_build_container
@@ -79,7 +81,8 @@ jobs:
7981
osName: windows
8082
osVersion: 21H1
8183
architecture: x64
82-
pool: Hosted VS2017
84+
pool:
85+
vmImage: windows-2019
8386
kind: blazor_scenarios
8487
machinePool: Open
8588
queue: Windows.10.Amd64.Client21H1.Open
@@ -93,7 +96,8 @@ jobs:
9396
osName: windows
9497
osVersion: 21H1
9598
architecture: x64
96-
pool: Hosted VS2017
99+
pool:
100+
vmImage: windows-2019
97101
kind: sdk_scenarios
98102
machinePool: Open
99103
queue: Windows.10.Amd64.Client21H1.Open
@@ -108,7 +112,8 @@ jobs:
108112
osVersion: 1804
109113
kind: sdk_scenarios
110114
architecture: x64
111-
pool: Azure Pipelines
115+
pool:
116+
vmImage: ubuntu-latest
112117
machinePool: Open
113118
queue: Ubuntu.1804.Amd64.Open
114119
container: ubuntu_x64_build_container
@@ -122,7 +127,8 @@ jobs:
122127
osName: windows
123128
osVersion: 21H1
124129
architecture: x86
125-
pool: Hosted VS2017
130+
pool:
131+
vmImage: windows-2019
126132
kind: sdk_scenarios
127133
machinePool: Open
128134
queue: Windows.10.Amd64.Client21H1.Open
@@ -137,7 +143,8 @@ jobs:
137143
osVersion: 21H1
138144
kind: micro
139145
architecture: x64
140-
pool: Hosted VS2017
146+
pool:
147+
vmImage: windows-2019
141148
machinePool: Open
142149
queue: Windows.10.Amd64.Client21H1.Open
143150
csproj: src\benchmarks\micro\MicroBenchmarks.csproj
@@ -152,7 +159,8 @@ jobs:
152159
osVersion: RS4
153160
kind: micro_net461
154161
architecture: x64
155-
pool: Hosted VS2017
162+
pool:
163+
vmImage: windows-2019
156164
machinePool: Open
157165
queue: Windows.10.Amd64.ClientRS4.DevEx.15.8.Open
158166
csproj: src\benchmarks\micro\MicroBenchmarks.csproj
@@ -167,7 +175,8 @@ jobs:
167175
osVersion: 21H1
168176
kind: micro
169177
architecture: x86
170-
pool: Hosted VS2017
178+
pool:
179+
vmImage: windows-2019
171180
machinePool: Open
172181
queue: Windows.10.Amd64.Client21H1.Open
173182
csproj: src\benchmarks\micro\MicroBenchmarks.csproj
@@ -182,7 +191,8 @@ jobs:
182191
osVersion: 21H1
183192
kind: mlnet
184193
architecture: x64
185-
pool: Hosted VS2017
194+
pool:
195+
vmImage: windows-2019
186196
machinePool: Open
187197
queue: Windows.10.Amd64.Client21H1.Open
188198
csproj: src\benchmarks\real-world\Microsoft.ML.Benchmarks\Microsoft.ML.Benchmarks.csproj
@@ -197,7 +207,8 @@ jobs:
197207
osVersion: 21H1
198208
kind: roslyn
199209
architecture: x64
200-
pool: Hosted VS2017
210+
pool:
211+
vmImage: windows-2019
201212
machinePool: Open
202213
queue: Windows.10.Amd64.Client21H1.Open
203214
csproj: src\benchmarks\real-world\Roslyn\CompilerBenchmarks.csproj
@@ -212,7 +223,8 @@ jobs:
212223
osVersion: 1804
213224
kind: micro
214225
architecture: x64
215-
pool: Azure Pipelines
226+
pool:
227+
vmImage: ubuntu-latest
216228
machinePool: Open
217229
queue: Ubuntu.1804.Amd64.Open
218230
container: ubuntu_x64_build_container
@@ -228,7 +240,8 @@ jobs:
228240
osVersion: 1804
229241
kind: mlnet
230242
architecture: x64
231-
pool: Azure Pipelines
243+
pool:
244+
vmImage: ubuntu-latest
232245
machinePool: Open
233246
queue: Ubuntu.1804.Amd64.Open
234247
container: ubuntu_x64_build_container
@@ -244,7 +257,8 @@ jobs:
244257
osVersion: 1804
245258
kind: roslyn
246259
architecture: x64
247-
pool: Azure Pipelines
260+
pool:
261+
vmImage: ubuntu-latest
248262
machinePool: Open
249263
queue: Ubuntu.1804.Amd64.Open
250264
container: ubuntu_x64_build_container
@@ -265,7 +279,8 @@ jobs:
265279
osName: windows
266280
osVersion: 19H1
267281
architecture: x64
268-
pool: Hosted VS2017
282+
pool:
283+
vmImage: windows-2019
269284
kind: scenarios
270285
machinePool: Tiger
271286
queue: Windows.10.Amd64.19H1.Tiger.Perf
@@ -280,7 +295,8 @@ jobs:
280295
osVersion: 1804
281296
kind: scenarios
282297
architecture: x64
283-
pool: Azure Pipelines
298+
pool:
299+
vmImage: ubuntu-latest
284300
machinePool: Tiger
285301
queue: Ubuntu.1804.Amd64.Tiger.Perf # using a dedicated private Helix queue (perftigers)
286302
container: ubuntu_x64_build_container
@@ -295,7 +311,8 @@ jobs:
295311
# osVersion: 19H1
296312
# kind: micro
297313
# architecture: x64
298-
# pool: Hosted VS2017
314+
# pool:
315+
# vmImage: windows-2019
299316
# machinePool: Tiger
300317
# queue: Windows.10.Amd64.19H1.Tiger.Perf # using a dedicated private Helix queue (perftigers)
301318
# csproj: src\benchmarks\micro\MicroBenchmarks.csproj
@@ -312,7 +329,8 @@ jobs:
312329
# osVersion: 20H2
313330
# kind: micro
314331
# architecture: x64
315-
# pool: Hosted VS2017
332+
# pool:
333+
# vmImage: windows-2019
316334
# machinePool: Owl
317335
# queue: Windows.10.Amd64.20H2.Owl.Perf # using a dedicated private Helix queue (perfowls)
318336
# csproj: src\benchmarks\micro\MicroBenchmarks.csproj
@@ -329,7 +347,8 @@ jobs:
329347
# osVersion: 19H1
330348
# kind: micro
331349
# architecture: x86
332-
# pool: Hosted VS2017
350+
# pool:
351+
# vmImage: windows-2019
333352
# machinePool: Tiger
334353
# queue: Windows.10.Amd64.19H1.Tiger.Perf # using a dedicated private Helix queue (perftigers)
335354
# csproj: src\benchmarks\micro\MicroBenchmarks.csproj
@@ -346,7 +365,8 @@ jobs:
346365
# osVersion: 19H1
347366
# kind: mlnet
348367
# architecture: x64
349-
# pool: Hosted VS2017
368+
# pool:
369+
# vmImage: windows-2019
350370
# machinePool: Tiger
351371
# queue: Windows.10.Amd64.19H1.Tiger.Perf # using a dedicated private Helix queue (perftigers)
352372
# csproj: src\benchmarks\real-world\Microsoft.ML.Benchmarks\Microsoft.ML.Benchmarks.csproj
@@ -363,7 +383,8 @@ jobs:
363383
# osVersion: 19H1
364384
# kind: roslyn
365385
# architecture: x64
366-
# pool: Hosted VS2017
386+
# pool:
387+
# vmImage: windows-2019
367388
# machinePool: Tiger
368389
# queue: Windows.10.Amd64.19H1.Tiger.Perf # using a dedicated private Helix queue (perfsnakes)
369390
# csproj: src\benchmarks\real-world\Roslyn\CompilerBenchmarks.csproj
@@ -380,7 +401,8 @@ jobs:
380401
# osVersion: 1804
381402
# kind: micro
382403
# architecture: x64
383-
# pool: Azure Pipelines
404+
# pool:
405+
# vmImage: ubuntu-latest
384406
# machinePool: Tiger
385407
# queue: Ubuntu.1804.Amd64.Tiger.Perf # using a dedicated private Helix queue (perftigers)
386408
# container: ubuntu_x64_build_container
@@ -398,7 +420,8 @@ jobs:
398420
# osVersion: 1804
399421
# kind: micro
400422
# architecture: x64
401-
# pool: Azure Pipelines
423+
# pool:
424+
# vmImage: ubuntu-latest
402425
# machinePool: Owl
403426
# queue: Ubuntu.1804.Amd64.Owl.Perf # using a dedicated private Helix queue (perfowls)
404427
# container: ubuntu_x64_build_container
@@ -416,7 +439,8 @@ jobs:
416439
# osVersion: 1804
417440
# kind: mlnet
418441
# architecture: x64
419-
# pool: Azure Pipelines
442+
# pool:
443+
# vmImage: ubuntu-latest
420444
# machinePool: Tiger
421445
# queue: Ubuntu.1804.Amd64.Tiger.Perf # using a dedicated private Helix queue (perftigers)
422446
# container: ubuntu_x64_build_container
@@ -434,7 +458,8 @@ jobs:
434458
# osVersion: 1804
435459
# kind: roslyn
436460
# architecture: x64
437-
# pool: Azure Pipelines
461+
# pool:
462+
# vmImage: ubuntu-latest
438463
# machinePool: Tiger
439464
# queue: Ubuntu.1804.Amd64.Tiger.Perf # using a dedicated private Helix queue (perftigers)
440465
# container: ubuntu_x64_build_container
@@ -458,7 +483,8 @@ jobs:
458483
osName: windows
459484
osVersion: RS5
460485
architecture: x64
461-
pool: Hosted VS2017
486+
pool:
487+
vmImage: windows-2019
462488
kind: sdk_scenarios
463489
machinePool: Tiger
464490
queue: Windows.10.Amd64.19H1.Tiger.Perf
@@ -472,7 +498,8 @@ jobs:
472498
osName: windows
473499
osVersion: RS5
474500
architecture: x86
475-
pool: Hosted VS2017
501+
pool:
502+
vmImage: windows-2019
476503
kind: sdk_scenarios
477504
machinePool: Tiger
478505
queue: Windows.10.Amd64.19H1.Tiger.Perf
@@ -486,7 +513,8 @@ jobs:
486513
osName: ubuntu
487514
osVersion: 1804
488515
architecture: x64
489-
pool: Azure Pipelines
516+
pool:
517+
vmImage: ubuntu-latest
490518
kind: sdk_scenarios
491519
machinePool: Tiger
492520
queue: Ubuntu.1804.Amd64.Tiger.Perf
@@ -501,7 +529,8 @@ jobs:
501529
osName: windows
502530
osVersion: RS5
503531
architecture: x64
504-
pool: Hosted VS2017
532+
pool:
533+
vmImage: windows-2019
505534
kind: blazor_scenarios
506535
machinePool: Tiger
507536
queue: Windows.10.Amd64.19H1.Tiger.Perf
@@ -522,7 +551,8 @@ jobs:
522551
osName: windows
523552
osVersion: RS5
524553
architecture: x64
525-
pool: Hosted VS2017
554+
pool:
555+
vmImage: windows-2019
526556
kind: sdk_scenarios
527557
machinePool: Tiger
528558
queue: Windows.10.Amd64.19H1.Tiger.Perf
@@ -536,7 +566,8 @@ jobs:
536566
osName: windows
537567
osVersion: RS5
538568
architecture: x86
539-
pool: Hosted VS2017
569+
pool:
570+
vmImage: windows-2019
540571
kind: sdk_scenarios
541572
machinePool: Tiger
542573
queue: Windows.10.Amd64.19H1.Tiger.Perf
@@ -550,7 +581,8 @@ jobs:
550581
osName: ubuntu
551582
osVersion: 1804
552583
architecture: x64
553-
pool: Azure Pipelines
584+
pool:
585+
vmImage: ubuntu-latest
554586
kind: sdk_scenarios
555587
machinePool: Tiger
556588
queue: Ubuntu.1804.Amd64.Tiger.Perf

Diff for: ‎eng/performance/benchmark_jobs.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ jobs:
9595
- group: dotnet-benchview
9696
workspace:
9797
clean: all
98-
pool:
99-
name: ${{ parameters.pool }}
98+
pool: ${{ parameters.pool }}
10099
container: ${{ parameters.container }}
101100
strategy:
102101
matrix:

0 commit comments

Comments
 (0)