diff options
author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-01-28 19:24:07 +0300 |
---|---|---|
committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-01-28 19:24:07 +0300 |
commit | 16ef0a65233acdac9aeef1b876e2fb7c829997f1 (patch) | |
tree | 5a2cff56ddf40d7c7956a5e61174a8f6e5fa7d91 /main/src/addins/ILAsmBinding | |
parent | 67b2054247bdcb8b15be1363a7359e70dd5393b6 (diff) | |
parent | 5c4aa35401e314cec5be299ed9ee66c39f11bfdc (diff) |
Merge remote-tracking branch 'origin/master' into new-project-model
Conflicts:
main/external/fsharpbinding
main/external/nrefactory
main/src/addins/AspNet/Razor/Generator/RazorTemplatePreprocessor.cs
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
main/src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs
main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IBuildTarget.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionEntityItem.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs
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/ProjectOperations.cs
version-checks
Diffstat (limited to 'main/src/addins/ILAsmBinding')
-rw-r--r-- | main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs b/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs index 41da0dd356..f452f3044f 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); } } } |