Use the correct key to strongname sign mscorlib.

Use the sign.targets from BuildTools to match what we do in CoreFx.

[tfs-changeset: 1561739]

diff --git a/src/mscorlib/Tools/Signing/PublicTestKey.snk b/src/mscorlib/Tools/Signing/PublicTestKey.snk
deleted file mode 100644 (file)
index 90063c6..0000000
Binary files a/src/mscorlib/Tools/Signing/PublicTestKey.snk and /dev/null differ

diff --git a/src/mscorlib/Tools/Signing/TestKeyPair.snk b/src/mscorlib/Tools/Signing/TestKeyPair.snk
deleted file mode 100644 (file)
index 95e79cd..0000000
Binary files a/src/mscorlib/Tools/Signing/TestKeyPair.snk and /dev/null differ

diff --git a/src/mscorlib/Tools/Signing/mscorlib.snk b/src/mscorlib/Tools/Signing/mscorlib.snk
new file mode 100644 (file)
index 0000000..60146e8
Binary files /dev/null and b/src/mscorlib/Tools/Signing/mscorlib.snk differ

diff --git a/src/mscorlib/mscorlib.csproj b/src/mscorlib/mscorlib.csproj
index 423a4e4..ea53e97 100644 (file)
--- a/src/mscorlib/mscorlib.csproj
+++ b/src/mscorlib/mscorlib.csproj
@@ -4,7 +4,7 @@
   
   <!-- Include common build properties -->
   <Import Project="..\..\dir.props" />
-  
+ 
   <!-- Compilation options -->
   <PropertyGroup>
     <AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms>
@@ -39,7 +39,6 @@
 
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == ''">$(MSBuildThisFileDirectory)Tools\Signing\PublicTestKey.snk</AssemblyOriginatorKeyFile>
 
     <DefineConstants>$(DefineConstants);NEW_EXPERIMENTAL_ASYNC_IO;_USE_NLS_PLUS_TABLE;RESOURCE_SATELLITE_CONFIG;INSIDE_CLR;CODE_ANALYSIS_BASELINE</DefineConstants>
   </PropertyGroup>
@@ -173,6 +172,14 @@
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 
+  <!-- Import signing tools -->
+  <Import Condition="Exists('$(ToolsDir)\sign.targets')" Project="$(ToolsDir)\sign.targets" />
+
+  <!-- Overwrite the key that we are going to use for signing -->
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Tools\Signing\mscorlib.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
   <Import Project="$(MSBuildThisFileDirectory)Tools\Versioning\GenerateVersionInfo.targets"/>
   <Import Project="GenerateSplitStringResources.targets"/>
   <Import Project="GenerateCompilerResponseFile.targets"/>