Merge remote-tracking branch 'monodevelop/master' into new-project-dialog

Conflicts:
	main/external/fsharpbinding
	main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectDialog.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	version-checks

1 files changed, 2 insertions, 20 deletions

diff --git a/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs b/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
index 1b334259ef..ca951872d9 100644
--- a/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
+++ b/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
@@ -217,7 +217,6 @@ namespace ILAsmBinding
 			return exitCode;
 		}
 
-		static readonly Regex regexError = new Regex (@"^(\s*(?<file>.*?)\s?\((?<line>\d*)(,\s(?<column>\d*[\+]*))?\)\s(:|)\s+)*(?<level>\w+)\s*(:|(--))\s*(?<message>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 		static BuildError CreateErrorFromString (string errorString)
 		{
 			// When IncludeDebugInformation is true, prevents the debug symbols stats from breaking this.
@@ -226,25 +225,8 @@ namespace ILAsmBinding
 			    errorString.StartsWith ("Compilation succeeded", StringComparison.Ordinal) ||
 			    errorString.StartsWith ("Compilation failed", StringComparison.Ordinal))
 				return null;
-			
-			Match match = regexError.Match(errorString);
-			if (!match.Success) 
-				return null;
-			
-			var error = new BuildError ();
-			error.FileName = match.Result ("${file}") ?? "";
-			
-			string line = match.Result ("${line}");
-			error.Line = !string.IsNullOrEmpty (line) ? Int32.Parse (line) : 0;
-			
-			string col = match.Result ("${column}");
-			if (!string.IsNullOrEmpty (col)) 
-				error.Column = col == "255+" ? -1 : Int32.Parse (col);
-			
-			error.IsWarning   = match.Result ("${level}") == "warning";
-			error.ErrorNumber = match.Result ("${number}");
-			error.ErrorText   = match.Result ("${message}");
-			return error;
+
+			return BuildError.FromMSBuildErrorFormat (errorString);
 		}
 	}
 }