Skip to content

Commit b481493

Browse files
committed
Fix pool config: use isCustom+Azure Pipelines+vmImage pattern for OneBranch compatibility (11 files)
1 parent c11e86c commit b481493

11 files changed

+35
-17
lines changed

build/AzurePipelinesTemplates/WindowsAppSDK-Build-Per-Platform-Stage.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ stages:
3232
type: windows
3333
${{ if not( parameters.IsOneBranch ) }}:
3434
type: windows
35-
isCustom: true
36-
name: 'Azure Pipelines'
35+
3736
# In the less likely case of running APIScan and/or PREfast, give it more time.
3837
${{ if or(parameters.runApiScan, parameters.runPREfast) }}:
3938
timeoutInMinutes: 180
@@ -115,8 +114,7 @@ stages:
115114
type: windows
116115
${{ if not( parameters.IsOneBranch ) }}:
117116
type: windows
118-
isCustom: true
119-
name: 'Azure Pipelines'
117+
120118
# In the less likely case of running APIScan and/or PREfast, give it more time.
121119
${{ if or(parameters.runApiScan, parameters.runPREfast) }}:
122120
timeoutInMinutes: 150
@@ -199,7 +197,9 @@ stages:
199197
pool:
200198
type: windows
201199
isCustom: true
202-
name: 'Azure Pipelines'
200+
name: Azure Pipelines
201+
vmImage: 'windows-latest'
202+
203203
steps:
204204
- powershell: |
205205
$testMatrix = "${{ parameters.testMatrix }}" | ConvertFrom-Json

build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ stages:
2828
pool:
2929
type: windows
3030
isCustom: true
31-
name: 'Azure Pipelines' # This stage is purely a test stage so we will use our own pools here
31+
name: Azure Pipelines
32+
vmImage: 'windows-latest'
33+
3234
steps:
3335
- task: powershell@2
3436
displayName: 'Verify copyright headers'
@@ -44,8 +46,7 @@ stages:
4446
type: windows
4547
${{ if not( parameters.IsOneBranch ) }}:
4648
type: windows
47-
isCustom: true
48-
name: 'Azure Pipelines'
49+
4950
variables:
5051
ob_outputDirectory: '$(REPOROOT)\out'
5152
ob_sdl_codeSignValidation_excludes: '-|**\Release\**'

build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ stages:
99
pool:
1010
type: windows
1111
isCustom: true
12-
name: 'Azure Pipelines' # This stage is purely for validation
12+
name: Azure Pipelines
13+
vmImage: 'windows-latest'
14+
1315
# If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
1416
demands: ImageOverride -equals MMS2022-1ES-GPT
1517
strategy:

build/AzurePipelinesTemplates/WindowsAppSDK-BuildSamplesCompat-Job.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ jobs:
3939
${{ if not( parameters.IsOneBranch ) }}:
4040
type: windows
4141
isCustom: true
42-
name: 'Azure Pipelines'
42+
name: Azure Pipelines
43+
vmImage: 'windows-latest'
44+
4345
timeoutInMinutes: 120
4446
strategy:
4547
maxParallel: ${{ parameters.maxParallel }}

build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Stage.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ stages:
99
pool:
1010
type: windows
1111
isCustom: true
12-
name: 'Azure Pipelines' # This stage is purely for validation
12+
name: Azure Pipelines
13+
vmImage: 'windows-latest'
14+
1315
# If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
1416
demands: ImageOverride -equals MMS2022-1ES-GPT
1517
variables:

build/AzurePipelinesTemplates/WindowsAppSDK-CheckApiChanges-Stage.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ stages:
1919
pool:
2020
type: windows
2121
isCustom: true
22-
name: 'Azure Pipelines'
22+
name: Azure Pipelines
23+
vmImage: 'windows-latest'
24+
2325
timeoutInMinutes: 120
2426
steps:
2527
- checkout: self

build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ stages:
3333
${{ if not( parameters.IsOneBranch ) }}:
3434
type: windows
3535
isCustom: true
36-
name: 'Azure Pipelines'
36+
name: Azure Pipelines
37+
vmImage: 'windows-latest'
38+
3739
timeoutInMinutes: 120
3840
variables:
3941
ob_outputDirectory: '$(REPOROOT)\out'

build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ stages:
3737
pool:
3838
type: windows
3939
isCustom: true
40-
name: 'Azure Pipelines' # This job is purely for ES, hence this custom pool
40+
name: Azure Pipelines
41+
vmImage: 'windows-latest'
42+
4143
variables:
4244
WindowsAppSDKPackageVersion: $[ stageDependencies.Pack.NugetPackage.outputs['SetVersion.packageVersion'] ]
4345
steps:

build/AzurePipelinesTemplates/WindowsAppSDK-StaticValidationTest-Stage.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ stages:
1212
pool:
1313
type: windows
1414
isCustom: true
15-
name: 'Azure Pipelines' # This stage is purely for ES, hence this custom pool
15+
name: Azure Pipelines
16+
vmImage: 'windows-latest'
17+
1618
# If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing.
1719
demands: ImageOverride -equals MMS2022-1ES-GPT
1820
timeoutInMinutes: 120

build/WindowsAppSDK-SyncTrigger.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ resources:
1010
jobs:
1111
- job: SyncMirror
1212
dependsOn: []
13-
pool: 'Azure Pipelines'
13+
pool:
14+
vmImage: 'windows-latest'
1415
steps:
1516
- checkout: InternalWindowsAppSDK
1617
persistCredentials: true

0 commit comments

Comments
 (0)