Skip to content

Commit 0abedc2

Browse files
committed
Fix pool config: remove isCustom/name for OneBranch compatibility - use type: windows (OB-managed pools)
1 parent c11e86c commit 0abedc2

11 files changed

Lines changed: 15 additions & 27 deletions

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

Lines changed: 3 additions & 6 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
@@ -198,8 +196,7 @@ stages:
198196
- job: ExtractMatrix
199197
pool:
200198
type: windows
201-
isCustom: true
202-
name: 'Azure Pipelines'
199+
203200
steps:
204201
- powershell: |
205202
$testMatrix = "${{ parameters.testMatrix }}" | ConvertFrom-Json

build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ stages:
2727
dependsOn: []
2828
pool:
2929
type: windows
30-
isCustom: true
31-
name: 'Azure Pipelines' # This stage is purely a test stage so we will use our own pools here
30+
3231
steps:
3332
- task: powershell@2
3433
displayName: 'Verify copyright headers'
@@ -44,8 +43,7 @@ stages:
4443
type: windows
4544
${{ if not( parameters.IsOneBranch ) }}:
4645
type: windows
47-
isCustom: true
48-
name: 'Azure Pipelines'
46+
4947
variables:
5048
ob_outputDirectory: '$(REPOROOT)\out'
5149
ob_sdl_codeSignValidation_excludes: '-|**\Release\**'

build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ stages:
88
dependsOn: []
99
pool:
1010
type: windows
11-
isCustom: true
12-
name: 'Azure Pipelines' # This stage is purely for validation
11+
1312
# If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
1413
demands: ImageOverride -equals MMS2022-1ES-GPT
1514
strategy:

build/AzurePipelinesTemplates/WindowsAppSDK-BuildSamplesCompat-Job.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ jobs:
3838
type: windows
3939
${{ if not( parameters.IsOneBranch ) }}:
4040
type: windows
41-
isCustom: true
42-
name: 'Azure Pipelines'
41+
4342
timeoutInMinutes: 120
4443
strategy:
4544
maxParallel: ${{ parameters.maxParallel }}

build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Stage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ stages:
88
dependsOn: []
99
pool:
1010
type: windows
11-
isCustom: true
12-
name: 'Azure Pipelines' # This stage is purely for validation
11+
1312
# If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
1413
demands: ImageOverride -equals MMS2022-1ES-GPT
1514
variables:

build/AzurePipelinesTemplates/WindowsAppSDK-CheckApiChanges-Stage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ stages:
1818
- job: CheckApiChanges
1919
pool:
2020
type: windows
21-
isCustom: true
22-
name: 'Azure Pipelines'
21+
2322
timeoutInMinutes: 120
2423
steps:
2524
- checkout: self

build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml

Lines changed: 1 addition & 2 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
timeoutInMinutes: 120
3837
variables:
3938
ob_outputDirectory: '$(REPOROOT)\out'

build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ stages:
3636
condition: and(or(succeeded(), eq(${{ parameters.IgnoreFailures }}, 'true')), eq('${{ parameters.PublishToMaestro }}', 'true'))
3737
pool:
3838
type: windows
39-
isCustom: true
40-
name: 'Azure Pipelines' # This job is purely for ES, hence this custom pool
39+
4140
variables:
4241
WindowsAppSDKPackageVersion: $[ stageDependencies.Pack.NugetPackage.outputs['SetVersion.packageVersion'] ]
4342
steps:

build/AzurePipelinesTemplates/WindowsAppSDK-StaticValidationTest-Stage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ stages:
1111
- job: StaticValidationTest
1212
pool:
1313
type: windows
14-
isCustom: true
15-
name: 'Azure Pipelines' # This stage is purely for ES, hence this custom pool
14+
1615
# If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing.
1716
demands: ImageOverride -equals MMS2022-1ES-GPT
1817
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)