diff options
Diffstat (limited to 'src/mscorlib/src/System/Activator.cs')
-rw-r--r-- | src/mscorlib/src/System/Activator.cs | 258 |
1 files changed, 0 insertions, 258 deletions
diff --git a/src/mscorlib/src/System/Activator.cs b/src/mscorlib/src/System/Activator.cs index 34c6ea5874..d11739b826 100644 --- a/src/mscorlib/src/System/Activator.cs +++ b/src/mscorlib/src/System/Activator.cs @@ -16,7 +16,6 @@ namespace System { using System; using System.Reflection; - using System.Runtime.Remoting; using System.Security; using CultureInfo = System.Globalization.CultureInfo; using Evidence = System.Security.Policy.Evidence; @@ -113,47 +112,6 @@ namespace System return Activator.CreateInstance(type, false); } - /* - * Create an instance using the name of type and the assembly where it exists. This allows - * types to be created remotely without having to load the type locally. - */ - - [System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod - static public ObjectHandle CreateInstance(String assemblyName, - String typeName) - { - StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller; - return CreateInstance(assemblyName, - typeName, - false, - Activator.ConstructorDefault, - null, - null, - null, - null, - null, - ref stackMark); - } - - [System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod - static public ObjectHandle CreateInstance(String assemblyName, - String typeName, - Object[] activationAttributes) - - { - StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller; - return CreateInstance(assemblyName, - typeName, - false, - Activator.ConstructorDefault, - null, - null, - null, - activationAttributes, - null, - ref stackMark); - } - [System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod static public Object CreateInstance(Type type, bool nonPublic) { @@ -185,221 +143,5 @@ namespace System // Skip the CreateInstanceCheckThis call to avoid perf cost and to maintain compatibility with V2 (throwing the same exceptions). return (T)rt.CreateInstanceDefaultCtor(true /*publicOnly*/, true /*skipCheckThis*/, true /*fillCache*/, ref stackMark); } - - static public ObjectHandle CreateInstanceFrom(String assemblyFile, - String typeName) - - { - return CreateInstanceFrom(assemblyFile, typeName, null); - } - - static public ObjectHandle CreateInstanceFrom(String assemblyFile, - String typeName, - Object[] activationAttributes) - - { - return CreateInstanceFrom(assemblyFile, - typeName, - false, - Activator.ConstructorDefault, - null, - null, - null, - activationAttributes); - } - - [System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod - public static ObjectHandle CreateInstance(string assemblyName, - string typeName, - bool ignoreCase, - BindingFlags bindingAttr, - Binder binder, - object[] args, - CultureInfo culture, - object[] activationAttributes) - { - StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller; - return CreateInstance(assemblyName, - typeName, - ignoreCase, - bindingAttr, - binder, - args, - culture, - activationAttributes, - null, - ref stackMark); - } - - static internal ObjectHandle CreateInstance(String assemblyString, - String typeName, - bool ignoreCase, - BindingFlags bindingAttr, - Binder binder, - Object[] args, - CultureInfo culture, - Object[] activationAttributes, - Evidence securityInfo, - ref StackCrawlMark stackMark) - { - Type type = null; - Assembly assembly = null; - if (assemblyString == null) - { - assembly = RuntimeAssembly.GetExecutingAssembly(ref stackMark); - } - else - { - RuntimeAssembly assemblyFromResolveEvent; - AssemblyName assemblyName = RuntimeAssembly.CreateAssemblyName(assemblyString, false /*forIntrospection*/, out assemblyFromResolveEvent); - if (assemblyFromResolveEvent != null) - { - // Assembly was resolved via AssemblyResolve event - assembly = assemblyFromResolveEvent; - } - else if (assemblyName.ContentType == AssemblyContentType.WindowsRuntime) - { - // WinRT type - we have to use Type.GetType - type = Type.GetType(typeName + ", " + assemblyString, true /*throwOnError*/, ignoreCase); - } - else - { - // Classic managed type - assembly = RuntimeAssembly.InternalLoadAssemblyName( - assemblyName, securityInfo, null, ref stackMark, - true /*thrownOnFileNotFound*/, false /*forIntrospection*/); - } - } - - if (type == null) - { - // It's classic managed type (not WinRT type) - Log(assembly != null, "CreateInstance:: ", "Loaded " + assembly.FullName, "Failed to Load: " + assemblyString); - if (assembly == null) return null; - - type = assembly.GetType(typeName, true /*throwOnError*/, ignoreCase); - } - - Object o = Activator.CreateInstance(type, - bindingAttr, - binder, - args, - culture, - activationAttributes); - - Log(o != null, "CreateInstance:: ", "Created Instance of class " + typeName, "Failed to create instance of class " + typeName); - if (o == null) - return null; - else - { - ObjectHandle Handle = new ObjectHandle(o); - return Handle; - } - } - - public static ObjectHandle CreateInstanceFrom(string assemblyFile, - string typeName, - bool ignoreCase, - BindingFlags bindingAttr, - Binder binder, - object[] args, - CultureInfo culture, - object[] activationAttributes) - { - return CreateInstanceFromInternal(assemblyFile, - typeName, - ignoreCase, - bindingAttr, - binder, - args, - culture, - activationAttributes, - null); - } - - private static ObjectHandle CreateInstanceFromInternal(String assemblyFile, - String typeName, - bool ignoreCase, - BindingFlags bindingAttr, - Binder binder, - Object[] args, - CultureInfo culture, - Object[] activationAttributes, - Evidence securityInfo) - { -#pragma warning disable 618 - Assembly assembly = Assembly.LoadFrom(assemblyFile, securityInfo); -#pragma warning restore 618 - Type t = assembly.GetType(typeName, true, ignoreCase); - - Object o = Activator.CreateInstance(t, - bindingAttr, - binder, - args, - culture, - activationAttributes); - - Log(o != null, "CreateInstanceFrom:: ", "Created Instance of class " + typeName, "Failed to create instance of class " + typeName); - if (o == null) - return null; - else - { - ObjectHandle Handle = new ObjectHandle(o); - return Handle; - } - } - - public static ObjectHandle CreateComInstanceFrom(String assemblyName, - String typeName) - { - return CreateComInstanceFrom(assemblyName, - typeName, - null, - AssemblyHashAlgorithm.None); - } - - public static ObjectHandle CreateComInstanceFrom(String assemblyName, - String typeName, - byte[] hashValue, - AssemblyHashAlgorithm hashAlgorithm) - { - Assembly assembly = Assembly.LoadFrom(assemblyName, hashValue, hashAlgorithm); - - Type t = assembly.GetType(typeName, true, false); - - Object[] Attr = t.GetCustomAttributes(typeof(ComVisibleAttribute), false); - if (Attr.Length > 0) - { - if (((ComVisibleAttribute)Attr[0]).Value == false) - throw new TypeLoadException(SR.Argument_TypeMustBeVisibleFromCom); - } - - Log(assembly != null, "CreateInstance:: ", "Loaded " + assembly.FullName, "Failed to Load: " + assemblyName); - - if (assembly == null) return null; - - - Object o = Activator.CreateInstance(t, - Activator.ConstructorDefault, - null, - null, - null, - null); - - Log(o != null, "CreateInstance:: ", "Created Instance of class " + typeName, "Failed to create instance of class " + typeName); - if (o == null) - return null; - else - { - ObjectHandle Handle = new ObjectHandle(o); - return Handle; - } - } - - [System.Diagnostics.Conditional("_DEBUG")] - private static void Log(bool test, string title, string success, string failure) - { - } } } - |