From da055532903afc2cecd2f973c7230b2dda549387 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Mon, 30 Mar 2020 13:31:20 -0700
Subject: [PATCH 1/2] Restore TargetArchitecture default

Fixes #34292
---
 src/coreclr/dir.common.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props
index eb59939656fdea..ad48e3abdf221a 100644
--- a/src/coreclr/dir.common.props
+++ b/src/coreclr/dir.common.props
@@ -14,6 +14,8 @@
     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">$(__BuildArch)</TargetArchitecture>
     <Configuration Condition="'$(Configuration)'==''">$(__BuildType)</Configuration>
 
+    <TargetArchitecture Condition="'$(TargetArchitecture)'==''">x64</TargetArchitecture>
+
     <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
     <Configuration Condition="'$(Configuration)' == 'debug'">Debug</Configuration>
     <Configuration Condition="'$(Configuration)' == 'release'">Release</Configuration>

From b503d8265d3eaf2a80514f54e5a1a6525666be76 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Mon, 30 Mar 2020 15:19:12 -0700
Subject: [PATCH 2/2] CR feedback

---
 src/coreclr/dir.common.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props
index ad48e3abdf221a..e4d212b2aee164 100644
--- a/src/coreclr/dir.common.props
+++ b/src/coreclr/dir.common.props
@@ -11,11 +11,11 @@
   <!-- Set default Configuration and Platform -->
   <PropertyGroup>
     <!-- TODO: Cleanup use of __BuildArch and __BuildType in the CI scripts -->
-    <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">$(__BuildArch)</TargetArchitecture>
-    <Configuration Condition="'$(Configuration)'==''">$(__BuildType)</Configuration>
 
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">$(__BuildArch)</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)'==''">x64</TargetArchitecture>
 
+    <Configuration Condition="'$(Configuration)'==''">$(__BuildType)</Configuration>
     <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
     <Configuration Condition="'$(Configuration)' == 'debug'">Debug</Configuration>
     <Configuration Condition="'$(Configuration)' == 'release'">Release</Configuration>