New test.

[mono.git] / mcs / class / corlib / System / Activator.cs

diff --git a/mcs/class/corlib/System/Activator.cs b/mcs/class/corlib/System/Activator.cs
index 96cfa7c4ef4f5e530ab4c186334bbc5fbdb1a3fa..245f28e39d066a7e21b2b0e40aea4121307cb10d 100644 (file)
--- a/mcs/class/corlib/System/Activator.cs
+++ b/mcs/class/corlib/System/Activator.cs
@@ -37,7 +37,7 @@ using System.Security.Permissions;
 using System.Security.Policy;
 using System.Configuration.Assemblies;
 using System.Text;
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Activation;
 #endif
@@ -58,7 +58,7 @@ namespace System
                {
                }
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                [MonoTODO ("No COM support")]
                public static ObjectHandle CreateComInstanceFrom (string assemblyName, string typeName)
                {
@@ -101,6 +101,9 @@ namespace System
                                activationAttributes, null);
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static ObjectHandle CreateInstanceFrom (string assemblyFile, string typeName, bool ignoreCase,
                                                               BindingFlags bindingAttr, Binder binder, object [] args,
                                                               CultureInfo culture, object [] activationAttributes,
@@ -135,6 +138,9 @@ namespace System
                                activationAttributes, null);
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static ObjectHandle CreateInstance (string assemblyName, string typeName, bool ignoreCase,
                                                           BindingFlags bindingAttr, Binder binder, object [] args,
                                                           CultureInfo culture, object [] activationAttributes, Evidence securityInfo)
@@ -170,6 +176,10 @@ namespace System
                        return domain.CreateInstanceFrom (assemblyFile, typeName);
                }
 
+
+#if NET_4_0
+               [Obsolete]
+#endif
                public static ObjectHandle CreateInstanceFrom (AppDomain domain, string assemblyFile, string typeName,
                                                               bool ignoreCase, BindingFlags bindingAttr, Binder binder,
                                                               object [] args, CultureInfo culture,
@@ -189,6 +199,9 @@ namespace System
                        return domain.CreateInstance (assemblyName, typeName);
                }
 
+#if NET_4_0
+               [Obsolete]
+#endif
                public static ObjectHandle CreateInstance (AppDomain domain, string assemblyName, string typeName,
                                                           bool ignoreCase, BindingFlags bindingAttr, Binder binder,
                                                           object [] args, CultureInfo culture,
@@ -273,7 +286,7 @@ namespace System
                        }
 
                        CheckAbstractType (type);
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                        if (activationAttributes != null && activationAttributes.Length > 0) {
                                if (!type.IsMarshalByRef) {
                                        string msg = Locale.GetText ("Type '{0}' doesn't derive from MarshalByRefObject.", type.FullName);
@@ -344,7 +357,7 @@ namespace System
                        }
                }
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                [SecurityPermission (SecurityAction.LinkDemand, RemotingConfiguration = true)]
                public static object GetObject (Type type, string url)
                {
@@ -386,5 +399,58 @@ namespace System
                {
                        throw new NotImplementedException ();
                }
+
+#if NET_4_0
+               public static ObjectHandle CreateInstance (string assemblyName, string typeName, bool ignoreCase,
+                                                          BindingFlags bindingAttr, Binder binder, object [] args,
+                                                          CultureInfo culture, object [] activationAttributes)
+               {
+                       Assembly assembly = null;
+                       if(assemblyName == null)
+                               assembly = Assembly.GetCallingAssembly ();
+                       else
+                               assembly = Assembly.Load (assemblyName);
+                       Type type = assembly.GetType (typeName, true, ignoreCase);
+                       object obj = CreateInstance (type, bindingAttr, binder, args, culture, activationAttributes);
+                       return (obj != null) ? new ObjectHandle (obj) : null;
+               }
+
+               public static ObjectHandle CreateInstance (AppDomain domain, string assemblyName, string typeName,
+                                                          bool ignoreCase, BindingFlags bindingAttr, Binder binder,
+                                                          object [] args, CultureInfo culture,
+                                                          object [] activationAttributes)
+               {
+                       if (domain == null)
+                               throw new ArgumentNullException ("domain");
+                       return domain.CreateInstance (assemblyName, typeName, ignoreCase, bindingAttr, binder, args, culture, activationAttributes);
+               }
+
+               public static ObjectHandle CreateInstanceFrom (string assemblyFile, string typeName, bool ignoreCase,
+                                                              BindingFlags bindingAttr, Binder binder, object [] args,
+                                                              CultureInfo culture, object [] activationAttributes)
+               {
+                       Assembly assembly = Assembly.LoadFrom (assemblyFile);
+                       if (assembly == null)
+                               return null;
+
+                       Type type = assembly.GetType (typeName, true, ignoreCase);
+                       if (type == null)
+                               return null;
+
+                       object obj = CreateInstance (type, bindingAttr, binder, args, culture, activationAttributes);
+                       return (obj != null) ? new ObjectHandle (obj) : null;
+               }
+
+               public static ObjectHandle CreateInstanceFrom (AppDomain domain, string assemblyFile, string typeName,
+                                                              bool ignoreCase, BindingFlags bindingAttr, Binder binder,
+                                                              object [] args, CultureInfo culture,
+                                                              object [] activationAttributes)
+               {
+                       if (domain == null)
+                               throw new ArgumentNullException ("domain");
+
+                       return domain.CreateInstanceFrom (assemblyFile, typeName, ignoreCase, bindingAttr, binder, args, culture, activationAttributes);
+               }
+#endif
        }
 }