From c5ae06d51f15da2374df42dbb8c94958fff825be Mon Sep 17 00:00:00 2001
From: Michael Niksa <miniksa@microsoft.com>
Date: Fri, 7 May 2021 16:39:53 -0700
Subject: [PATCH] Revert "Try x64 only"

This reverts commit 3616c2d473398a4be69ecc50fc048835990831bc.
---
 build/pipelines/pgo.yml                       | 17 ++++++++---------
 tools/PGODatabase/NuSpecs/PGO.nuspec.template | 16 ++++++++--------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/build/pipelines/pgo.yml b/build/pipelines/pgo.yml
index 8b1b75d6ec6..91574083045 100644
--- a/build/pipelines/pgo.yml
+++ b/build/pipelines/pgo.yml
@@ -18,17 +18,16 @@ stages:
       - template: ./templates/build-console-pgo.yml
         parameters:
           platform: x64
-  # - stage: Build_x86
-  #   displayName: Build x86
-  #   dependsOn: []
-  #   jobs:
-  #     - template: ./templates/build-console-pgo.yml
-  #       parameters:
-  #         platform: x86
+  - stage: Build_x86
+    displayName: Build x86
+    dependsOn: []
+    jobs:
+      - template: ./templates/build-console-pgo.yml
+        parameters:
+          platform: x86
   - stage: Publish_PGO_Databases
     displayName: Publish PGO databases
-    # dependsOn: ['Build_x64', 'Build_x86']
-    dependsOn: ['Build_x64']
+    dependsOn: ['Build_x64', 'Build_x86']
     jobs:
       - template: ./templates/pgo-build-and-publish-nuget-job.yml
         parameters:
diff --git a/tools/PGODatabase/NuSpecs/PGO.nuspec.template b/tools/PGODatabase/NuSpecs/PGO.nuspec.template
index 78ee4daa911..1356db21f72 100644
--- a/tools/PGODatabase/NuSpecs/PGO.nuspec.template
+++ b/tools/PGODatabase/NuSpecs/PGO.nuspec.template
@@ -13,21 +13,21 @@
   </metadata>
   <files>
     <file target="build\PGO.targets" src="build\PGO.targets"/>
-    <!-- <file target="tools\x86\WindowsTerminal.pgd" src="tools\x86\WindowsTerminal.pgd"/> -->
+    <file target="tools\x86\WindowsTerminal.pgd" src="tools\x86\WindowsTerminal.pgd"/>
     <file target="tools\x64\WindowsTerminal.pgd" src="tools\x64\WindowsTerminal.pgd"/>
-    <!-- <file target="tools\x86\OpenConsole.pgd" src="tools\x86\OpenConsole.pgd"/> -->
+    <file target="tools\x86\OpenConsole.pgd" src="tools\x86\OpenConsole.pgd"/>
     <file target="tools\x64\OpenConsole.pgd" src="tools\x64\OpenConsole.pgd"/>
-    <!-- <file target="tools\x86\Microsoft.Terminal.Control.pgd" src="tools\x86\Microsoft.Terminal.Control.pgd"/> -->
+    <file target="tools\x86\Microsoft.Terminal.Control.pgd" src="tools\x86\Microsoft.Terminal.Control.pgd"/>
     <file target="tools\x64\Microsoft.Terminal.Control.pgd" src="tools\x64\Microsoft.Terminal.Control.pgd"/>
-    <!-- <file target="tools\x86\Microsoft.Terminal.Remoting.pgd" src="tools\x86\Microsoft.Terminal.Remoting.pgd"/> -->
+    <file target="tools\x86\Microsoft.Terminal.Remoting.pgd" src="tools\x86\Microsoft.Terminal.Remoting.pgd"/>
     <file target="tools\x64\Microsoft.Terminal.Remoting.pgd" src="tools\x64\Microsoft.Terminal.Remoting.pgd"/>
-    <!-- <file target="tools\x86\Microsoft.Terminal.Settings.Editor.pgd" src="tools\x86\Microsoft.Terminal.Settings.Editor.pgd"/> -->
+    <file target="tools\x86\Microsoft.Terminal.Settings.Editor.pgd" src="tools\x86\Microsoft.Terminal.Settings.Editor.pgd"/>
     <file target="tools\x64\Microsoft.Terminal.Settings.Editor.pgd" src="tools\x64\Microsoft.Terminal.Settings.Editor.pgd"/>
-    <!-- <file target="tools\x86\Microsoft.Terminal.Settings.Model.pgd" src="tools\x86\Microsoft.Terminal.Settings.Model.pgd"/> -->
+    <file target="tools\x86\Microsoft.Terminal.Settings.Model.pgd" src="tools\x86\Microsoft.Terminal.Settings.Model.pgd"/>
     <file target="tools\x64\Microsoft.Terminal.Settings.Model.pgd" src="tools\x64\Microsoft.Terminal.Settings.Model.pgd"/>
-    <!-- <file target="tools\x86\TerminalApp.pgd" src="tools\x86\TerminalApp.pgd"/> -->
+    <file target="tools\x86\TerminalApp.pgd" src="tools\x86\TerminalApp.pgd"/>
     <file target="tools\x64\TerminalApp.pgd" src="tools\x64\TerminalApp.pgd"/>
-    <!-- <file target="tools\x86\TerminalConnection.pgd" src="tools\x86\TerminalConnection.pgd"/> -->
+    <file target="tools\x86\TerminalConnection.pgd" src="tools\x86\TerminalConnection.pgd"/>
     <file target="tools\x64\TerminalConnection.pgd" src="tools\x64\TerminalConnection.pgd"/>
   </files>
 </package>
\ No newline at end of file