2009-09-20 Sebastien Pouliot <sebastien@ximian.com>

	* AssemblyInfo.cs: Remove ComCompatibleVersion and
	AllowPartiallyTrustedCallers for NET_2_1

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

diff --git a/mcs/class/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs
index 64dfb4c0218a15d183e933b6b5b8c273c532ee09..e8099d64492dea99354f7fdc95fe6e1c62bfdc91 100644 (file)
--- a/mcs/class/System/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System/Assembly/AssemblyInfo.cs
@@ -54,7 +54,10 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: ComVisible (false)]
+#if !NET_2_1
+[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: AllowPartiallyTrustedCallers]
+#endif
 
 #if !BOOTSTRAP_WITH_OLDLIB
        [assembly: SecurityPermission (SecurityAction.RequestMinimum, SkipVerification = true)]
@@ -72,12 +75,10 @@ using System.Runtime.InteropServices;
        [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
        [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
        [assembly: StringFreezing]
-       [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
        [assembly: DefaultDependency (LoadHint.Always)]
 #elif NET_1_1
        [assembly: AssemblyTrademark ("")]
        [assembly: AssemblyConfiguration ("")]
-       [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
        [assembly: TypeLibVersion (1, 10)]
 #elif NET_1_0
        [assembly: AssemblyTrademark ("")]

diff --git a/mcs/class/System/Assembly/ChangeLog b/mcs/class/System/Assembly/ChangeLog
index 1de430b90bed992725becead4cd2b875863cdc20..8eb2e396292840d6e93f86e3854d0a7360c85411 100644 (file)
--- a/mcs/class/System/Assembly/ChangeLog
+++ b/mcs/class/System/Assembly/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-20  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AssemblyInfo.cs: Remove ComCompatibleVersion and 
+       AllowPartiallyTrustedCallers for NET_2_1
+
 2009-06-23  Marek Habersack  <mhabersack@novell.com>
 
        * AssemblyInfo.cs: added InternalsVisibleTo for