Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
displayName: CodeQL
pool:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals 1es-windows-2022
demands: ImageOverride -equals windows.vs2026.amd64
timeoutInMinutes: 90

steps:
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stages:
displayName: Synchronize secrets
pool:
name: NetCore1ESPool-Internal-NoMSI
demands: ImageOverride -equals 1es-windows-2022
demands: ImageOverride -equals windows.vs2026.amd64

steps:
- script: restore.cmd -ci
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-unofficial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extends:
parameters:
pool:
name: $(DncEngInternalBuildPool)
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows

stages:
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extends:
networkIsolationPolicy: Permissive, CFSClean, CFSClean2
pool:
name: $(DncEngInternalBuildPool)
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows
sdl:
policheck:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ jobs:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows

steps:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ jobs:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
16 changes: 8 additions & 8 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
Expand Down Expand Up @@ -164,14 +164,14 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
Expand Down Expand Up @@ -225,14 +225,14 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
Expand Down Expand Up @@ -286,18 +286,18 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2022.amd64
demands: ImageOverride -equals windows.vs2026.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# image: 1es-windows-2022
# image: windows.vs2026.amd64

variables:
# Coalesce the target and source branches so we know when a PR targets a release branch
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2022.amd64
# demands: ImageOverride -equals windows.vs2026.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/promote-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ extends:
pool:
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2019
image: 1ESPT-Windows2025
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows
sdl:
policheck:
Expand Down
2 changes: 1 addition & 1 deletion eng/validate-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- template: /eng/common/templates-official/variables/pool-providers.yml@self
pool:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64
demands: ImageOverride -equals windows.vs2026.amd64
preSteps:
- checkout: self
clean: true
Expand Down
2 changes: 1 addition & 1 deletion eng/xcopy-msbuild/azure-pipelines-xcopy-msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
displayName: Build xcopy-msbuild package
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals 1es-windows-2022
demands: ImageOverride -equals windows.vs2026.amd64
steps:
- task: PowerShell@2
displayName: Download Visual Studio Build Tools
Expand Down
Loading