From 9ae81b0971fab7b2b2620a7dcfa9148e6a81e357 Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Wed, 28 Oct 2020 11:38:52 -0700
Subject: [PATCH 1/3] Switch to the WinDev scale pool

---
 build/pipelines/templates/build-console-audit-job.yml | 4 +++-
 build/pipelines/templates/build-console-ci.yml        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/pipelines/templates/build-console-audit-job.yml b/build/pipelines/templates/build-console-audit-job.yml
index faf5ec67207..1c9a90d6e8f 100644
--- a/build/pipelines/templates/build-console-audit-job.yml
+++ b/build/pipelines/templates/build-console-audit-job.yml
@@ -8,7 +8,9 @@ jobs:
   variables:
     BuildConfiguration: AuditMode
     BuildPlatform: ${{ parameters.platform }}
-  pool: { vmImage: windows-2019 }
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }
 
   steps:
   - checkout: self
diff --git a/build/pipelines/templates/build-console-ci.yml b/build/pipelines/templates/build-console-ci.yml
index d611a93540c..7c414af06b9 100644
--- a/build/pipelines/templates/build-console-ci.yml
+++ b/build/pipelines/templates/build-console-ci.yml
@@ -11,7 +11,9 @@ jobs:
   variables:
     BuildConfiguration: ${{ parameters.configuration }}
     BuildPlatform: ${{ parameters.platform }}
-  pool: { vmImage: windows-2019 }
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }
 
   steps:
   - template: build-console-steps.yml

From cd632f2982fe5fb140c2a6c713db3aa8e1d24a3f Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Wed, 28 Oct 2020 11:40:45 -0700
Subject: [PATCH 2/3] enable parallel build

---
 build/pipelines/templates/build-console-steps.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build/pipelines/templates/build-console-steps.yml b/build/pipelines/templates/build-console-steps.yml
index fd75a78a8bd..4a3adcb4054 100644
--- a/build/pipelines/templates/build-console-steps.yml
+++ b/build/pipelines/templates/build-console-steps.yml
@@ -41,9 +41,7 @@ steps:
     configuration: '$(BuildConfiguration)'
     msbuildArgs: "${{ parameters.additionalBuildArguments }}"
     clean: true
-    # The build agents cannot currently support parallel build due to the
-    # memory requirements of our PCH files.
-    maximumCpuCount: false
+    maximumCpuCount: true
 
 - task: PowerShell@2
   displayName: 'Check MSIX for common regressions'

From 90bb2e98ddf9920cbf402d832b5d48ea499e27f0 Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Wed, 28 Oct 2020 11:41:37 -0700
Subject: [PATCH 3/3] DISABLE (do not remote) PCH clean

---
 src/common.build.post.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.build.post.props b/src/common.build.post.props
index 3f271eaf626..e3e563b900d 100644
--- a/src/common.build.post.props
+++ b/src/common.build.post.props
@@ -54,7 +54,7 @@
   <Target Name="CleanUpPrecompForSmallCIAgents"
           DependsOnTargets="_ComputePrecompToCleanUp"
           AfterTargets="AfterBuild"
-          Condition="'$(AGENT_ID)' != '' and !$(ProjectName.Contains('TerminalApp'))">
+          Condition="'$(OpenConsoleCleanPCH)' == 'true' and '$(AGENT_ID)' != '' and !$(ProjectName.Contains('TerminalApp'))">
     <!-- We just need to keep *TerminalApp*'s PCHs because they get rebuilt more often. -->
     <Delete Files="@(_PCHFileToCleanWithTimestamp)"/>
     <Touch Files="@(_PCHFileToCleanWithTimestamp)" Time="%(LastWriteTime)" AlwaysCreate="true" />