Merge pull request #1439 from BrzVlad/feature-managed-allocator

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

diff --git a/mcs/class/corlib/System/_AppDomain.cs b/mcs/class/corlib/System/_AppDomain.cs
index f141511ea5230cb059983a2562a70493ac0c5023..37c71de14bf3ce011d94bf4a11eab28e13c212ac 100644 (file)
--- a/mcs/class/corlib/System/_AppDomain.cs
+++ b/mcs/class/corlib/System/_AppDomain.cs
@@ -31,16 +31,16 @@ using System.Security.Permissions;
 using System.Security.Policy;
 using System.Security.Principal;
 using System.Reflection;
+#if !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
+#endif
 using System.Globalization;
 using System.Runtime.Remoting;
 using System.Runtime.InteropServices;
 
 namespace System
 {
-#if NET_2_0
        [ComVisible (true)]
-#endif
        [CLSCompliant (false)]
        [InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
        [Guid ("05F696DC-2B29-3663-AD8B-C4389CF2A713")]
@@ -66,31 +66,33 @@ namespace System
                ObjectHandle CreateInstance (string assemblyName, string typeName, object[] activationAttributes);
                ObjectHandle CreateInstance (string assemblyName, string typeName, bool ignoreCase,
                        BindingFlags bindingAttr, Binder binder, object[] args, CultureInfo culture,
-                       object[] activationAttributes, Evidence securityAttribtutes);
+                       object[] activationAttributes, Evidence securityAttributes);
 
                ObjectHandle CreateInstanceFrom (string assemblyFile, string typeName);
-               ObjectHandle CreateInstanceFrom (string assemblyName, string typeName, object[] activationAttributes);
-               ObjectHandle CreateInstanceFrom (string assemblyName, string typeName, bool ignoreCase,
+               ObjectHandle CreateInstanceFrom (string assemblyFile, string typeName, object[] activationAttributes);
+               ObjectHandle CreateInstanceFrom (string assemblyFile, string typeName, bool ignoreCase,
                        BindingFlags bindingAttr, Binder binder, object[] args, CultureInfo culture,
-                       object[] activationAttributes, Evidence securityAttribtutes);
+                       object[] activationAttributes, Evidence securityAttributes);
 
+#if !FULL_AOT_RUNTIME
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access, Evidence evidence);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access, string dir);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access, string dir, Evidence evidence);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access,
-                       PermissionSet requiredPermissions, PermissionSet optionalPermissions, PermissionSet refusedPersmissions);
+                       PermissionSet requiredPermissions, PermissionSet optionalPermissions, PermissionSet refusedPermissions);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access,
                        Evidence evidence, PermissionSet requiredPermissions, PermissionSet optionalPermissions,
-                       PermissionSet refusedPersmissions);
+                       PermissionSet refusedPermissions);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access,
-                       string dir, PermissionSet requiredPermissions, PermissionSet optionalPermissions, PermissionSet refusedPersmissions);
+                       string dir, PermissionSet requiredPermissions, PermissionSet optionalPermissions, PermissionSet refusedPermissions);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access,
                        string dir, Evidence evidence, PermissionSet requiredPermissions, PermissionSet optionalPermissions,
-                       PermissionSet refusedPersmissions);
+                       PermissionSet refusedPermissions);
                AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access, string dir,
                        Evidence evidence, PermissionSet requiredPermissions, PermissionSet optionalPermissions,
-                       PermissionSet refusedPersmissions, bool isSynchronized);
+                       PermissionSet refusedPermissions, bool isSynchronized);
+#endif
 
                void DoCallBack (CrossAppDomainDelegate theDelegate);
                bool Equals (object other);
@@ -103,7 +105,6 @@ namespace System
                object GetData (string name);
                int GetHashCode();
 
-               [SecurityPermission (SecurityAction.LinkDemand, Infrastructure = true)]
                object GetLifetimeService ();
 
                Type GetType ();
@@ -134,20 +135,9 @@ namespace System
                void SetShadowCopyPath (string s);
 
                void SetThreadPrincipal (IPrincipal principal);
+
                string ToString ();
 
-#if BOOTSTRAP_WITH_OLDLIB
-               // older MCS/corlib returns:
-               // _AppDomain.cs(138) error CS0592: Attribute 'SecurityPermission' is not valid on this declaration type.
-               // It is valid on 'assembly' 'class' 'constructor' 'method' 'struct'  declarations only.
-               event AssemblyLoadEventHandler AssemblyLoad;
-               event ResolveEventHandler AssemblyResolve;
-               event EventHandler DomainUnload;
-               event EventHandler ProcessExit;
-               event ResolveEventHandler ResourceResolve;
-               event ResolveEventHandler TypeResolve;
-               event UnhandledExceptionEventHandler UnhandledException;
-#else
                [method: SecurityPermission (SecurityAction.LinkDemand, ControlAppDomain = true)]
                event AssemblyLoadEventHandler AssemblyLoad;
 
@@ -168,9 +158,8 @@ namespace System
 
                [method: SecurityPermission (SecurityAction.LinkDemand, ControlAppDomain = true)]
                event UnhandledExceptionEventHandler UnhandledException;
-#endif
 
-#if NET_1_1
+#if !NET_2_1
                void GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
 
                void GetTypeInfo (uint iTInfo, uint lcid, IntPtr ppTInfo);