From da879d9237dc34a5ba9728358b7f78fc1981fc68 Mon Sep 17 00:00:00 2001
From: John Chen <jochen@microsoft.com>
Date: Tue, 1 Nov 2016 16:20:08 -0700
Subject: [PATCH] Fix GitHub build break caused by change #1636179

[tfs-changeset: 1636227]
---
 clr.coreclr.props                                     | 6 ------
 src/dlls/mscoree/coreclr/coreclr.nativeproj           | 6 ++++++
 src/vm/crossgen_mscorlib/mscorlib_crossgen.nativeproj | 7 +++++++
 src/vm/vm.settings                                    | 7 +++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/clr.coreclr.props b/clr.coreclr.props
index a1324ce..26e2118 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -34,12 +34,6 @@
     <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
     <FeatureMulticoreJIT>true</FeatureMulticoreJIT>
     <FeaturePrejit>true</FeaturePrejit>
-
-    <!-- Work around problems with loading System.Private.CoreLib.dll, -->
-    <!-- caused by inconsistent setting of UseLegacyCompiler and FeatureSpanOfT -->
-    <!-- between System.Private.CoreLib.dll and the runtime. -->
-    <UseLegacyCompiler>true</UseLegacyCompiler>
-
     <FeatureSpanOfT Condition="'$(UseLegacyCompiler)'!='true'">true</FeatureSpanOfT>
     <FeatureStandaloneSn>true</FeatureStandaloneSn>
     <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed>
diff --git a/src/dlls/mscoree/coreclr/coreclr.nativeproj b/src/dlls/mscoree/coreclr/coreclr.nativeproj
index d9350bc..484790e 100644
--- a/src/dlls/mscoree/coreclr/coreclr.nativeproj
+++ b/src/dlls/mscoree/coreclr/coreclr.nativeproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
+  <PropertyGroup>
+    <!-- Work around problems with loading System.Private.CoreLib.dll, -->
+    <!-- caused by inconsistent setting of UseLegacyCompiler and FeatureSpanOfT -->
+    <!-- between System.Private.CoreLib.dll and the runtime. -->
+    <UseLegacyCompiler>true</UseLegacyCompiler>
+  </PropertyGroup>
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\dlls\mscoree\mscoree.settings.targets" />
   <PropertyGroup Label="Globals">
diff --git a/src/vm/crossgen_mscorlib/mscorlib_crossgen.nativeproj b/src/vm/crossgen_mscorlib/mscorlib_crossgen.nativeproj
index be65670..67e6f4a 100644
--- a/src/vm/crossgen_mscorlib/mscorlib_crossgen.nativeproj
+++ b/src/vm/crossgen_mscorlib/mscorlib_crossgen.nativeproj
@@ -1,5 +1,12 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
 
+    <PropertyGroup>
+      <!-- Work around problems with loading System.Private.CoreLib.dll, -->
+      <!-- caused by inconsistent setting of UseLegacyCompiler and FeatureSpanOfT -->
+      <!-- between System.Private.CoreLib.dll and the runtime. -->
+      <UseLegacyCompiler>true</UseLegacyCompiler>
+    </PropertyGroup>
+
     <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\xplat\SetCrossGen.props" />
 
     <PropertyGroup>
diff --git a/src/vm/vm.settings b/src/vm/vm.settings
index b4799d1..83d7d9f 100644
--- a/src/vm/vm.settings
+++ b/src/vm/vm.settings
@@ -1,5 +1,12 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+    <!-- Work around problems with loading System.Private.CoreLib.dll, -->
+    <!-- caused by inconsistent setting of UseLegacyCompiler and FeatureSpanOfT -->
+    <!-- between System.Private.CoreLib.dll and the runtime. -->
+    <UseLegacyCompiler>true</UseLegacyCompiler>
+  </PropertyGroup>
+
   <!--Import the settings-->
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\debug\SetDebugTargetLocal.props" />
-- 
2.7.4