From 9d592ea3882c478ac87947e8d57d090a67688de0 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 13 Mar 2020 09:00:18 -0700
Subject: [PATCH] Move to standard internal pool for building (#12119)

---
 tools/releaseBuild/azureDevOps/WindowsBuild.yml               | 4 ++--
 tools/releaseBuild/azureDevOps/releaseBuild.yml               | 2 ++
 tools/releaseBuild/azureDevOps/templates/nuget.yml            | 2 +-
 tools/releaseBuild/azureDevOps/templates/windows-build.yml    | 2 +-
 .../azureDevOps/templates/windows-component-governance.yml    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/WindowsBuild.yml b/tools/releaseBuild/azureDevOps/WindowsBuild.yml
index bdd6a31d53..cd194ace52 100644
--- a/tools/releaseBuild/azureDevOps/WindowsBuild.yml
+++ b/tools/releaseBuild/azureDevOps/WindowsBuild.yml
@@ -4,7 +4,7 @@ jobs:
   displayName: Build
   condition: succeeded()
   pool:
-    name: PowerShell
+    name: Package ES Standard Build
   strategy:
     matrix:
       Build (x64,release):
@@ -177,7 +177,7 @@ jobs:
   dependsOn: BuildJob
   condition: succeeded()
   pool:
-    name: PowerShell
+    name: Package ES Standard Build
   strategy:
     matrix:
       release-anycpu:
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 37a14c4118..80a2bdd756 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -135,6 +135,8 @@ jobs:
 
 - job: release_json
   displayName: Create and Upload release.json
+  pool:
+    vmImage: 'windows-latest'
   steps:
   - template: templates/SetVersionVariables.yml
     parameters:
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index b4e4193cad..bfbf237e60 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -7,7 +7,7 @@ jobs:
     ${{ parameters.parentJobs }}
   displayName: Build NuGet packages
   condition: succeeded()
-  pool: PowerShell
+  pool: Package ES Standard Build
 
   timeoutInMinutes: 90
 
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-build.yml
index f0c77272c8..8aab17585f 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-build.yml
@@ -8,7 +8,7 @@ jobs:
   displayName: Build Windows - ${{ parameters.Architecture }}
   condition: succeeded()
   pool:
-    name: PowerShell
+    name: Package ES Standard Build
   variables:
     BuildConfiguration: ${{ parameters.BuildConfiguration }}
     BuildPlatform: ${{ parameters.BuildPlatform }}
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
index d4698f84a4..f667c27d85 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
@@ -5,7 +5,7 @@ jobs:
   condition: succeeded()
 
   pool:
-    name: PowerShell
+    name: Package ES Standard Build
 
   steps: