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
3 changes: 2 additions & 1 deletion azure-pipelines-e2e-tests-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ stages:
- ${{ each option in test.jobOptions }}:
- job: Run_${{ replace(option.pool, ' ', '_') }}
${{ if eq(lower(option.pool), 'windows') }}:
pool: Hosted VS2017
pool:
vmImage: 'windows-2019'
${{ else }}:
pool:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
8 changes: 5 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ stages:
displayName: Build Sources
jobs:
- job: Build
pool: Hosted VS2017
pool:
vmImage: 'windows-2019'

variables:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down Expand Up @@ -122,7 +123,7 @@ stages:
displayName: Sign Artifacts
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2017
demands: ImageOverride -equals build.windows.10.amd64.vs2019

variables:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down Expand Up @@ -169,7 +170,8 @@ stages:
dependsOn:
- Sign
displayName: Publish Artifacts
pool: Hosted VS2017
pool:
vmImage: 'windows-2019'

variables:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down