-Index: monodevelop/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
-===================================================================
---- monodevelop.orig/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs	2011-07-03 16:33:08.000000000 +0100
-+++ monodevelop/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs	2011-07-03 16:33:37.000000000 +0100
-@@ -43,25 +43,25 @@
- 	public class NUnitTestRunner: MarshalByRefObject
- 	{
- 		public void Initialize (string nunitPath, string nunitCorePath)
--		{
--			// In some cases MS.NET can't properly resolve assemblies even if they
--			// are already loaded. For example, when deserializing objects from remoting.
--			AppDomain.CurrentDomain.AssemblyResolve += delegate (object s, ResolveEventArgs args) {
--				foreach (Assembly am in AppDomain.CurrentDomain.GetAssemblies ()) {
--					if (am.GetName ().FullName == args.Name)
--						return am;
--				}
--				return null;
--			};
--
-+		{
-+			// In some cases MS.NET can't properly resolve assemblies even if they
-+			// are already loaded. For example, when deserializing objects from remoting.
-+			AppDomain.CurrentDomain.AssemblyResolve += delegate (object s, ResolveEventArgs args) {
-+				foreach (Assembly am in AppDomain.CurrentDomain.GetAssemblies ()) {
-+					if (am.GetName ().FullName == args.Name)
-+						return am;
-+				}
-+				return null;
-+			};
-+
- 			// Force the loading of the NUnit.Framework assembly.
- 			// It's needed since that dll is not located in the test dll directory.
- 			Assembly.LoadFrom (nunitCorePath);
- 			Assembly.LoadFrom (nunitPath);
--
--			// Initialize ExtensionHost if not already done
--			if ( !CoreExtensions.Host.Initialized )
--				CoreExtensions.Host.InitializeService();
-+
-+			// Initialize ExtensionHost if not already done
-+			if ( !CoreExtensions.Host.Initialized )
-+				CoreExtensions.Host.InitializeService();
- 		}
- 		
- 		public TestResult Run (EventListener listener, ITestFilter filter, string path, string suiteName, List<string> supportAssemblies)
+--- a/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
++++ b/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
 @@ -153,7 +153,7 @@
  		
  		public bool Pass (ITest test)

+			// Preload the runner assembly. Required because TestNameFilter is implemented there
 			string asm = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "NUnitRunner.dll");
 			Assembly.LoadFrom (asm);
 		}
 		
 		public UnitTestResult Run (IRemoteEventListener listener, ITestFilter filter, string path, string suiteName, List<string> supportAssemblies)

 			TestPackage package = new TestPackage (assemblyPath);
 			package.Settings ["ShadowCopyFiles"] = false;
 			DomainManager dm = new DomainManager ();
@@ -116,7 +117,7 @@
 		{
 		}
 		
