X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Tasks%2FMicrosoft.Build.Tasks%2FExec.cs;h=fe1f00bfa5f46861467f6c1d89c198df635b5679;hb=d6bb1449801fbde9329c65778d2788aedf7ecafe;hp=cfcc2d65892d11ade52ddf8ae604b85f010c16e0;hpb=3fd4901a235bda0019f03317f4ee083744195758;p=mono.git

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs
index cfcc2d65892..fe1f00bfa5f 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs
+++ b/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]