From e984a7e2aafd974d9a9ee503de2cbfe5e87c9adc Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 6 Mar 2020 17:21:22 -0800
Subject: [PATCH] Update hosted (AzDO) and BYOC (dnceng) agents used in our
 builds - dotnet/aspnetcore-internal#3540

---
 .azure/pipelines/e2e-tests.yml          | 2 +-
 .azure/pipelines/jobs/default-build.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.azure/pipelines/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml
index 89872313dc..4838bd4ed4 100644
--- a/.azure/pipelines/e2e-tests.yml
+++ b/.azure/pipelines/e2e-tests.yml
@@ -49,7 +49,7 @@ jobs:
       testResultsFiles: 'artifacts/logs/**/*.trx'
 - job: Host_macOS
   pool:
-    vmImage: macOS-10.13
+    vmImage: macOS-10.14
   strategy:
     maxParallel: 4
     # The ASP.NET Core 2.1.X templates are incompatible with Node10 on macOS
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index ae51d10a7d..2b8c2f8c6f 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -73,16 +73,16 @@ jobs:
     ${{ if ne(parameters.poolName, '') }}:
       name: ${{ parameters.poolName }}
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'macOS')) }}:
-      vmImage: macOS-10.13
+      vmImage: macOS-10.14
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
       vmImage: ubuntu-16.04
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         name: NetCorePublic-Pool
-        queue: BuildPool.Windows.10.Amd64.VS2017.Open
+        queue: BuildPool.Server.Amd64.VS2017.Open
       ${{ if ne(variables['System.TeamProject'], 'public') }}:
         name: NetCoreInternal-Pool
-        queue: BuildPool.Windows.10.Amd64.VS2017
+        queue: BuildPool.Server.Amd64.VS2017
   variables:
     AgentOsName: ${{ parameters.agentOs }}
     ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping