[System] Fix a few type members on WatchOS

[mono.git] / mcs / class / Microsoft.Build.Tasks / Microsoft.Build.Tasks / Exec.cs

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 33beac30384a0fc4ae6111faf075d0c7c1963a7b..fe1f00bfa5f46861467f6c1d89c198df635b5679 100644 (file)
--- 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)
@@ -122,16 +118,13 @@ namespace Microsoft.Build.Tasks {
                        Log.LogMessage (MessageImportance.Normal, "Executing: " + command);
                }
                
-               protected override void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
+               protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
                {
-#if NET_4_0
                        if (IgnoreStandardErrorWarningFormat ||
                                (!errorMatcher (singleLine) && !warningMatcher (singleLine)))
-#endif
-                               Log.LogMessage (importance, singleLine);
+                               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]