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
7 changes: 5 additions & 2 deletions eng/pipelines/ci-device-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ parameters:
- name: windowsPool
type: object
default:
name: Azure Pipelines
vmImage: windows-2022
name: NetCore-Public
demands:
- ImageOverride -equals 1es-windows-2022-open
image: 1es-windows-2022-open
os: Windows

- name: macOSTestPool
type: object
Expand Down
12 changes: 7 additions & 5 deletions eng/pipelines/ci-uitests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,16 @@ parameters:
- name: windowsBuildPool
type: object
default:
name: $(windowsVmPool)
vmImage: $(windowsVmImage)

name: NetCore-Public
demands:
- ImageOverride -equals 1es-windows-2022-open

- name: windowsPool
type: object
default:
name: $(windowsTestsVmPool)
vmImage: $(windowsTestsVmImage)
name: NetCore-Public
demands:
- ImageOverride -equals 1es-windows-2022-open

- name: macosPool
type: object
Expand Down
12 changes: 8 additions & 4 deletions eng/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ parameters:
type: object
default:
- name: NetCore1ESPool-Internal
image: 1es-windows-2022
demands:
- ImageOverride -equals 1es-windows-2022
os: Windows
buildScript: $(_buildScript)
sln: '$(Build.SourcesDirectory)/Microsoft.Maui.sln'
Expand All @@ -68,7 +69,8 @@ parameters:
type: object
default:
- name: NetCore-Public
image: 1es-windows-2022
demands:
- ImageOverride -equals 1es-windows-2022-open
os: Windows
buildScript: $(_buildScript)
sln: '$(Build.SourcesDirectory)/Microsoft.Maui.sln'
Expand All @@ -83,11 +85,13 @@ parameters:
default:
internal:
name: NetCore1ESPool-Internal
image: 1es-windows-2022
demands:
- ImageOverride -equals 1es-windows-2022
os: windows
public:
name: NetCore-Public
image: 1es-windows-2022
demands:
- ImageOverride -equals 1es-windows-2022-open
os: windows

- name: MacOSPool
Expand Down
Loading