2009-11-03 Sebastien Pouliot <sebastien@ximian.com>

	* AssemblyInfo.cs: Open up the internals to System.Net.dll (which
	needs Uri.IsDefaultPort) for NET_2_1 and remove it for
	System.ComponentModel.DataAnnotations (again for NET_2_1)

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

diff --git a/mcs/class/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs
index e8099d64492dea99354f7fdc95fe6e1c62bfdc91..60822c2e3973142645e7e712d273eda6372ae238 100644 (file)
--- a/mcs/class/System/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System/Assembly/AssemblyInfo.cs
@@ -69,8 +69,13 @@ using System.Runtime.InteropServices;
 #endif
 #endif
 
-#if NET_2_0
+#if NET_2_1
+       [assembly: InternalsVisibleTo ("System.Net, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
+#elif NET_2_0
        [assembly: InternalsVisibleTo ("System.ComponentModel.DataAnnotations, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+#endif
+
+#if NET_2_0
        [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
        [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
        [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]

diff --git a/mcs/class/System/Assembly/ChangeLog b/mcs/class/System/Assembly/ChangeLog
index 8eb2e396292840d6e93f86e3854d0a7360c85411..0a7aa73ed6a349bb1788eecc398a72634f6c3e42 100644 (file)
--- a/mcs/class/System/Assembly/ChangeLog
+++ b/mcs/class/System/Assembly/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-03  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AssemblyInfo.cs: Open up the internals to System.Net.dll (which
+       needs Uri.IsDefaultPort) for NET_2_1 and remove it for 
+       System.ComponentModel.DataAnnotations (again for NET_2_1)
+
 2009-09-20  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AssemblyInfo.cs: Remove ComCompatibleVersion and