[Pkg-cli-libs-commits] [SCM] nunit branch, master, updated. debian/2.5.10.11092+dfsg-2-2-g161ce71

[Julian Taylor]

The following commit has been merged in the master branch:
commit 2d4a71e920b42bd442dc034abea6e9b6f28a2178
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Mon Jan 30 23:53:14 2012 +0100

    add patch to fix monodevelop's nunit addin (LP: #889241)

diff --git a/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch b/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch
new file mode 100644
index 0000000..e0d0c38
--- /dev/null
+++ b/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch
@@ -0,0 +1,26 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Mon, 30 Jan 2012 23:40:42 +0100
+Subject: instantiate a ProjectService when creating a domain
+
+required for Services.ProjectService.CanLoadProject used later.
+fixes monodevelop's nunit addin.
+Issue introduced in upstream revision 3127.
+Forwarded: no
+---
+ src/ClientUtilities/util/Services/DomainManager.cs |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/ClientUtilities/util/Services/DomainManager.cs b/src/ClientUtilities/util/Services/DomainManager.cs
+index 3c86207..1993e37 100644
+--- a/src/ClientUtilities/util/Services/DomainManager.cs
++++ b/src/ClientUtilities/util/Services/DomainManager.cs
+@@ -55,6 +55,8 @@ namespace NUnit.Util
+ 		public AppDomain CreateDomain( TestPackage package )
+ 		{
+ 			AppDomainSetup setup = new AppDomainSetup();
++			if (Services.ProjectService == null)
++				ServiceManager.Services.AddService(new ProjectService());
+ 			 
+ 			//For paralell tests, we need to use distinct application name
+         	setup.ApplicationName = "Tests" + "_" + Environment.TickCount;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 36d7200..62b043e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_default_framework.patch
 05_build_xml_doc_for_nunit.core.dpatch
+instantiate-a-ProjectService-when-creating-a-domain.patch

-- 
nunit