diff options
| author | John Chen <jochen@microsoft.com> | 2016-11-01 16:20:08 -0700 |
|---|---|---|
| committer | John Chen <jochen@microsoft.com> | 2016-11-01 16:20:08 -0700 |
| commit | da879d9237dc34a5ba9728358b7f78fc1981fc68 (patch) | |
| tree | 78cd268a889c81c1bb439e45ce363b54617acb33 | |
| parent | ee38f0cde26d486bdbe7dbbf83ea286c408e790f (diff) | |
| download | coreclr-da879d9237dc34a5ba9728358b7f78fc1981fc68.tar.gz coreclr-da879d9237dc34a5ba9728358b7f78fc1981fc68.tar.bz2 coreclr-da879d9237dc34a5ba9728358b7f78fc1981fc68.zip | |
Fix GitHub build break caused by change #1636179
[tfs-changeset: 1636227]
| -rw-r--r-- | clr.coreclr.props | 6 | ||||
| -rw-r--r-- | src/dlls/mscoree/coreclr/coreclr.nativeproj | 6 | ||||
| -rw-r--r-- | src/vm/crossgen_mscorlib/mscorlib_crossgen.nativeproj | 7 | ||||
| -rw-r--r-- | src/vm/vm.settings | 7 |
4 files changed, 20 insertions, 6 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index a1324ce238..26e21187aa 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 d9350bcf4c..484790ee6f 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 be65670654..67e6f4acd2 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 b4799d1b37..83d7d9f72e 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" /> |