2010-03-25 Rodrigo Kumpera <rkumpera@novell.com>

	* Assembly.cs: Add v4 obsolete attribute.

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

diff --git a/mcs/class/corlib/System.Reflection/Assembly.cs b/mcs/class/corlib/System.Reflection/Assembly.cs
index 99acaf3947634382c14f987852a8f4fb69d0cd3e..2442e925b960ebc00658853278a1db1651c7b668 100644 (file)
--- a/mcs/class/corlib/System.Reflection/Assembly.cs
+++ b/mcs/class/corlib/System.Reflection/Assembly.cs
@@ -473,6 +473,9 @@ namespace System.Reflection {
                        return LoadFrom (assemblyFile, false);
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static Assembly LoadFrom (String assemblyFile, Evidence securityEvidence)
                {
                        Assembly a = LoadFrom (assemblyFile, false);
@@ -485,6 +488,9 @@ namespace System.Reflection {
                        return a;
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                [MonoTODO("This overload is not currently implemented")]
                // FIXME: What are we missing?
                public static Assembly LoadFrom (String assemblyFile, Evidence securityEvidence, byte[] hashValue, AssemblyHashAlgorithm hashAlgorithm)
@@ -496,6 +502,9 @@ namespace System.Reflection {
                        throw new NotImplementedException ();
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static Assembly LoadFile (String path, Evidence securityEvidence)
                {
                        if (path == null)
@@ -515,7 +524,10 @@ namespace System.Reflection {
                {
                        return AppDomain.CurrentDomain.Load (assemblyString);
                }
-               
+
+#if NET_4_0
+               [Obsolete]
+#endif         
                public static Assembly Load (String assemblyString, Evidence assemblySecurity)
                {
                        return AppDomain.CurrentDomain.Load (assemblyString, assemblySecurity);
@@ -526,6 +538,9 @@ namespace System.Reflection {
                        return AppDomain.CurrentDomain.Load (assemblyRef);
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static Assembly Load (AssemblyName assemblyRef, Evidence assemblySecurity)
                {
                        return AppDomain.CurrentDomain.Load (assemblyRef, assemblySecurity);
@@ -541,6 +556,9 @@ namespace System.Reflection {
                        return AppDomain.CurrentDomain.Load (rawAssembly, rawSymbolStore);
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static Assembly Load (Byte[] rawAssembly, Byte[] rawSymbolStore,
                                             Evidence securityEvidence)
                {
@@ -565,6 +583,9 @@ namespace System.Reflection {
                        return LoadFrom (assemblyFile, true);
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static Assembly LoadWithPartialName (string partialName)
                {
                        return LoadWithPartialName (partialName, null);
@@ -589,6 +610,9 @@ namespace System.Reflection {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                private static extern Assembly load_with_partial_name (string name, Evidence e);
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static Assembly LoadWithPartialName (string partialName, Evidence securityEvidence)
                {
                        return LoadWithPartialName (partialName, securityEvidence, true);

diff --git a/mcs/class/corlib/System.Reflection/ChangeLog b/mcs/class/corlib/System.Reflection/ChangeLog
index 1e49507ea5cd03f91895bfca0798ceb000a74026..cf38738b594753f9f8ecf6950f981afbd70c0013 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/System.Reflection/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-25 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * Assembly.cs: Add v4 obsolete attribute.
+
 2010-03-25 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * Assembly.cs: