From e7bc5d67441ebe8e8dcd5709b8f8df9531f2ed8d Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 11 Feb 2019 10:48:59 -0800
Subject: [PATCH 1/3] adding back platform builds

---
 eng/pipeline.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 2b45dcb56d8..263268a913c 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -69,14 +69,26 @@ jobs:
             value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
       strategy:
         matrix:
-          Build_Debug:
+          Build_Debug_x86:
             _BuildConfig: Debug
             # override some variables for debug
             _PublishType: none
             _SignType: test
             _DotNetPublishToBlobFeed : false
-          Build_Release:
+            _Platform: x86
+          Build_Release_x86:
             _BuildConfig: Release
+            _Platform: x86
+          Build_Debug_x64:
+            _BuildConfig: Debug
+            # override some variables for debug
+            _PublishType: none
+            _SignType: test
+            _DotNetPublishToBlobFeed : false
+            _Platform: x64
+          Build_Release_x64:
+            _BuildConfig: Release
+            _Platform: x64
       steps:
       - checkout: self
         clean: true

From 4d9aad440080764c09c91b7729b9b551d8fabb89 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 11 Feb 2019 11:06:41 -0800
Subject: [PATCH 2/3] passing platform to cibuild.cmd

---
 eng/pipeline.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 263268a913c..0effa61aa29 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -39,6 +39,8 @@ jobs:
           value: ''
         - name: _OfficialBuildIdArgs
           value: ''
+        - name: _Platform
+          value: x86
 
         # Override some values if we're building internally
         - ${{ if eq(parameters.runAsPublic, 'false') }}:
@@ -67,6 +69,8 @@ jobs:
               /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
           - name: _OfficialBuildIdArgs
             value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+          - name: _PlatformArgs
+            value: /p:Platform=$(_Platform)
       strategy:
         matrix:
           Build_Debug_x86:
@@ -75,10 +79,8 @@ jobs:
             _PublishType: none
             _SignType: test
             _DotNetPublishToBlobFeed : false
-            _Platform: x86
           Build_Release_x86:
             _BuildConfig: Release
-            _Platform: x86
           Build_Debug_x64:
             _BuildConfig: Debug
             # override some variables for debug
@@ -99,4 +101,5 @@ jobs:
           $(_PublishArgs)
           $(_SignArgs)
           $(_OfficialBuildIdArgs)
+          $(_PlatformArgs)
         displayName: Windows Build / Publish
\ No newline at end of file

From bc8ddb23073f8af40991b5c87a846929b742f74a Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 11 Feb 2019 11:08:59 -0800
Subject: [PATCH 3/3] adding _PlatformArgs to the right place

---
 eng/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 0effa61aa29..1d75c6cf808 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -41,6 +41,8 @@ jobs:
           value: ''
         - name: _Platform
           value: x86
+        - name: _PlatformArgs
+          value: /p:Platform=$(_Platform)
 
         # Override some values if we're building internally
         - ${{ if eq(parameters.runAsPublic, 'false') }}:
@@ -69,8 +71,6 @@ jobs:
               /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
           - name: _OfficialBuildIdArgs
             value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
-          - name: _PlatformArgs
-            value: /p:Platform=$(_Platform)
       strategy:
         matrix:
           Build_Debug_x86: