[bcl] Remove NET_4_0 defines from class libs.

11 files changed, 0 insertions, 48 deletions

diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildErrorEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildErrorEventArgs.cs
index a6e27f24b05..44e2ac5905d 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildErrorEventArgs.cs
+++ b/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
 
 	}
 }
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs
index 20566ffe215..b2e33740379 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs
+++ b/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 {
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildFinishedEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildFinishedEventArgs.cs
index 4655d80e0f7..d0cb357dc9d 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildFinishedEventArgs.cs
+++ b/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 {
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildStartedEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildStartedEventArgs.cs
index e6497b0f3d0..1ca70e2fbe2 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildStartedEventArgs.cs
+++ b/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
 	}
 }
 
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildStatusEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildStatusEventArgs.cs
index c0b5b3c0526..9d2612e7463 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildStatusEventArgs.cs
+++ b/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
 	}
 }
 
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildWarningEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildWarningEventArgs.cs
index a928e6187b7..b959fa8d366 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildWarningEventArgs.cs
+++ b/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
 	}
 }
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ICancelableTask.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ICancelableTask.cs
index 10923776c83..d4d7370179e 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ICancelableTask.cs
+++ b/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
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/IForwardingLogger.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/IForwardingLogger.cs
index 4b08961e0fc..dd2e62b7739 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/IForwardingLogger.cs
+++ b/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
 
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/INodeLogger.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/INodeLogger.cs
index 3fe741d436e..3da4baa5c1d 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/INodeLogger.cs
+++ b/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
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITaskItem2.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITaskItem2.cs
index b9d882c62e9..1fa2e084219 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITaskItem2.cs
+++ b/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
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LazyFormattedBuildEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LazyFormattedBuildEventArgs.cs
index 26a0306278a..33a9af67dc6 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LazyFormattedBuildEventArgs.cs
+++ b/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