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

	* Assembly.cs: Remove Evidence and GlobalAssemblyCache
	properties for NET_2_1

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

diff --git a/mcs/class/corlib/System.Reflection/Assembly.cs b/mcs/class/corlib/System.Reflection/Assembly.cs
index b1ed3eea4863208cf7455ea1b42c239ef9bb42c4..665a3c8351c696bc2f1aad565905c6cc82596f00 100644 (file)
--- a/mcs/class/corlib/System.Reflection/Assembly.cs
+++ b/mcs/class/corlib/System.Reflection/Assembly.cs
@@ -31,6 +31,7 @@ using System.Security;
 using System.Security.Policy;
 using System.Security.Permissions;
 using System.Runtime.Serialization;
+using System.Reflection;
 using System.Reflection.Emit;
 using System.IO;
 using System.Globalization;
@@ -49,8 +50,11 @@ namespace System.Reflection {
 #endif
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
-       public class Assembly : System.Reflection.ICustomAttributeProvider, _Assembly,
-               System.Security.IEvidenceFactory, System.Runtime.Serialization.ISerializable {
+#if NET_2_1
+       public class Assembly : ICustomAttributeProvider, _Assembly {
+#else
+       public class Assembly : ICustomAttributeProvider, _Assembly, IEvidenceFactory, ISerializable {
+#endif
 
                internal class ResolveEventHolder {
                        public event ModuleResolveEventHandler ModuleResolve;
@@ -103,9 +107,6 @@ namespace System.Reflection {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                private extern string InternalImageRuntimeVersion ();
 
-               [MethodImplAttribute (MethodImplOptions.InternalCall)]
-               private extern bool get_global_assembly_cache ();
-
                // SECURITY: this should be the only caller to icall get_code_base
                private string GetCodeBase (bool escaped)
                {
@@ -144,7 +145,7 @@ namespace System.Reflection {
                        [MethodImplAttribute (MethodImplOptions.InternalCall)]
                        get;
                }
-
+#if !NET_2_1
                public virtual Evidence Evidence {
                        [SecurityPermission (SecurityAction.Demand, ControlEvidence = true)]
                        get { return UnprotectedGetEvidence (); }
@@ -163,12 +164,15 @@ namespace System.Reflection {
                        return _evidence;
                }
 
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               private extern bool get_global_assembly_cache ();
+
                public bool GlobalAssemblyCache {
                        get {
                                return get_global_assembly_cache ();
                        }
                }
-
+#endif
                internal bool FromByteArray {
                        set { fromByteArray = value; }
                }
@@ -493,10 +497,12 @@ namespace System.Reflection {
                public static Assembly LoadFrom (String assemblyFile, Evidence securityEvidence)
                {
                        Assembly a = LoadFrom (assemblyFile, false);
+#if !NET_2_1
                        if ((a != null) && (securityEvidence != null)) {
                                // merge evidence (i.e. replace defaults with provided evidences)
                                a.Evidence.Merge (securityEvidence);
                        }
+#endif
                        return a;
                }
 

diff --git a/mcs/class/corlib/System.Reflection/ChangeLog b/mcs/class/corlib/System.Reflection/ChangeLog
index 80a669af60698ac9c3d3bd0c79f6e1249c7e2b93..85b7dc9c6a5931a8fa489f441b42621561107ad1 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/System.Reflection/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-22  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * Assembly.cs: Remove Evidence and GlobalAssemblyCache 
+       properties for NET_2_1
+
 2009-09-19  Sebastien Pouliot  <sebastien@ximian.com>
 
        * TargetException.cs, TargetInvocationException.cs,