[bcl] Remove NET_4_0 defines from class libs.

6 files changed, 0 insertions, 30 deletions

diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs
index 9095cb866d3..ae4272b40e3 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs
@@ -133,11 +133,7 @@ namespace System.Web.Script.Serialization
 			return (T) ConvertToType (obj, typeof (T));
 		}
 
-#if NET_4_0
 		public
-#else
-		internal
-#endif
 		object ConvertToType (object obj, Type targetType)
 		{
 			if (obj == null)
diff --git a/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDataItem.cs b/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDataItem.cs
index 7944ff08d64..b63bb72bb8d 100644
--- a/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDataItem.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDataItem.cs
@@ -52,22 +52,6 @@ namespace System.Web.UI.WebControls
 			return base.OnBubbleEvent (source, e);
 		}
 		
-#if !NET_4_0
-		public virtual object DataItem {
-			get;
-			set;
-		}
-		
-		public virtual int DataItemIndex {
-			get;
-			private set;
-		}
-		
-		public virtual int DisplayIndex {
-			get;
-			private set;
-		}
-#endif
 	}
 }
 #endif
diff --git a/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItem.cs b/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItem.cs
index c73332b2613..97d411ac39e 100644
--- a/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItem.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItem.cs
@@ -35,9 +35,7 @@ namespace System.Web.UI.WebControls
 {
 	[ToolboxItemAttribute (false)]
 	public class ListViewItem : Control, INamingContainer
-#if NET_4_0
 	, IDataItemContainer
-#endif
 	{
 		internal ListViewItem ()
 			: this (ListViewItemType.DataItem)
@@ -65,7 +63,6 @@ namespace System.Web.UI.WebControls
 			private set;
 		}
 		
-#if NET_4_0
 		public virtual object DataItem {
 			get;
 			set;
@@ -80,7 +77,6 @@ namespace System.Web.UI.WebControls
 			get;
 			protected set;
 		}
-#endif
 	}
 }
 #endif
diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/CompositeScriptReference.cs b/mcs/class/System.Web.Extensions/System.Web.UI/CompositeScriptReference.cs
index f0b3e7760f8..0d08402b1ca 100644
--- a/mcs/class/System.Web.Extensions/System.Web.UI/CompositeScriptReference.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI/CompositeScriptReference.cs
@@ -148,14 +148,12 @@ namespace System.Web.UI
 			entriesCache.InsertOrUpdate ((uint)ret.GetHashCode (), ret, entries, entries);
 			return ret;
 		}
-#if NET_4_0
 		protected internal override bool IsAjaxFrameworkScript (ScriptManager scriptManager)
 		{
 			return false;
 		}
 		
 		[Obsolete ("Use IsAjaxFrameworkScript(ScriptManager)")]
-#endif
 		protected internal override bool IsFromSystemWebExtensions ()
 		{
 			if (scripts == null || scripts.Count == 0)
diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReference.cs b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReference.cs
index 69641e2c81f..d5534d8e3db 100644
--- a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReference.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReference.cs
@@ -167,14 +167,12 @@ namespace System.Web.UI
 
 			return url;
 		}
-#if NET_4_0
 		protected internal override bool IsAjaxFrameworkScript (ScriptManager scriptManager)
 		{
 			return false;
 		}
 		
 		[Obsolete ("Use IsAjaxFrameworkScript(ScriptManager)")]
-#endif		
 		protected internal override bool IsFromSystemWebExtensions ()
 		{
 			return ResolvedAssembly == ThisAssembly;
diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReferenceBase.cs b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReferenceBase.cs
index 1b95a559d36..ef27f6b01b6 100644
--- a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReferenceBase.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptReferenceBase.cs
@@ -76,14 +76,12 @@ namespace System.Web.UI
 			this.NotifyScriptLoaded = true;
 			this.ScriptMode = ScriptMode.Auto;
 		}
-#if NET_4_0
 		protected internal virtual bool IsAjaxFrameworkScript (ScriptManager scriptManager)
 		{
 			return false;
 		}
 		
 		[Obsolete ("Use IsAjaxFrameworkScript(ScriptManager)")]
-#endif
 		protected internal abstract bool IsFromSystemWebExtensions ();
 		protected internal abstract string GetUrl (ScriptManager scriptManager, bool zip);