Second attempt to fix hang when closing SharpDevelop with a solution and the package management console open.

src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IThread.cs

@@ -8,6 +8,6 @@ namespace ICSharpCode.PackageManagement.Scripting
 	public interface IThread
 	{
 		void Start();
-		void Join();
+		bool Join(int milliescondsTimeout);
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageManagementConsoleHost.cs

@@ -61,8 +61,10 @@ namespace ICSharpCode.PackageManagement.Scripting
 			ShutdownConsole();
 			
 			if (thread != null) {
-				thread.Join();
+				if (thread.Join(100)) {
-				thread = null;
+					thread = null;
+					IsRunning = false;
+				}
 			}
 		}
 		

src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageManagementConsolePad.cs

@@ -25,9 +25,9 @@ namespace ICSharpCode.PackageManagement.Scripting
 		public override void Dispose()
 		{
 			if (viewModel != null) {
-				viewModel.ShutdownConsole();
+				while (!viewModel.ShutdownConsole()) {
-				DoEvents();
+					DoEvents();
-				viewModel.Dispose();
+				}
 				viewModel = null;
 			}
 		}

src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageManagementConsoleViewModel.cs

@@ -228,14 +228,11 @@ namespace ICSharpCode.PackageManagement.Scripting
 			get { return packageManagementConsole.TextEditor; }
 		}
 		
-		public void Dispose()
+		public bool ShutdownConsole()
-		{
-			consoleHost.Dispose();
-		}
-		
-		public void ShutdownConsole()
 		{
 			consoleHost.ShutdownConsole();
+			consoleHost.Dispose();
+			return !consoleHost.IsRunning;
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageManagementThread.cs

@@ -20,9 +20,9 @@ namespace ICSharpCode.PackageManagement.Scripting
 			thread.Start();
 		}
 		
-		public void Join()
+		public bool Join(int milliescondsTimeout)
 		{
-			thread.Join();
+			return thread.Join(milliescondsTimeout);
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeThread.cs

@@ -17,9 +17,14 @@ namespace PackageManagement.Tests.Helpers
 			IsStartCalled = true;
 		}
 		
-		public void Join()
+		public int TimeoutPassedToJoin;
+		public bool JoinReturnValue = true;
+		
+		public bool Join(int milliescondsTimeout)
 		{
 			IsJoinCalled = true;
+			TimeoutPassedToJoin = milliescondsTimeout;
+			return JoinReturnValue;
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs

@@ -67,13 +67,16 @@ namespace PackageManagement.Tests.Scripting
 		}
 		
 		[Test]
-		public void Dispose_ConsoleHostRunCalled_ThreadJoinIsCalled()
+		public void Dispose_ConsoleHostRunCalled_ThreadJoinIsCalledWithTimeout()
 		{
 			CreateHost();
 			host.Run();
 			host.Dispose();
 			
-			Assert.IsTrue(host.FakeThread.IsJoinCalled);
+			int timeout = host.FakeThread.TimeoutPassedToJoin;
+			int expectedTimeout = 100; //ms
+			
+			Assert.AreEqual(expectedTimeout, timeout);
 		}
 		
 		[Test]
@@ -89,6 +92,42 @@ namespace PackageManagement.Tests.Scripting
 			Assert.IsFalse(host.FakeThread.IsJoinCalled);
 		}
 		
+		[Test]
+		public void Dispose_DisposeCalledTwiceAfterConsoleHostIsRunAndThreadDoesNotFinishOnFirstCall_ThreadJoinIsCalledTwice()
+		{
+			CreateHost();
+			host.Run();
+			host.FakeThread.JoinReturnValue = false;
+			host.Dispose();
+			host.FakeThread.IsJoinCalled = false;
+			
+			host.Dispose();
+			
+			Assert.IsTrue(host.FakeThread.IsJoinCalled);
+		}
+		
+		[Test]
+		public void IsRunning_DisposedAndThreadFinishes_ReturnsFalse()
+		{
+			CreateHost();
+			host.Run();
+			host.FakeThread.JoinReturnValue = true;
+			host.Dispose();
+			
+			Assert.IsFalse(host.IsRunning);
+		}
+		
+		[Test]
+		public void IsRunning_DisposedButThreadDidNotFinish_ReturnsTrue()
+		{
+			CreateHost();
+			host.Run();
+			host.FakeThread.JoinReturnValue = false;
+			host.Dispose();
+			
+			Assert.IsTrue(host.IsRunning);
+		}
+		
 		[Test]
 		public void Run_ConsoleExitsOnFirstRead_PowerShellHostIsCreated()
 		{

src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleViewModelTests.cs

@@ -459,10 +459,10 @@ namespace PackageManagement.Tests.Scripting
 		}
 		
 		[Test]
-		public void Dispose_ViewModelDisposed_ConsoleIsDisposed()
+		public void ShutdownConsole_ViewModelShuttingDown_ConsoleIsDisposed()
 		{
 			CreateViewModel();
-			viewModel.Dispose();
+			viewModel.ShutdownConsole();
 			
 			Assert.IsTrue(consoleHost.IsDisposeCalled);
 		}
@@ -511,6 +511,26 @@ namespace PackageManagement.Tests.Scripting
 			Assert.IsTrue(shutdownConsole);
 		}
 		
+		[Test]
+		public void ShutdownConsole_ConsoleHostIsRunningIsTrue_ReturnsFalse()
+		{
+			CreateViewModel();
+			consoleHost.IsRunning = true;
+			bool shutdownConsole = viewModel.ShutdownConsole();
+			
+			Assert.IsFalse(shutdownConsole);
+		}
+		
+		[Test]
+		public void ShutdownConsole_ConsoleHostIsRunningIsFalse_ReturnsTrue()
+		{
+			CreateViewModel();
+			consoleHost.IsRunning = false;
+			bool shutdownConsole = viewModel.ShutdownConsole();
+			
+			Assert.IsTrue(shutdownConsole);
+		}
+		
 		[Test]
 		public void ActivePackageSource_SetToNullWhenPackageSourcesCleared_DoesNotThrowNullReferenceException()
 		{