[bcl] Remove NET_3_5 defines from class libs

mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs

@@ -110,12 +110,10 @@ namespace Microsoft.Build.BuildEngine {
 		{
 			Toolsets.Add (new Toolset ("2.0",
 						ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20)));
-#if NET_3_5
 			Toolsets.Add (new Toolset ("3.0",
 						ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version30)));
 			Toolsets.Add (new Toolset ("3.5",
 						ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35)));
-#endif
 			Toolsets.Add (new Toolset ("4.0",
 						ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40)));
 #if XBUILD_12

mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs

@@ -77,7 +77,6 @@ namespace Microsoft.Build.BuildEngine {
 					} else if (onErrorFound)
 						throw new InvalidProjectFileException (
 							"The element <OnError> must be last under element <Target>. Found element <Error> instead.");
-#if NET_3_5
 					else if (xe.Name == "ItemGroup") {
 						var group = new BuildTaskItemGroup (xe, this);
 						buildTasks.AddRange (group.Items);
@@ -86,7 +85,6 @@ namespace Microsoft.Build.BuildEngine {
 						buildTasks.Add (new BuildTaskPropertyGroup (xe, this));
 						continue;
 					}
-#endif
 					else
 						buildTasks.Add (new BuildTask (xe, this));
 				}

mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/Consts.cs

@@ -47,8 +47,6 @@ public static class Consts {
 				string profile = "net_4_5";
 #elif NET_4_0
 				string profile = "net_4_0";
-#elif NET_3_5
-				string profile = "net_3_5";
 #else
 				string profile = "net_2_0";
 #endif
@@ -64,8 +62,6 @@ public static class Consts {
 				return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version45);
 #elif NET_4_0
 				return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40);
-#elif NET_3_5
-				return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35);
 #else
 				return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20);
 #endif
@@ -81,8 +77,6 @@ public static class Consts {
 			return " ToolsVersion='12.0'";
 #elif NET_4_0
 			return " ToolsVersion='4.0'";
-#elif NET_3_5
-			return " ToolsVersion='3.5'";
 #else
 			return String.Empty;
 #endif
@@ -97,8 +91,6 @@ public static class Consts {
 		return Path.Combine (BinPath, "Microsoft.Build.Tasks.v12.0.dll");
 #elif NET_4_0
 		return Path.Combine (BinPath, "Microsoft.Build.Tasks.v4.0.dll");
-#elif NET_3_5
-		return Path.Combine (BinPath, "Microsoft.Build.Tasks.v3.5.dll");
 #else
 		return Path.Combine (BinPath, "Microsoft.Build.Tasks.dll");
 #endif

mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs

@@ -349,7 +349,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			}
 		}
 
-#if NET_3_5
 		bool Build (string projectXml, ILogger logger)
 		{
 			if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
@@ -786,7 +785,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			3, "COMPILE: input1a;input1b - output1", "COMPILE: input2a;input2b - output2");
 		}
 
-		#endif
 
 		[Test]
 		public void TestTargetOutputsIncludingMetadata ()

mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs

@@ -39,9 +39,7 @@ namespace Microsoft.Build.Framework
 		string	senderName;
 		int	threadId;
 		DateTime	timestamp;
-#if NET_3_5
 		BuildEventContext context;
-#endif
 
 		protected BuildEventArgs ()
 			: this (null, null, null)
@@ -63,9 +61,7 @@ namespace Microsoft.Build.Framework
 			this.senderName = senderName;
 			this.threadId = Thread.CurrentThread.GetHashCode ();
 			this.timestamp = eventTimestamp;
-#if NET_3_5
 			this.context = BuildEventContext.NewInstance ();
-#endif
 		}
 
 		public string HelpKeyword {
@@ -103,7 +99,6 @@ namespace Microsoft.Build.Framework
 			}
 		}
 
-#if NET_3_5
 		public BuildEventContext BuildEventContext {
 			get { return context; }
 			set {
@@ -112,7 +107,6 @@ namespace Microsoft.Build.Framework
 				context = value;
 			}
 		}
-#endif
 	}
 }
 

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs

@@ -163,7 +163,6 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-#if NET_3_5
 		public bool OverwriteReadOnlyFiles {
 			get {
 				return overwriteReadOnlyFiles;
@@ -172,7 +171,6 @@ namespace Microsoft.Build.Tasks {
 				overwriteReadOnlyFiles = value;
 			}
 		}
-#endif
 
 		[Required]
 		public ITaskItem[] SourceFiles {

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs

@@ -95,12 +95,10 @@ namespace Microsoft.Build.Tasks {
 			set { include = value; }
 		}
 
-#if NET_3_5
 		public bool PreserveExistingMetadata {
 			get { return preserveExistingMetadata; }
 			set { preserveExistingMetadata = value; }
 		}
-#endif
 	}
 }
 

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs

@@ -55,7 +55,6 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-#if NET_3_5
 		[Output]
 		public string FrameworkVersion11Path {
 			get {
@@ -87,7 +86,6 @@ namespace Microsoft.Build.Tasks {
 						TargetDotNetFrameworkVersion.Version35);
 			}
 		}
-#endif
 
 		[Output]
 		public string FrameworkVersion40Path {

mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs

@@ -303,7 +303,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
 			Assert.AreEqual (FileAttributes.Normal, File.GetAttributes (target_file), "A3");					
 		}
 
-#if NET_3_5
 		[Test]
 		public void TestCopy_OverwriteReadOnlyTrue ()
 		{
@@ -396,7 +395,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
 			
 			File.SetAttributes (target_file, FileAttributes.Normal);
 		}
-#endif
 
 		void CheckCopyBuildItems (Project project, string [] source_files, string destination_folder, string prefix)
 		{

mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CreateItemTest.cs

@@ -252,7 +252,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
 
 		}
 
-#if NET_3_5 || NET_4_0
 		[Test]
 		public void TestItemsWithWildcards () {
 			Engine engine = new Engine (Consts.BinPath);
@@ -369,7 +368,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
 				Directory.Delete (basedir, true);
 			}
 		}
-#endif
 
 		void CreateDirectoriesAndFiles (string basedir, string[] dirs, string[] files) {
 			foreach (string dir in dirs)

mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/FindAppConfigFileTest.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET_3_5
 
 using System;
 using System.Collections;
@@ -125,4 +124,3 @@ namespace MonoTests.Microsoft.Build.Tasks {
 		}
 	}
 }	
-#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs

@@ -40,10 +40,8 @@ namespace Microsoft.Build.Utilities
 	{
 		Version11,
 		Version20,
-#if NET_3_5
 		Version30,
 		Version35,
-#endif
 		Version40,
 		Version45,
 #if XBUILD_12

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs

@@ -131,11 +131,9 @@ namespace Microsoft.Build.Utilities
 
 			//Mono doesn't ship multiple versions of tools that are backwards/forwards compatible
 			if (!runningOnDotNet) {
-#if NET_3_5
 				//most of the 3.5 tools are in the 2.0 directory
 				if (version == TargetDotNetFrameworkVersion.Version35)
 					return GetPathToDotNetFrameworkFile (fileName, TargetDotNetFrameworkVersion.Version20);
-#endif
 				//unversioned tools are in the 4.5 directory
 				if (version == TargetDotNetFrameworkVersion.Version20)
 					return GetPathToDotNetFrameworkFile (fileName, (TargetDotNetFrameworkVersion)5);

mcs/class/System.Data/Assembly/AssemblyInfo.cs

@@ -65,7 +65,5 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo ("System.Design, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 
-#if NET_3_5
 //	[assembly: InternalsVisibleTo ("System.Data.Entity, PublicKey=00000000000000000400000000000000")]
 //	[assembly: InternalsVisibleTo ("System.Data.DataSetExtensions, PublicKey=00000000000000000400000000000000")]
-#endif

mcs/class/System.Design/Assembly/AssemblyInfo.cs

@@ -61,6 +61,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 
-#if NET_3_5
 	[assembly: InternalsVisibleTo ("System.Web.Extensions.Design, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel.Configuration/ServiceModelSectionGroupTest.cs

@@ -70,11 +70,7 @@ namespace MonoTests.System.ServiceModel.Configuration
 		public void BindingCollections () {
 			ServiceModelSectionGroup g = GetConfig ("Test/config/test1.config");
 			List<BindingCollectionElement> coll = g.Bindings.BindingCollections;
-#if NET_3_5
 			Assert.AreEqual (20, coll.Count, "Count");
-#else
-			Assert.AreEqual (16, coll.Count, "Count");
-#endif
 		}
 
 		[Test]

mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs

@@ -46,11 +46,7 @@ using System.Security;
 [assembly: AssemblyCompany (Consts.MonoCompany)]
 [assembly: AssemblyProduct (Consts.MonoProduct)]
 [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-#if NET_3_5
 	[assembly: AssemblyVersion (Consts.FxVersion)]
-#else
-	[assembly: AssemblyVersion ("1.0.61025.0")]
-#endif
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]

mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs

@@ -47,13 +47,8 @@ using System.Security.Permissions;
 [assembly: AssemblyCompany (Consts.MonoCompany)]
 [assembly: AssemblyProduct (Consts.MonoProduct)]
 [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-#if NET_3_5
 	[assembly: AssemblyVersion (Consts.FxVersion)]
 	[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-#else
-	[assembly: AssemblyVersion ("1.0.61025.0")]
-	[assembly: AssemblyInformationalVersion ("1.0.61025.0")]
-#endif
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientFormsAuthenticationCredentials.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Net;
@@ -65,4 +64,3 @@ namespace System.Web.ClientServices.Providers
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientFormsAuthenticationMembershipProvider.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Collections.Specialized;
@@ -197,4 +196,3 @@ namespace System.Web.ClientServices.Providers
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientRoleProvider.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -119,4 +118,3 @@ namespace System.Web.ClientServices.Providers
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientSettingsProvider.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -97,4 +96,3 @@ namespace System.Web.ClientServices.Providers
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientWindowsAuthenticationMembershipProvider.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -180,4 +179,3 @@ namespace System.Web.ClientServices.Providers
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/IClientFormsAuthenticationCredentialsProvider.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Net;
@@ -45,4 +44,3 @@ namespace System.Web.ClientServices.Providers
 		ClientFormsAuthenticationCredentials GetCredentials ();
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/SettingsSavedEventArgs.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -55,4 +54,3 @@ namespace System.Web.ClientServices.Providers
 		}		
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/UserValidatedEventArgs.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Net;
@@ -53,4 +52,3 @@ namespace System.Web.ClientServices.Providers
 		}		
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices/ClientFormsIdentity.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Net;
@@ -93,4 +92,3 @@ namespace System.Web.ClientServices
 		}		
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices/ClientRolePrincipal.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Net;
@@ -58,4 +57,3 @@ namespace System.Web.ClientServices
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.ClientServices/ConnectivityStatus.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Net;
@@ -53,4 +52,3 @@ namespace System.Web.ClientServices
 		}		
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.Configuration/ScriptingJsonSerializationSection.cs

@@ -43,11 +43,7 @@ namespace System.Web.Configuration
 			}
 		}
 
-#if NET_3_5
 		[ConfigurationPropertyAttribute ("maxJsonLength", DefaultValue = 2097152)]
-#else
-		[ConfigurationPropertyAttribute ("maxJsonLength", DefaultValue = 102400)]
-#endif
 		public int MaxJsonLength {
 			get {
 				return (int) this ["maxJsonLength"];

mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs

@@ -62,7 +62,6 @@ namespace System.Web.Handlers
 		}
 
 		#endregion
-#if NET_3_5
 		void AppendResourceScriptContents (StringWriter sw, CompositeEntry entry)
 		{
 			if (entry.Assembly == null || entry.Attribute == null || String.IsNullOrEmpty (entry.NameOrPath))
@@ -179,7 +178,6 @@ namespace System.Web.Handlers
 			if (notifyScriptLoaded)
 				OutputScriptLoadedNotification (response.Output);
 		}
-#endif
 		void OutputScriptLoadedNotification (TextWriter writer)
 		{
 			writer.WriteLine ();
@@ -190,13 +188,11 @@ namespace System.Web.Handlers
 		{
 			HttpRequest request = context.Request;
 			bool notifyScriptLoaded = request.QueryString ["n"] == "t";
-#if NET_3_5
 			List <CompositeEntry> compositeEntries = CompositeScriptReference.GetCompositeScriptEntries (request.RawUrl);
 			if (compositeEntries != null) {
 				SendCompositeScript (context, request, notifyScriptLoaded, compositeEntries);
 				return;
 			}
-#endif
 			EmbeddedResource res;
 			Assembly assembly;			
 			SendEmbeddedResource (context, out res, out assembly);
@@ -247,7 +243,6 @@ namespace System.Web.Handlers
 			if (notifyScriptLoaded)
 				OutputScriptLoadedNotification (writer);
 		}
-#if NET_3_5
 		static void CheckIfResourceIsCompositeScript (string resourceName, ref bool includeTimeStamp)
 		{
 			bool isCompositeScript = resourceName.StartsWith (CompositeScriptReference.COMPOSITE_SCRIPT_REFERENCE_PREFIX, StringComparison.Ordinal);
@@ -261,7 +256,6 @@ namespace System.Web.Handlers
 		{
 			return false;
 		}
-#endif
 		// TODO: add value cache?
 		static string GetScriptStringLiteral (string value)
 		{

mcs/class/System.Web.Extensions/System.Web.Query.Dynamic/DynamicClass.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -49,4 +48,3 @@ namespace System.Web.Query.Dynamic
 	}
 }
 
-#endif

mcs/class/System.Web.Extensions/System.Web.Query.Dynamic/ParseException.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 
@@ -52,4 +51,3 @@ namespace System.Web.Query.Dynamic
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs

@@ -66,11 +66,7 @@ namespace System.Web.Script.Serialization
 
 			ScriptingJsonSerializationSection section = (ScriptingJsonSerializationSection) ConfigurationManager.GetSection ("system.web.extensions/scripting/webServices/jsonSerialization");
 			if (section == null) {
-#if NET_3_5
 				_maxJsonLength = 2097152;
-#else
-				_maxJsonLength = 102400;
-#endif
 				_recursionLimit = 100;
 			} else {
 				_maxJsonLength = section.MaxJsonLength;

mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs

@@ -40,10 +40,8 @@ using System.Web.Script.Serialization;
 using System.IO;
 using System.Xml.Serialization;
 using System.Xml;
-#if NET_3_5
 using System.ServiceModel;
 using System.ServiceModel.Description;
-#endif
 
 namespace System.Web.Script.Services
 {
@@ -59,11 +57,9 @@ namespace System.Web.Script.Services
 	{
 		public static LogicalTypeInfo CreateTypeInfo (Type t, string filePath)
 		{
-#if NET_3_5
 			if (t.GetCustomAttributes (typeof (ServiceContractAttribute), false).Length > 0)
 				return new WcfLogicalTypeInfo (t, filePath);
 			else
-#endif
 				return new AsmxLogicalTypeInfo (t, filePath);
 		}
 
@@ -577,7 +573,6 @@ var gtc = Sys.Net.WebServiceProxy._generateTypedConstructor;");
 		}
 	}
 
-#if NET_3_5
 	internal class WcfLogicalTypeInfo : LogicalTypeInfo
 	{
 		ContractDescription cd;
@@ -678,5 +673,4 @@ var gtc = Sys.Net.WebServiceProxy._generateTypedConstructor;");
 			}
 		}
 	}
-#endif
 }

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPager.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -497,4 +496,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerCommandEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Security.Permissions;
 
@@ -73,4 +72,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerField.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -267,4 +266,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerFieldCollection.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.ComponentModel;
@@ -201,4 +200,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerFieldCommandEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -58,4 +57,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerFieldItem.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -70,4 +69,3 @@ namespace System.Web.UI.WebControls
 
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/HelperExtensions.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -46,4 +45,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/IPageableItemContainer.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Security.Permissions;
 using System.Web;
@@ -47,4 +46,3 @@ namespace System.Web.UI.WebControls
 		event EventHandler<PageEventArgs> TotalRowCountAvailable;
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/InsertItemPosition.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 namespace System.Web.UI.WebControls
 {
 	public enum InsertItemPosition
@@ -37,4 +36,3 @@ namespace System.Web.UI.WebControls
 		LastItem
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSource.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.ComponentModel;
@@ -439,4 +438,3 @@ namespace System.Web.UI.WebControls
 		#endregion
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceContextEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -56,4 +55,3 @@ namespace System.Web.UI.WebControls
 		public DataSourceOperation Operation { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceDeleteEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -57,4 +56,3 @@ namespace System.Web.UI.WebControls
 		public object OriginalObject { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceDisposeEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -48,4 +47,3 @@ namespace System.Web.UI.WebControls
 		public object ObjectInstance { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceInsertEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -57,4 +56,3 @@ namespace System.Web.UI.WebControls
 		public object NewObject { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceSelectEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -73,4 +72,3 @@ namespace System.Web.UI.WebControls
 		public IDictionary<string, object> WhereParameters { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceStatusEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -66,4 +65,3 @@ namespace System.Web.UI.WebControls
 		public int TotalRowCount { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceUpdateEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -62,4 +61,3 @@ namespace System.Web.UI.WebControls
 		public object OriginalObject { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceValidationException.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -83,4 +82,3 @@ namespace System.Web.UI.WebControls
 		public IDictionary<string, Exception> InnerExceptions { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceView.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 
 // FIXME: in general we should create something like
 // System.Web.Query,Dynamic.DynamicClass to execute DataContext operations.
@@ -564,4 +563,3 @@ namespace System.Web.UI.WebControls
 		#endregion
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -2059,5 +2058,4 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif
 

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewCancelEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 
@@ -52,4 +51,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewCancelMode.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 namespace System.Web.UI.WebControls
 {
 	public enum ListViewCancelMode
@@ -36,4 +35,3 @@ namespace System.Web.UI.WebControls
 		CancelingInsert
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewCommandEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 
 namespace System.Web.UI.WebControls
@@ -52,4 +51,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewContainer.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Web;
 using System.Web.UI;
@@ -54,4 +53,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDataItem.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 
 namespace System.Web.UI.WebControls
@@ -54,4 +53,3 @@ namespace System.Web.UI.WebControls
 		
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDeleteEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Collections.Specialized;
@@ -66,4 +65,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDeletedEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 
@@ -84,4 +83,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewEditEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 
@@ -46,4 +45,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewInsertEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -57,4 +56,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewInsertedEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 
@@ -80,4 +79,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItem.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 
@@ -79,4 +78,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItemEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 
 namespace System.Web.UI.WebControls
@@ -45,4 +44,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItemType.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 namespace System.Web.UI.WebControls
 {
 	public enum ListViewItemType
@@ -37,4 +36,3 @@ namespace System.Web.UI.WebControls
 		EmptyItem
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewPagedDataSource.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.ComponentModel;
@@ -243,4 +242,3 @@ namespace System.Web.UI.WebControls
 		
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewSelectEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 
@@ -46,4 +45,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewSortEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 
@@ -52,4 +51,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewTableCell.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
@@ -42,4 +41,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewTableRow.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
@@ -47,4 +46,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewUpdateEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -75,4 +74,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewUpdatedEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 
@@ -90,4 +89,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/NextPreviousPagerField.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -482,4 +481,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/NumericPagerField.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Globalization;
 using System.Security.Permissions;
@@ -440,4 +439,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/PageEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Security.Permissions;
 using System.Web;
@@ -63,4 +62,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/PagePropertiesChangingEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 
 namespace System.Web.UI.WebControls
@@ -51,4 +50,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/TemplatePagerField.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -111,4 +110,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI/CompositeScriptReference.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.Collections.Concurrent;
@@ -173,4 +172,3 @@ namespace System.Web.UI
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI/CompositeScriptReferenceEventArgs.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -50,4 +49,3 @@ namespace System.Web.UI
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs

@@ -65,9 +65,7 @@ namespace System.Web.UI
 		const string hiddenField = "hiddenField";
 		const string arrayDeclaration = "arrayDeclaration";
 		const string scriptBlock = "scriptBlock";
-#if NET_3_5
 		const string scriptStartupBlock = "scriptStartupBlock";
-#endif
 		const string expando = "expando";
 		const string onSubmit = "onSubmit";
 		const string asyncPostBackControlIDs = "asyncPostBackControlIDs";
@@ -97,9 +95,7 @@ namespace System.Web.UI
 		List<UpdatePanel> _panelsToRefresh;
 		List<UpdatePanel> _updatePanels;
 		ScriptReferenceCollection _scripts;
-#if NET_3_5
 		CompositeScriptReference _compositeScript;
-#endif
 		ServiceReferenceCollection _services;
 		bool _isInAsyncPostBack;
 		bool _isInPartialRendering;
@@ -335,7 +331,6 @@ namespace System.Web.UI
 				return _scripts;
 			}
 		}
-#if NET_3_5
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[Category ("Behavior")]
 		[DefaultValue (null)]
@@ -348,7 +343,6 @@ namespace System.Web.UI
 				return _compositeScript;
 			}
 		}
-#endif
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[DefaultValue ("")]
 		[MergableProperty (false)]
@@ -404,10 +398,8 @@ namespace System.Web.UI
 
 		[Category ("Action")]
 		public event EventHandler<ScriptReferenceEventArgs> ResolveScriptReference;
-#if NET_3_5
 		[Category ("Action")]
 		public event EventHandler<CompositeScriptReferenceEventArgs> ResolveCompositeScriptReference;
-#endif
 		public static ScriptManager GetCurrent (Page page) {
 			if (page == null)
 				throw new ArgumentNullException ("page");
@@ -594,12 +586,10 @@ namespace System.Web.UI
 				if (IsMultiForm)
 					RegisterScriptReference (this, ajaxWebFormsExtensionScript, true);
 			}
-#if NET_3_5
 			if (_compositeScript != null && _compositeScript.HaveScripts ()) {
 				OnResolveCompositeScriptReference (new CompositeScriptReferenceEventArgs (_compositeScript));
 				RegisterScriptReference (this, _compositeScript, true);
 			}
-#endif			
 			// Register Scripts
 			if (_scriptToRegister != null)
 				for (int i = 0; i < _scriptToRegister.Count; i++)
@@ -756,14 +746,12 @@ namespace System.Web.UI
 				}
 			}
 		}
-#if NET_3_5
 		protected virtual void OnResolveCompositeScriptReference (CompositeScriptReferenceEventArgs e)
 		{
 			EventHandler <CompositeScriptReferenceEventArgs> evt = ResolveCompositeScriptReference;
 			if (evt != null)
 				evt (this, e);
 		}
-#endif
 		protected virtual void OnResolveScriptReference (ScriptReferenceEventArgs e) {
 			if (ResolveScriptReference != null)
 				ResolveScriptReference (this, e);
@@ -1428,14 +1416,12 @@ namespace System.Web.UI
 							else
 								WriteCallbackOutput (output, scriptBlock, scriptContentWithTags, SerializeScriptBlock (scriptEntry));
 							break;
-#if NET_3_5
 						case RegisteredScriptType.ClientStartupScript:
 							if (scriptEntry.AddScriptTags)
 								WriteCallbackOutput (output, scriptStartupBlock, scriptContentNoTags, scriptEntry.Script);
 							else
 								WriteCallbackOutput (output, scriptStartupBlock, scriptContentWithTags, SerializeScriptBlock (scriptEntry));
 							break;
-#endif
 						case RegisteredScriptType.ClientScriptInclude:
 							WriteCallbackOutput (output, scriptBlock, scriptPath, scriptEntry.Url);
 							break;

mcs/class/System.Web.Extensions/System.Web.UI/ScriptManagerProxy.cs

@@ -42,9 +42,7 @@ namespace System.Web.UI
 	{
 		ScriptManager _scriptManager;
 		ScriptReferenceCollection _scripts;
-#if NET_3_5
 		CompositeScriptReference _compositeScript;
-#endif
 		ServiceReferenceCollection _services;
 		AuthenticationServiceManager _authenticationService;
 		ProfileServiceManager _profileService;
@@ -84,7 +82,6 @@ namespace System.Web.UI
 				return _scripts;
 			}
 		}
-#if NET_3_5
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[Category ("Behavior")]
 		[DefaultValue (null)]
@@ -97,7 +94,6 @@ namespace System.Web.UI
 				return _compositeScript;
 			}
 		}
-#endif
 		[MergableProperty (false)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[Category ("Behavior")]

mcs/class/System.Web.Extensions/Test/System.Web.Script.Serialization/JavaScriptSerializerTest.cs

@@ -347,11 +347,7 @@ namespace MonoTests.System.Web.Script.Serialization
 		[Category ("NotDotNet")]
 		public void TestDefaults () {
 			JavaScriptSerializer ser = new JavaScriptSerializer ();
-#if NET_3_5
 			Assert.AreEqual (2097152, ser.MaxJsonLength);
-#else
-			Assert.AreEqual (102400, ser.MaxJsonLength);
-#endif
 			Assert.AreEqual (100, ser.RecursionLimit);
 			//List<JavaScriptConverter> l = new List<JavaScriptConverter> ();
 			//l.Add (new MyJavaScriptConverter ());

mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/DataPagerFieldCollectionTest.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -222,4 +221,3 @@ namespace MonoTests.System.Web.UI.WebControls
 		
 	}
 }
-#endif

mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/EventRecorder.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -55,4 +54,3 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewPagedDataSourceTest.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -229,4 +228,3 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -1322,4 +1321,3 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs

@@ -272,9 +272,7 @@ namespace System.Web.Handlers
 				debug = resourceName.EndsWith (".debug.js", StringComparison.OrdinalIgnoreCase);
 				string dbgTail = debug ? "d" : String.Empty;
 				lookupKey = resourceNameHash + (notifyScriptLoaded ? "t" : "f") + dbgTail;
-#if NET_3_5
 				CheckIfResourceIsCompositeScript (resourceName, ref includeTimeStamp);
-#endif
 #else
 				lookupKey = resourceNameHash;
 #endif

mcs/class/System.Web/System.Web/ApplicationShutdownReason.cs

@@ -46,9 +46,7 @@ namespace System.Web
                 HttpRuntimeClose = 12,
                 InitializationError = 13,
                 MaxRecompilationsReached = 14
-#if NET_3_5
 		, BuildManagerChange = 15
-#endif 		
         }
 }
 

mcs/class/System.Web/Test/System.Web/AppBrowsersTest.cs

@@ -39,9 +39,7 @@ using System.Threading;
 namespace MonoTests.System.Web
 {
 	[TestFixture]
-#if NET_3_0
 	[Ignore ("adapters.browser depends on System.Web_test_net_2_0.dll")]
-#endif
 	public class AppBrowsersTest
 	{
 		[TestFixtureSetUp]

mcs/class/System/System.Net/HttpWebRequest.cs

@@ -937,13 +937,11 @@ namespace System.Net
 			return result.Response;
 		}
 		
-#if NET_3_5
 		public Stream EndGetRequestStream (IAsyncResult asyncResult, out TransportContext transportContext)
 		{
 			transportContext = null;
 			return EndGetRequestStream (asyncResult);
 		}
-#endif
 
 		public override WebResponse GetResponse()
 		{

mcs/class/System/System.Net/TransportContext.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_3_5
 
 using System.Security.Authentication.ExtendedProtection;
 
@@ -38,4 +37,3 @@ namespace System.Net
 	}
 }
 
-#endif