From 6fc73687e04223ba605d7283f92f45c489e12351 Mon Sep 17 00:00:00 2001
From: jfrijters <jfrijters>
Date: Sun, 3 Jun 2012 13:29:07 +0000
Subject: [PATCH] Don't duplicate the strong name key directive in pubkey.cs,
 instead reuse CommonAssemblyInfo.cs.

---
 tools/pubkey.cs   | 5 -----
 tools/tools.build | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/pubkey.cs b/tools/pubkey.cs
index 491fe8ec..2129d8b2 100644
--- a/tools/pubkey.cs
+++ b/tools/pubkey.cs
@@ -27,11 +27,6 @@ using System.IO;
 using System.Text;
 using System.Reflection;
 
-#if SIGNCODE
-    #pragma warning disable 1699
-    [assembly: AssemblyKeyName("ikvm-key")]
-#endif
-
 class PublicKey
 {
     static void Main(string[] args)
diff --git a/tools/tools.build b/tools/tools.build
index aa4d56ab..8a739cfb 100644
--- a/tools/tools.build
+++ b/tools/tools.build
@@ -26,6 +26,7 @@
         <csc target="exe" output="pubkey.exe" define="${defs}" optimize="true" rebuild="true">
             <sources>
                 <include name="pubkey.cs" />
+                <include name="../CommonAssemblyInfo.cs" />
             </sources>
         </csc>
         <exec program="pubkey.exe" useruntimeengine="true" />