Move remaining util classes.

src/AddIns/Analysis/UnitTesting/Interfaces/IUnitTestProcessRunner.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.SharpDevelop.Util;
+using ICSharpCode.SharpDevelop;
 
 namespace ICSharpCode.UnitTesting
 {
@@ -17,8 +17,8 @@ namespace ICSharpCode.UnitTesting
 		void Start(string command, string arguments);
 		void Kill();
 		
-		event LineReceivedEventHandler OutputLineReceived;
-		event LineReceivedEventHandler ErrorLineReceived;
+		event EventHandler<LineReceivedEventArgs> OutputLineReceived;
+		event EventHandler<LineReceivedEventArgs> ErrorLineReceived;
 		event EventHandler ProcessExited;
 	}
 }

src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestProcessRunner.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.SharpDevelop.Util;
+using ICSharpCode.SharpDevelop;
 
 namespace ICSharpCode.UnitTesting
 {
@@ -11,12 +11,12 @@ namespace ICSharpCode.UnitTesting
 	{
 		ProcessRunner runner;
 		
-		public event LineReceivedEventHandler OutputLineReceived {
+		public event EventHandler<LineReceivedEventArgs> OutputLineReceived {
 			add { runner.OutputLineReceived += value; }
 			remove { runner.OutputLineReceived -= value; }
 		}
 		
-		public event LineReceivedEventHandler ErrorLineReceived {
+		public event EventHandler<LineReceivedEventArgs> ErrorLineReceived {
 			add { runner.ErrorLineReceived += value; }
 			remove { runner.ErrorLineReceived -= value; }
 		}

src/AddIns/Analysis/UnitTesting/NUnit/NUnitTestRunner.cs

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.UnitTesting
 {

src/AddIns/Analysis/UnitTesting/TestRunner/ITestRunner.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.UnitTesting
 {

src/AddIns/Analysis/UnitTesting/TestRunner/TestProcessRunnerBase.cs

@@ -7,7 +7,6 @@ using System.Diagnostics;
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.UnitTesting
 {

src/AddIns/Analysis/UnitTesting/TestRunner/TestProcessRunnerBaseContext.cs

@@ -4,7 +4,6 @@
 using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.UnitTesting
 {

src/AddIns/VersionControl/GitAddIn/Src/Commands.cs

@@ -11,7 +11,6 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
-using ICSharpCode.SharpDevelop.Util;
 using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.GitAddIn

src/AddIns/VersionControl/GitAddIn/Src/Git.cs

@@ -1,11 +1,11 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
-using ICSharpCode.SharpDevelop.Gui;
 using System;
 using System.IO;
 using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Util;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.GitAddIn
 {

src/AddIns/VersionControl/GitAddIn/Src/GitStatusCache.cs

@@ -1,12 +1,13 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
-using ICSharpCode.Core;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-using ICSharpCode.SharpDevelop.Util;
+
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 
 namespace ICSharpCode.GitAddIn
 {

src/AddIns/VersionControl/GitAddIn/Src/GitVersionProvider.cs

@@ -8,8 +8,8 @@ using System.IO.Pipes;
 using System.Runtime.InteropServices;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
-using ICSharpCode.SharpDevelop.Util;
 using Microsoft.Win32.SafeHandles;
 
 namespace ICSharpCode.GitAddIn

src/Main/Base/Project/Editor/PermanentAnchor.cs

@@ -8,7 +8,6 @@ using System.Diagnostics;
 using ICSharpCode.Core;
 using ICSharpCode.NRefactory;
 using ICSharpCode.NRefactory.Editor;
-using ICSharpCode.SharpDevelop.Util;
 using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop.Editor

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -166,7 +166,6 @@
     <Compile Include="Services\IClipboard.cs" />
     <Compile Include="Services\IMessageLoop.cs" />
     <Compile Include="Services\SD.cs" />
-    <Compile Include="Src\Gui\FileService.cs" />
     <Compile Include="Src\Commands\SharpDevelopRoutedCommands.cs" />
     <Compile Include="Src\Commands\ViewInBrowser.cs" />
     <Compile Include="Src\Editor\AvalonEdit\IndentationStrategyAdapter.cs" />
@@ -230,20 +229,31 @@
     <Compile Include="Src\Gui\Dialogs\ExtractInterfaceDialog.cs" />
     <Compile Include="Src\Gui\IWorkbenchLayout.cs" />
     <Compile Include="Src\Services\FileChangeWatcher.cs" />
-    <Compile Include="Src\Services\ViewContentServiceAttribute.cs" />
-    <Compile Include="Src\Util\NotAvailableCommand.cs" />
     <Compile Include="Util\AtomicBoolean.cs" />
     <Compile Include="Util\CustomThreadPoolTaskScheduler.cs" />
     <Compile Include="Util\DebugTimer.cs" />
+    <Compile Include="Util\DotnetDetection.cs" />
     <Compile Include="Util\EnumBinding.cs" />
-    <Compile Include="Util\ExtensionMethods.cs" />
+    <Compile Include="Util\SharpDevelopExtensions.cs" />
+    <Compile Include="Util\FakeXmlViewContent.cs" />
+    <Compile Include="Util\GenericConverter.cs" />
     <Compile Include="Util\ICanBeDirty.cs" />
     <Compile Include="Util\IImage.cs" />
+    <Compile Include="Util\IOTaskScheduler.cs" />
     <Compile Include="Util\IProgressMonitor.cs" />
+    <Compile Include="Util\LineReceivedEventArgs.cs" />
+    <Compile Include="Util\MimeTypeDetection.cs" />
+    <Compile Include="Util\NativeMethods.cs" />
+    <Compile Include="Util\NotAvailableCommand.cs" />
+    <Compile Include="Util\ProcessRunner.cs" />
     <Compile Include="Util\ProgressCollector.cs" />
     <Compile Include="Util\ReactiveExtensions.cs" />
+    <Compile Include="Util\ReadOnlyCollectionWrapper.cs" />
+    <Compile Include="Util\ScrollUtils.cs" />
+    <Compile Include="Util\SharpDevelopServiceContainer.cs" />
     <Compile Include="Util\SimpleCommand.cs" />
     <Compile Include="Util\SimpleTaskScheduler.cs" />
+    <Compile Include="Util\TreeNode.cs" />
     <Compile Include="Util\UnclosableStream.cs" />
     <Compile Include="Util\WeakCollection.cs" />
     <Compile Include="WinForms\IClipboardHandler.cs" />
@@ -259,6 +269,7 @@
     <Compile Include="Workbench\AbstractViewContent.cs" />
     <Compile Include="Workbench\AbstractViewContentHandlingLoadErrors.cs" />
     <Compile Include="Workbench\AbstractViewContentWithoutFile.cs" />
+    <Compile Include="Workbench\File\FileService.cs" />
     <Compile Include="Workbench\File\IRecentOpen.cs" />
     <Compile Include="Workbench\ICustomizedCommands.cs" />
     <Compile Include="Workbench\IPadContent.cs" />
@@ -268,6 +279,7 @@
     <Compile Include="Workbench\IWorkbenchWindow.cs" />
     <Compile Include="Workbench\SimpleViewContent.cs" />
     <Compile Include="Workbench\ViewContentEventArgs.cs" />
+    <Compile Include="Workbench\ViewContentServiceAttribute.cs" />
     <None Include="ICSharpCode.SharpDevelop.addin" />
     <Compile Include="Src\Gui\Dialogs\ExtractInterfaceDialog.Designer.cs">
       <DependentUpon>ExtractInterfaceDialog.cs</DependentUpon>
@@ -489,7 +501,6 @@
     <Compile Include="Src\Internal\Doozers\OptionPanelDoozer.cs" />
     <Compile Include="Src\Internal\Doozers\IOptionPanelDescriptor.cs" />
     <Compile Include="Workbench\File\FileEventArgs.cs" />
-    <Compile Include="Src\Services\MimeTypeDetection.cs" />
     <Compile Include="Src\Services\ProjectService\SolutionConfigurationEventHandler.cs" />
     <Compile Include="Src\Services\RefactoringService\ExtractInterfaceOptions.cs" />
     <Compile Include="Src\Services\RefactoringService\FindReferenceService.cs" />
@@ -770,15 +781,6 @@
     <Compile Include="Src\Gui\Dialogs\ReferenceDialog\AsyncDiscoveryState.cs" />
     <Compile Include="Src\Gui\Dialogs\ReferenceDialog\DiscoveryNetworkCredential.cs" />
     <Compile Include="Src\Services\ProjectService\ProjectLoader.cs" />
-    <Compile Include="Src\Util\DotnetDetection.cs" />
-    <Compile Include="Src\Util\FakeXmlViewContent.cs" />
-    <Compile Include="Src\Util\IOTaskScheduler.cs" />
-    <Compile Include="Src\Util\SharpDevelopServiceContainer.cs" />
-    <Compile Include="Src\Util\TreeNode.cs" />
-    <Compile Include="Src\Util\NativeMethods.cs" />
-    <Compile Include="Src\Util\ProcessRunnerException.cs" />
-    <Compile Include="Src\Util\LineReceivedEventArgs.cs" />
-    <Compile Include="Src\Util\ProcessRunner.cs" />
     <Compile Include="..\..\GlobalAssemblyInfo.cs">
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
@@ -807,10 +809,7 @@
     <Compile Include="Src\Project\AbstractProject.cs" />
     <Compile Include="Src\Project\CompilableProject.cs" />
     <Compile Include="Src\Project\MSBuildInternals.cs" />
-    <Compile Include="Src\Util\ScrollUtils.cs" />
-    <Compile Include="Src\Util\ReadOnlyCollectionWrapper.cs" />
     <Compile Include="Src\Project\Items\ItemType.cs" />
-    <Compile Include="Src\Util\GenericConverter.cs" />
     <Compile Include="Src\Internal\Templates\TemplateLoadException.cs" />
     <EmbeddedResource Include="Resources\DefaultManifest.manifest" />
     <EmbeddedResource Include="Src\Gui\Dialogs\ExtractInterfaceDialog.resx">
@@ -889,7 +888,6 @@
     <Folder Include="Src\Editor\Commands" />
     <Folder Include="Editor\Search" />
     <Folder Include="Src\Gui\Pads\TaskList" />
-    <Folder Include="Src\Util" />
     <Folder Include="Src\Services\NavigationService" />
     <ProjectReference Include="..\..\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
       <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>

src/Main/Base/Project/Parser/ProjectContentContainer.cs

@@ -15,7 +15,6 @@ using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.NRefactory.Utils;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.SharpDevelop.Parser
 {

src/Main/Base/Project/Services/IMessageLoop.cs

@@ -92,5 +92,10 @@ namespace ICSharpCode.SharpDevelop
 		Task<T> InvokeAsync<T>(Func<T> callback, DispatcherPriority priority);
 		/// <inheritdoc see="InvokeAsync(Action)"/>
 		Task<T> InvokeAsync<T>(Func<T> callback, DispatcherPriority priority, CancellationToken cancellationToken);
+		
+		/// <summary>
+		/// Waits <paramref name="delay"/>, then executed <paramref name="method"/> on the message loop thread.
+		/// </summary>
+		void CallLater(TimeSpan delay, Action method);
 	}
 }

src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs

@@ -14,7 +14,6 @@ using ICSharpCode.Core.Presentation;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Internal.ExternalTool;
 using ICSharpCode.SharpDevelop.Project;
-using ICSharpCode.SharpDevelop.Util;
 using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop.Commands

src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/SvcUtilRunner.cs

@@ -2,7 +2,6 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
 {

src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs

@@ -121,6 +121,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		
 		#region Safe Thread Caller
+		[Obsolete("Use SD.MainThread.InvokeRequired instead")]
 		public static bool InvokeRequired {
 			get {
 				if (workbench == null)
@@ -259,10 +260,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 		/// <summary>
 		/// Calls a method on the GUI thread, but delays the call a bit.
 		/// </summary>
+		[Obsolete("Use SD.MainThread.CallLater() instead")]
 		public static async void CallLater(TimeSpan delay, Action method)
 		{
-			await Task.Delay(delay).ConfigureAwait(false);
-			SD.MainThread.InvokeAsync(method).FireAndForget();
+			SD.MainThread.CallLater(delay, method);
 		}
 		#endregion
 		

src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs

@@ -13,7 +13,6 @@ using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using ICSharpCode.SharpDevelop.Project.Converter;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.SharpDevelop.Project
 {

src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs

@@ -10,7 +10,6 @@ using System.Xml.Linq;
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Project.Converter;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.SharpDevelop.Project
 {

src/Main/Base/Project/Src/Project/Behaviors/ProjectBehavior.cs

@@ -13,7 +13,6 @@ using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using ICSharpCode.SharpDevelop.Project.Converter;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.SharpDevelop.Project
 {

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

@@ -16,7 +16,6 @@ using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Parser;
 using ICSharpCode.SharpDevelop.Project.Converter;
-using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.SharpDevelop.Project
 {

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

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Parser;
-using ICSharpCode.SharpDevelop.Util;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Framework;

src/Main/Base/Project/Src/Util/ProcessRunnerException.cs

@@ -1,32 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Runtime.Serialization;
-
-namespace ICSharpCode.SharpDevelop.Util
-{
-	/// <summary>
-	/// An exception thrown by a <see cref="ProcessRunner"/>
-	/// instance.
-	/// </summary>
-	[Serializable()]
-	public class ProcessRunnerException : ApplicationException
-	{
-		public ProcessRunnerException() : base()
-		{
-		}
-		
-		public ProcessRunnerException(string message) : base(message)
-		{
-		}
-		
-		public ProcessRunnerException(string message, Exception innerException) : base(message, innerException)
-		{
-		}
-		
-		protected ProcessRunnerException(SerializationInfo info, StreamingContext context) : base(info, context)
-		{
-		}
-	}
-}

src/Main/Base/Project/Util/FakeXmlViewContent.cs

@@ -9,7 +9,7 @@ using System.Xml.Linq;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Workbench;
 
-namespace ICSharpCode.SharpDevelop.Util
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// IViewContent implementation that opens a file as XDocument and allows editing it, while synchronizing changes with any open editor.

src/Main/Base/Project/Util/GenericConverter.cs

@@ -11,7 +11,7 @@ namespace ICSharpCode.SharpDevelop
 	/// Provides static conversion functions to quickly convert types
 	/// having a TypeConverter to and from string (culture-invariant).
 	/// </summary>
-	internal static class GenericConverter
+	public static class GenericConverter
 	{
 		/// <summary>
 		/// Converts the value from string.

src/Main/Base/Project/Util/IOTaskScheduler.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace ICSharpCode.SharpDevelop.Util
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// Scheduler for IO-intensive tasks.

src/Main/Base/Project/Util/LineReceivedEventArgs.cs

@@ -3,10 +3,8 @@
 
 using System;
 
-namespace ICSharpCode.SharpDevelop.Util
+namespace ICSharpCode.SharpDevelop
 {
-	public delegate void LineReceivedEventHandler(object sender, LineReceivedEventArgs e);
-	
 	/// <summary>
 	/// The arguments for the <see cref="LineReceivedEventHandler"/> event.
 	/// </summary>

src/Main/Base/Project/Util/ProcessRunner.cs

@@ -9,7 +9,7 @@ using System.Threading;
 
 using ICSharpCode.Core;
 
-namespace ICSharpCode.SharpDevelop.Util
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// Runs a process that sends output to standard output and to
@@ -37,12 +37,12 @@ namespace ICSharpCode.SharpDevelop.Util
 		/// <summary>
 		/// Triggered when a line of text is read from the standard output.
 		/// </summary>
-		public event LineReceivedEventHandler OutputLineReceived;
+		public event EventHandler<LineReceivedEventArgs> OutputLineReceived;
 		
 		/// <summary>
 		/// Triggered when a line of text is read from the standard error.
 		/// </summary>
-		public event LineReceivedEventHandler ErrorLineReceived;
+		public event EventHandler<LineReceivedEventArgs> ErrorLineReceived;
 		
 		/// <summary>
 		/// Creates a new instance of the <see cref="ProcessRunner"/>.
@@ -124,7 +124,7 @@ namespace ICSharpCode.SharpDevelop.Util
 		public bool WaitForExit(int timeout)
 		{
 			if (process == null) {
-				throw new ProcessRunnerException(StringParser.Parse("${res:ICSharpCode.NAntAddIn.ProcessRunner.NoProcessRunningErrorText}"));
+				throw new InvalidOperationException("no process is running");
 			}
 			
 			bool exited = process.WaitForExit(timeout);

src/Main/Base/Project/Util/SharpDevelopExtensions.cs

@@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop
 	/// <summary>
 	/// Extension methods used in SharpDevelop.
 	/// </summary>
-	public static class ExtensionMethods
+	public static class SharpDevelopExtensions
 	{
 		#region RaiseEvent
 		/// <summary>
@@ -45,6 +45,7 @@ namespace ICSharpCode.SharpDevelop
 		/// </summary>
 		/// <remarks>Using this method is only thread-safe under the Microsoft .NET memory model,
 		/// not under the less strict memory model in the CLI specification.</remarks>
+		[Obsolete("Use 'event EventHandler MyEvent = delegate{};' instead")]
 		public static void RaiseEvent(this EventHandler eventHandler, object sender, EventArgs e)
 		{
 			if (eventHandler != null) {
@@ -63,6 +64,7 @@ namespace ICSharpCode.SharpDevelop
 		/// <code>if (MyEvent != null) MyEvent(x,y);</code>
 		/// would not be safe.
 		/// </summary>
+		[Obsolete("Use 'event EventHandler MyEvent = delegate{};' instead")]
 		public static void RaiseEvent<T>(this EventHandler<T> eventHandler, object sender, T e) where T : EventArgs
 		{
 			if (eventHandler != null) {

src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs

@@ -11,7 +11,7 @@ namespace ICSharpCode.SharpDevelop
 	/// <summary>
 	/// A thread-safe service container class.
 	/// </summary>
-	public class SharpDevelopServiceContainer : IServiceProvider, IServiceContainer, IDisposable
+	sealed class SharpDevelopServiceContainer : IServiceProvider, IServiceContainer, IDisposable
 	{
 		readonly IServiceProvider parentProvider;
 		readonly Dictionary<Type, object> services = new Dictionary<Type, object>();

src/Main/Base/Project/Util/TreeNode.cs

@@ -6,10 +6,13 @@ using System.Collections.Generic;
 
 namespace ICSharpCode.SharpDevelop
 {
+	// TODO: is this interface really useful?
+	// the use with TypeGraphNode seems redundant, we can just directly use the TypeGraphNodes...
+	
 	/// <summary>
 	/// Generic TreeNode with content and children.
 	/// </summary>
-	public interface ITreeNode<TContent>
+	public interface ITreeNode<out TContent>
 	{
 		TContent Content { get; }
 		

src/Main/Base/Test/CancelLongRunningAppTestFixture.cs

@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
-using ICSharpCode.SharpDevelop.Util;
 using NUnit.Framework;
 
 namespace ICSharpCode.SharpDevelop.Tests

src/Main/Base/Test/CheckAssemblyFlags.cs

@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Util;
 using NUnit.Framework;
 using System.Text.RegularExpressions;
 

src/Main/Base/Test/ExitCodeTestFixture.cs

@@ -1,7 +1,6 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
-using ICSharpCode.SharpDevelop.Util;
 using NUnit.Framework;
 using System;
 using System.IO;

src/Main/Base/Test/LineReceivedFromProcessTestFixture.cs

@@ -2,7 +2,6 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using NUnit.Framework;
-using ICSharpCode.SharpDevelop.Util;
 using System;
 using System.Collections;
 using System.IO;
@@ -32,7 +31,7 @@ namespace ICSharpCode.SharpDevelop.Tests
 			string echoText = "Test";
 			string expectedOutput = String.Concat(echoText, "\r\n");
 			
-			runner.OutputLineReceived += new LineReceivedEventHandler(OutputLineReceived);
+			runner.OutputLineReceived += OutputLineReceived;
 			
 			runner.Start(GetConsoleAppFileName(), String.Concat("-echo:", echoText));
 			runner.WaitForExit();

src/Main/Base/Test/NoSuchExecutableTestFixture.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.ComponentModel;
-using ICSharpCode.SharpDevelop.Util;
 using NUnit.Framework;
 
 namespace ICSharpCode.SharpDevelop.Tests

src/Main/Base/Test/ProcessExitedTestFixture.cs

@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Threading;
 
-using ICSharpCode.SharpDevelop.Util;
 using NUnit.Framework;
 
 namespace ICSharpCode.SharpDevelop.Tests

src/Main/Base/Test/ProcessRunnerNotStartedTestFixture.cs

@@ -2,7 +2,6 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using ICSharpCode.SharpDevelop.Util;
 using NUnit.Framework;
 
 namespace ICSharpCode.SharpDevelop.Tests
@@ -42,15 +41,10 @@ namespace ICSharpCode.SharpDevelop.Tests
 		}
 		
 		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
 		public void WaitForExit()
 		{
-			try {
-				runner.WaitForExit();
-				Assert.Fail("Expected ProcessRunnerException");
-			} catch (ProcessRunnerException ex) {
-				Assert.AreEqual(ICSharpCode.Core.StringParser.Parse("${res:ICSharpCode.NAntAddIn.ProcessRunner.NoProcessRunningErrorText}"),
-				                ex.Message);
-			}
+			runner.WaitForExit();
 		}
 	}
 }

src/Main/Base/Test/SDTestFixtureBase.cs

@@ -17,8 +17,7 @@ namespace ICSharpCode.SharpDevelop
 		public virtual void FixtureSetUp()
 		{
 			SD.InitializeForUnitTests();
-			SD.Services.AddService(typeof(IMessageLoop), MockRepository.GenerateStrictMock<IMessageLoop>());
-			SD.MainThread.Stub(m => m.VerifyAccess());
+			SD.Services.AddService(typeof(IMessageLoop), new FakeMessageLoop());
 		}
 		
 		[TestFixtureTearDown]

src/Main/Base/Test/StandardOutputFromProcessTestFixture.cs

@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 
-using ICSharpCode.SharpDevelop.Util;
 using NUnit.Framework;
 
 namespace ICSharpCode.SharpDevelop.Tests

src/Main/Base/Test/Utils/FakeMessageLoop.cs

@@ -109,5 +109,10 @@ namespace ICSharpCode.SharpDevelop
 		{
 			throw new NotImplementedException();
 		}
+		
+		public void CallLater(TimeSpan delay, Action method)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

src/Main/SharpDevelop/Parser/AssemblyParserService.cs

@@ -13,7 +13,6 @@ using ICSharpCode.Core;
 using ICSharpCode.NRefactory.Documentation;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Utils;
-using ICSharpCode.SharpDevelop.Util;
 using Mono.Cecil;
 
 namespace ICSharpCode.SharpDevelop.Parser

src/Main/SharpDevelop/Services/DispatcherMessageLoop.cs

@@ -128,6 +128,12 @@ namespace ICSharpCode.SharpDevelop
 			return dispatcher.InvokeAsync(callback, priority, cancellationToken).Task;
 		}
 		
+		public async void CallLater(TimeSpan delay, Action method)
+		{
+			await Task.Delay(delay).ConfigureAwait(false);
+			InvokeAsync(method).FireAndForget();
+		}
+		
 		IAsyncResult ISynchronizeInvoke.BeginInvoke(Delegate method, object[] args)
 		{
 			return dispatcher.InvokeAsync<object>(() => method.DynamicInvoke(args)).Task;

src/Main/SharpDevelop/WinForms/SDWindowsFormsHost.cs

@@ -6,7 +6,6 @@ using System.Windows.Forms;
 using System.Windows.Forms.Integration;
 using System.Windows.Input;
 
-using ICSharpCode.SharpDevelop.Util;
 using ICSharpCode.SharpDevelop.Widgets;
 
 namespace ICSharpCode.SharpDevelop.WinForms