From 8f5e355eb3dc7d03c84a342c4bc42c9f561810fd Mon Sep 17 00:00:00 2001
From: AlexGhiondea <AlexGhiondea@users.noreply.github.com>
Date: Sat, 14 May 2016 21:15:16 -0700
Subject: [PATCH] Use different value for win32resource for
System.Private.CoreLib. (#4964)
When building both mscorlib and System.Private.CoreLib we should use a different name to avoid conflicting on this file.
---
src/mscorlib/System.Private.CoreLib.csproj | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
index 017a52eb04..e1e6d3b787 100644
--- a/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/mscorlib/System.Private.CoreLib.csproj
@@ -192,6 +192,12 @@
<Import Project="$(MSBuildThisFileDirectory)Tools\Versioning\GenerateVersionInfo.targets"/>
<!-- Override versioning targets -->
<Import Condition="Exists('$(ToolsDir)versioning.targets')" Project="$(ToolsDir)versioning.targets" />
+
+ <PropertyGroup>
+ <!-- Use a different nativeresource file to avoid conflicts with mscorlib-->
+ <Win32Resource Condition="'$(GenerateNativeVersionInfo)'=='true'">$(IntermediateOutputPath)\System.Private.CoreLib.res</Win32Resource>
+ </PropertyGroup>
+
<Import Project="GenerateSplitStringResources.targets"/>
<Import Project="GenerateCompilerResponseFile.targets"/>
<Import Project="$(PostProcessingToolsPath)" />
--
2.34.1