From 1d90f5a81d9dc09650e15b3f1452ef7e2a8f4135 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 9 May 2009 12:10:21 +0000 Subject: [PATCH] Fixed SD2-1514 - Exception compiling F# project using build worker. Custom events are no longer forwarded to the SharpDevelop process. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4062 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- src/Main/Base/Project/Src/Project/MSBuildEngine.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs index 65d3c32501..0ebf6a2ba6 100644 --- a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs @@ -181,7 +181,11 @@ namespace ICSharpCode.SharpDevelop.Project BuildJob job = new BuildJob(); job.IntPtrSize = IntPtr.Size; job.ProjectFileName = project.FileName; - job.EventMask = EventTypes.All & ~ControllableEvents; + // Never report custom events (those are usually derived EventArgs classes, and SharpDevelop + // doesn't have the matching assemblies loaded - see SD2-1514). + // Also, remove the flags for the controllable events. + job.EventMask = EventTypes.All & ~(ControllableEvents | EventTypes.Custom); + // Add back active controllable events. if (ReportMessageEvents) job.EventMask |= EventTypes.Message; if (ReportTargetStartedEvents) @@ -266,7 +270,7 @@ namespace ICSharpCode.SharpDevelop.Project static string EnsureBackslash(string path) { - if (path.EndsWith("\\")) + if (path.EndsWith("\\", StringComparison.Ordinal)) return path; else return path + "\\";