* main/src/core/Mono.Debugging/Makefile.am:

* main/src/core/Mono.Debugging/mono.debugging.snk: * main/src/core/Mono.Debugging/Mono.Debugging.csproj: Sign and fix deps. * main/src/addins/MonoDevelop.Debugger.Soft/Makefile.am: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/AssemblyInfo.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/ArrayAdaptor.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/LoggingService.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ArrayAdaptor.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerSession.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerAdaptor.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/FieldValueReference.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftEvaluationContext.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerStartInfo.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerBacktrace.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/VariableValueReference.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/PropertyValueReference.cs: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll.mdb: * main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugging.Soft.csproj: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerSession.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerAdaptor.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/FieldValueReference.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerBacktrace.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftEvaluationContext.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/VariableValueReference.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/PropertyValueReference.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll.mdb: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/RemoteSoftDebuggerSession.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj: Split out a new dll Mono.Debugging.Soft from the soft debugger addin. It has the bits that have with no MD deps apart from Mono.Debugging, and it's strongnamed so MonoVS can use it. * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj: * main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/MonoDevelop.Debugger.Soft.Moonlight.csproj: Fix deps to track the dll split. * main/Main.sln: * main/configure.in: * main/monodevelop-core-addins.pc.in: Add the new dll. svn path=/trunk/monodevelop/; revision=149937
author: Michael Hutchinson <mhutchinson@novell.com> 2010-01-21 02:07:58 +0300
committer: Michael Hutchinson <mhutchinson@novell.com> 2010-01-21 02:07:58 +0300
commit: 40cf424721837814ecd5f8dbb9993b64738efecc (patch)
tree: 6d84f7397950aea1c3e2f994b3e113df36b32db9
parent: f6da1f379f84e1b8c357422b5650323eb8c95f3c (diff)
37 files changed, 355 insertions, 107 deletions
diff --git a/main/ChangeLog b/main/ChangeLog
index 2728fd192f..fea0ac3a5c 100644
--- a/main/ChangeLog
+++ b/main/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Main.sln:
+	* configure.in:
+	* monodevelop-core-addins.pc.in: Add the new dll.
+
 2010-01-20  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* Main.sln: Update. The GUID for the Cecil.Decompiler project
diff --git a/main/Main.sln b/main/Main.sln
index 076af291e5..5d3e59aea4 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -146,6 +146,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Soft.A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Soft.Moonlight", "src\addins\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft.Moonlight\MonoDevelop.Debugger.Soft.Moonlight.csproj", "{7D1252E7-42D0-486D-B04B-CFFDD6113691}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging.Soft", "src\addins\MonoDevelop.Debugger.Soft\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj", "{DE40756E-57F6-4AF2-B155-55E3A88CCED8}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.HexEditor", "src\addins\MonoDevelop.HexEditor\MonoDevelop.HexEditor.csproj", "{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger", "MonoDevelop.Debugger", "{776872D9-76FA-407B-BA69-08E25A24E5CE}"
@@ -873,6 +875,18 @@ Global
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|x86.ActiveCfg = Release|Any CPU
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|x86.Build.0 = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|x86.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x86.Build.0 = Release|Any CPU
 		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1042,6 +1056,7 @@ Global
 		{3D363F0C-5731-42AA-9022-B7F4657F298A} = {33248236-FF84-4336-A73B-65E6B1090D15}
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4} = {33248236-FF84-4336-A73B-65E6B1090D15}
 		{7D1252E7-42D0-486D-B04B-CFFDD6113691} = {33248236-FF84-4336-A73B-65E6B1090D15}
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8} = {33248236-FF84-4336-A73B-65E6B1090D15}
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
 		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
diff --git a/main/configure.in b/main/configure.in
index a4bc61bb72..c2399f23e4 100644
--- a/main/configure.in
+++ b/main/configure.in
@@ -389,6 +389,7 @@ src/addins/MonoDevelop.CodeMetrics/Makefile
 src/addins/MonoDevelop.Refactoring/Makefile
 src/addins/MonoDevelop.Debugger/Makefile
 src/addins/MonoDevelop.Debugger.Soft/Makefile
+src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile
 src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile
 src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile
 src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile
diff --git a/main/monodevelop-core-addins.pc.in b/main/monodevelop-core-addins.pc.in
index ead27ccc5b..4b3997e19a 100644
--- a/main/monodevelop-core-addins.pc.in
+++ b/main/monodevelop-core-addins.pc.in
@@ -6,4 +6,4 @@ GacPackage=false
 Name: MonoDevelop Core Add-ins
 Description: MonoDevelop Core Add-ins
 Version: @VERSION@
-Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll
+Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/ChangeLog
index 688999ce42..27e569d6d5 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/ChangeLog
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Makefile.am:
+	* Mono.Debugging.Soft: Split out a new dll Mono.Debugging.Soft
+	  from the soft debugger addin. It has the bits that have with
+	  no MD deps apart from Mono.Debugging, and it's strongnamed
+	  so MonoVS can use it.
+
 2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* Makefile.am: Wire the soft debug addin into the build.
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Soft/Makefile.am
index f80a5d8a03..f93cf12ce7 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
+	Mono.Debugging.Soft \
 	MonoDevelop.Debugger.Soft \
 	MonoDevelop.Debugger.Soft.AspNet \
 	MonoDevelop.Debugger.Soft.Moonlight
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ArrayAdaptor.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/ArrayAdaptor.cs
index 9dbceb1984..1cbb84d21f 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ArrayAdaptor.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/ArrayAdaptor.cs
@@ -28,7 +28,7 @@ using System;
 using Mono.Debugging.Evaluation;
 using Mono.Debugger;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class ArrayAdaptor: ICollectionAdaptor
 	{
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/AssemblyInfo.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/AssemblyInfo.cs
new file mode 100644
index 0000000000..d70591c7b4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/AssemblyInfo.cs
@@ -0,0 +1,29 @@
+// 
+// AssemblyInfo.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutchinson@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc. (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Mono.Debugging.Soft")]
+\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/ChangeLog
new file mode 100644
index 0000000000..7cca49d9d1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/ChangeLog
@@ -0,0 +1,20 @@
+2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* AssemblyInfo.cs:
+	* ArrayAdaptor.cs:
+	* LoggingService.cs:
+	* SoftDebuggerSession.cs:
+	* SoftDebuggerAdaptor.cs:
+	* Mono.Debugger.Soft.dll:
+	* FieldValueReference.cs:
+	* SoftDebuggerBacktrace.cs:
+	* SoftDebuggerStartInfo.cs:
+	* SoftEvaluationContext.cs:
+	* VariableValueReference.cs:
+	* PropertyValueReference.cs:
+	* Mono.Debugger.Soft.dll.mdb:
+	* Mono.Debugging.Soft.csproj: Split out a new dll
+	  Mono.Debugging.Soft from the soft debugger addin. It has the
+	  bits that have with no MD deps apart from Mono.Debugging,
+	  and it's strongnamed so MonoVS can use it.
+
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/FieldValueReference.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/FieldValueReference.cs
index 49a546c91c..aa98a4a193 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/FieldValueReference.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/FieldValueReference.cs
@@ -30,7 +30,7 @@ using Mono.Debugging.Evaluation;
 using Mono.Debugger;
 using Mono.Debugging.Client;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class FieldValueReference: ValueReference
 	{
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/LoggingService.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/LoggingService.cs
new file mode 100644
index 0000000000..2c9a8ba79b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/LoggingService.cs
@@ -0,0 +1,62 @@
+// 
+// LoggingService.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutchinson@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc. (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace Mono.Debugging.Soft
+{
+	/// <summary>
+	/// This is a simple abstraction so that MD can plug in its own logging service to handle the Mono.Debugging.Soft
+	/// error logging, without Mono.Debugging.Soft depending on MonoDevelop.Core.
+	/// In the absence of a custom logger, it writes to Console.
+	/// </summary>
+	public static class LoggingService
+	{
+		public static ICustomLogger CustomLogger { get; set; }
+		
+		internal static void LogError (string message, Exception ex)
+		{
+			if (CustomLogger != null)
+				CustomLogger.LogError (message, ex);
+			else
+				Console.WriteLine (message + System.Environment.NewLine + (ex != null? ex.ToString () : string.Empty));
+		}
+
+		//this is meant to show a GUI if possible
+		internal static void LogAndShowException (string message, Exception ex)
+		{
+			if (CustomLogger != null)
+				CustomLogger.LogAndShowException (message, ex);
+			else
+				LogError (message, ex);
+		}
+	}
+	
+	public interface ICustomLogger
+	{
+		void LogError (string message, System.Exception ex);
+		void LogAndShowException (string message, System.Exception ex);
+	}
+}
+\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll
index 140c96ecee..140c96ecee 100755
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll.mdb b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll.mdb
index f52b671b4c..f52b671b4c 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll.mdb
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll.mdb
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugging.Soft.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugging.Soft.csproj
new file mode 100644
index 0000000000..63ec965157
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugging.Soft.csproj
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DE40756E-57F6-4AF2-B155-55E3A88CCED8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Mono.Debugging.Soft</RootNamespace>
+    <AssemblyName>Mono.Debugging.Soft</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\core\Mono.Debugging\mono.debugging.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Debugger.Soft</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Debugger.Soft</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\core\Mono.Debugging\Mono.Debugging.csproj">
+      <Project>{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}</Project>
+      <Name>Mono.Debugging</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArrayAdaptor.cs" />
+    <Compile Include="FieldValueReference.cs" />
+    <Compile Include="PropertyValueReference.cs" />
+    <Compile Include="SoftDebuggerSession.cs" />
+    <Compile Include="VariableValueReference.cs" />
+    <Compile Include="SoftEvaluationContext.cs" />
+    <Compile Include="SoftDebuggerAdaptor.cs" />
+    <Compile Include="SoftDebuggerBacktrace.cs" />
+    <Compile Include="SoftDebuggerStartInfo.cs" />
+    <Compile Include="LoggingService.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Debugger.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Mono.Debugger.Soft.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties xmlns="">
+        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true">
+          <BuildFilesVar Sync="true" Name="FILES" />
+          <DeployFilesVar />
+          <ResourcesVar Sync="true" Name="RES" />
+          <OthersVar />
+          <GacRefVar Sync="true" Name="REFS" Prefix="-r:" />
+          <AsmRefVar Sync="true" Name="REFS" Prefix="-r:" />
+          <ProjectRefVar Sync="true" Name="DEPS" />
+        </MonoDevelop.Autotools.MakefileInfo>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
+\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/PropertyValueReference.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/PropertyValueReference.cs
index 6674a123fa..7dec978a39 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/PropertyValueReference.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/PropertyValueReference.cs
@@ -29,7 +29,7 @@ using Mono.Debugging.Evaluation;
 using Mono.Debugger;
 using Mono.Debugging.Client;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class PropertyValueReference: ValueReference
 	{
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerAdaptor.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerAdaptor.cs
index bb83743d40..35d5c19cf6 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerAdaptor.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerAdaptor.cs
@@ -35,7 +35,7 @@ using System.Reflection;
 using ST = System.Threading;
 using Mono.Debugging.Backend;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class SoftDebuggerAdaptor : ObjectValueAdaptor
 	{
@@ -759,7 +759,7 @@ namespace MonoDevelop.Debugger.Soft
 				exception = ex;
 			} catch (Exception ex) {
 				ctx.Session.StackVersion++;
-				MonoDevelop.Core.LoggingService.LogError ("Error in soft debugger method call thread on " + GetInfo (), ex);
+				LoggingService.LogError ("Error in soft debugger method call thread on " + GetInfo (), ex);
 				exception = ex;
 			}
 		}
@@ -787,7 +787,7 @@ namespace MonoDevelop.Debugger.Soft
 			} catch (InvocationException ex) {
 				exception = ex;
 			} catch (Exception ex) {
-				MonoDevelop.Core.LoggingService.LogError ("Error in soft debugger method call thread on " + GetInfo (), ex);
+				LoggingService.LogError ("Error in soft debugger method call thread on " + GetInfo (), ex);
 				exception = ex;
 			} finally {
 				ctx.Session.StackVersion++;
@@ -808,7 +808,7 @@ namespace MonoDevelop.Debugger.Soft
 				                      function == null? "[null]" : function.FullName,
 				                      type == null? "[null]" : type.FullName);
 			} catch (Exception ex) {
-				MonoDevelop.Core.LoggingService.LogError ("Error getting info for SDB MethodCall", ex);
+				LoggingService.LogError ("Error getting info for SDB MethodCall", ex);
 				return "";
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerBacktrace.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerBacktrace.cs
index 72e7ba6c65..a9039fb01c 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerBacktrace.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerBacktrace.cs
@@ -32,7 +32,7 @@ using MDB = Mono.Debugger;
 using DC = Mono.Debugging.Client;
 using Mono.Debugging.Evaluation;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class SoftDebuggerBacktrace: BaseBacktrace
 	{
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerSession.cs
index b538e40e02..4bab903cc7 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerSession.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerSession.cs
@@ -33,13 +33,11 @@ using Mono.Debugger;
 using Mono.Debugging.Evaluation;
 using MDB = Mono.Debugger;
 using System.Net.Sockets;
-using MonoDevelop.Core;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using MonoDevelop.Core.Execution;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class SoftDebuggerSession : DebuggerSession
 	{
@@ -85,7 +83,7 @@ namespace MonoDevelop.Debugger.Soft
 				throw new InvalidOperationException ("Already exited");
 			
 			var dsi = (SoftDebuggerStartInfo) startInfo;
-			var runtime = Path.Combine (Path.Combine (dsi.Runtime.Prefix, "bin"), "mono");
+			var runtime = Path.Combine (Path.Combine (dsi.MonoRuntimePrefix, "bin"), "mono");
 			RegisterUserAssemblies (dsi.UserAssemblyNames);
 			
 			var psi = new System.Diagnostics.ProcessStartInfo (runtime) {
@@ -97,7 +95,7 @@ namespace MonoDevelop.Debugger.Soft
 			};
 			
 			LaunchOptions options = null;
-			
+			/*
 			if (startInfo.UseExternalConsole) {
 				options = new LaunchOptions ();
 				options.CustomProcessLauncher = delegate (System.Diagnostics.ProcessStartInfo info) {
@@ -107,14 +105,14 @@ namespace MonoDevelop.Debugger.Soft
 					return Runtime.ProcessService.StartConsoleProcess (psi.FileName, psi.Arguments, psi.WorkingDirectory, vars, ExternalConsoleFactory.Instance.CreateConsole (dsi.CloseExternalConsoleOnExit), null);
 				};
 			}
-			
+			*/
 			var sdbLog = Environment.GetEnvironmentVariable ("MONODEVELOP_SDB_LOG");
 			if (!String.IsNullOrEmpty (sdbLog)) {
 				options = options ?? new LaunchOptions ();
 				options.AgentArgs = string.Format ("loglevel=1,logfile='{0}'", sdbLog);
 			}
 			
-			foreach (var env in dsi.Runtime.EnvironmentVariables)
+			foreach (var env in dsi.MonoRuntimeEnvironmentVariables)
 				psi.EnvironmentVariables[env.Key] = env.Value;
 			
 			foreach (var env in startInfo.EnvironmentVariables)
@@ -130,7 +128,7 @@ namespace MonoDevelop.Debugger.Soft
 			));
 		}
 		
-		internal AsyncCallback HandleCallbackErrors (AsyncCallback callback)
+		protected AsyncCallback HandleCallbackErrors (AsyncCallback callback)
 		{
 			return delegate (IAsyncResult ar) {
 				connectionHandle = null;
@@ -139,8 +137,7 @@ namespace MonoDevelop.Debugger.Soft
 				} catch (Exception ex) {
 					//only show the exception if we didn't cause it by cancelling & closing the socket
 					if (!(connectionHandle == null && ex is SocketException)) {
-						MonoDevelop.Core.Gui.MessageService.ShowException (ex, "Soft debugger error: " + ex.Message);
-						LoggingService.LogError ("Unhandled error launching soft debugger", ex);
+						LoggingService.LogAndShowException ("Unhandled error launching soft debugger", ex);
 					}
 					EndSession ();
 				}
@@ -151,7 +148,7 @@ namespace MonoDevelop.Debugger.Soft
 		/// Subclasses should pass any handles they get from the VirtualMachineManager to this
 		/// so that they will be closed if the connection attempt is aborted before OnConnected is called.
 		/// </summary>
-		internal void OnConnecting (IAsyncResult connectionHandle)
+		protected void OnConnecting (IAsyncResult connectionHandle)
 		{
 			if (this.connectionHandle != null)
 				throw new InvalidOperationException ("Already connecting");
@@ -183,7 +180,7 @@ namespace MonoDevelop.Debugger.Soft
 		/// If subclasses do an async connect in OnRun, they should pass the resulting VM to this method.
 		/// If the vm is null, the session will be closed.
 		/// </summary>
-		internal void HandleConnection (VirtualMachine vm)
+		protected void HandleConnection (VirtualMachine vm)
 		{
 			if (this.vm != null)
 				throw new InvalidOperationException ("The VM has already connected");
@@ -219,7 +216,7 @@ namespace MonoDevelop.Debugger.Soft
 		{
 		}
 		
-		internal void RegisterUserAssemblies (List<AssemblyName> userAssemblyNames)
+		protected void RegisterUserAssemblies (List<AssemblyName> userAssemblyNames)
 		{
 			if (Options.ProjectAssembliesOnly && userAssemblyNames != null) {
 				assemblyFilters = new List<AssemblyMirror> ();
@@ -344,10 +341,14 @@ namespace MonoDevelop.Debugger.Soft
 		{
 			if (vm != null) {
 				//FIXME: this might never get reached if the IDE is exited first
-				GLib.Timeout.Add (10000, delegate {
+				var t = new System.Timers.Timer ();
+				t.Interval = 10000;
+				t.Elapsed += delegate {
 					EnsureExited ();
-					return false;
-				});
+					t.Enabled = false;
+					t.Dispose ();
+				};
+				t.Enabled = true;
 			}	
 		}
 		
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerStartInfo.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerStartInfo.cs
new file mode 100644
index 0000000000..b75ab39c33
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerStartInfo.cs
@@ -0,0 +1,54 @@
+// 
+// SoftDebuggerStartInfo.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutchinson@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc. (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.Debugging.Client;
+using System.Collections.Generic;
+using System.Reflection;
+using System.IO;
+
+namespace Mono.Debugging.Soft
+{
+	public class SoftDebuggerStartInfo : DebuggerStartInfo
+	{
+		public SoftDebuggerStartInfo (string monoRuntimePrefix, Dictionary<string,string> monoRuntimeEnvironmentVariables)
+		{
+			this.MonoRuntimePrefix = monoRuntimePrefix;
+			this.MonoRuntimeEnvironmentVariables = monoRuntimeEnvironmentVariables;
+		}
+		
+		public string MonoRuntimePrefix { get; private set; }
+		public Dictionary<string,string> MonoRuntimeEnvironmentVariables { get; private set; }
+		
+		public List<AssemblyName> UserAssemblyNames { get; set; }
+		
+		/// <summary>
+		/// The session will output this to the debug log as soon as it starts. It can be used to log warnings from
+		/// creating the SoftDebuggerStartInfo
+		/// </summary>
+		public string LogMessage { get; set; }
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftEvaluationContext.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftEvaluationContext.cs
index 43933cc2e8..860e0ca683 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftEvaluationContext.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftEvaluationContext.cs
@@ -29,7 +29,7 @@ using Mono.Debugging.Evaluation;
 using Mono.Debugger;
 using DC = Mono.Debugging.Client;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class SoftEvaluationContext: EvaluationContext
 	{
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/VariableValueReference.cs b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/VariableValueReference.cs
index 9e4a506d16..213a4d1e58 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/VariableValueReference.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/VariableValueReference.cs
@@ -30,7 +30,7 @@ using Mono.Debugging.Evaluation;
 using Mono.Debugging.Client;
 using Mono.Debugger;
 
-namespace MonoDevelop.Debugger.Soft
+namespace Mono.Debugging.Soft
 {
 	public class VariableValueReference : ValueReference
 	{
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
index dbc57daf13..dc95346cc1 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
@@ -35,6 +35,7 @@ using Mono.Debugging.Client;
 using MonoDevelop.Debugger.Soft;
 using System.Net;
 using MonoDevelop.Core.Assemblies;
+using Mono.Debugging.Soft;
 
 namespace MonoDevelop.Debugger.Soft.AspNet
 {
@@ -56,16 +57,20 @@ namespace MonoDevelop.Debugger.Soft.AspNet
 		{
 			var cmd = (AspNetExecutionCommand) command;
 			
-			var startInfo = new SoftDebuggerStartInfo ((MonoTargetRuntime)cmd.TargetRuntime) {
+			var runtime = (MonoTargetRuntime)cmd.TargetRuntime;
+			var startInfo = new SoftDebuggerStartInfo (runtime.Prefix, runtime.EnvironmentVariables) {
 				WorkingDirectory = cmd.BaseDirectory,
 				Arguments = cmd.XspParameters.GetXspParameters ().Trim (),
 			};
 			
+			FilePath prefix = runtime.Prefix;
 			startInfo.Command = (cmd.ClrVersion == ClrVersion.Net_1_1)
-				? startInfo.MonoPrefix.Combine ("lib", "mono", "1.0", "xsp.exe")
-				: startInfo.MonoPrefix.Combine ("lib", "mono", "2.0", "xsp2.exe");
+				? prefix.Combine ("lib", "mono", "1.0", "xsp.exe")
+				: prefix.Combine ("lib", "mono", "2.0", "xsp2.exe");
 			
-			startInfo.SetUserAssemblies (cmd.UserAssemblyPaths);
+			string error;
+			startInfo.UserAssemblyNames = SoftDebuggerEngine.GetAssemblyNames (cmd.UserAssemblyPaths, out error);
+			startInfo.LogMessage = error;
 			
 			return startInfo;
 		}
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/ChangeLog
index c3a49133b1..e4124bc2a9 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/ChangeLog
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Makefile.am:
+	* AspNetSoftDebuggerEngine.cs:
+	* MonoDevelop.Debugger.Soft.AspNet.csproj: Fix deps to track
+	  the dll split.
+
 2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* AspNetSoftDebuggerEngine.cs: Set UserAssemblyPaths.
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am
index 322466c0ff..630cca47b1 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am
@@ -3,6 +3,7 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Debugger.Soft.AspNet.dll
 
 DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll \
+	$(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
@@ -16,7 +17,7 @@ DEPS =  \
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll \
+	-r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll \
 	-r:System \
 	-r:System.Core
 
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj
index 6ec9fd745c..cee690a67e 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj
@@ -30,7 +30,7 @@
   <ItemGroup>
     <Reference Include="Mono.Debugger.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\MonoDevelop.Debugger.Soft\Mono.Debugger.Soft.dll</HintPath>
+      <HintPath>..\Mono.Debugging.Soft\Mono.Debugger.Soft.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System">
@@ -103,6 +103,11 @@
       <Name>MonoDevelop.Projects.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj">
+      <Project>{DE40756E-57F6-4AF2-B155-55E3A88CCED8}</Project>
+      <Name>Mono.Debugging.Soft</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AspNetSoftDebuggerEngine.cs" />
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/ChangeLog
index 1f8f111a46..bec8e3fcd8 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/ChangeLog
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Makefile.am:
+	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Fix deps to
+	  track the dll split.
+
 2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MoonlightSoftDebuggerSession.cs: Create the
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am
index f0de4cd4e2..e3f8420e96 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am
@@ -2,6 +2,7 @@ ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Debugger.Soft.Moonlight.dll
 
 DEPS =  \
+	$(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll \
@@ -16,7 +17,7 @@ DEPS =  \
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll \
+	-r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll \
 	-r:System \
 	-r:System.Core
 
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/MonoDevelop.Debugger.Soft.Moonlight.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/MonoDevelop.Debugger.Soft.Moonlight.csproj
index f643257945..8925b77c01 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/MonoDevelop.Debugger.Soft.Moonlight.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/MonoDevelop.Debugger.Soft.Moonlight.csproj
@@ -30,7 +30,7 @@
   <ItemGroup>
     <Reference Include="Mono.Debugger.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\MonoDevelop.Debugger.Soft\Mono.Debugger.Soft.dll</HintPath>
+      <HintPath>..\Mono.Debugging.Soft\Mono.Debugger.Soft.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System">
@@ -103,6 +103,11 @@
       <Name>MonoDevelop.Projects.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj">
+      <Project>{DE40756E-57F6-4AF2-B155-55E3A88CCED8}</Project>
+      <Name>Mono.Debugging.Soft</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MoonlightSoftDebuggerEngine.cs" />
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ChangeLog
index c74e20100d..47e59319fa 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ChangeLog
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ChangeLog
@@ -1,3 +1,23 @@
+2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Makefile.am:
+	* ArrayAdaptor.cs:
+	* SoftDebuggerEngine.cs:
+	* SoftDebuggerSession.cs:
+	* SoftDebuggerAdaptor.cs:
+	* FieldValueReference.cs:
+	* Mono.Debugger.Soft.dll:
+	* SoftDebuggerBacktrace.cs:
+	* SoftEvaluationContext.cs:
+	* VariableValueReference.cs:
+	* PropertyValueReference.cs:
+	* Mono.Debugger.Soft.dll.mdb:
+	* RemoteSoftDebuggerSession.cs:
+	* MonoDevelop.Debugger.Soft.csproj: Split out a new dll
+	  Mono.Debugging.Soft from the soft debugger addin. It has the
+	  bits that have with no MD deps apart from Mono.Debugging,
+	  and it's strongnamed so MonoVS can use it.
+
 2010-01-19  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* SoftDebuggerAdaptor.cs: In the log message for failed
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am
index 93076877d7..4f7565061e 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am
@@ -1,12 +1,8 @@
 ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Debugger.Soft.dll
 
-DBG_ASM = $(ADDIN_BUILD)/Mono.Debugger.Soft.dll
-DBG_ASM_SRC = $(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
-DBG_MDB = $(DBG_ASM).mdb
-DBG_MDB_SRC = $(DBG_ASM_SRC).mdb
-
 DEPS =  \
+	$(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll \
 	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
@@ -21,49 +17,33 @@ DEPS =  \
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll \
+	-r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll \
 	-r:System \
 	-r:System.Core
 
 FILES =  \
-	ArrayAdaptor.cs \
 	AssemblyInfo.cs \
-	FieldValueReference.cs \
-	PropertyValueReference.cs \
 	RemoteSoftDebuggerSession.cs \
-	SoftDebuggerAdaptor.cs \
-	SoftDebuggerBacktrace.cs \
-	SoftDebuggerEngine.cs \
-	SoftDebuggerSession.cs \
-	SoftEvaluationContext.cs \
-	VariableValueReference.cs
+	SoftDebuggerEngine.cs
 
 RES = Manifest.addin.xml
 
 all: $(ASSEMBLY) $(ASSEMBLY).mdb $(DATA_FILE_BUILD)
 
-$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS) $(DBG_ASM) $(DBG_MDB)
+$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
 	mkdir -p $(ADDIN_BUILD)
 	$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) $(build_deps) \
 		$(build_resources:%=/resource:%) $(build_sources)
 
-$(DBG_ASM): $(DBG_ASM_SRC)
-	mkdir -p $(ADDIN_BUILD)
-	cp $^ $@ 
-
-$(DBG_MDB): $(DBG_MDB_SRC)
-	mkdir -p $(ADDIN_BUILD)
-	cp $^ $@
-
 $(ASSEMBLY).mdb: $(ASSEMBLY)
 
 check: all
 
 assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.Debugger.Soft
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(DBG_ASM) $(DBG_MDB)
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
 
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(DBG_ASM) $(DBG_MDB)
-EXTRA_DIST = $(FILES) $(RES) $(DBG_ASM_SRC) $(DBG_MDB_SRC)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+EXTRA_DIST = $(FILES) $(RES)
 
 include $(top_srcdir)/Makefile.include
 
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj
index 8af1e63982..fe10960cd2 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj
@@ -33,7 +33,8 @@
     <Reference Include="System" />
     <Reference Include="Mono.Debugger.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>Mono.Debugger.Soft.dll</HintPath>
+      <HintPath>..\Mono.Debugging.Soft\Mono.Debugger.Soft.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -46,15 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="SoftDebuggerSession.cs" />
     <Compile Include="SoftDebuggerEngine.cs" />
-    <Compile Include="SoftDebuggerBacktrace.cs" />
-    <Compile Include="SoftDebuggerAdaptor.cs" />
-    <Compile Include="SoftEvaluationContext.cs" />
-    <Compile Include="ArrayAdaptor.cs" />
-    <Compile Include="VariableValueReference.cs" />
-    <Compile Include="FieldValueReference.cs" />
-    <Compile Include="PropertyValueReference.cs" />
     <Compile Include="RemoteSoftDebuggerSession.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -113,6 +106,11 @@
       <Project>{3EC06433-F168-4C5B-A885-99CE4AB617E1}</Project>
       <Name>Mono.Cecil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj">
+      <Project>{DE40756E-57F6-4AF2-B155-55E3A88CCED8}</Project>
+      <Name>Mono.Debugging.Soft</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/RemoteSoftDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/RemoteSoftDebuggerSession.cs
index 407aeea07c..480ccc59bb 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/RemoteSoftDebuggerSession.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/RemoteSoftDebuggerSession.cs
@@ -31,11 +31,12 @@ using Mono.Debugging.Client;
 using System.Threading;
 using System.Diagnostics;
 using System.IO;
-using MonoDevelop.Core;
 using System.Net.Sockets;
 using System.Net;
 using System.Collections.Generic;
 using System.Reflection;
+using MonoDevelop.Core;
+using Mono.Debugging.Soft;
 
 namespace MonoDevelop.Debugger.Soft
 {
@@ -159,6 +160,7 @@ namespace MonoDevelop.Debugger.Soft
 
 		RemoteDebuggerStartInfo (string appName, IPAddress address, int debugPort,  bool redirectOutput, int outputPort)
 		{
+			SoftDebuggerEngine.EnsureSdbLoggingService ();
 			this.AppName = appName;
 			this.Address = address;
 			this.DebugPort = debugPort;
@@ -171,7 +173,7 @@ namespace MonoDevelop.Debugger.Soft
 		public void SetUserAssemblies (IList<string> files)
 		{
 			string error;
-			UserAssemblyNames = SoftDebuggerStartInfo.GetAssemblyNames (files, out error);
+			UserAssemblyNames = SoftDebuggerEngine.GetAssemblyNames (files, out error);
 			LogMessage = error;
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs
index 6f2f99a552..1e8f0d4402 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs
@@ -32,11 +32,18 @@ using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core;
 using System.IO;
 using System.Reflection;
+using Mono.Debugging.Soft;
+using MDLS = MonoDevelop.Core.LoggingService;
 
 namespace MonoDevelop.Debugger.Soft
 {
 	public class SoftDebuggerEngine: IDebuggerEngine
 	{
+		public SoftDebuggerEngine ()
+		{
+			EnsureSdbLoggingService ();
+		}
+		
 		public string Id {
 			get {
 				return "Mono.Debugger.Soft";
@@ -64,12 +71,16 @@ namespace MonoDevelop.Debugger.Soft
 		public DebuggerStartInfo CreateDebuggerStartInfo (ExecutionCommand c)
 		{
 			var cmd = (DotNetExecutionCommand) c;
-			var dsi = new SoftDebuggerStartInfo ((MonoTargetRuntime)cmd.TargetRuntime) {
+			var runtime = (MonoTargetRuntime)cmd.TargetRuntime;
+			var dsi = new SoftDebuggerStartInfo (runtime.Prefix, runtime.EnvironmentVariables) {
 				Command = cmd.Command,
 				Arguments = cmd.Arguments,
 				WorkingDirectory = cmd.WorkingDirectory,
 			};
-			dsi.SetUserAssemblies (cmd.UserAssemblyPaths);
+			
+			string error;
+			dsi.UserAssemblyNames = GetAssemblyNames (cmd.UserAssemblyPaths, out error);
+			dsi.LogMessage = error;
 			
 			foreach (KeyValuePair<string,string> var in cmd.EnvironmentVariables)
 				dsi.EnvironmentVariables [var.Key] = var.Value;
@@ -103,31 +114,8 @@ namespace MonoDevelop.Debugger.Soft
 					   DebuggerFeatures.Catchpoints;
 			}
 		}
-	}
-
-	public class SoftDebuggerStartInfo : DebuggerStartInfo
-	{
-		public SoftDebuggerStartInfo (MonoTargetRuntime runtime)
-		{
-			this.Runtime = runtime;
-		}
-		
-		public FilePath MonoPrefix { get { return Runtime.Prefix; } }
-
-		public MonoTargetRuntime Runtime { get; private set; }
-		
-		public List<AssemblyName> UserAssemblyNames { get; private set; }
-		
-		internal string LogMessage { get; private set; }
 		
-		public void SetUserAssemblies (IList<string> files)
-		{
-			string error;
-			UserAssemblyNames = GetAssemblyNames (files, out error);
-			LogMessage = error;
-		}
-		
-		internal static List<AssemblyName> GetAssemblyNames (IList<string> files, out string error)
+		public static List<AssemblyName> GetAssemblyNames (IList<string> files, out string error)
 		{
 			error = null;
 			if (files == null || files.Count == 0)
@@ -148,11 +136,32 @@ namespace MonoDevelop.Debugger.Soft
 				} catch (Exception ex) {
 					error = GettextCatalog.GetString ("Could not get assembly name for user assembly '{0}'. " +
 						"Debugger will now debug all code, not just user code.", file);
-					LoggingService.LogError ("Error getting assembly name for user assembly '" + file + "'", ex);
+					MDLS.LogError ("Error getting assembly name for user assembly '" + file + "'", ex);
 					return null;
 				}
 			}
 			return names;
 		}
+		
+		static ICustomLogger logger;
+		internal static void EnsureSdbLoggingService ()
+		{
+			if (logger == null)
+				Mono.Debugging.Soft.LoggingService.CustomLogger = logger = new MDLogger ();
+		}
+		
+		class MDLogger : ICustomLogger
+		{
+			public void LogError (string message, Exception ex)
+			{
+				MonoDevelop.Core.LoggingService.LogError (message, ex);
+			}
+			
+			public void LogAndShowException (string message, Exception ex)
+			{
+				LogError (message, ex);
+				MonoDevelop.Core.Gui.MessageService.ShowException (ex, message);
+			}
+		}
 	}
 }
diff --git a/main/src/core/Mono.Debugging/ChangeLog b/main/src/core/Mono.Debugging/ChangeLog
index 65dd8201c8..9efff3d7a3 100644
--- a/main/src/core/Mono.Debugging/ChangeLog
+++ b/main/src/core/Mono.Debugging/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Makefile.am:
+	* mono.debugging.snk:
+	* Mono.Debugging.csproj: Sign and fix deps.
+
 2010-01-20  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* Mono.Debugging.Evaluation/NRefactoryEvaluator.cs: Fix
diff --git a/main/src/core/Mono.Debugging/Makefile.am b/main/src/core/Mono.Debugging/Makefile.am
index dc1f7e0060..757ed4f53c 100644
--- a/main/src/core/Mono.Debugging/Makefile.am
+++ b/main/src/core/Mono.Debugging/Makefile.am
@@ -1,10 +1,12 @@
 	
 ASSEMBLY_BUILD_DIR = $(top_builddir)/build/bin
 ASSEMBLY = $(ASSEMBLY_BUILD_DIR)/Mono.Debugging.dll
-  
+
+SIGNING_KEY=$(srcdir)/mono.debugging.snk
+
+DEPS = $(top_builddir)/build/bin/NRefactory.dll
 
 REFS =  \
-	-r:../../../build/bin/NRefactory.dll \
 	-r:System \
 	-r:System.Core \
 	-r:System.Xml
@@ -72,9 +74,9 @@ RES =
 
 all: $(ASSEMBLY) $(ASSEMBLY).mdb
 
-$(ASSEMBLY): $(build_sources) $(build_resources)
+$(ASSEMBLY): $(build_sources) $(build_resources) $(SIGNING_KEY) $(DEPS)
 	mkdir -p $(ASSEMBLY_BUILD_DIR)
-	$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) $(build_resources:%=/resource:%) $(build_sources)
+	$(CSC) $(CSC_FLAGS) -debug -out:$@ /keycontainer:$(SIGNING_KEY) -target:library $(REFS) $(build_deps) $(build_resources:%=/resource:%) $(build_sources)
 
 $(ASSEMBLY).mdb: $(ASSEMBLY)
 
@@ -83,6 +85,6 @@ assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
 
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
 
-EXTRA_DIST = $(FILES) $(RES)
+EXTRA_DIST = $(FILES) $(RES) $(SIGNING_KEY)
 
 include $(top_srcdir)/Makefile.include
diff --git a/main/src/core/Mono.Debugging/Mono.Debugging.csproj b/main/src/core/Mono.Debugging/Mono.Debugging.csproj
index 3f0af67a0e..27236eca21 100644
--- a/main/src/core/Mono.Debugging/Mono.Debugging.csproj
+++ b/main/src/core/Mono.Debugging/Mono.Debugging.csproj
@@ -9,6 +9,8 @@
     <OutputType>Library</OutputType>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <RootNamespace>Mono.Debugging</RootNamespace>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>mono.debugging.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -113,7 +115,7 @@
           <OthersVar />
           <GacRefVar Sync="true" Name="REFS" Prefix="-r:" />
           <AsmRefVar Sync="true" Name="REFS" Prefix="-r:" />
-          <ProjectRefVar Sync="true" Name="REFS" Prefix="-r:" />
+          <ProjectRefVar Sync="true" Name="DEPS" />
         </MonoDevelop.Autotools.MakefileInfo>
       </Properties>
     </MonoDevelop>
@@ -125,6 +127,7 @@
     <ProjectReference Include="..\..\..\contrib\NRefactory\Project\NRefactory.csproj">
       <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
       <Name>NRefactory</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/main/src/core/Mono.Debugging/mono.debugging.snk b/main/src/core/Mono.Debugging/mono.debugging.snk
new file mode 100644
index 0000000000..47df15fe9f
--- /dev/null
+++ b/main/src/core/Mono.Debugging/mono.debugging.snk
author	Michael Hutchinson <mhutchinson@novell.com>	2010-01-21 02:07:58 +0300
committer	Michael Hutchinson <mhutchinson@novell.com>	2010-01-21 02:07:58 +0300
commit	40cf424721837814ecd5f8dbb9993b64738efecc (patch)
tree	6d84f7397950aea1c3e2f994b3e113df36b32db9
parent	f6da1f379f84e1b8c357422b5650323eb8c95f3c (diff)