[bcl] Remove NET_4_0 defines from class libs.

mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs

@@ -48,11 +48,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-#if NET_4_0
 [assembly: AssemblyVersion("4.84.0.0")]
-#else
-[assembly: AssemblyVersion("2.84.0.0")]
-#endif
 
 [assembly: AssemblyDelaySign(true)]
 [assembly: AssemblyKeyFile("SharpZipLib.pub")]

mcs/class/Managed.Windows.Forms/System.Windows.Forms/SplitContainer.cs

@@ -42,9 +42,7 @@ namespace System.Windows.Forms
 	[Docking (DockingBehavior.AutoDock)]
 	[Designer ("System.Windows.Forms.Design.SplitContainerDesigner, " + Consts.AssemblySystem_Design)]
 	public class SplitContainer : ContainerControl
-#if NET_4_0
 		, ISupportInitialize
-#endif
 	{
 		#region Local Variables
 		private FixedPanel fixed_panel;
@@ -474,7 +472,6 @@ namespace System.Windows.Forms
 		#endregion
 
 		#region Public Methods
-#if NET_4_0
 		[MonoTODO]
 		public void BeginInit ()
 		{
@@ -484,7 +481,6 @@ namespace System.Windows.Forms
 		public void EndInit ()
 		{
 		}
-#endif
 		
 		public void OnSplitterMoved (SplitterEventArgs e)
 		{

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

@@ -291,11 +291,7 @@ namespace Microsoft.Build.BuildEngine
 			// Hence we expect sender as a valid object only if it is IBuildEngine4 -
 			// only Microsoft.Build.Internal.BuildEngine4 implements it so far. 
 			// (Used IBuildEngine3 because it needs to build for NET_4_0).
-#if NET_4_0
 			var key = sender as IBuildEngine3 ?? dummy_key;
-#else
-			var key = dummy_key;
-#endif
 			if (!build_records.TryGetValue (key, out r)) {
 				r = new BuildRecord (this);
 				build_records.Add (key, r);

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

@@ -116,10 +116,8 @@ namespace Microsoft.Build.BuildEngine {
 			Toolsets.Add (new Toolset ("3.5",
 						ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35)));
 #endif
-#if NET_4_0
 			Toolsets.Add (new Toolset ("4.0",
 						ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40)));
-#endif
 #if XBUILD_12
 			Toolsets.Add (new Toolset ("12.0", ToolLocationHelper.GetPathToBuildTools ("12.0")));
 #endif
@@ -562,11 +560,7 @@ namespace Microsoft.Build.BuildEngine {
 				// project can't find a version to use
 				return String.IsNullOrEmpty (defaultToolsVersion)
 						?
-#if NET_4_0						
 						 "4.0"
-#else
-						"2.0"
-#endif						
 						: defaultToolsVersion;
 			}
 			set {

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

@@ -231,7 +231,6 @@ namespace Microsoft.Build.BuildEngine {
 			if (String.IsNullOrEmpty (parsed_import))
 				throw new InvalidProjectFileException ("The required attribute \"Project\" in Import is empty");
 
-#if NET_4_0
 			if (DirectoryScanner.HasWildcard (parsed_import)) {
 				var directoryScanner = new DirectoryScanner () {
 					Includes = new ITaskItem [] { new TaskItem (parsed_import) },
@@ -242,7 +241,6 @@ namespace Microsoft.Build.BuildEngine {
 				foreach (ITaskItem matchedItem in directoryScanner.MatchedItems)
 					yield return matchedItem.ItemSpec;
 			} else
-#endif
 				yield return parsed_import;
 		}
 

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

@@ -323,9 +323,7 @@ namespace Microsoft.Build.BuildEngine {
 				Reevaluate ();
 			}
 
-#if NET_4_0
 			ProcessBeforeAndAfterTargets ();
-#endif
 
 			if (targetNames == null || targetNames.Length == 0) {
 				if (defaultTargets != null && defaultTargets.Length != 0) {
@@ -404,7 +402,6 @@ namespace Microsoft.Build.BuildEngine {
 			return sb.ToString ();
 		}
 
-#if NET_4_0
 		void ProcessBeforeAndAfterTargets ()
 		{
 			var beforeTable = Targets.AsIEnumerable ()
@@ -440,7 +437,6 @@ namespace Microsoft.Build.BuildEngine {
 			expr.Parse (targets, ParseOptions.AllowItemsNoMetadataAndSplit);
 			return (string []) expr.ConvertTo (this, typeof (string []));
 		}
-#endif
 
 		[MonoTODO]
 		public string [] GetConditionedPropertyValues (string propertyName)

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

@@ -176,14 +176,10 @@ namespace Microsoft.Build.BuildEngine {
 			try {
 				buildState = BuildState.Started;
 
-#if NET_4_0
 				result = BuildDependencies (out executeOnErrors) &&
 						BuildBeforeThisTargets (out executeOnErrors) &&
 						DoBuild (out executeOnErrors) && // deps & Before targets built fine, do main build
 						BuildAfterThisTargets (out executeOnErrors);
-#else
-				result = BuildDependencies (out executeOnErrors) && DoBuild (out executeOnErrors);
-#endif
 
 				buildState = BuildState.Finished;
 			} catch (Exception e) {
@@ -224,7 +220,6 @@ namespace Microsoft.Build.BuildEngine {
 			return result;
 		}
 
-#if NET_4_0
 		bool BuildBeforeThisTargets (out bool executeOnErrors)
 		{
 			executeOnErrors = false;
@@ -246,7 +241,6 @@ namespace Microsoft.Build.BuildEngine {
 
 			return result;
 		}
-#endif
 
 		bool BuildOtherTargets (IEnumerable<string> targetNames, Action<string> missing_target, out bool executeOnErrors)
 		{
@@ -379,7 +373,6 @@ namespace Microsoft.Build.BuildEngine {
 			}
 		}
 
-#if NET_4_0
 		internal string BeforeTargets {
 			get { return targetElement.GetAttribute ("BeforeTargets"); }
 		}
@@ -390,7 +383,6 @@ namespace Microsoft.Build.BuildEngine {
 
 		internal List<string> BeforeThisTargets { get; set; }
 		internal List<string> AfterThisTargets { get; set; }
-#endif
 
 		internal List<IBuildTask> BuildTasks {
 			get { return buildTasks; }

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

@@ -31,11 +31,7 @@ using System;
 namespace Microsoft.Build.Framework {
 	[Serializable]
 	public class BuildErrorEventArgs
-#if NET_4_0
 			: LazyFormattedBuildEventArgs {
-#else
-			: BuildEventArgs {
-#endif
 	
 		string	code;
 		int	columnNumber;
@@ -44,9 +40,7 @@ namespace Microsoft.Build.Framework {
 		string 	file;
 		int	lineNumber;
 		string	subcategory;
-#if NET_4_0
 		string projectFile;
-#endif
 
 		protected BuildErrorEventArgs ()
 		{
@@ -70,7 +64,6 @@ namespace Microsoft.Build.Framework {
 			this.endColumnNumber = endColumnNumber;
 		}
 
-#if NET_4_0
 		public BuildErrorEventArgs (string subcategory, string code,
 				string file, int lineNumber, int columnNumber,
 				int endLineNumber, int endColumnNumber, string message,
@@ -97,7 +90,6 @@ namespace Microsoft.Build.Framework {
 			this.endColumnNumber = endColumnNumber;
 
 		}
-#endif
 
 		public string Code {
 			get {
@@ -141,12 +133,10 @@ namespace Microsoft.Build.Framework {
 			}
 		}
 
-#if NET_4_0
 		public string ProjectFile {
 			get { return projectFile; }
 			set {  projectFile = value; }
 		}
-#endif
 
 	}
 }

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

@@ -54,9 +54,7 @@ namespace Microsoft.Build.Framework
 		{
 		}
 
-#if NET_4_0
 		protected
-#endif
 		BuildEventArgs (string message, string helpKeyword,
 		                string senderName, DateTime eventTimestamp)
 		{
@@ -76,18 +74,14 @@ namespace Microsoft.Build.Framework
 			}
 		}
 
-#if NET_4_0
 		virtual
-#endif
 		public string Message {
 			get {
 				return message;
 			}
-#if NET_4_0			
 			protected set {
 				message = value;
 			}
-#endif
 		}
 
 		public string SenderName {

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

@@ -46,7 +46,6 @@ namespace Microsoft.Build.Framework {
 			this.succeeded = succeeded;
 		}
 
-#if NET_4_0
 		public BuildFinishedEventArgs (string message,
 						  string helpKeyword,
 						  bool succeeded,
@@ -65,7 +64,6 @@ namespace Microsoft.Build.Framework {
 		{
 			this.succeeded = succeeded;
 		}
-#endif
 
 		public bool Succeeded {
 			get {

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

@@ -33,9 +33,7 @@ namespace Microsoft.Build.Framework {
 	[Serializable]
 	public class BuildStartedEventArgs : BuildStatusEventArgs {
 
-#if NET_4_0
 		IDictionary<string, string> buildEnvironment;
-#endif
 	
 		protected BuildStartedEventArgs ()
 		{
@@ -47,7 +45,6 @@ namespace Microsoft.Build.Framework {
 		{
 		}
 
-#if NET_4_0
 		public BuildStartedEventArgs (string message,
 					      string helpKeyword,
 					      IDictionary<string, string> environmentOfBuild)
@@ -74,7 +71,6 @@ namespace Microsoft.Build.Framework {
 		public IDictionary<string, string> BuildEnvironment {
 			get { return buildEnvironment; }
 		}
-#endif
 	}
 }
 

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

@@ -32,11 +32,7 @@ namespace Microsoft.Build.Framework
 {
 	[Serializable]
 	public abstract class BuildStatusEventArgs
-#if NET_4_0
 			: LazyFormattedBuildEventArgs {
-#else
-			: BuildEventArgs {
-#endif
 	
 		protected BuildStatusEventArgs ()
 		{
@@ -49,7 +45,6 @@ namespace Microsoft.Build.Framework
 		{
 		}
 
-#if NET_4_0
 		protected BuildStatusEventArgs (string message,
 						string helpKeyword,
 						string senderName,
@@ -66,7 +61,6 @@ namespace Microsoft.Build.Framework
 			: base (message, helpKeyword, senderName, eventTimestamp, messageArgs)
 		{
 		}
-#endif
 	}
 }
 

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

@@ -31,11 +31,7 @@ using System;
 namespace Microsoft.Build.Framework {
 	[Serializable]
 	public class BuildWarningEventArgs
-#if NET_4_0
 			: LazyFormattedBuildEventArgs {
-#else
-			: BuildEventArgs {
-#endif
 	
 		string	subcategory;
 		string	code;
@@ -44,9 +40,7 @@ namespace Microsoft.Build.Framework {
 		int	columnNumber;
 		int	endLineNumber;
 		int	endColumnNumber;
-#if NET_4_0
 		string projectFile;
-#endif
 
 		protected BuildWarningEventArgs ()
 		{
@@ -71,7 +65,6 @@ namespace Microsoft.Build.Framework {
 			this.endColumnNumber = endColumnNumber;
 		}
 
-#if NET_4_0
 		public BuildWarningEventArgs (string subcategory, string code,
 				string file, int lineNumber, int columnNumber,
 				int endLineNumber, int endColumnNumber, string message,
@@ -98,7 +91,6 @@ namespace Microsoft.Build.Framework {
 			this.endColumnNumber = endColumnNumber;
 
 		}
-#endif
 
 		public string Code {
 			get {
@@ -142,11 +134,9 @@ namespace Microsoft.Build.Framework {
 			}
 		}
 
-#if NET_4_0
 		public string ProjectFile {
 			get { return projectFile; }
 			set {  projectFile = value; }
 		}
-#endif
 	}
 }

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

@@ -1,4 +1,3 @@
-#if NET_4_0
 using System;
 
 namespace Microsoft.Build.Framework
@@ -10,4 +9,3 @@ namespace Microsoft.Build.Framework
 	}
 }
 
-#endif

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

@@ -1,6 +1,5 @@
 using System;
 
-#if NET_4_0
 
 namespace Microsoft.Build.Framework
 {
@@ -11,5 +10,4 @@ namespace Microsoft.Build.Framework
 	}
 }
 
-#endif
 

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

@@ -27,7 +27,6 @@
 //
 
 
-#if NET_4_0
 
 using System;
 using System.Collections;
@@ -41,4 +40,3 @@ namespace Microsoft.Build.Framework
 	}
 }
 
-#endif

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

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.Collections;
@@ -47,4 +46,3 @@ namespace Microsoft.Build.Framework
 	}
 }
 
-#endif

mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LazyFormattedBuildEventArgs.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_4_0
 
 using System;
 
@@ -72,4 +71,3 @@ namespace Microsoft.Build.Framework
 	}
 }
 
-#endif

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CodeTaskFactory.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_4_0
 using System;
 using Microsoft.Build.Framework;
 using System.Collections.Generic;
@@ -213,4 +212,3 @@ namespace Microsoft.Build.Tasks
 	}
 }
 
-#endif

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

@@ -26,92 +26,3 @@
 ///// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /////
 
-#if !NET_4_0
-
-using System;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.Build.Tasks
-{
-	public class CreateTemporaryVCProject : TaskExtension
-	{
-		[MonoTODO]
-		public CreateTemporaryVCProject ()
-		{
-			throw new NotImplementedException ();
-		}
-		
-		[MonoTODO]
-		[Required]
-		public string Configuration {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-		
-		[MonoTODO]
-		[Required]
-		public ITaskItem OutputProjectFile {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-		
-		[MonoTODO]
-		[Required]
-		public ITaskItem ProjectFile {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-		
-		[MonoTODO]
-		public ITaskItem[] ReferenceAssemblies {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-		
-		[MonoTODO]
-		[Required]
-		public ITaskItem[] ReferenceGuids {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-		
-		[MonoTODO]
-		public ITaskItem[] ReferenceImportLibraries {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-		
-		[MonoTODO]
-		public override bool Execute ()
-		{
-			throw new NotImplementedException ();
-		}
-	}
-}
-
-#endif

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

@@ -41,10 +41,6 @@ namespace Microsoft.Build.Tasks {
 
 		protected internal override void AddResponseFileCommands (CommandLineBuilderExtension commandLine)
 		{
-#if !NET_4_0
-			//pre-MSBuild 2 targets don't support multi-targeting, so tell compiler to use 2.0 corlib
-			commandLine.AppendSwitch ("/sdk:2");
-#endif
 			base.AddResponseFileCommands (commandLine);
 
 			if (AdditionalLibPaths != null && AdditionalLibPaths.Length > 0)

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

@@ -49,9 +49,7 @@ namespace Microsoft.Build.Tasks {
 		string		workingDirectory;
 		string scriptFile;
 
-#if NET_4_0
 		Func<string, bool> errorMatcher, warningMatcher;
-#endif
 		
 		public Exec ()
 		{
@@ -80,10 +78,8 @@ namespace Microsoft.Build.Tasks {
 						    string commandLineCommands)
 		{
 			try {
-#if NET_4_0
 				errorMatcher = GetTryMatchRegexFunc (CustomErrorRegularExpression, true);
 				warningMatcher = GetTryMatchRegexFunc (CustomWarningRegularExpression, false);
-#endif
 				return base.ExecuteTool (pathToTool, responseFileCommands, commandLineCommands);
 			} finally {
 				if (scriptFile != null)
@@ -124,14 +120,11 @@ namespace Microsoft.Build.Tasks {
 		
 		protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
 		{
-#if NET_4_0
 			if (IgnoreStandardErrorWarningFormat ||
 				(!errorMatcher (singleLine) && !warningMatcher (singleLine)))
-#endif
 				Log.LogMessage (messageImportance, singleLine);
 		}
 
-#if NET_4_0
 		// @is_error_type - log as errors, else warnings
 		Func<string, bool> GetTryMatchRegexFunc (string regex_str, bool is_error_type)
 		{
@@ -164,7 +157,6 @@ namespace Microsoft.Build.Tasks {
 				return true;
 			};
 		}
-#endif
 
 		[MonoTODO]
 		protected override bool ValidateParameters ()
@@ -209,13 +201,11 @@ namespace Microsoft.Build.Tasks {
 			get { return base.StandardOutputLoggingImportance; }
 		}
 
-#if NET_4_0
 		public bool IgnoreStandardErrorWarningFormat { get; set; }
 
 		public string CustomErrorRegularExpression { get; set; }
 
 		public string CustomWarningRegularExpression { get; set; }
-#endif
 		
 		[MonoTODO]
 		[Output]

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

@@ -89,7 +89,6 @@ namespace Microsoft.Build.Tasks {
 		}
 #endif
 
-#if NET_4_0
 		[Output]
 		public string FrameworkVersion40Path {
 			get {
@@ -97,7 +96,6 @@ namespace Microsoft.Build.Tasks {
 						TargetDotNetFrameworkVersion.Version40);
 			}
 		}
-#endif
 		
 #if NET_4_5
 		[Output]

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

@@ -35,7 +35,6 @@ using System.Collections.Generic;
 
 using Mono.XBuild.Utilities;
 
-#if NET_4_0
 
 namespace Microsoft.Build.Tasks
 {
@@ -273,4 +272,3 @@ namespace Microsoft.Build.Tasks
 	}
 }
 
-#endif

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

@@ -627,11 +627,7 @@ namespace Microsoft.Build.Tasks {
 		}
 
 		public
-#if NET_4_0
 		ITaskItem[]
-#else
-		string[]
-#endif
 		InstalledAssemblyTables { get; set; }
 
 		[Output]
@@ -685,11 +681,9 @@ namespace Microsoft.Build.Tasks {
 			get { return suggestedRedirects; }
 		}
 
-#if NET_4_0
 		public string TargetFrameworkMoniker { get; set; }
 
 		public string TargetFrameworkMonikerDisplayName { get; set; }
-#endif
 
 		public string TargetFrameworkVersion { get; set; }
 

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

@@ -26,163 +26,3 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_4_0
-
-using System;
-using System.Collections.Specialized;
-using Microsoft.Build.Framework;
-
-namespace Microsoft.Build.Tasks {
-
-	[MonoTODO]
-	public class VCBuild : ToolTaskExtension {
-
-		[MonoTODO]
-		public VCBuild ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public ITaskItem[] AdditionalLibPaths {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public string AdditionalOptions {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public bool Clean {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public string Configuration {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public ITaskItem Override {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public string Platform {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		[Required]
-		public ITaskItem[] Projects {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public bool Rebuild {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public ITaskItem SolutionFile {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public bool UserEnvironment {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		protected override StringDictionary EnvironmentOverride {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		protected override string ToolName {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public override bool Execute ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected internal override void AddCommandLineCommands (
-				CommandLineBuilderExtension commandLine )
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected override string GenerateFullPathToTool ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected override bool ValidateParameters ()
-		{
-			throw new NotImplementedException ();
-		}
-	}
-}
-
-#endif

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

@@ -306,11 +306,7 @@ namespace Microsoft.Build.Tasks {
 		[MonoTODO]
 		protected override string ToolName {
 			get {
-#if NET_4_0
 				return MSBuildUtils.RunningOnWindows ? "vbnc.bat" : "vbnc";
-#else
-				return MSBuildUtils.RunningOnWindows ? "vbnc2.bat" : "vbnc2";
-#endif
 			}
 		}
 

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

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -127,4 +126,3 @@ namespace Microsoft.Build.Tasks
 	}
 }
 
-#endif

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

@@ -328,11 +328,7 @@ namespace Microsoft.Build.Utilities
 			}
 		}
 
-#if NET_4_0
 		public
-#else
-		protected
-#endif
 		void AppendTextUnquoted (string textToAppend)
 		{
 			commandLine.Append (textToAppend);

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

@@ -44,9 +44,7 @@ namespace Microsoft.Build.Utilities
 		Version30,
 		Version35,
 #endif
-#if NET_4_0
 		Version40,
-#endif
 #if NET_4_5
 		Version45,
 #endif
@@ -63,12 +61,8 @@ namespace Microsoft.Build.Utilities
 		VersionLatest = Version451
 #elif NET_4_5
 		VersionLatest = Version45
-#elif NET_4_0
-		VersionLatest = Version40
-#elif NET_3_5
-		VersionLatest = Version35
 #else
-		VersionLatest = Version20
+		VersionLatest = Version40
 #endif
 	}
 }

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

@@ -39,9 +39,7 @@ namespace Microsoft.Build.Utilities
 	public
 #endif
 	sealed class TaskItem : MarshalByRefObject, ITaskItem
-#if NET_4_0
 		, ITaskItem2
-#endif
 	{
 		IDictionary		escapedMetadata;
 		string			escapedItemSpec;
@@ -57,13 +55,11 @@ namespace Microsoft.Build.Utilities
 			if (sourceItem == null)
 				throw new ArgumentNullException ("sourceItem");
 
-#if NET_4_0
 			var ti2 = sourceItem as ITaskItem2;
 			if (ti2 != null) {
 				escapedItemSpec = ti2.EvaluatedIncludeEscaped;
 				escapedMetadata = ti2.CloneCustomMetadataEscaped ();
 			} else
-#endif
 			{
 				escapedItemSpec = MSBuildUtils.Escape (sourceItem.ItemSpec);
 				escapedMetadata = sourceItem.CloneCustomMetadata ();
@@ -106,12 +102,10 @@ namespace Microsoft.Build.Utilities
 			return CollectionsUtil.CreateCaseInsensitiveHashtable (escapedMetadata);
 		}
 
-#if NET_4_0
 		IDictionary ITaskItem2.CloneCustomMetadataEscaped ()
 		{
 			return CloneCustomMetadataEscaped ();
 		}
-#endif
 
 		public void CopyMetadataTo (ITaskItem destinationItem)
 		{
@@ -139,12 +133,10 @@ namespace Microsoft.Build.Utilities
 			return ((string) escapedMetadata [metadataName]) ?? String.Empty;
 		}
 
-#if NET_4_0
 		string ITaskItem2.GetMetadataValueEscaped (string metadataName)
 		{
 			return GetMetadataValue (metadataName);
 		}
-#endif
 
 		public override object InitializeLifetimeService ()
 		{
@@ -175,12 +167,10 @@ namespace Microsoft.Build.Utilities
 			escapedMetadata [metadataName] = metadataValue;
 		}
 
-#if NET_4_0
 		void ITaskItem2.SetMetadataValueLiteral (string metadataName, string metadataValue)
 		{
 			SetMetadata (metadataName, MSBuildUtils.Escape (metadataValue));
 		}
-#endif
 		public override string ToString ()
 		{
 			return escapedItemSpec;
@@ -191,12 +181,10 @@ namespace Microsoft.Build.Utilities
 			set { escapedItemSpec = value; }
 		}
 
-#if NET_4_0
 		string ITaskItem2.EvaluatedIncludeEscaped {
 			get { return escapedItemSpec; }
 			set { escapedItemSpec = value; }
 		}
-#endif
 
 		public int MetadataCount {
 			get { return escapedMetadata.Count + 11; }

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

@@ -57,10 +57,8 @@ namespace Microsoft.Build.Utilities
 
 			lib_mono_dir = t2.FullName;
 
-#if NET_4_0
 			var windowsPath = Environment.GetFolderPath (Environment.SpecialFolder.Windows);
 			runningOnDotNet = !string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath);
-#endif
 
 			if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) {
 				mono_dir = new string [] {
@@ -158,7 +156,6 @@ namespace Microsoft.Build.Utilities
 			throw new NotImplementedException ();
 		}
 
-		#if NET_4_0
 		public static string GetPathToStandardLibraries (string targetFrameworkIdentifier,
 								 string targetFrameworkVersion,
 								 string targetFrameworkProfile)
@@ -209,7 +206,6 @@ namespace Microsoft.Build.Utilities
 			// I'm not sure if this is completely valid assumption...
 			return path;
 		}
-		#endif
 
 		[MonoTODO]
 		public static string GetPathToSystemFile (string fileName)

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

@@ -46,9 +46,7 @@ using SCS = System.Collections.Specialized;
 namespace Microsoft.Build.Utilities
 {
 	public abstract class ToolTask : Task
-#if NET_4_0
 		, ICancelableTask
-#endif	
 	{
 		int			exitCode;
 		int			timeout;
@@ -58,9 +56,7 @@ namespace Microsoft.Build.Utilities
 		MessageImportance	standardOutputLoggingImportance;
 		StringBuilder toolOutput;
 		bool typeLoadException;
-#if NET_4_0
 		ManualResetEvent canceled;
-#endif
 
 		protected ToolTask ()
 			: this (null, null)
@@ -81,9 +77,7 @@ namespace Microsoft.Build.Utilities
 			this.HelpKeywordPrefix = helpKeywordPrefix;
 			this.responseFileEncoding = Encoding.UTF8;
 			this.timeout = Int32.MaxValue;
-#if NET_4_0
 			canceled = new ManualResetEvent (false);
-#endif
 		}
 
 		[MonoTODO]
@@ -506,7 +500,6 @@ namespace Microsoft.Build.Utilities
 			set { toolPath  = value; }
 		}
 
-#if NET_4_0
 		protected ManualResetEvent ToolCanceled {
 			get {
 				return canceled;
@@ -517,7 +510,6 @@ namespace Microsoft.Build.Utilities
 		{
 			canceled.Set ();
 		}
-#endif
 
 #if XBUILD_12
 		protected MessageImportance StandardErrorImportanceToUse {

mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs

@@ -251,10 +251,8 @@ namespace Microsoft.Build.Evaluation
 		//FIXME: should also support config file, depending on ToolsetLocations
 		void LoadDefaultToolsets ()
 		{
-#if NET_4_0
 			AddToolset (new Toolset ("4.0",
 				ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40), this, null));
-#endif
 #if XBUILD_12
 			AddToolset (new Toolset ("12.0", ToolLocationHelper.GetPathToBuildTools ("12.0"), this, null));
 #endif

mcs/class/Mono.Data.Sqlite/Assembly/AssemblyInfo.cs

@@ -35,11 +35,7 @@ using System.Runtime.ConstrainedExecution;
 #if !PLATFORM_COMPACTFRAMEWORK
 [assembly: AllowPartiallyTrustedCallers]
 [assembly: ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-  #if NET_4_0
     [assembly: SecurityRules(SecurityRuleSet.Level1)]
-  #else
-    [assembly: SecurityPermission(SecurityAction.RequestMinimum, SkipVerification = true)]
-  #endif
 #endif
 
 // Version information for an assembly consists of the following four values:
@@ -52,11 +48,7 @@ using System.Runtime.ConstrainedExecution;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 #if !MOBILE
-  #if NET_4_0
     [assembly: AssemblyVersion("4.0.0.0")]
-  #else // NET_4_0
-    [assembly: AssemblyVersion("2.0.0.0")]
-  #endif // NET_4_0
 #else
 [assembly: AssemblyVersion(Consts.FxVersion)]
 #endif

mcs/class/Mono.Parallel/Mono.Collections.Concurrent/ConcurrentSkipList.cs

@@ -22,7 +22,6 @@
 //
 //
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -425,4 +424,3 @@ namespace Mono.Collections.Concurrent
 		}
 	}
 }
-#endif

mcs/class/Mono.Parallel/Mono.Threading/CSnzi.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 
@@ -242,4 +241,3 @@ namespace Mono.Threading
 		}
 	}
 }
-#endif

mcs/class/Mono.Parallel/Mono.Threading/ReaderWriterLockSlimmer.cs

@@ -22,7 +22,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -140,4 +139,3 @@ namespace Mono.Threading
 	}
 }
 
-#endif

mcs/class/Mono.Parallel/Mono.Threading/Snzi.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 
@@ -305,4 +304,3 @@ namespace Mono.Threading
 		}
 	}
 }
-#endif

mcs/class/Mono.Parallel/Mono.Threading/SpinLockWrapper.cs

@@ -22,7 +22,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -48,4 +47,3 @@ namespace Mono.Threading
 		}
 	}
 }
-#endif

mcs/class/Mono.Security/Mono.Security.Protocol.Tls/CipherSuite.cs

@@ -477,12 +477,8 @@ namespace Mono.Security.Protocol.Tls
 					break;
 
 				case CipherAlgorithmType.Rijndael:
-#if MOBILE || NET_4_0
 					// only AES is really used - and we can use CommonCrypto for iOS and OSX this way
 					this.encryptionAlgorithm = Aes.Create();
-#else
-					this.encryptionAlgorithm = Rijndael.Create();
-#endif
 					break;
 			}
 
@@ -548,12 +544,8 @@ namespace Mono.Security.Protocol.Tls
 					break;
 
 				case CipherAlgorithmType.Rijndael:
-#if MOBILE || NET_4_0
 					// only AES is really used - and we can use CommonCrypto for iOS and OSX this way
 					this.decryptionAlgorithm = Aes.Create();
-#else
-					this.decryptionAlgorithm = Rijndael.Create();
-#endif
 					break;
 			}
 

mcs/class/PEAPI/Metadata.cs

@@ -4927,11 +4927,7 @@ namespace PEAPI {
 		private static readonly uint max3BitSmlIx = 0x1FFF;
 		private static readonly uint max5BitSmlIx = 0x7FF;
 		// NOTE: version and stream name strings MUST always be quad padded
-#if NET_4_0
 		private static readonly string version = "v4.0.30319\0\0";
-#else
-		private static readonly string version = "v2.0.50727\0\0";
-#endif
 		private static readonly char[] tildeName = {'#','~','\0','\0'};
 		private static readonly char[] stringsName = {'#','S','t','r','i','n','g','s','\0','\0','\0','\0'};
 		private static readonly char[] usName = {'#','U','S','\0'};

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

@@ -67,8 +67,6 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible (false)]
 
-#if NET_4_0
 [assembly: TypeForwardedTo (typeof (System.Security.Cryptography.Aes))]
 [assembly: TypeForwardedTo (typeof (System.Threading.LazyThreadSafetyMode ))]
 [assembly: TypeForwardedTo (typeof (System.Lazy<>))]
-#endif

mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeMemoryMappedViewHandle.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -53,4 +52,3 @@ namespace Microsoft.Win32.SafeHandles
 	}
 }
 
-#endif

mcs/class/System.Core/System.Collections.Generic/HashSet.cs

@@ -44,9 +44,7 @@ namespace System.Collections.Generic {
 	[DebuggerDisplay ("Count={Count}")]
 	[DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))]
 	public class HashSet<T> : ICollection<T>, ISerializable, IDeserializationCallback
-#if NET_4_0
 							, ISet<T>
-#endif
 	{
 		const int INITIAL_SIZE = 10;
 		const float DEFAULT_LOAD_FACTOR = (90f / 100);

mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFile.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_4_0
 
 using System;
 using System.IO;
@@ -362,4 +361,3 @@ namespace System.IO.MemoryMappedFiles
 	}
 }
 
-#endif

mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFileAccess.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -43,5 +42,4 @@ namespace System.IO.MemoryMappedFiles
 	}
 }
 
-#endif
 

mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFileOptions.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -40,4 +39,3 @@ namespace System.IO.MemoryMappedFiles
 	}
 }
 
-#endif

mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFileRights.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -51,4 +50,3 @@ namespace System.IO.MemoryMappedFiles
 	}
 }
 
-#endif

mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFileSecurity.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System.Security.AccessControl;
 
@@ -40,4 +39,3 @@ namespace System.IO.MemoryMappedFiles
 	}
 }
 
-#endif

mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -94,4 +93,3 @@ namespace System.IO.MemoryMappedFiles
 	}
 }
 
-#endif

mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedViewStream.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -90,4 +89,3 @@ namespace System.IO.MemoryMappedFiles
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Expressions/ExpressionVisitor.cs

@@ -26,235 +26,3 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_4_0
-
-using System;
-using System.Collections.ObjectModel;
-
-namespace System.Linq.Expressions {
-
-	abstract class ExpressionVisitor {
-
-		protected virtual void Visit (Expression expression)
-		{
-			if (expression == null)
-				return;
-
-			switch (expression.NodeType) {
-			case ExpressionType.Negate:
-			case ExpressionType.NegateChecked:
-			case ExpressionType.Not:
-			case ExpressionType.Convert:
-			case ExpressionType.ConvertChecked:
-			case ExpressionType.ArrayLength:
-			case ExpressionType.Quote:
-			case ExpressionType.TypeAs:
-			case ExpressionType.UnaryPlus:
-				VisitUnary ((UnaryExpression) expression);
-				break;
-			case ExpressionType.Add:
-			case ExpressionType.AddChecked:
-			case ExpressionType.Subtract:
-			case ExpressionType.SubtractChecked:
-			case ExpressionType.Multiply:
-			case ExpressionType.MultiplyChecked:
-			case ExpressionType.Divide:
-			case ExpressionType.Modulo:
-			case ExpressionType.Power:
-			case ExpressionType.And:
-			case ExpressionType.AndAlso:
-			case ExpressionType.Or:
-			case ExpressionType.OrElse:
-			case ExpressionType.LessThan:
-			case ExpressionType.LessThanOrEqual:
-			case ExpressionType.GreaterThan:
-			case ExpressionType.GreaterThanOrEqual:
-			case ExpressionType.Equal:
-			case ExpressionType.NotEqual:
-			case ExpressionType.Coalesce:
-			case ExpressionType.ArrayIndex:
-			case ExpressionType.RightShift:
-			case ExpressionType.LeftShift:
-			case ExpressionType.ExclusiveOr:
-				VisitBinary ((BinaryExpression) expression);
-				break;
-			case ExpressionType.TypeIs:
-				VisitTypeIs ((TypeBinaryExpression) expression);
-				break;
-			case ExpressionType.Conditional:
-				VisitConditional ((ConditionalExpression) expression);
-				break;
-			case ExpressionType.Constant:
-				VisitConstant ((ConstantExpression) expression);
-				break;
-			case ExpressionType.Parameter:
-				VisitParameter ((ParameterExpression) expression);
-				break;
-			case ExpressionType.MemberAccess:
-				VisitMemberAccess ((MemberExpression) expression);
-				break;
-			case ExpressionType.Call:
-				VisitMethodCall ((MethodCallExpression) expression);
-				break;
-			case ExpressionType.Lambda:
-				VisitLambda ((LambdaExpression) expression);
-				break;
-			case ExpressionType.New:
-				VisitNew ((NewExpression) expression);
-				break;
-			case ExpressionType.NewArrayInit:
-			case ExpressionType.NewArrayBounds:
-				VisitNewArray ((NewArrayExpression) expression);
-				break;
-			case ExpressionType.Invoke:
-				VisitInvocation ((InvocationExpression) expression);
-				break;
-			case ExpressionType.MemberInit:
-				VisitMemberInit ((MemberInitExpression) expression);
-				break;
-			case ExpressionType.ListInit:
-				VisitListInit ((ListInitExpression) expression);
-				break;
-			default:
-				throw new ArgumentException (string.Format ("Unhandled expression type: '{0}'", expression.NodeType));
-			}
-		}
-
-		protected virtual void VisitBinding (MemberBinding binding)
-		{
-			switch (binding.BindingType) {
-			case MemberBindingType.Assignment:
-				VisitMemberAssignment ((MemberAssignment) binding);
-				break;
-			case MemberBindingType.MemberBinding:
-				VisitMemberMemberBinding ((MemberMemberBinding) binding);
-				break;
-			case MemberBindingType.ListBinding:
-				VisitMemberListBinding ((MemberListBinding) binding);
-				break;
-			default:
-				throw new ArgumentException (string.Format ("Unhandled binding type '{0}'", binding.BindingType));
-			}
-		}
-
-		protected virtual void VisitElementInitializer (ElementInit initializer)
-		{
-			VisitExpressionList (initializer.Arguments);
-		}
-
-		protected virtual void VisitUnary (UnaryExpression unary)
-		{
-			Visit (unary.Operand);
-		}
-
-		protected virtual void VisitBinary (BinaryExpression binary)
-		{
-			Visit (binary.Left);
-			Visit (binary.Right);
-			Visit (binary.Conversion);
-		}
-
-		protected virtual void VisitTypeIs (TypeBinaryExpression type)
-		{
-			Visit (type.Expression);
-		}
-
-		protected virtual void VisitConstant (ConstantExpression constant)
-		{
-		}
-
-		protected virtual void VisitConditional (ConditionalExpression conditional)
-		{
-			Visit (conditional.Test);
-			Visit (conditional.IfTrue);
-			Visit (conditional.IfFalse);
-		}
-
-		protected virtual void VisitParameter (ParameterExpression parameter)
-		{
-		}
-
-		protected virtual void VisitMemberAccess (MemberExpression member)
-		{
-			Visit (member.Expression);
-		}
-
-		protected virtual void VisitMethodCall (MethodCallExpression methodCall)
-		{
-			Visit (methodCall.Object);
-			VisitExpressionList (methodCall.Arguments);
-		}
-
-		protected virtual void VisitList<T> (ReadOnlyCollection<T> list, Action<T> visitor)
-		{
-			foreach (T element in list) {
-				visitor (element);
-			}
-		}
-
-		protected virtual void VisitExpressionList (ReadOnlyCollection<Expression> list)
-		{
-			VisitList (list, Visit);
-		}
-
-		protected virtual void VisitMemberAssignment (MemberAssignment assignment)
-		{
-			Visit (assignment.Expression);
-		}
-
-		protected virtual void VisitMemberMemberBinding (MemberMemberBinding binding)
-		{
-			VisitBindingList (binding.Bindings);
-		}
-
-		protected virtual void VisitMemberListBinding (MemberListBinding binding)
-		{
-			VisitElementInitializerList (binding.Initializers);
-		}
-
-		protected virtual void VisitBindingList (ReadOnlyCollection<MemberBinding> list)
-		{
-			VisitList (list, VisitBinding);
-		}
-
-		protected virtual void VisitElementInitializerList (ReadOnlyCollection<ElementInit> list)
-		{
-			VisitList (list, VisitElementInitializer);
-		}
-
-		protected virtual void VisitLambda (LambdaExpression lambda)
-		{
-			Visit (lambda.Body);
-		}
-
-		protected virtual void VisitNew (NewExpression nex)
-		{
-			VisitExpressionList (nex.Arguments);
-		}
-
-		protected virtual void VisitMemberInit (MemberInitExpression init)
-		{
-			VisitNew (init.NewExpression);
-			VisitBindingList (init.Bindings);
-		}
-
-		protected virtual void VisitListInit (ListInitExpression init)
-		{
-			VisitNew (init.NewExpression);
-			VisitElementInitializerList (init.Initializers);
-		}
-
-		protected virtual void VisitNewArray (NewArrayExpression newArray)
-		{
-			VisitExpressionList (newArray.Expressions);
-		}
-
-		protected virtual void VisitInvocation (InvocationExpression invocation)
-		{
-			VisitExpressionList (invocation.Arguments);
-			Visit (invocation.Expression);
-		}
-	}
-}
-
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryBaseNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -50,4 +49,3 @@ namespace System.Linq.Parallel.QueryNodes
 		internal abstract IEnumerable<T> GetSequential ();
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryCastNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -61,4 +60,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryChildNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 
 namespace System.Linq.Parallel.QueryNodes
@@ -59,4 +58,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryConcatNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -75,4 +74,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryDefaultEmptyNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -88,4 +87,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryGroupByNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -87,4 +86,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryHeadWorkerNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -147,4 +146,3 @@ namespace System.Linq.Parallel.QueryNodes
 
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryJoinNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -185,4 +184,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryMuxNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -58,4 +57,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryOptionNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections.Generic;
@@ -157,4 +156,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryOrderByNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -119,4 +118,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryOrderGuardNode.cs

@@ -23,7 +23,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 
@@ -100,4 +99,3 @@ namespace System.Linq.Parallel.QueryNodes
 
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryOrderedStreamNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 
 namespace System.Linq.Parallel.QueryNodes
@@ -37,4 +36,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryReverseNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Threading;
@@ -64,4 +63,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QuerySelectManyNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -204,4 +203,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QuerySelectNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -81,4 +80,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QuerySetNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -141,4 +140,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryStartNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -124,4 +123,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryStreamNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -76,4 +75,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryWhereNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Threading;
@@ -164,4 +163,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/QueryZipNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Linq;
@@ -157,4 +156,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/SetInclusion.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -49,4 +48,3 @@ namespace System.Linq.Parallel.QueryNodes
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel.QueryNodes/WrapHelper.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Collections;
@@ -63,4 +62,3 @@ namespace System.Linq.Parallel.QueryNodes
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/AggregationList.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -132,4 +131,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/ConcurrentGrouping.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -62,4 +61,3 @@ namespace System.Linq.Parallel
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel/ConcurrentLookup.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -114,4 +113,3 @@ namespace System.Linq.Parallel
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel/INodeVisitor.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq.Parallel.QueryNodes;
 
@@ -42,4 +41,3 @@ namespace System.Linq.Parallel
 		void Visit (QueryHeadWorkerNode node);
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/IVisitableNode.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 
 namespace System.Linq.Parallel
@@ -34,4 +33,3 @@ namespace System.Linq.Parallel
 		void Visit (INodeVisitor visitor);
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/OrderingEnumerator.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -216,4 +215,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/ParallelExecuter.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -267,4 +266,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/ParallelPartitioner.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Collections.Generic;
@@ -74,4 +73,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/ParallelQueryEnumerator.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -128,4 +127,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/ParallelQuickSort.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Linq;
 using System.Collections;
@@ -282,4 +281,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/QueryCheckerVisitor.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Linq.Parallel.QueryNodes;
@@ -185,4 +184,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/QueryIsOrderedVisitor.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Linq.Parallel.QueryNodes;
@@ -80,4 +79,3 @@ namespace System.Linq.Parallel
 		#endregion
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/QueryOptions.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 
@@ -126,4 +125,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/RangeList.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -122,4 +121,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/RepeatList.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -116,4 +115,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/ReverseList.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System.Linq;
 using System.Threading;
 using System.Collections;
@@ -116,4 +115,3 @@ namespace System.Linq.Parallel
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq.Parallel/StripPartitioner.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections.Generic;
@@ -59,4 +58,3 @@ namespace System.Linq.Parallel
 		}
 	}
 }
-#endif

mcs/class/System.Core/System.Linq.Parallel/TemporaryArea.cs

@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Threading;
 using System.Collections;
@@ -68,4 +67,3 @@ namespace System.Linq.Parallel
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq/Enumerable.cs

@@ -3073,7 +3073,6 @@ namespace System.Linq
 
 		#endregion
 		
-#if NET_4_0
 		#region Zip
 		
 		public static IEnumerable<TResult> Zip<TFirst, TSecond, TResult> (this IEnumerable<TFirst> first, IEnumerable<TSecond> second, Func<TFirst, TSecond, TResult> resultSelector)
@@ -3098,7 +3097,6 @@ namespace System.Linq
 		}
 		
 		#endregion
-#endif		
 
 		#region Where
 

mcs/class/System.Core/System.Linq/EnumerableExecutor.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 namespace System.Linq
 {
@@ -38,4 +37,3 @@ namespace System.Linq
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq/EnumerableExecutor_T.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System.Linq.Expressions;
 
@@ -40,4 +39,3 @@ namespace System.Linq
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq/EnumerableQuery.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 namespace System.Linq
 {
@@ -38,4 +37,3 @@ namespace System.Linq
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq/EnumerableQuery_T.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System.Collections;
 using System.Collections.Generic;
@@ -98,4 +97,3 @@ namespace System.Linq
 	}
 }
 
-#endif

mcs/class/System.Core/System.Linq/IGrouping.cs

@@ -30,11 +30,7 @@
 using System.Collections.Generic;
 
 namespace System.Linq {
-#if NET_4_0
 	public interface IGrouping<out TKey, out TElement> : IEnumerable<TElement>
-#else
-	public interface IGrouping<TKey, TElement> : IEnumerable<TElement>
-#endif
 	{
 		TKey Key { get; }
 	}