Run MsBuild in a separate thread => you can continue coding while your code is compiling.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@538 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

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

@@ -56,66 +56,87 @@ namespace ICSharpCode.SharpDevelop.Project
 			return Run(buildFile, null);
 		}
 		
+		static bool IsRunning = false;
+		
 		public CompilerResults Run(string buildFile, string[] targets)
 		{
-			LoggingService.Debug("Run MSBuild on " + buildFile);
+			CompilerResults results = new CompilerResults(null);
+			if (IsRunning) {
+				results.Errors.Add(new CompilerError(null, 0, 0, null, "MsBuild is already running!"));
+				return results;
+			}
+			IsRunning = true;
+			try {
+				Thread thread = new Thread(new ThreadStarter(results, buildFile, targets, this).Run);
+				thread.SetApartmentState(ApartmentState.STA);
+				thread.Start();
+				while (!thread.Join(10)) {
+					Application.DoEvents();
+					Application.DoEvents();
+				}
+				return results;
+			} finally {
+				IsRunning = false;
+			}
+		}
 		
-			// HACK: Workaround for MSBuild bug:
+		class ThreadStarter
-			// "unknown" MSBuild projects (projects with unknown type id, e.g. IL-projects)
+		{
-			// are looked up by MSBuild if the project files are MSBuild-compatible.
+			CompilerResults results;
-			// That lookup method has a bug: it uses the working directory instead of the
+			string buildFile;
-			// solution directory as base path for the lookup.
+			string[] targets;
-			Environment.CurrentDirectory = Path.GetDirectoryName(buildFile);
+			MSBuildEngine engine;
 			
-			CompilerResults results = new CompilerResults(null);
+			public ThreadStarter(CompilerResults results, string buildFile, string[] targets, MSBuildEngine engine)
-			BuildPropertyGroup properties = new BuildPropertyGroup();
+			{
-			string location = Path.GetDirectoryName(typeof(MSBuildEngine).Assembly.Location);
+				this.results = results;
-			properties.SetProperty("SharpDevelopBinPath", location);
+				this.buildFile = buildFile;
-			foreach (KeyValuePair<string, string> entry in MsBuildProperties) {
+				this.targets = targets;
-				properties.SetProperty(entry.Key, entry.Value);
+				this.engine = engine;
 			}
 			
-			Engine engine = new Engine(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory());
+			[STAThread]
-			SharpDevelopLogger logger = new SharpDevelopLogger(this, results);
+			public void Run()
-			engine.RegisterLogger(logger);
+			{
-			engine.BuildProjectFile(buildFile, targets, properties, null);
+				LoggingService.Debug("Run MSBuild on " + buildFile);
-			logger.FlushText();
+				
+				// HACK: Workaround for MSBuild bug:
+				// "unknown" MSBuild projects (projects with unknown type id, e.g. IL-projects)
+				// are looked up by MSBuild if the project files are MSBuild-compatible.
+				// That lookup method has a bug: it uses the working directory instead of the
+				// solution directory as base path for the lookup.
+				Environment.CurrentDirectory = Path.GetDirectoryName(buildFile);
+				
+				BuildPropertyGroup properties = new BuildPropertyGroup();
+				string location = Path.GetDirectoryName(typeof(MSBuildEngine).Assembly.Location);
+				properties.SetProperty("SharpDevelopBinPath", location);
+				foreach (KeyValuePair<string, string> entry in MsBuildProperties) {
+					properties.SetProperty(entry.Key, entry.Value);
+				}
 				
-			LoggingService.Debug("MSBuild finished");
+				Engine engine = new Engine(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory());
-			return results;
+				SharpDevelopLogger logger = new SharpDevelopLogger(this.engine, results);
+				engine.RegisterLogger(logger);
+				engine.BuildProjectFile(buildFile, targets, properties, null);
+				
+				LoggingService.Debug("MSBuild finished");
+			}
 		}
 		
 		class SharpDevelopLogger : ILogger
 		{
 			MSBuildEngine engine;
 			CompilerResults results;
-			Thread mainThread;
 			
 			public SharpDevelopLogger(MSBuildEngine engine, CompilerResults results)
 			{
-				mainThread = Thread.CurrentThread;
 				this.engine = engine;
 				this.results = results;
 			}
 			
-			StringBuilder textToWrite = new StringBuilder();
-			
 			void AppendText(string text)
 			{
-				lock (textToWrite) {
+				engine.MessageView.AppendText(text + "\r\n");
-					textToWrite.AppendLine(text);
-					if (Thread.CurrentThread == mainThread) {
-						FlushText();
-					}
-				}
-			}
-			
-			public void FlushText()
-			{
-				if (engine.MessageView != null) {
-					engine.MessageView.AppendText(textToWrite.ToString());
-				}
-				textToWrite.Length = 0;
 			}
 			
 			void OnBuildStarted(object sender, BuildStartedEventArgs e)
@@ -140,7 +161,6 @@ namespace ICSharpCode.SharpDevelop.Project
 			{
 				projectFiles.Push(e.ProjectFile);
 				StatusBarService.SetMessage("Building " + Path.GetFileNameWithoutExtension(e.ProjectFile) + "...");
-				Application.DoEvents();
 			}
 			
 			void OnProjectFinished(object sender, ProjectFinishedEventArgs e)
@@ -148,7 +168,6 @@ namespace ICSharpCode.SharpDevelop.Project
 				projectFiles.Pop();
 				if (projectFiles.Count > 0) {
 					StatusBarService.SetMessage("Building " + Path.GetFileNameWithoutExtension(projectFiles.Peek()) + "...");
-					Application.DoEvents();
 				}
 			}
 			

src/Main/StartUp/Project/Dialogs/ExceptionBox.cs

@@ -55,7 +55,14 @@ namespace ICSharpCode.SharpDevelop
 			string str = "";
 			str += ".NET Version         : " + Environment.Version.ToString() + Environment.NewLine;
 			str += "OS Version           : " + Environment.OSVersion.ToString() + Environment.NewLine;
-			str += "Boot Mode            : " + SystemInformation.BootMode + Environment.NewLine;
+			try {
+				if (SystemInformation.TerminalServerSession) {
+					str += "Terminal Server Session" + Environment.NewLine;
+				}
+				if (SystemInformation.BootMode != BootMode.Normal) {
+					str += "Boot Mode            : " + SystemInformation.BootMode + Environment.NewLine;
+				}
+			} catch {}
 			str += "Working Set Memory   : " + (Environment.WorkingSet / 1024) + "kb" + Environment.NewLine;
 			Version v = Assembly.GetEntryAssembly().GetName().Version;
 			str += "SharpDevelop Version : " + v.Major + "." + v.Minor + "." + v.Build + "." + v.Revision + Environment.NewLine;