From bc617373cdabad9f4ffe99a2313a4112b712f3af 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. (dotnet/coreclr#4964)

When building both mscorlib and System.Private.CoreLib we should use a different name to avoid conflicting on this file.

Commit migrated from https://github.com/dotnet/coreclr/commit/8f5e355eb3dc7d03c84a342c4bc42c9f561810fd
---
 src/coreclr/src/mscorlib/System.Private.CoreLib.csproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
index 017a52e..e1e6d3b 100644
--- a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/coreclr/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.7.4