[bcl] Actually fix the nunit/nunitlite assembly identity (#12743)

The solution from https://github.com/mono/mono/pull/12725 doesn't fully work
since e.g. gacutil seems to verify the strong name.

Instead follow what we do for other keys where we don't have the private key:
add them to the machine.config pubTokenMapping list.

13 files changed, 8 insertions, 55 deletions

diff --git a/data/net_1_1/machine.config b/data/net_1_1/machine.config
index 2dfec5f0203..9c604051b59 100644
--- a/data/net_1_1/machine.config
+++ b/data/net_1_1/machine.config
@@ -237,6 +237,8 @@
 			<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- Silverlight 2.0 key -->
 			<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+			<!-- NUnit broken key -->
+			<map Token="96d09a1eb7f44a77" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- XNA Framework key -->                                                            
 			<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
 		</pubTokenMapping>
diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index 2577c81dd92..1d59a0a81b5 100644
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -220,6 +220,8 @@
 			<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- Silverlight 2.0 key -->
 			<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+			<!-- NUnit broken key -->
+			<map Token="96d09a1eb7f44a77" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- XNA Framework key -->                                                            
 			<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
 		</pubTokenMapping>
diff --git a/data/net_4_0/machine.config b/data/net_4_0/machine.config
index f3b71c43c53..a1e11bbd130 100644
--- a/data/net_4_0/machine.config
+++ b/data/net_4_0/machine.config
@@ -237,6 +237,8 @@
 			<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- Silverlight 2.0 key -->
 			<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+			<!-- NUnit broken key -->
+			<map Token="96d09a1eb7f44a77" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- XNA Framework key -->                                                            
 			<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
 		</pubTokenMapping>
diff --git a/data/net_4_5/machine.config b/data/net_4_5/machine.config
index 455709536f8..0814804953d 100644
--- a/data/net_4_5/machine.config
+++ b/data/net_4_5/machine.config
@@ -240,6 +240,8 @@
 			<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- Silverlight 2.0 key -->
 			<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+			<!-- NUnit broken key -->
+			<map Token="96d09a1eb7f44a77" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
 			<!-- XNA Framework key -->                                                            
 			<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
 		</pubTokenMapping>
diff --git a/mcs/nunit24/ClientUtilities/util/Makefile b/mcs/nunit24/ClientUtilities/util/Makefile
index 88d001bb110..23684912c96 100644
--- a/mcs/nunit24/ClientUtilities/util/Makefile
+++ b/mcs/nunit24/ClientUtilities/util/Makefile
@@ -4,13 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunit.util.dll
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
-
 
 LOCAL_MCS_FLAGS= /resource:Transform.resources,NUnit.Util.Transform.resources /d:MONO /d:StronglyNamedAssembly /publicsign -warn:1
 LIB_REFS = nunit.core nunit.core.interfaces System System.Xml System.Runtime.Remoting
diff --git a/mcs/nunit24/ConsoleRunner/nunit-console/Makefile b/mcs/nunit24/ConsoleRunner/nunit-console/Makefile
index 7da91c9952d..21b597bbece 100644
--- a/mcs/nunit24/ConsoleRunner/nunit-console/Makefile
+++ b/mcs/nunit24/ConsoleRunner/nunit-console/Makefile
@@ -4,12 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunit-console-runner.dll
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LOCAL_MCS_FLAGS= /d:MONO /d:StronglyNamedAssembly /publicsign
 LIB_REFS = nunit.core nunit.core.interfaces nunit.util System System.Xml
diff --git a/mcs/nunit24/NUnitCore/core/Makefile b/mcs/nunit24/NUnitCore/core/Makefile
index cd138424885..017a222b9be 100644
--- a/mcs/nunit24/NUnitCore/core/Makefile
+++ b/mcs/nunit24/NUnitCore/core/Makefile
@@ -4,12 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunit.core.dll
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LOCAL_MCS_FLAGS = /d:StronglyNamedAssembly -warn:1 /publicsign
 LIB_REFS = nunit.framework nunit.core.interfaces System
diff --git a/mcs/nunit24/NUnitCore/interfaces/Makefile b/mcs/nunit24/NUnitCore/interfaces/Makefile
index f14f649f71c..79c5e22ab52 100644
--- a/mcs/nunit24/NUnitCore/interfaces/Makefile
+++ b/mcs/nunit24/NUnitCore/interfaces/Makefile
@@ -4,12 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunit.core.interfaces.dll
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LOCAL_MCS_FLAGS= /d:StronglyNamedAssembly /publicsign
 LIB_REFS = nunit.framework System
diff --git a/mcs/nunit24/NUnitExtensions/core/Makefile b/mcs/nunit24/NUnitExtensions/core/Makefile
index 89fa06ab9a4..4d71c2e398c 100644
--- a/mcs/nunit24/NUnitExtensions/core/Makefile
+++ b/mcs/nunit24/NUnitExtensions/core/Makefile
@@ -4,12 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunit.core.extensions.dll
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LIB_MCS_FLAGS =  /d:StronglyNamedAssembly /publicsign
 LIB_REFS = nunit.core nunit.core.interfaces System.Xml System
diff --git a/mcs/nunit24/NUnitExtensions/framework/Makefile b/mcs/nunit24/NUnitExtensions/framework/Makefile
index 40c102644e0..5f1984ce9df 100644
--- a/mcs/nunit24/NUnitExtensions/framework/Makefile
+++ b/mcs/nunit24/NUnitExtensions/framework/Makefile
@@ -4,12 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunit.framework.extensions.dll
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LIB_MCS_FLAGS = /d:StronglyNamedAssembly /publicsign
 LIB_REFS = System.Xml System
diff --git a/mcs/nunit24/NUnitFramework/framework/Makefile b/mcs/nunit24/NUnitFramework/framework/Makefile
index 9baa98dcf01..66f9fb65a8e 100644
--- a/mcs/nunit24/NUnitFramework/framework/Makefile
+++ b/mcs/nunit24/NUnitFramework/framework/Makefile
@@ -6,12 +6,6 @@ LIBRARY = NUnit.Framework.dll
 LIBRARY_NAME = nunit.framework.dll
 
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LIB_MCS_FLAGS = /d:StronglyNamedAssembly -warn:1 /publicsign
 LIB_REFS = System.Xml System
diff --git a/mcs/nunit24/NUnitMocks/mocks/Makefile b/mcs/nunit24/NUnitMocks/mocks/Makefile
index f0839a0570f..f027a50a389 100644
--- a/mcs/nunit24/NUnitMocks/mocks/Makefile
+++ b/mcs/nunit24/NUnitMocks/mocks/Makefile
@@ -4,12 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunit.mocks.dll
 KEYFILE = $(topdir)/nunit24/nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LOCAL_MCS_FLAGS= /d:StronglyNamedAssembly /publicsign
 LIB_REFS = nunit.framework System
diff --git a/mcs/tools/nunit-lite/NUnitLite/Makefile b/mcs/tools/nunit-lite/NUnitLite/Makefile
index d776baa221a..dbeb60801de 100644
--- a/mcs/tools/nunit-lite/NUnitLite/Makefile
+++ b/mcs/tools/nunit-lite/NUnitLite/Makefile
@@ -4,12 +4,6 @@ include ../../../build/rules.make
 
 LIBRARY = nunitlite.dll
 KEYFILE = nunit.pub
-NO_SIGN_ASSEMBLY = 1
-
-ifdef MCS_MODE
-KEYFILE = $(topdir)/class/mono.snk
-NO_SIGN_ASSEMBLY =
-endif
 
 LOCAL_MCS_FLAGS= /target:library /define:"__MOBILE__;TRACE;DEBUG;NET_4_0;CLR_4_0,NUNITLITE" /warn:4 /publicsign
 LIB_REFS = System System.Xml System.Core