Skip to content

Commit 93e6745

Browse files
authored
[release/7.0] Switch to consolidated Windows build images (#44350)
- incomplete w/o updates in spa-templates and a submodule update here
1 parent a6d7c39 commit 93e6745

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.azure/pipelines/azure-pipelines-mirror-within-azdo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ trigger:
44
branches:
55
include:
66
- internal/release/6.0
7-
7+
88
parameters:
99
# Run the pipeline manually (usually disallowed)
1010
- name: manualRun
@@ -27,7 +27,7 @@ jobs:
2727
enableSBOM: false
2828
pool:
2929
name: NetCore1ESPool-Svc-Internal
30-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
30+
demands: ImageOverride -equals 1es-windows-2019
3131
variables:
3232
- name: WorkingDirectoryName
3333
value: repo-dir

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ stages:
757757
- Source_Build_Managed
758758
pool:
759759
name: NetCore1ESPool-Svc-Internal
760-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
760+
demands: ImageOverride -equals 1es-windows-2019
761761
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
762762
enablePublishBuildArtifacts: true # publish artifacts/log files
763763
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
@@ -796,7 +796,7 @@ stages:
796796
pool:
797797
name: NetCore1ESPool-Svc-Internal
798798
# Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows
799-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
799+
demands: ImageOverride -equals 1es-windows-2019
800800
steps:
801801
- task: DownloadBuildArtifacts@0
802802
inputs:

0 commit comments

Comments
 (0)