Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / class / corlib / System.Runtime.InteropServices / _Assembly.cs

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs b/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
index 531ec34351e522677f005af964089f1d0303dccc..a30e29ce22d696bd8a3b810212421137de6da3de 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.IO;
 using System.Globalization;
 using System.Reflection;
@@ -36,13 +34,13 @@ using System.Security.Policy;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
        [ComVisible (true)]
-#endif
        [CLSCompliant (false)]
        [InterfaceType (ComInterfaceType.InterfaceIsDual)]
        [Guid ("17156360-2F1A-384A-BC52-FDE93C215C5B")]
+#if !FULL_AOT_RUNTIME
        [TypeLibImportClass (typeof(Assembly))]
+#endif
        public interface _Assembly
        {
                string ToString ();
@@ -89,7 +87,9 @@ namespace System.Runtime.InteropServices
 
                string Location { get; }
 
+#if !NET_2_1
                Evidence Evidence { get; }
+#endif
 
                object[] GetCustomAttributes (Type attributeType, bool inherit);
 
@@ -129,10 +129,11 @@ namespace System.Runtime.InteropServices
 
                AssemblyName[] GetReferencedAssemblies ();
 
+#if !NET_2_1
                bool GlobalAssemblyCache { get; }
+#endif
 
                event ModuleResolveEventHandler ModuleResolve;
        }
 }
 
-#endif