Use different value for win32resource for System.Private.CoreLib. (#4964)
authorAlexGhiondea <AlexGhiondea@users.noreply.github.com>
Sun, 15 May 2016 04:15:16 +0000 (21:15 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sun, 15 May 2016 04:15:16 +0000 (21:15 -0700)
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

index 017a52eb0430675ed4dc03e29fd3f722befce396..e1e6d3b787efb3770216f4bd3cd6e7ec8ce09591 100644 (file)
   <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)" />