Merge pull request #925 from ermshiperete/novell-bug-602934

[mono.git] / mcs / class / corlib / System.Reflection / MonoAssembly.cs

diff --git a/mcs/class/corlib/System.Reflection/MonoAssembly.cs b/mcs/class/corlib/System.Reflection/MonoAssembly.cs
index 410e192ba098373b73fb42348a4e260d29c3badc..fedff328ce7dd41801dbe977817df96c9a7b81fe 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MonoAssembly.cs
+++ b/mcs/class/corlib/System.Reflection/MonoAssembly.cs
@@ -30,12 +30,14 @@ using System;
 using System.Collections;
 using System.Globalization;
 using System.Runtime.InteropServices;
+#if !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
+#endif
 using System.Collections.Generic;
 
 namespace System.Reflection {
 
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
        [ComVisible (true)]
        [ComDefaultInterfaceAttribute (typeof (_Assembly))]
        [Serializable]
@@ -45,7 +47,7 @@ namespace System.Reflection {
        public partial class Assembly {
 #endif
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                Type GetType (string name, bool throwOnError, bool ignoreCase)
@@ -57,7 +59,7 @@ namespace System.Reflection {
                        throw new ArgumentException ("name", "Name cannot be empty");
 
                        res = InternalGetType (null, name, throwOnError, ignoreCase);
-#if !(NET_4_0 || MOONLIGHT)
+#if !NET_4_0 && !FULL_AOT_RUNTIME
                        if (res is TypeBuilder) {
                                if (throwOnError)
                                        throw new TypeLoadException (string.Format ("Could not load type '{0}' from assembly '{1}'", name, this));
@@ -68,7 +70,7 @@ namespace System.Reflection {
                }
 
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                Module GetModule (String name)
@@ -88,7 +90,7 @@ namespace System.Reflection {
                }
 
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                AssemblyName[] GetReferencedAssemblies () {
@@ -96,7 +98,7 @@ namespace System.Reflection {
                }
 
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                Module[] GetModules (bool getResourceModules) {
@@ -115,7 +117,7 @@ namespace System.Reflection {
 
                [MonoTODO ("Always returns the same as GetModules")]
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                Module[] GetLoadedModules (bool getResourceModules)
@@ -124,7 +126,7 @@ namespace System.Reflection {
                }
 
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                Assembly GetSatelliteAssembly (CultureInfo culture)
@@ -133,7 +135,7 @@ namespace System.Reflection {
                }
 
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                Assembly GetSatelliteAssembly (CultureInfo culture, Version version)
@@ -144,7 +146,7 @@ namespace System.Reflection {
                //FIXME remove GetManifestModule under v4, it's a v2 artifact
                [ComVisible (false)]
                public
-#if NET_4_0 || MOONLIGHT
+#if NET_4_0
                override
 #endif
                Module ManifestModule {
@@ -153,7 +155,6 @@ namespace System.Reflection {
                        }
                }
 
-#if !MOONLIGHT
                public
 #if NET_4_0
                override
@@ -163,8 +164,6 @@ namespace System.Reflection {
                                return get_global_assembly_cache ();
                        }
                }
-#endif
-
        }
 }