Browse Source

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
shortcuts
Daniel Grunwald 16 years ago
parent
commit
1d90f5a81d
  1. 8
      src/Main/Base/Project/Src/Project/MSBuildEngine.cs

8
src/Main/Base/Project/Src/Project/MSBuildEngine.cs

@ -181,7 +181,11 @@ namespace ICSharpCode.SharpDevelop.Project @@ -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 @@ -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 + "\\";

Loading…
Cancel
Save