From 82b0ded6aff5804ce8a001d81292572ad318c8b7 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Mon, 20 Jul 2020 11:48:37 -0700
Subject: [PATCH] Fixup pools (#8024)

* Fixup pools and move to 2019 queues

* Fixup queues

* Revert publish build assets to hosted
---
 .vsts-ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index fc6579578..461be33bb 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -40,10 +40,10 @@ stages:
     parameters:
       agentOs: Windows_NT
       pool:
-        ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+        ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: NetCorePublic-Pool
           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
           queue: buildpool.windows.10.amd64.vs2017
       timeoutInMinutes: 180
@@ -256,8 +256,7 @@ stages:
           - Darwin
         publishUsingPipelines: true
         pool:
-          name: NetCorePublic-Pool
-          queue: buildpool.windows.10.amd64.vs2017.open
+          vmImage: vs2017-win2016
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml