Enable Checksum csc param for mscorlib (dotnet/coreclr#4996)

Enable Checksum csc param for mscorlib

Commit migrated from https://github.com/dotnet/coreclr/commit/c396cf15da1ddbf1fd7dcf256357adac44829679

diff --git a/src/coreclr/BuildToolsVersion.txt b/src/coreclr/BuildToolsVersion.txt
index 1848041..5e3f561 100644 (file)
--- a/src/coreclr/BuildToolsVersion.txt
+++ b/src/coreclr/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.25-prerelease-00416-04
\ No newline at end of file
+1.0.25-prerelease-00416-05

diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/descriptions.json b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/descriptions.json
index 411e67b..167cee1 100644 (file)
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/descriptions.json
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/descriptions.json
@@ -5,6 +5,11 @@
         "CommonTypes": [ ]
     },
     {
+        "Name": "NuGet3MinVersion",
+        "Description": "When using NuGet 3.x this package requires at least version {0}.",
+        "CommonTypes": [ ]
+    },
+    {
         "Name": "Microsoft.NETCore.Jit",
         "Description": "The .NET JIT compiler.",
         "CommonTypes": [ ]

diff --git a/src/coreclr/src/.nuget/descriptions.json b/src/coreclr/src/.nuget/descriptions.json
index 8a8333f..81d22ce 100644 (file)
--- a/src/coreclr/src/.nuget/descriptions.json
+++ b/src/coreclr/src/.nuget/descriptions.json
@@ -5,6 +5,11 @@
         "CommonTypes": [ ]
     },
     {
+        "Name": "NuGet3MinVersion",
+        "Description": "When using NuGet 3.x this package requires at least version {0}.",
+        "CommonTypes": [ ]
+    },
+    {
         "Name": "Microsoft.NETCore.Runtime.CoreCLR",
         "Description": "The .NET Core runtime, called CoreCLR, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.",
         "CommonTypes": [ ]

diff --git a/src/coreclr/src/mscorlib/GenerateCompilerResponseFile.targets b/src/coreclr/src/mscorlib/GenerateCompilerResponseFile.targets
index 0212fcd..ed9136f 100644 (file)
--- a/src/coreclr/src/mscorlib/GenerateCompilerResponseFile.targets
+++ b/src/coreclr/src/mscorlib/GenerateCompilerResponseFile.targets
@@ -5,18 +5,18 @@
   </PropertyGroup>
 
   <Target Name="GenerateCompilerResponseFile">
-    <Message Text="Generating module name response file: $(IntermediateOutputPath)\moduleName.rsp" />
+    <Message Text="Generating module name response file: $(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp" />
 
     <!-- We need to set the runtimemetadataversion -->
-    <WriteLinesToFile File="$(IntermediateOutputPath)\moduleName.rsp"
+    <WriteLinesToFile File="$(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp"
                       Lines="/runtimemetadataversion:v4.0.30319"
                       Overwrite="true" />
 
     <ItemGroup>
-      <Clean Include="$(IntermediateOutputPath)\moduleName.rsp" />
+      <Clean Include="$(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp" />
     </ItemGroup>
     <PropertyGroup>
-      <CompilerResponseFile>$(IntermediateOutputPath)\moduleName.rsp</CompilerResponseFile>
+      <CompilerResponseFile>$(IntermediateOutputPath)\moduleName.$(AssemblyName).rsp;$(CompilerResponseFile)</CompilerResponseFile>
     </PropertyGroup>
   </Target>
 </Project>
\ No newline at end of file