2010-02-27 Rodrigo Kumpera <rkumpera@novell.com>

	* Type.cs: Make cor-compare happy.

2010-02-27 Rodrigo Kumpera  <rkumpera@novell.com>

	* Evidence.cs: Add some v4 bits.

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

diff --git a/mcs/class/corlib/System.Security.Policy/ChangeLog b/mcs/class/corlib/System.Security.Policy/ChangeLog
index 3218b1c8ab675b5fe2fc51eb2ce49b71e4cace8b..1a2429495d3c63f685a084971b390dc77216a61e 100644 (file)
--- a/mcs/class/corlib/System.Security.Policy/ChangeLog
+++ b/mcs/class/corlib/System.Security.Policy/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-27 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * Evidence.cs: Add some v4 bits.
+
 2009-09-22  Sebastien Pouliot  <sebastien@ximian.com> 
 
        * Evidence_2_1.cs: New.

diff --git a/mcs/class/corlib/System.Security.Policy/Evidence.cs b/mcs/class/corlib/System.Security.Policy/Evidence.cs
index 96e0a0f3b75661e65e3ac2e262d250993f170365..a876dfd3c9ccd5320c0d3c411903787bbfcd4068 100644 (file)
--- a/mcs/class/corlib/System.Security.Policy/Evidence.cs
+++ b/mcs/class/corlib/System.Security.Policy/Evidence.cs
@@ -65,6 +65,9 @@ namespace System.Security.Policy {
                                Merge (evidence);       
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public Evidence (object[] hostEvidence, object[] assemblyEvidence)
                {
                        if (null != hostEvidence)
@@ -77,6 +80,9 @@ namespace System.Security.Policy {
                // Public Properties
                //
        
+#if NET_4_0
+               [Obsolete]
+#endif
                public int Count {
                        get {
                                int count = 0;
@@ -128,12 +134,18 @@ namespace System.Security.Policy {
                // Public Methods
                //
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public void AddAssembly (object id) 
                {
                        AssemblyEvidenceList.Add (id);
                        _hashCode = 0;
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public void AddHost (object id) 
                {
                        if (_locked && SecurityManager.SecurityEnabled) {
@@ -153,6 +165,9 @@ namespace System.Security.Policy {
                        _hashCode = 0;
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public void CopyTo (Array array, int index) 
                {
                        int hc = 0;
@@ -205,6 +220,9 @@ namespace System.Security.Policy {
                        return true;
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public IEnumerator GetEnumerator () 
                {
                        IEnumerator he = null;

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 58be8a9f6f856768f92f1f678592fc5c1905d731..5c9a0fcca9b0ec0f37a3394ebe27c271d2604e21 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-27 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * Type.cs: Make cor-compare happy.
+
 2010-02-26 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * Lazy.cs: Implement all lazy modes.

diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs
index 3042c11115c74897fcbbb7aca9724910ddeb3575..12d557980704607a4eaa17179500a6a8d32056f7 100644 (file)
--- a/mcs/class/corlib/System/Type.cs
+++ b/mcs/class/corlib/System/Type.cs
@@ -482,11 +482,15 @@ namespace System {
                        return result;
                }
 
+               NotImplementedException CreateNIE () {
+                       return new NotImplementedException ();
+               }
+
                public virtual Array GetEnumValues () {
                        if (!IsEnum)
                                throw new ArgumentException ("Type is not an enumeration", "enumType");
 
-                       throw new NotImplementedException ();
+                       throw CreateNIE ();
                }
 
                bool IsValidEnumType (Type type) {