2008-05-07 Sebastien Pouliot <sebastien@ximian.com>

	* data/net_[1_1|2_0]/machine.config: Add entry to remap the public
	key used by Silverlight 2.0 platform assemblies. Needed in both
	profiles since SN uses 1.0.

svn path=/trunk/mono/; revision=102712

diff --git a/ChangeLog b/ChangeLog
index e3f778e4f966e012a000fd3796a81f3e1a01181e..1a40c5b55af5cb0b8a29971eb48fed5cad744617 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-07  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * data/net_[1_1|2_0]/machine.config: Add entry to remap the public 
+       key used by Silverlight 2.0 platform assemblies. Needed in both 
+       profiles since SN uses 1.0.
+
 2008-05-05  Andreas Färber  <andreas.faerber@web.de>
 
        * configure.in: Detect ppc64 target architecture.

diff --git a/data/net_1_1/machine.config b/data/net_1_1/machine.config
index 89db2e52dd57c29b4ffeb3f1ec576a28b61fd9e0..f93d88252743ab7c2a74891ceb46c9926e228eb3 100644 (file)
--- a/data/net_1_1/machine.config
+++ b/data/net_1_1/machine.config
@@ -233,6 +233,8 @@
                        <map Token="31bf3856ad364e35" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
                        <!-- IBM (DB2 Data Provider) key -->
                        <map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+                       <!-- Silverlight 2.0 key -->
+                       <map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
                </pubTokenMapping>
        </strongNames>
 </configuration>

diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index 2ebc00b22c511a84caf49d608376a4347969aa3c..8b95025a5cfc79182cd5fbf8d5ebaeea7c815ed3 100644 (file)
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -208,6 +208,8 @@
                        <map Token="31bf3856ad364e35" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
                        <!-- IBM (DB2 Data Provider) key -->
                        <map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+                       <!-- Silverlight 2.0 key -->
+                       <map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
                </pubTokenMapping>
        </strongNames>