r: spouliot

2009-05-26  Andrés G. Aragoneses  <aaragoneses@novell.com>

        * AssemblyInfo.cs: Add InternalsVisibleTo for MoonAtkBridge
        under a MOON_A11Y_INTERNAL_HACK define.
	* Makefile: Handling of the MOON_A11Y_INTERNAL_HACK env var.

svn path=/trunk/mcs/; revision=134789

diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs
index 5f72f6a451e241064f0708490a93ca30db28ec39..3618d1cbdb7d91a9a07218cbc6425a19994a26b4 100644 (file)
--- a/mcs/class/corlib/Assembly/AssemblyInfo.cs
+++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs
@@ -92,6 +92,13 @@ using System.Runtime.InteropServices;
        [assembly: InternalsVisibleTo ("System.Windows.Browser, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
        [assembly: InternalsVisibleTo ("System.Net, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
        [assembly: InternalsVisibleTo ("System.Runtime.Serialization, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
+
+// this hack will be dropped once we get this working:
+// http://www.mono-project.com/Moonlight/SecurityStatus#Assembly_Loading
+#if MOON_A11Y_INTERNAL_HACK
+       [assembly: InternalsVisibleTo ("MoonAtkBridge, PublicKey=002400000480000094000000060200000024000052534131000400000100010071eb6c5575529cbf7244f7a6ea056284f9eae03bcff2cc132c9c490ab309eab0b56bce449df503d9c0a81e520585cdbe70e2fb90434bac04fa6222a80098b7a1a7b3af991a412324bb4325f6b865bb64ebf6d1c206d5732ddfbc70a7389ee53e0c246e3279741ad00503e49842e19bf37b198b402126cb3689c2ea6496a47cb4")]
+#endif
+
        [assembly: InternalsVisibleTo ("System.ServiceModel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100B5FC90E7027F67871E773A8FDE8938C81DD402BA65B9201D60593E96C492651E889CC13F1415EBB53FAC1131AE0BD333C5EE6021672D9718EA31A8AEBD0DA0072F25D87DBA6FC90FFD598ED4DA35E44C398C454307E8E33B8426143DAEC9F596836F97C8F74750E5975C64E2189F45DEF46B2A2B1247ADC3652BF5C308055DA9")]
        [assembly: InternalsVisibleTo ("System.ServiceModel.Web, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
        [assembly: InternalsVisibleTo ("System.Xml, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
@@ -99,3 +106,4 @@ using System.Runtime.InteropServices;
 #else
        [assembly: Guid ("BED7F4EA-1A96-11D2-8F08-00A0C9A6186D")]
 #endif
+

diff --git a/mcs/class/corlib/Assembly/ChangeLog b/mcs/class/corlib/Assembly/ChangeLog
index 42bbcb1ae09fdd5a3601ee5d36016d658c9fe8c9..e846fc84e4271e836eeb6b68e32f41cdd74411f0 100644 (file)
--- a/mcs/class/corlib/Assembly/ChangeLog
+++ b/mcs/class/corlib/Assembly/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-26  Andrés G. Aragoneses  <aaragoneses@novell.com>
+
+        * AssemblyInfo.cs: Add InternalsVisibleTo for MoonAtkBridge
+       under a MOON_A11Y_INTERNAL_HACK define.
+
 2009-04-29  Chris Toshok  <toshok@ximian.com>
 
        * AssemblyInfo.cs: in the 2.1 case we're InternalsVisibleTo

diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index 63f383f1810c4c03b0ad4dcfebea12481ba88171..1e07d111c2031019a82e7a4170f2a476aa4253d0 100644 (file)
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-26  Andrés G. Aragoneses  <aaragoneses@novell.com>
+
+       * Makefile: Handling of the MOON_A11Y_INTERNAL_HACK env var.
+
 2009-05-22  Zoltan Varga  <vargaz@gmail.com>
 
        * corlib.dll.sources: Add new net 4.0 files.

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 20113c7967a6726368c107e904b6d6587ebad16c..076fbb6b0c4ee7b0972a93886d97535e51e9d326 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -25,6 +25,12 @@ RESOURCE_FILES = \
 corlib_flags = -unsafe -nostdlib
 LOCAL_MCS_FLAGS = -nowarn:612,618 -d:INSIDE_CORLIB
 
+# this hack will be dropped once we get this working:
+# http://www.mono-project.com/Moonlight/SecurityStatus#Assembly_Loading
+ifdef MOON_A11Y_INTERNAL_HACK
+       MCS_FLAGS += -define:MOON_A11Y_INTERNAL_HACK
+endif
+
 # System.IO/DirectoryInfoTest.cs needs Mono.Posix
 TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe -r:$(topdir)/class/lib/$(PROFILE)/Mono.Posix.dll -define:MONO_DATACONVERTER_STATIC_METHODS