Fixup pools (#8024)

* Fixup pools and move to 2019 queues

* Fixup queues

* Revert publish build assets to hosted
This commit is contained in:
Matt Mitchell 2020-07-20 11:48:37 -07:00 committed by GitHub
parent 7bc397e4f5
commit 82b0ded6af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -40,10 +40,10 @@ stages:
parameters: parameters:
agentOs: Windows_NT agentOs: Windows_NT
pool: pool:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool name: NetCorePublic-Pool
queue: buildpool.windows.10.amd64.vs2017.open queue: buildpool.windows.10.amd64.vs2017.open
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool name: NetCoreInternal-Pool
queue: buildpool.windows.10.amd64.vs2017 queue: buildpool.windows.10.amd64.vs2017
timeoutInMinutes: 180 timeoutInMinutes: 180
@ -256,8 +256,7 @@ stages:
- Darwin - Darwin
publishUsingPipelines: true publishUsingPipelines: true
pool: pool:
name: NetCorePublic-Pool vmImage: vs2017-win2016
queue: buildpool.windows.10.amd64.vs2017.open
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng\common\templates\post-build\post-build.yml - template: eng\common\templates\post-build\post-build.yml