Jumbo NET_2_0 removal

svn path=/trunk/mcs/; revision=145235

mcs/class/corlib/System.Runtime.InteropServices/AllowReversePInvokeCallsAttribute.cs

@@ -28,7 +28,6 @@
 //
 using System;
 
-#if NET_2_0
 
 namespace System.Runtime.InteropServices {
 
@@ -37,4 +36,3 @@ namespace System.Runtime.InteropServices {
 		public AllowReversePInvokeCallsAttribute () { }
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs

@@ -33,10 +33,8 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[Serializable]
 	[ComVisible (true)]
-#endif
 	public struct ArrayWithOffset {
 		object array;
 		int offset;
@@ -63,7 +61,6 @@ namespace System.Runtime.InteropServices {
 			return obj.array == array && obj.offset == offset;
 		}
 
-#if NET_2_0
 		public static bool operator == (ArrayWithOffset a, ArrayWithOffset b)
 		{
 			return a.Equals (b);
@@ -73,7 +70,6 @@ namespace System.Runtime.InteropServices {
 		{
 			return !a.Equals (b);
 		}
-#endif
 
 		public override int GetHashCode ()
 		{

mcs/class/corlib/System.Runtime.InteropServices/AssemblyRegistrationFlags.cs

@@ -33,9 +33,7 @@
 namespace System.Runtime.InteropServices
 {
 	[Flags]
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	public enum AssemblyRegistrationFlags {
 		None = 0,
 		SetCodeBase,

mcs/class/corlib/System.Runtime.InteropServices/AutomationProxyAttribute.cs

@@ -35,9 +35,7 @@ namespace System.Runtime.InteropServices {
 
 	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
 			 AttributeTargets.Interface, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class AutomationProxyAttribute : Attribute
 	{
 		bool val;

mcs/class/corlib/System.Runtime.InteropServices/BINDPTR.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible(false)]
-#endif
 	[StructLayout (LayoutKind.Explicit, CharSet = CharSet.Unicode)]
 	public struct BINDPTR {
 		[FieldOffset (0)] 

mcs/class/corlib/System.Runtime.InteropServices/BIND_OPTS.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential)]
 	public struct BIND_OPTS
 	{

mcs/class/corlib/System.Runtime.InteropServices/BStrWrapper.cs

@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  ([email protected])
 //
 
-#if NET_2_0
-
 using System;
 
 namespace System.Runtime.InteropServices
@@ -25,4 +23,3 @@ namespace System.Runtime.InteropServices
 		public string WrappedObject { get { return _value; } }
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/BestFitMappingAttribute.cs

@@ -36,9 +36,7 @@ namespace System.Runtime.InteropServices {
 	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | 
 			 AttributeTargets.Struct | AttributeTargets.Interface,
 			 Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class BestFitMappingAttribute : Attribute {
 		bool bfm;
 		

mcs/class/corlib/System.Runtime.InteropServices/CALLCONV.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Serializable]
 	public enum CALLCONV
 	{

mcs/class/corlib/System.Runtime.InteropServices/COMException.cs

@@ -32,9 +32,7 @@ using System.Runtime.Serialization;
 namespace System.Runtime.InteropServices {
 
 [Serializable]
-#if NET_2_0
 [ComVisible (true)]
-#endif
 public class COMException : ExternalException {
 
 	public COMException () 

mcs/class/corlib/System.Runtime.InteropServices/CONNECTDATA.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct CONNECTDATA
 	{

mcs/class/corlib/System.Runtime.InteropServices/CallingConvention.cs

@@ -35,10 +35,8 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[Serializable]
 	[ComVisible (true)]
-#endif
 	public enum CallingConvention {
 		Winapi = 1,
 		Cdecl = 2,

mcs/class/corlib/System.Runtime.InteropServices/ChangeLog

@@ -1,3 +1,7 @@
+2009-11-02  Miguel de Icaza  <[email protected]>
+
+	* Jumbo NET_2_0 removal patch.
+
 2009-10-15  Sebastien Pouliot  <[email protected]>
 
 	* GCHandle.cs: Add missing validations

mcs/class/corlib/System.Runtime.InteropServices/CharSet.cs

@@ -35,10 +35,8 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[Serializable]
 	[ComVisible (true)]
-#endif
 	public enum CharSet {
 		None = 1,
 		Ansi = 2,

mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceAttribute.cs

@@ -36,9 +36,7 @@ namespace System.Runtime.InteropServices {
 
 	[AttributeUsage(AttributeTargets.Assembly | 
 			AttributeTargets.Class, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ClassInterfaceAttribute : Attribute {
 		private ClassInterfaceType ciType;
 		

mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceType.cs

@@ -34,9 +34,7 @@
 namespace System.Runtime.InteropServices {
 
 	[Serializable]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public enum ClassInterfaceType 
 	{
 		None = 0,

mcs/class/corlib/System.Runtime.InteropServices/CoClassAttribute.cs

@@ -32,9 +32,7 @@
 namespace System.Runtime.InteropServices {
 
 	[AttributeUsage (AttributeTargets.Interface, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class CoClassAttribute : Attribute
 	{
 

mcs/class/corlib/System.Runtime.InteropServices/ComAliasNameAttribute.cs

@@ -35,9 +35,7 @@ namespace System.Runtime.InteropServices {
 	[AttributeUsage (AttributeTargets.Property | AttributeTargets.Field |
 			 AttributeTargets.Parameter | AttributeTargets.ReturnValue,
 			 Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComAliasNameAttribute : Attribute
 	{
 		string val;

mcs/class/corlib/System.Runtime.InteropServices/ComCompatibleVersionAttribute.cs

@@ -30,15 +30,11 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if (NET_1_1)
-
 namespace System.Runtime.InteropServices
 {
 	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, 
 			Inherited = false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComCompatibleVersionAttribute : Attribute
 	{
 		private int major;
@@ -71,5 +67,3 @@ namespace System.Runtime.InteropServices
 		}
 	}
 }
-
-#endif

mcs/class/corlib/System.Runtime.InteropServices/ComConversionLossAttribute.cs

@@ -34,9 +34,7 @@ using System;
 namespace System.Runtime.InteropServices {
 
 	[AttributeUsage (AttributeTargets.All, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComConversionLossAttribute : Attribute
 	{
 		public ComConversionLossAttribute ()

mcs/class/corlib/System.Runtime.InteropServices/ComDefaultInterfaceAttribute.cs

@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  ([email protected])
 //
 
-#if NET_2_0
-
 using System;
 
 namespace System.Runtime.InteropServices
@@ -25,4 +23,3 @@ namespace System.Runtime.InteropServices
 		public Type Value { get { return _type; }}
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/ComEventInterfaceAttribute.cs

@@ -34,9 +34,7 @@ using System;
 namespace System.Runtime.InteropServices {
 
 	[AttributeUsage (AttributeTargets.Interface, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComEventInterfaceAttribute : Attribute
 	{
 		Type si, ep;

mcs/class/corlib/System.Runtime.InteropServices/ComImportAttribute.cs

@@ -35,9 +35,7 @@ namespace System.Runtime.InteropServices {
 
 	[AttributeUsage (AttributeTargets.Class |
 			 AttributeTargets.Interface, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComImportAttribute : Attribute
 	{
 		public ComImportAttribute ()

mcs/class/corlib/System.Runtime.InteropServices/ComInterfaceType.cs

@@ -32,9 +32,7 @@
 namespace System.Runtime.InteropServices
 {
 	[Serializable]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public enum ComInterfaceType
 	{
 		InterfaceIsDual = 0,

mcs/class/corlib/System.Runtime.InteropServices/ComMemberType.cs

@@ -33,9 +33,7 @@ using System;
 namespace System.Runtime.InteropServices
 {
 	[Serializable]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public enum ComMemberType {
 		Method  = 0,
 		PropGet = 1,

mcs/class/corlib/System.Runtime.InteropServices/ComRegisterFunctionAttribute.cs

@@ -32,9 +32,7 @@
 namespace System.Runtime.InteropServices {
 
 	[AttributeUsage (AttributeTargets.Method, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComRegisterFunctionAttribute : Attribute
 	{
 		public ComRegisterFunctionAttribute ()

mcs/class/corlib/System.Runtime.InteropServices/ComSourceInterfacesAttribute.cs

@@ -34,11 +34,7 @@ using System.Runtime.Serialization;
 namespace System.Runtime.InteropServices
 {
 	[AttributeUsage (AttributeTargets.Class, AllowMultiple = false,
-#if NET_2_0
 			Inherited = true),ComVisible(true)]
-#else
-			Inherited = false)]
-#endif
 	public sealed class ComSourceInterfacesAttribute : Attribute
 	{
 		private string internalValue;

mcs/class/corlib/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.cs

@@ -34,9 +34,7 @@ using System;
 namespace System.Runtime.InteropServices {
 
 	[AttributeUsage (AttributeTargets.Method, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComUnregisterFunctionAttribute : Attribute
 	{
 		public ComUnregisterFunctionAttribute ()

mcs/class/corlib/System.Runtime.InteropServices/ComVisible.cs

@@ -39,9 +39,7 @@ namespace System.Runtime.InteropServices {
 		AttributeTargets.Method | AttributeTargets.Property |
 		AttributeTargets.Field | AttributeTargets.Interface |
 		AttributeTargets.Delegate, Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ComVisibleAttribute : Attribute {
 
 		private bool Visible = false;

mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs

@@ -5,7 +5,6 @@
 //   Kazuki Oikawa  ([email protected])
 //
 
-#if NET_2_0
 
 using System;
 using System.Runtime.ConstrainedExecution;
@@ -87,4 +86,3 @@ namespace System.Runtime.InteropServices
 		}
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/CurrencyWrapper.cs

@@ -32,10 +32,8 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Serializable]
 	[ComVisible (true)]
-#endif
 	public sealed class CurrencyWrapper
 	{
 		Decimal currency;

mcs/class/corlib/System.Runtime.InteropServices/DESCKIND.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible(false)]
-#endif
 	[Serializable]
 	public enum DESCKIND {
 		DESCKIND_NONE = 0,

mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible(false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct DISPPARAMS {
 		public IntPtr rgvarg;

mcs/class/corlib/System.Runtime.InteropServices/DefaultCharSetAttribute.cs

@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  ([email protected])
 //
 
-#if NET_2_0
-
 using System;
 using System.Runtime.Serialization;
 
@@ -26,4 +24,3 @@ namespace System.Runtime.InteropServices
 		public CharSet CharSet { get { return _set; } }
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/DispIdAttribute.cs

@@ -33,9 +33,7 @@ namespace System.Runtime.InteropServices {
 	[AttributeUsage (AttributeTargets.Method | AttributeTargets.Property |
 			 AttributeTargets.Field | AttributeTargets.Event,
 			 Inherited=false)]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class DispIdAttribute : Attribute
 	{
 		int id;

mcs/class/corlib/System.Runtime.InteropServices/DispatchWrapper.cs

@@ -32,10 +32,8 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Serializable]
 	[ComVisible (true)]
-#endif
 	public sealed class DispatchWrapper
 	{
 		object wrappedObject;

mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs

@@ -35,9 +35,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Method, Inherited=false)]
 	public sealed class DllImportAttribute: Attribute {
 		#region Sync with reflection.h

mcs/class/corlib/System.Runtime.InteropServices/ELEMDESC.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct ELEMDESC
 	{

mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible(false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct EXCEPINFO {
 		public short wCode;

mcs/class/corlib/System.Runtime.InteropServices/ErrorWrapper.cs

@@ -32,10 +32,8 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Serializable]
 	[ComVisible (true)]
-#endif
 	public sealed class ErrorWrapper
 	{
 		int errorCode;

mcs/class/corlib/System.Runtime.InteropServices/ExporterEventKind.cs

@@ -33,9 +33,7 @@
 namespace System.Runtime.InteropServices
 {
 	[Serializable]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public enum ExporterEventKind
 	{
 		NOTIF_TYPECONVERTED = 0,

mcs/class/corlib/System.Runtime.InteropServices/ExtensibleClassFactory.cs

@@ -36,9 +36,7 @@ using System.Reflection;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class ExtensibleClassFactory
 	{
 		static Hashtable hashtable;

mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs

@@ -36,9 +36,7 @@ using System.Globalization;
 namespace System.Runtime.InteropServices
 {
 	[Serializable]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public class ExternalException : SystemException
 	{
 		public ExternalException ()

mcs/class/corlib/System.Runtime.InteropServices/FILETIME.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential)]
 	public struct FILETIME
 	{

mcs/class/corlib/System.Runtime.InteropServices/FUNCDESC.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential)]
 	public struct FUNCDESC
 	{

mcs/class/corlib/System.Runtime.InteropServices/FUNCFLAGS.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Flags, Serializable]
 	public enum FUNCFLAGS
 	{

mcs/class/corlib/System.Runtime.InteropServices/FUNCKIND.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Serializable]
 	public enum FUNCKIND
 	{

mcs/class/corlib/System.Runtime.InteropServices/FieldOffsetAttribute.cs

@@ -24,9 +24,7 @@
 using System;
 
 namespace System.Runtime.InteropServices {
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	[AttributeUsage (AttributeTargets.Field, Inherited=false)]
 	public sealed class FieldOffsetAttribute : Attribute {
 		private int val;

mcs/class/corlib/System.Runtime.InteropServices/GCHandle.cs

@@ -36,9 +36,7 @@ using System.Runtime.InteropServices;
 namespace System.Runtime.InteropServices
 {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[MonoTODO("Struct should be [StructLayout(LayoutKind.Sequential)] but will need to be reordered for that.")]
 	public struct GCHandle 
 	{
@@ -143,7 +141,6 @@ namespace System.Runtime.InteropServices
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		private extern static IntPtr GetAddrOfPinnedObject(int handle);
 
-#if NET_2_0
 		public static bool operator ==(GCHandle a, GCHandle b)
 		{
 			return a.Equals(b);
@@ -176,7 +173,6 @@ namespace System.Runtime.InteropServices
 		{
 			return (IntPtr)value;
 		}
-#endif
 	} 
 }
 

mcs/class/corlib/System.Runtime.InteropServices/GCHandleType.cs

@@ -35,9 +35,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[Serializable]
 	public enum GCHandleType {
 		Weak = 0,

mcs/class/corlib/System.Runtime.InteropServices/GuidAttribute.cs

@@ -32,9 +32,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | 
 			AttributeTargets.Struct | AttributeTargets.Enum | 
 			AttributeTargets.Interface | AttributeTargets.Delegate,

mcs/class/corlib/System.Runtime.InteropServices/HandleRef.cs

@@ -32,9 +32,7 @@
 using System;
 
 namespace System.Runtime.InteropServices {
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public struct HandleRef {
 
 		#region Fields
@@ -74,12 +72,10 @@ namespace System.Runtime.InteropServices {
 		}
 		
 		#endregion // Type Conversions
-#if NET_2_0
 		public static IntPtr ToIntPtr(HandleRef value)
 		{
 			return value.Handle; 
 			// Why did MS add a function for this?
 		}
-#endif
 	}
 }

mcs/class/corlib/System.Runtime.InteropServices/ICustomAdapter.cs

@@ -32,9 +32,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public interface ICustomAdapter {
 		[return: MarshalAs (UnmanagedType.IUnknown)]
 		object GetUnderlyingObject ();

mcs/class/corlib/System.Runtime.InteropServices/ICustomFactory.cs

@@ -32,9 +32,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public interface ICustomFactory {
 		MarshalByRefObject CreateInstance (Type serverType);
 	}

mcs/class/corlib/System.Runtime.InteropServices/ICustomMarshaler.cs

@@ -32,9 +32,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public interface ICustomMarshaler {
 		void CleanUpManagedData (object ManagedObj);
 		void CleanUpNativeData (IntPtr pNativeData);

mcs/class/corlib/System.Runtime.InteropServices/IDLDESC.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct IDLDESC
 	{

mcs/class/corlib/System.Runtime.InteropServices/IDLFLAG.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Flags, Serializable]
 	public enum IDLFLAG
 	{

mcs/class/corlib/System.Runtime.InteropServices/IDispatchImplAttribute.cs

@@ -33,10 +33,8 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
 	[ComVisible (true)]
-#endif
 	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Assembly, 
 			 AllowMultiple = false, Inherited = false)]
 	public sealed class IDispatchImplAttribute : Attribute

mcs/class/corlib/System.Runtime.InteropServices/IDispatchImplType.cs

@@ -30,10 +30,8 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
 	[ComVisible (true)]
-#endif
 	[Serializable]
 	public enum IDispatchImplType
 	{

mcs/class/corlib/System.Runtime.InteropServices/IMPLTYPEFLAGS.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Flags, Serializable]
 	public enum IMPLTYPEFLAGS
 	{

mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible(false)]
-#endif
 	[Serializable]
 	public enum INVOKEKIND {
 		INVOKE_FUNC = 1,

mcs/class/corlib/System.Runtime.InteropServices/IRegistrationServices.cs

@@ -35,42 +35,28 @@ using System.Reflection;
 using System.Security.Permissions;
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[Guid("CCBD682C-73A5-4568-B8B0-C7007E11ABA2")]
 	public interface IRegistrationServices {
 		Guid GetManagedCategoryGuid ();
-#if NET_2_0		
 		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-#endif		
 		string GetProgIdForType (Type type);
 
-#if NET_2_0		
 		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-#endif		
 		Type[] GetRegistrableTypesInAssembly (Assembly assembly);
 
-#if NET_2_0		
 		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-#endif		
 		bool RegisterAssembly (Assembly assembly, AssemblyRegistrationFlags flags);
 
-#if NET_2_0		
 		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-#endif				
 		void RegisterTypeForComClients (Type type, ref Guid g);
 		
 		bool TypeRepresentsComType (Type type);
 		
-#if NET_2_0		
 		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-#endif		
 		bool TypeRequiresRegistration (Type type);
 
-#if NET_2_0		
 		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-#endif		
 		bool UnregisterAssembly (Assembly assembly);
 	}
 }

mcs/class/corlib/System.Runtime.InteropServices/ITypeLibConverter.cs

@@ -35,9 +35,7 @@ using System.Reflection.Emit;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	[Guid("F1C3BF78-C3E4-11D3-88E7-00902754C43A")]
 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 	public interface ITypeLibConverter {

mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs

@@ -32,9 +32,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	[Guid("fa1f3615-acb9-486d-9eac-1bef87e36b09")]
 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 	public interface ITypeLibExporterNameProvider {

mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs

@@ -33,9 +33,7 @@
 using System.Reflection;
 
 namespace System.Runtime.InteropServices {
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	[Guid("f1c3bf77-c3e4-11d3-88e7-00902754c43a")]
 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 	public interface ITypeLibExporterNotifySink {

mcs/class/corlib/System.Runtime.InteropServices/ITypeLibImporterNotifySink.cs

@@ -33,9 +33,7 @@
 using System.Reflection;
 
 namespace System.Runtime.InteropServices {
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	[Guid("f1c3bf76-c3e4-11d3-88e7-00902754c43a")]
 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 	public interface ITypeLibImporterNotifySink {

mcs/class/corlib/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.cs

@@ -33,9 +33,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 	
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Assembly, Inherited=false)]
 	public sealed class ImportedFromTypeLibAttribute : Attribute
 	{

mcs/class/corlib/System.Runtime.InteropServices/ImporterEventKind.cs

@@ -32,9 +32,7 @@
 namespace System.Runtime.InteropServices
 {
 	
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[Serializable] public enum ImporterEventKind
 	{
 		NOTIF_TYPECONVERTED = 0,

mcs/class/corlib/System.Runtime.InteropServices/InAttribute.cs

@@ -33,9 +33,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Parameter, Inherited=false)]
 	public sealed class InAttribute : Attribute {
 		public InAttribute () {

mcs/class/corlib/System.Runtime.InteropServices/InterfaceTypeAttribute.cs

@@ -32,9 +32,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage(AttributeTargets.Interface, Inherited=false)]
 	public sealed class InterfaceTypeAttribute : Attribute {
 		

mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs

@@ -33,9 +33,7 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[Serializable]
 	public class InvalidComObjectException : SystemException
 	{

mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs

@@ -33,9 +33,7 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[Serializable]
 	public class InvalidOleVariantTypeException : SystemException
 	{

mcs/class/corlib/System.Runtime.InteropServices/LIBFLAGS.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Flags, Serializable]
 	public enum LIBFLAGS
 	{

mcs/class/corlib/System.Runtime.InteropServices/LayoutKind.cs

@@ -35,9 +35,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[Serializable]
 	public enum LayoutKind {
 		Sequential = 0,

mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs

@@ -37,12 +37,10 @@ using System.Security;
 using System.Reflection;
 using System.Threading;
 
-#if NET_2_0
 using System.Runtime.ConstrainedExecution;
 #if !NET_2_1 || MONOTOUCH
 using System.Runtime.InteropServices.ComTypes;
 #endif
-#endif
 
 #if !NET_2_1 || MONOTOUCH
 using Mono.Interop;
@@ -51,13 +49,7 @@ using Mono.Interop;
 namespace System.Runtime.InteropServices
 {
 	[SuppressUnmanagedCodeSecurity ()]
-	public
-#if NET_2_0
-	static
-#else
-	sealed
-#endif
-	class Marshal
+	public static class Marshal
 	{
 		/* fields */
 		public static readonly int SystemMaxDBCSCharSize = 2; // don't know what this is
@@ -68,10 +60,6 @@ namespace System.Runtime.InteropServices
 			SystemDefaultCharSize = Environment.OSVersion.Platform == PlatformID.Win32NT ? 2 : 1;
 		}
 
-#if !NET_2_0
-		private Marshal () {}
-#endif
-
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
 		private extern static int AddRefInternal (IntPtr pUnk);
 
@@ -86,14 +74,10 @@ namespace System.Runtime.InteropServices
 		public extern static IntPtr AllocCoTaskMem (int cb);
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
-#endif
 		public extern static IntPtr AllocHGlobal (IntPtr cb);
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
-#endif
 		public static IntPtr AllocHGlobal (int cb)
 		{
 			return AllocHGlobal ((IntPtr)cb);
@@ -154,12 +138,10 @@ namespace System.Runtime.InteropServices
 			copy_to_unmanaged (source, startIndex, destination, length);
 		}
 
-#if NET_2_0
 		public static void Copy (IntPtr[] source, int startIndex, IntPtr destination, int length)
 		{
 			copy_to_unmanaged (source, startIndex, destination, length);
 		}
-#endif
 
 		public static void Copy (IntPtr source, byte[] destination, int startIndex, int length)
 		{
@@ -196,7 +178,6 @@ namespace System.Runtime.InteropServices
 			copy_from_unmanaged (source, startIndex, destination, length);
 		}
 
-#if NET_2_0
 		public static void Copy (IntPtr source, IntPtr[] destination, int startIndex, int length)
 		{
 			copy_from_unmanaged (source, startIndex, destination, length);
@@ -207,7 +188,6 @@ namespace System.Runtime.InteropServices
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 #if !NET_2_1 || MONOTOUCH
 		public static object CreateWrapperOfType (object o, Type t)
@@ -229,9 +209,7 @@ namespace System.Runtime.InteropServices
 #endif
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-#if NET_2_0
 		[ComVisible (true)]
-#endif
 		public extern static void DestroyStructure (IntPtr ptr, Type structuretype);
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -241,13 +219,9 @@ namespace System.Runtime.InteropServices
 		public extern static void FreeCoTaskMem (IntPtr ptr);
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		public extern static void FreeHGlobal (IntPtr hglobal);
 
-#if NET_2_0
-
 		static void ClearBSTR (IntPtr ptr)
 		{
 			int len = ReadInt32 (ptr, -4);
@@ -297,7 +271,6 @@ namespace System.Runtime.InteropServices
 			ClearUnicode (s);
 			FreeHGlobal (s);
 		}
-#endif
 
 #if !NET_2_1 || MONOTOUCH
 		public static Guid GenerateGuidForType (Type type)
@@ -335,13 +308,11 @@ namespace System.Runtime.InteropServices
 			return pItf;
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public static IntPtr GetComInterfaceForObjectInContext (object o, Type t)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		[MonoNotSupportedAttribute ("MSDN states user code should never need to call this method.")]
 		public static object GetComObjectData (object obj, object key)
@@ -355,11 +326,7 @@ namespace System.Runtime.InteropServices
 		public static int GetComSlotForMethodInfo (MemberInfo m)
 		{
 			if (m == null)
-#if NET_2_0
 				throw new ArgumentNullException ("m");
-#else
-				throw new ArgumentNullException (null, "Value cannot be null.");
-#endif
 			if (!(m is MethodInfo))
 				throw new ArgumentException ("The MemberInfo must be an interface method.", "m");
 			if (!m.DeclaringType.IsInterface)
@@ -380,9 +347,7 @@ namespace System.Runtime.InteropServices
 		}
 
 		[MonoTODO]
-#if NET_2_0
 		[ComVisible (true)]
-#endif
 		public static IntPtr GetExceptionPointers()
 		{
 			throw new NotImplementedException ();
@@ -404,9 +369,7 @@ namespace System.Runtime.InteropServices
 		}
 
 		[MonoTODO]
-#if NET_2_0
 		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		public static int GetHRForLastWin32Error()
 		{
 			throw new NotImplementedException ();
@@ -423,13 +386,11 @@ namespace System.Runtime.InteropServices
 			return pUnk;
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public static IntPtr GetIDispatchForObjectInContext (object o)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		[MonoTODO]
 		public static IntPtr GetITypeInfoForType (Type t)
@@ -448,18 +409,14 @@ namespace System.Runtime.InteropServices
 			return pUnk;
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public static IntPtr GetIUnknownForObjectInContext (object o)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		[MonoTODO]
-#if NET_2_0
 		[Obsolete ("This method has been deprecated")]
-#endif
 		public static IntPtr GetManagedThunkForUnmanagedMethodPtr (IntPtr pfnMethodToWrap, IntPtr pbSignature, int cbSignature)
 		{
 			throw new NotImplementedException ();
@@ -516,9 +473,7 @@ namespace System.Runtime.InteropServices
 		}
 
 		[MonoTODO]
-#if NET_2_0
 		[Obsolete ("This method has been deprecated")]
-#endif
 		public static Thread GetThreadFromFiberCookie (int cookie)
 		{
 			throw new NotImplementedException ();
@@ -543,38 +498,30 @@ namespace System.Runtime.InteropServices
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[Obsolete]
-#endif
 		[MonoTODO]
 		public static string GetTypeInfoName (UCOMITypeInfo pTI)
 		{
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		public static string GetTypeInfoName (ITypeInfo typeInfo)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
-#if NET_2_0
 		[Obsolete]
-#endif
 		[MonoTODO]
 		public static Guid GetTypeLibGuid (UCOMITypeLib pTLB)
 		{
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public static Guid GetTypeLibGuid (ITypeLib typelib)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		[MonoTODO]
 		public static Guid GetTypeLibGuidForAssembly (Assembly asm)
@@ -582,33 +529,26 @@ namespace System.Runtime.InteropServices
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[Obsolete]
-#endif
 		[MonoTODO]
 		public static int GetTypeLibLcid (UCOMITypeLib pTLB)
 		{
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public static int GetTypeLibLcid (ITypeLib typelib)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
-#if NET_2_0
 		[Obsolete]
-#endif
 		[MonoTODO]
 		public static string GetTypeLibName (UCOMITypeLib pTLB)
 		{
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public static string GetTypeLibName (ITypeLib typelib)
 		{
@@ -625,12 +565,9 @@ namespace System.Runtime.InteropServices
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 
 		[MonoTODO]
-#if NET_2_0
 		[Obsolete ("This method has been deprecated")]
-#endif
 		public static IntPtr GetUnmanagedThunkForManagedMethodPtr (IntPtr pfnMethodToWrap, IntPtr pbSignature, int cbSignature)
 		{
 			throw new NotImplementedException ();
@@ -653,9 +590,7 @@ namespace System.Runtime.InteropServices
 #endif // !NET_2_1
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		public static extern int GetLastWin32Error();
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -695,15 +630,11 @@ namespace System.Runtime.InteropServices
 		public extern static string PtrToStringBSTR (IntPtr ptr);
 		
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-#if NET_2_0
 		[ComVisible (true)]
-#endif
 		public extern static void PtrToStructure (IntPtr ptr, object structure);
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-#if NET_2_0
 		[ComVisible (true)]
-#endif
 		public extern static object PtrToStructure (IntPtr ptr, Type structureType);
 
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
@@ -744,69 +675,51 @@ namespace System.Runtime.InteropServices
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		public static int ReadInt32 (IntPtr ptr)
 		{
 			return ReadInt32 (ptr, 0);
 		}
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static int ReadInt32 (IntPtr ptr, int ofs);
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		[MonoTODO]
 		public static int ReadInt32 ([In, MarshalAs(UnmanagedType.AsAny)] object ptr, int ofs)
 		{
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		public static long ReadInt64 (IntPtr ptr)
 		{
 			return ReadInt64 (ptr, 0);
 		}
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static long ReadInt64 (IntPtr ptr, int ofs);
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		[MonoTODO]
 		public static long ReadInt64 ([In, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs)
 		{
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		public static IntPtr ReadIntPtr (IntPtr ptr)
 		{
 			return ReadIntPtr (ptr, 0);
 		}
 		
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static IntPtr ReadIntPtr (IntPtr ptr, int ofs);
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		[MonoTODO]
 		public static IntPtr ReadIntPtr ([In, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs)
 		{
@@ -819,15 +732,11 @@ namespace System.Runtime.InteropServices
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static IntPtr ReAllocHGlobal (IntPtr pv, IntPtr cb);
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
 		private extern static int ReleaseInternal (IntPtr pUnk);
 
-#if NET_2_0
 		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
 		public static int Release (IntPtr pUnk)
 		{
 			if (pUnk == IntPtr.Zero)
@@ -848,9 +757,7 @@ namespace System.Runtime.InteropServices
 			return ReleaseComObjectInternal (o);
 		}
 
-#if NET_2_0
 		[Obsolete]
-#endif
 		[MonoTODO]
 		public static void ReleaseThreadCache()
 		{
@@ -864,9 +771,7 @@ namespace System.Runtime.InteropServices
 		}
 #endif // !NET_2_1
 
-#if NET_2_0
 		[ComVisible (true)]
-#endif
 		public static int SizeOf (object structure)
 		{
 			return SizeOf (structure.GetType ());
@@ -928,7 +833,7 @@ namespace System.Runtime.InteropServices
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static IntPtr StringToHGlobalUni (string s);
 
-#if NET_2_0 && (!NET_2_1 || MONOTOUCH)
+#if !NET_2_1 || MONOTOUCH
 		public static IntPtr SecureStringToBSTR (SecureString s)
 		{
 			if (s == null)
@@ -1018,10 +923,8 @@ namespace System.Runtime.InteropServices
 		}
 #endif
 
-#if NET_2_0
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
 		[ComVisible (true)]
-#endif
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static void StructureToPtr (object structure, IntPtr ptr, bool fDeleteOld);
 
@@ -1125,21 +1028,11 @@ namespace System.Runtime.InteropServices
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
-		public
-#else
-		internal
-#endif
-		static Exception GetExceptionForHR (int errorCode) {
+		public static Exception GetExceptionForHR (int errorCode) {
 			return GetExceptionForHR (errorCode, IntPtr.Zero);
 		}
 
-#if NET_2_0
-		public
-#else
-		internal
-#endif
-		static Exception GetExceptionForHR (int errorCode, IntPtr errorInfo) {
+		public static Exception GetExceptionForHR (int errorCode, IntPtr errorInfo) {
 
 			const int E_OUTOFMEMORY = unchecked ((int)0x8007000EL);
 			const int E_INVALIDARG = unchecked ((int)0X80070057);
@@ -1156,14 +1049,14 @@ namespace System.Runtime.InteropServices
 			return null;
 		}
 
-#if NET_2_0 && (!NET_2_1 || MONOTOUCH)
+#if !NET_2_1 || MONOTOUCH
 		public static int FinalReleaseComObject (object o)
 		{
 			while (ReleaseComObject (o) != 0);
 			return 0;
 		}
 #endif
-#if NET_2_0
+
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		private static extern Delegate GetDelegateForFunctionPointerInternal (IntPtr ptr, Type t);
 
@@ -1189,6 +1082,5 @@ namespace System.Runtime.InteropServices
 			
 			return GetFunctionPointerForDelegateInternal (d);
 		}
-#endif
 	}
 }

mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs

@@ -32,9 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Parameter | 
 			 AttributeTargets.ReturnValue, Inherited=false)]
 	public sealed class MarshalAsAttribute : Attribute {
@@ -42,14 +40,10 @@ namespace System.Runtime.InteropServices {
 		public UnmanagedType ArraySubType;
 		public string MarshalCookie;
 
-#if NET_2_0
 		[ComVisible(true)]
-#endif	
 		public string MarshalType;
 
-#if NET_2_0
 		[ComVisible(true)]
-#endif	
 		public Type MarshalTypeRef;
 		
 #if !NET_2_1 || MONOTOUCH
@@ -59,9 +53,7 @@ namespace System.Runtime.InteropServices {
 		public int SizeConst;
 		public short SizeParamIndex;
 		public Type SafeArrayUserDefinedSubType;
-#if NET_2_0
 		public int IidParameterIndex;
-#endif
 
 		public MarshalAsAttribute (short unmanagedType) {
 			utype = (UnmanagedType)unmanagedType;

mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs

@@ -33,9 +33,7 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[Serializable]
 	public class MarshalDirectiveException : SystemException
 	{

mcs/class/corlib/System.Runtime.InteropServices/ObjectCreationDelegate.cs

@@ -33,8 +33,6 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-	#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	public delegate IntPtr ObjectCreationDelegate (IntPtr aggregator);
 }

mcs/class/corlib/System.Runtime.InteropServices/OptionalAttribute.cs

@@ -25,9 +25,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Parameter, Inherited=false)]
 	public sealed class OptionalAttribute : Attribute {
 		public OptionalAttribute () {

mcs/class/corlib/System.Runtime.InteropServices/OutAttribute.cs

@@ -32,9 +32,7 @@
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Parameter, Inherited=false)]
 	public sealed class OutAttribute : Attribute {
 

mcs/class/corlib/System.Runtime.InteropServices/PARAMDESC.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct PARAMDESC
 	{

mcs/class/corlib/System.Runtime.InteropServices/PARAMFLAG.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Serializable]
 	[Flags]
 	public enum PARAMFLAG

mcs/class/corlib/System.Runtime.InteropServices/PreserveSigAttribute.cs

@@ -32,9 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Method, Inherited=false)]
 	public sealed class PreserveSigAttribute : Attribute
 	{

mcs/class/corlib/System.Runtime.InteropServices/ProgIdAttribute.cs

@@ -33,9 +33,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[AttributeUsage (AttributeTargets.Class, Inherited=false)]
 	public sealed class ProgIdAttribute : Attribute
 	{

mcs/class/corlib/System.Runtime.InteropServices/RegistrationClassContext.cs

@@ -27,9 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-
-#if NET_2_0
-
 using System;
 
 namespace System.Runtime.InteropServices
@@ -57,4 +54,3 @@ namespace System.Runtime.InteropServices
 		Reserved5 = 2048,
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/RegistrationConnectionType.cs

@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  ([email protected])
 //
 
-#if NET_2_0
-
 using System;
 
 namespace System.Runtime.InteropServices
@@ -21,4 +19,3 @@ namespace System.Runtime.InteropServices
 		Surrogate = 8
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/RegistrationServices.cs

@@ -34,9 +34,7 @@ using System.Reflection;
 namespace System.Runtime.InteropServices
 {
 	
-#if NET_2_0
 	[ComVisible(true)]
-#endif	
 	[Guid ("475e398f-8afa-43a7-a3be-f4ef8d6787c9")]
 	[ClassInterface (ClassInterfaceType.None)]
 	public class RegistrationServices : IRegistrationServices
@@ -93,8 +91,6 @@ namespace System.Runtime.InteropServices
 			throw new NotImplementedException ();
 		}
 
-#if NET_2_0
-				
 		[ComVisible(false)]
 		[MonoTODO ("implement")]
 		public virtual int RegisterTypeForComClients(Type type, RegistrationClassContext classContext, RegistrationConnectionType flags)
@@ -108,7 +104,6 @@ namespace System.Runtime.InteropServices
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 		
 	}
 }

mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs

@@ -36,9 +36,7 @@ using System.Security.Permissions;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public class RuntimeEnvironment
 	{
 		public RuntimeEnvironment ()

mcs/class/corlib/System.Runtime.InteropServices/SEHException.cs

@@ -34,9 +34,7 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible(true)]	
-#endif
 	[Serializable]
 	public class SEHException : ExternalException
 	{

mcs/class/corlib/System.Runtime.InteropServices/STATSTG.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible(false)]
-#endif
 	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct STATSTG
 	{

mcs/class/corlib/System.Runtime.InteropServices/SYSKIND.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Serializable]
 	public enum SYSKIND
 	{

mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs

@@ -33,9 +33,7 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[Serializable]
 	public class SafeArrayRankMismatchException : SystemException
 	{

mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs

@@ -33,9 +33,7 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[Serializable]
 	public class SafeArrayTypeMismatchException : SystemException
 	{

mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs

@@ -43,7 +43,6 @@
 //
 //
 
-#if NET_2_0
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.ConstrainedExecution;
@@ -217,4 +216,3 @@ namespace System.Runtime.InteropServices
 		}
 	}
 }
-#endif

mcs/class/corlib/System.Runtime.InteropServices/SetWin32ContextInIDispatchAttribute.cs

@@ -30,16 +30,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if (NET_2_0 || NET_1_1)
-
 using System;
 
 namespace System.Runtime.InteropServices 
 {
-#if NET_2_0
 	[Obsolete]
 	[ComVisible(true)]	
-#endif
 	[AttributeUsage (AttributeTargets.Assembly, Inherited = false)]
 	public sealed class SetWin32ContextInIDispatchAttribute : Attribute
 	{
@@ -48,5 +44,3 @@ namespace System.Runtime.InteropServices
 		}
 	}
 }
-
-#endif

mcs/class/corlib/System.Runtime.InteropServices/StructLayoutAttribute.cs

@@ -25,9 +25,7 @@ using System;
 
 namespace System.Runtime.InteropServices {
 
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct,
 			 Inherited=false)]
 	public sealed class StructLayoutAttribute : Attribute {

mcs/class/corlib/System.Runtime.InteropServices/TYPEATTR.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct TYPEATTR
 	{

mcs/class/corlib/System.Runtime.InteropServices/TYPEDESC.cs

@@ -30,11 +30,7 @@
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	public struct TYPEDESC
 	{

mcs/class/corlib/System.Runtime.InteropServices/TYPEFLAGS.cs

@@ -32,11 +32,7 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[Obsolete]
-#else
-	[ComVisible (false)]
-#endif
 	[Serializable, Flags]
 	public enum TYPEFLAGS
 	{

mcs/class/corlib/System.Runtime.InteropServices/TypeLibConverter.cs

@@ -34,9 +34,7 @@ using System.Reflection.Emit;
 
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
 	[ComVisible(true)]
-#endif
 	[Guid ("f1c3bf79-c3e4-11d3-88e7-00902754c43a")]
 	[ClassInterface (ClassInterfaceType.None)]
 	public sealed class TypeLibConverter : ITypeLibConverter
@@ -46,9 +44,7 @@ namespace System.Runtime.InteropServices
 		}
 
 		[MonoTODO ("implement")]
-#if NET_2_0
 		[return: MarshalAs (UnmanagedType.Interface)]
-#endif
 		public object ConvertAssemblyToTypeLib (Assembly assembly, string strTypeLibName, TypeLibExporterFlags flags, ITypeLibExporterNotifySink notifySink)
 		{
 			throw new NotImplementedException ();