fixed some compile errors in AddIns depending on FormsDesigner.AddIn

src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj

@@ -139,6 +139,11 @@
       <Name>FormsDesigner.AddIn</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj">
+      <Project>{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}</Project>
+      <Name>FormsDesigner</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj">
       <Project>{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}</Project>
       <Name>NRefactoryToBooConverter</Name>

src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/BooDesignerLoader.cs

@@ -19,20 +19,23 @@ namespace Grunwald.BooBinding.Designer
 {
 	public class BooDesignerLoader : AbstractCodeDomDesignerLoader
 	{
-		protected override bool IsReloadNeeded()
+		FormsDesignerViewContent viewContent;
+		
+		public override bool IsReloadNeeded(bool value)
 		{
-			return base.IsReloadNeeded() || this.Generator.ViewContent.DesignerCodeFileContent != lastTextContent;
+			return base.IsReloadNeeded(value) || viewContent.DesignerCodeFileContent != lastTextContent;
 		}
 		
-		public BooDesignerLoader(IDesignerGenerator generator)
+		public BooDesignerLoader(IDesignerGenerator generator, FormsDesignerViewContent viewContent)
 			: base(generator)
 		{
+			this.viewContent = viewContent;
 		}
 		
 		string lastTextContent;
 		Module parsedModule;
 		
-		protected override CodeCompileUnit Parse()
+		public override CodeCompileUnit Parse()
 		{
 			LoggingService.Debug("BooDesignerLoader.Parse()");
 			try {
@@ -48,7 +51,7 @@ namespace Grunwald.BooBinding.Designer
 		
 		CodeCompileUnit ParseForm()
 		{
-			ParseInformation parseInfo = ParserService.ParseFile(this.Generator.ViewContent.DesignerCodeFile.FileName, new StringTextBuffer(this.Generator.ViewContent.DesignerCodeFileContent));
+			ParseInformation parseInfo = ParserService.ParseFile(viewContent.DesignerCodeFile.FileName, new StringTextBuffer(viewContent.DesignerCodeFileContent));
 			Module module = ParseFormAsModule();
 			
 			#if DEBUG
@@ -74,15 +77,15 @@ namespace Grunwald.BooBinding.Designer
 			// The module is cached while loading so that
 			// determining the localization model and generating the CodeDOM
 			// does not require the code to be parsed twice.
-			if (this.parsedModule != null && lastTextContent == this.Generator.ViewContent.DesignerCodeFileContent) {
+			if (this.parsedModule != null && lastTextContent == viewContent.DesignerCodeFileContent) {
 				return this.parsedModule;
 			}
 			
-			lastTextContent = this.Generator.ViewContent.DesignerCodeFileContent;
+			lastTextContent = viewContent.DesignerCodeFileContent;
 			
-			ParseInformation parseInfo = ParserService.ParseFile(this.Generator.ViewContent.DesignerCodeFile.FileName, new StringTextBuffer(this.Generator.ViewContent.DesignerCodeFileContent));
+			ParseInformation parseInfo = ParserService.ParseFile(viewContent.DesignerCodeFile.FileName, new StringTextBuffer(viewContent.DesignerCodeFileContent));
 			// ensure that there are no syntax errors in the file:
-			Module mainModule = Parse(this.Generator.ViewContent.DesignerCodeFile.FileName, lastTextContent);
+			Module mainModule = Parse(viewContent.DesignerCodeFile.FileName, lastTextContent);
 			
 			IClass formClass;
 			bool isFirstClassInFile;
@@ -102,7 +105,7 @@ namespace Grunwald.BooBinding.Designer
 				throw new FormsDesignerLoadException("formClass.BaseClass returned null.");
 			cld.BaseTypes.Add(new SimpleTypeReference(formClass.BaseClass.FullyQualifiedName));
 			
-			System.Diagnostics.Debug.Assert(FileUtility.IsEqualFileName(initMethod.DeclaringType.CompilationUnit.FileName, this.Generator.ViewContent.DesignerCodeFile.FileName));
+			System.Diagnostics.Debug.Assert(FileUtility.IsEqualFileName(initMethod.DeclaringType.CompilationUnit.FileName, viewContent.DesignerCodeFile.FileName));
 			
 			foreach (IField f in formClass.Fields) {
 				Field field = new Field();
@@ -151,7 +154,7 @@ namespace Grunwald.BooBinding.Designer
 			return module;
 		}
 		
-		protected override void Write(CodeCompileUnit unit)
+		public override void Write(CodeCompileUnit unit)
 		{
 			LoggingService.Info("BooDesignerLoader.Write called");
 			try {

src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/FormsDesignerBinding.cs

@@ -60,9 +60,11 @@ namespace Grunwald.BooBinding.Designer
 		{
 		}
 		
-		public System.ComponentModel.Design.Serialization.DesignerLoader CreateLoader(IDesignerGenerator generator)
+		public IDesignerLoader CreateLoader(IDesignerGenerator generator)
 		{
-			return new BooDesignerLoader(generator);
+			return new BooDesignerLoader(generator, ViewContent);
 		}
+		
+		public FormsDesignerViewContent ViewContent { get; set; }
 	}
 }

src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj

@@ -141,6 +141,11 @@
       <Name>FormsDesigner.AddIn</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj">
+      <Project>{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}</Project>
+      <Name>FormsDesigner</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerLoaderProvider.cs

@@ -15,7 +15,7 @@ namespace ICSharpCode.WixBinding
 		{
 		}
 		
-		public DesignerLoader CreateLoader(IDesignerGenerator generator)
+		public IDesignerLoader CreateLoader(IDesignerGenerator generator)
 		{
 			return new WixDialogDesignerLoader(designer, generator as IWixDialogDesignerGenerator);
 		}
@@ -31,5 +31,7 @@ namespace ICSharpCode.WixBinding
 				designer = value;
 			}
 		}
+		
+		public FormsDesignerViewContent ViewContent { get; set; }
 	}
 }

src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj

@@ -256,6 +256,11 @@
       <Name>FormsDesigner.AddIn</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj">
+      <Project>{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}</Project>
+      <Name>FormsDesigner</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.AddIn.csproj

@@ -8,20 +8,27 @@
     <RootNamespace>ICSharpCode.FormsDesigner</RootNamespace>
     <AssemblyName>FormsDesigner.AddIn</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <OutputPath>..\..\..\..\..\AddIns\DisplayBindings\FormsDesigner\</OutputPath>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
     <PlatformTarget>x86</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
-    <DebugSymbols>True</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
     <DebugSymbols>False</DebugSymbols>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
@@ -71,6 +78,7 @@
     <Compile Include="DesignerLoader\DesignerLoaderProvider.cs" />
     <Compile Include="DesignerLoader\NRefactoryDesignerLoader.cs" />
     <Compile Include="DesignerSourceCodeStorage.cs" />
+    <Compile Include="FormsDesignerLoggingServiceImpl.cs" />
     <Compile Include="FormsDesignerViewContent.cs" />
     <Compile Include="FormKeyHandler.cs" />
     <Compile Include="ImageResourceEditorDialog.cs" />

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerLoggingServiceImpl.cs

@@ -0,0 +1,50 @@
+// 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 ICSharpCode.Core;
+using ICSharpCode.Core.Services;
+
+namespace ICSharpCode.FormsDesigner
+{
+	/// <summary>
+	/// Description of FormsDesignerLoggingServiceImpl.
+	/// </summary>
+	public class FormsDesignerLoggingServiceImpl : IFormsDesignerLoggingService
+	{
+		public void Debug(string message)
+		{
+			LoggingService.Debug(message);
+		}
+		
+		public void Info(string message)
+		{
+			LoggingService.Info(message);
+		}
+		
+		public void Warn(string message)
+		{
+			LoggingService.Warn(message);
+		}
+		
+		public void Error(Exception error)
+		{
+			LoggingService.Error(error);
+		}
+		
+		public void Error(string message, Exception error)
+		{
+			LoggingService.Error(message, error);
+		}
+		
+		public void DebugFormatted(string format, params object[] args)
+		{
+			LoggingService.DebugFormatted(format, args);
+		}
+		
+		public void WarnFormatted(string format, params object[] args)
+		{
+			LoggingService.WarnFormatted(format, args);
+		}
+	}
+}

src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/SecondaryDisplayBinding.cs

@@ -117,6 +117,8 @@ namespace ICSharpCode.FormsDesigner
 			IDesignerGenerator generator;
 			IDesignerSourceProvider sourceProvider;
 			
+			FormsDesignerLoggingService.Service = new FormsDesignerLoggingServiceImpl();
+			
 			switch (fileExtension) {
 				case ".cs":
 					loader    = new NRefactoryDesignerLoaderProvider(SupportedLanguage.CSharp);

src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj

@@ -65,11 +65,12 @@
     <Compile Include="Src\DesignerAppDomainManager.cs" />
     <Compile Include="Src\DesignerLoader\SharpDevelopDesignerLoader.cs" />
     <Compile Include="Src\DesignerLoader\IDesignerLoader.cs" />
+    <Compile Include="Src\FormsDesignerLoggingService.cs" />
     <Compile Include="Src\Gui\ComponentLibraryLoader.cs" />
     <Compile Include="Src\Gui\CustomComponentToolBoxItem.cs" />
     <Compile Include="Src\IDesignerGenerator.cs" />
     <Compile Include="Src\IFormsDesigner.cs" />
-    <Compile Include="Src\LoggingService.cs" />
+    <Compile Include="Src\IFormsDesignerLoggingService.cs" />
     <Compile Include="Src\Services\AssemblyInfo.cs" />
     <Compile Include="Src\Services\DefaultMemberRelationshipService.cs" />
     <Compile Include="Src\Services\DefaultServiceContainer.cs" />

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/SharpDevelopDesignerLoader.cs

@@ -61,10 +61,10 @@ namespace ICSharpCode.FormsDesigner
 			try {
 				IComponentChangeService componentChangeService = (IComponentChangeService)this.GetService(typeof(IComponentChangeService));
 				if (componentChangeService != null) {
-					LoggingService.Debug("Forms designer: Removing ComponentAdded handler for nested container setup");
+					FormsDesignerLoggingService.Debug("Forms designer: Removing ComponentAdded handler for nested container setup");
 					componentChangeService.ComponentAdded -= ComponentContainerSetUp;
 				} else {
-					LoggingService.Info("Forms designer: Could not remove ComponentAdding handler because IComponentChangeService is no longer available");
+					FormsDesignerLoggingService.Info("Forms designer: Could not remove ComponentAdding handler because IComponentChangeService is no longer available");
 				}
 			} finally {
 				base.Dispose();
@@ -98,7 +98,7 @@ namespace ICSharpCode.FormsDesigner
 			if (nestedContainer != null) {
 				MethodInfo getServiceMethod = nestedContainer.GetType().GetMethod("GetService", BindingFlags.Instance | BindingFlags.NonPublic, null, new [] {typeof(Type)}, null);
 				if (getServiceMethod != null) {
-					LoggingService.Debug("Forms designer: Initializing nested service container of " + e.Component.ToString() + " using Reflection");
+					FormsDesignerLoggingService.Debug("Forms designer: Initializing nested service container of " + e.Component.ToString() + " using Reflection");
 					getServiceMethod.Invoke(nestedContainer, BindingFlags.InvokeMethod | BindingFlags.Instance | BindingFlags.NonPublic, null, new [] {typeof(IServiceContainer)}, null);
 				}
 			}
@@ -116,10 +116,10 @@ namespace ICSharpCode.FormsDesigner
 			
 			IComponentChangeService componentChangeService = (IComponentChangeService)this.GetService(typeof(IComponentChangeService));
 			if (componentChangeService != null) {
-				LoggingService.Debug("Forms designer: Adding ComponentAdded handler for nested container setup");
+				FormsDesignerLoggingService.Debug("Forms designer: Adding ComponentAdded handler for nested container setup");
 				componentChangeService.ComponentAdded += ComponentContainerSetUp;
 			} else {
-				LoggingService.Warn("Forms designer: Cannot add ComponentAdded handler for nested container setup because IComponentChangeService is unavailable");
+				FormsDesignerLoggingService.Warn("Forms designer: Cannot add ComponentAdded handler for nested container setup because IComponentChangeService is unavailable");
 			}
 		}
 		
@@ -132,13 +132,13 @@ namespace ICSharpCode.FormsDesigner
 			try {
 				base.OnEndLoad(successful, errors);
 			} catch(ExceptionCollection e) {
-				LoggingService.Error("DesignerLoader.OnEndLoad error " + e.Message, e);
+				FormsDesignerLoggingService.Error("DesignerLoader.OnEndLoad error " + e.Message, e);
 				foreach(Exception ine in e.Exceptions) {
-					LoggingService.Error("DesignerLoader.OnEndLoad error " + ine.Message, ine);
+					FormsDesignerLoggingService.Error("DesignerLoader.OnEndLoad error " + ine.Message, ine);
 				}
 				throw;
 			} catch(Exception e) {
-				LoggingService.Error("DesignerLoader.OnEndLoad error " + e.Message, e);
+				FormsDesignerLoggingService.Error("DesignerLoader.OnEndLoad error " + e.Message, e);
 				throw;
 			}
 		}

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormsDesignerLoggingService.cs

@@ -5,41 +5,43 @@ using System;
 
 namespace ICSharpCode.FormsDesigner
 {
-	static class LoggingService
+	public class FormsDesignerLoggingService
 	{
+		public static IFormsDesignerLoggingService Service;
+		
 		public static void Debug(string message)
 		{
-			throw new NotImplementedException();
+			Service.Debug(message);
 		}
 		
 		public static void Info(string message)
 		{
-			throw new NotImplementedException();
+			Service.Info(message);
 		}
 		
 		public static void Warn(string message)
 		{
-			throw new NotImplementedException();
+			Service.Warn(message);
 		}
 		
 		public static void Error(Exception error)
 		{
-			throw new NotImplementedException();
+			Service.Error(error);
 		}
 		
 		public static void Error(string message, Exception error)
 		{
-			throw new NotImplementedException();
+			Service.Error(message, error);
 		}
 		
 		public static void DebugFormatted(string format, params object[] args)
 		{
-			throw new NotImplementedException();
+			Service.DebugFormatted(format, args);
 		}
 		
 		public static void WarnFormatted(string format, params object[] args)
 		{
-			throw new NotImplementedException();
+			Service.WarnFormatted(format, args);
 		}
 	}
 }

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ComponentLibraryLoader.cs

@@ -334,7 +334,7 @@ namespace ICSharpCode.FormsDesigner.Gui
 					}
 				}
 			} catch (Exception e) {
-				LoggingService.Warn("ComponentLibraryLoader.LoadToolComponentLibrary: " + e.Message);
+				FormsDesignerLoggingService.Warn("ComponentLibraryLoader.LoadToolComponentLibrary: " + e.Message);
 				return false;
 			}
 			return true;
@@ -364,7 +364,7 @@ namespace ICSharpCode.FormsDesigner.Gui
 						b.MakeTransparent();
 					}
 				} catch (Exception e) {
-					LoggingService.Warn("ComponentLibraryLoader.GetIcon: " + e.Message);
+					FormsDesignerLoggingService.Warn("ComponentLibraryLoader.GetIcon: " + e.Message);
 				}
 			}
 			

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/CustomComponentToolBoxItem.cs

@@ -26,7 +26,7 @@ namespace ICSharpCode.FormsDesigner.Gui
 		
 		void Init(IDesignerHost host)
 		{
-			LoggingService.Debug("Initializing MyToolBoxItem: " + className);
+			FormsDesignerLoggingService.Debug("Initializing MyToolBoxItem: " + className);
 			if (host == null) throw new ArgumentNullException("host");
 			if (sourceFileName != null) {
 				TypeResolutionService typeResolutionService = host.GetService(typeof(ITypeResolutionService)) as TypeResolutionService;

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/IFormsDesignerLoggingService.cs

@@ -0,0 +1,18 @@
+// 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;
+
+namespace ICSharpCode.FormsDesigner
+{
+	public interface IFormsDesignerLoggingService
+	{
+		void Debug(string message);
+		void Info(string message);
+		void Warn(string message);
+		void Error(Exception error);
+		void Error(string message, Exception error);
+		void DebugFormatted(string format, params object[] args);
+		void WarnFormatted(string format, params object[] args);
+	}
+}

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DefaultMemberRelationshipService.cs

@@ -17,7 +17,7 @@ namespace ICSharpCode.FormsDesigner.Services
 		public override bool SupportsRelationship(MemberRelationship source, MemberRelationship relationship)
 		{
 			#if WFDESIGN_LOG_MEMBERRELATIONSHIPSERVICE
-			LoggingService.Debug("MemberRelationshipService: SupportsRelationship called, source=" + ToString(source) + ", relationship=" + ToString(relationship));
+			FormsDesignerLoggingService.Debug("MemberRelationshipService: SupportsRelationship called, source=" + ToString(source) + ", relationship=" + ToString(relationship));
 			#endif
 			return true;
 		}
@@ -25,9 +25,9 @@ namespace ICSharpCode.FormsDesigner.Services
 		#if WFDESIGN_LOG_MEMBERRELATIONSHIPSERVICE
 		protected override MemberRelationship GetRelationship(MemberRelationship source)
 		{
-			LoggingService.Debug("MemberRelationshipService: GetRelationship called, source=" + ToString(source));
+			FormsDesignerLoggingService.Debug("MemberRelationshipService: GetRelationship called, source=" + ToString(source));
 			var mrs = base.GetRelationship(source);
-			LoggingService.Debug("MemberRelationshipService: -> returning " + ToString(mrs));
+			FormsDesignerLoggingService.Debug("MemberRelationshipService: -> returning " + ToString(mrs));
 			return mrs;
 		}
 		

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DefaultServiceContainer.cs

@@ -69,9 +69,9 @@ namespace ICSharpCode.FormsDesigner.Services
 		{
 			object service = base.GetService(serviceType);
 			if (service == null) {
-				LoggingService.InfoFormatted("request missing service : {0} from Assembly {1} is not available.", serviceType, serviceType.Assembly.FullName);
+				FormsDesignerLoggingService.InfoFormatted("request missing service : {0} from Assembly {1} is not available.", serviceType, serviceType.Assembly.FullName);
 			} else {
-				LoggingService.DebugFormatted("get service : {0} from Assembly {1}.", serviceType, serviceType.Assembly.FullName);
+				FormsDesignerLoggingService.DebugFormatted("get service : {0} from Assembly {1}.", serviceType, serviceType.Assembly.FullName);
 			}
 			return service;
 		}

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ImageResourceEditor.cs

@@ -51,7 +51,7 @@ namespace ICSharpCode.FormsDesigner.Services
 			
 			IComponent component = context.Instance as IComponent;
 			if (component == null || component.Site == null) {
-				LoggingService.Info("Editing of image properties on objects not implementing IComponent and components without Site is not supported by the ImageResourceEditor.");
+				FormsDesignerLoggingService.Info("Editing of image properties on objects not implementing IComponent and components without Site is not supported by the ImageResourceEditor.");
 				if (typeof(Icon).IsAssignableFrom(context.PropertyDescriptor.PropertyType)) {
 					return new IconEditor().EditValue(context, provider, value);
 				} else {

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourcesComponentCodeDomSerializer.cs

@@ -94,16 +94,16 @@ namespace ICSharpCode.FormsDesigner.Services
 			
 			IMessageService messenger = manager.GetService(typeof(IMessageService)) as IMessageService;
 			
-			LoggingService.Debug("Forms designer: deserializing a property assignment:");
+			FormsDesignerLoggingService.Debug("Forms designer: deserializing a property assignment:");
-			LoggingService.Debug("-> " + messenger.CodeStatementToString(assignStatement));
+			FormsDesignerLoggingService.Debug("-> " + messenger.CodeStatementToString(assignStatement));
 			
 			IComponent component = this.baseSerializer.Deserialize(manager, propRefTarget.TargetObject) as IComponent;
 			if (component == null) {
-				LoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer could not deserialze the target object to IComponent");
+				FormsDesignerLoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer could not deserialze the target object to IComponent");
 				return false;
 			}
 			if (component.Site == null) {
-				LoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer: The deserialized component '" + component.ToString() + "' does not have a Site.");
+				FormsDesignerLoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer: The deserialized component '" + component.ToString() + "' does not have a Site.");
 				return false;
 			}
 			
@@ -147,8 +147,8 @@ namespace ICSharpCode.FormsDesigner.Services
 			
 			IMessageService messenger = manager.GetService(typeof(IMessageService)) as IMessageService;
 			
-			LoggingService.Debug("Forms designer: deserializing a method invocation:");
+			FormsDesignerLoggingService.Debug("Forms designer: deserializing a method invocation:");
-			LoggingService.Debug("-> " + messenger.CodeStatementToString(new CodeExpressionStatement(invokeExpression)));
+			FormsDesignerLoggingService.Debug("-> " + messenger.CodeStatementToString(new CodeExpressionStatement(invokeExpression)));
 			
 			object extenderProvider = this.baseSerializer.Deserialize(manager, invokeExpression.Method.TargetObject);
 			if (extenderProvider == null) {
@@ -157,11 +157,11 @@ namespace ICSharpCode.FormsDesigner.Services
 			
 			IComponent targetComponent = this.baseSerializer.Deserialize(manager, invokeExpression.Parameters[0]) as IComponent;
 			if (targetComponent == null) {
-				LoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer could not deserialze the target object to IComponent");
+				FormsDesignerLoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer could not deserialze the target object to IComponent");
 				return false;
 			}
 			if (targetComponent.Site == null) {
-				LoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer: The deserialized component '" + targetComponent.ToString() + "' does not have a Site.");
+				FormsDesignerLoggingService.Info("Forms designer: ProjectResourcesComponentCodeDomSerializer: The deserialized component '" + targetComponent.ToString() + "' does not have a Site.");
 				return false;
 			}
 			

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourcesMemberCodeDomSerializer.cs

@@ -52,7 +52,7 @@ namespace ICSharpCode.FormsDesigner.Services
 			
 			var prs = manager.GetService(typeof(IProjectResourceService)) as IProjectResourceService;
 			if (prs == null) {
-				LoggingService.Warn("ProjectResourceService not found");
+				FormsDesignerLoggingService.Warn("ProjectResourceService not found");
 				return false;
 			}
 			
@@ -60,7 +60,7 @@ namespace ICSharpCode.FormsDesigner.Services
 			if (resourceInfo == null) return false;
 			
 			if (!Object.ReferenceEquals(resourceInfo.OriginalValue, propDesc.GetValue(value))) {
-				LoggingService.Info("Value of property '" + propDesc.Name + "' on component '" + value.ToString() + "' is not equal to stored project resource value. Ignoring this resource.");
+				FormsDesignerLoggingService.Info("Value of property '" + propDesc.Name + "' on component '" + value.ToString() + "' is not equal to stored project resource value. Ignoring this resource.");
 				return false;
 			}
 			
@@ -72,16 +72,16 @@ namespace ICSharpCode.FormsDesigner.Services
 			
 			// Now do the actual serialization.
 			
-			LoggingService.Debug("Serializing project resource: Component '" + component.ToString() + "', Property: '" + propDesc.Name + "', Resource class: '" + resourceClassFullyQualifiedName + "', Resource property: '" + resourcePropertyName + "'");
+			FormsDesignerLoggingService.Debug("Serializing project resource: Component '" + component.ToString() + "', Property: '" + propDesc.Name + "', Resource class: '" + resourceClassFullyQualifiedName + "', Resource property: '" + resourcePropertyName + "'");
 			
 			var targetObjectExpr = base.SerializeToExpression(manager, value);
 			if (targetObjectExpr == null) {
-				LoggingService.Info("Target object could not be serialized: " + value.ToString());
+				FormsDesignerLoggingService.Info("Target object could not be serialized: " + value.ToString());
 				return false;
 			}
 			
 			if (propDesc.SerializationVisibility == DesignerSerializationVisibility.Content) {
-				LoggingService.Debug("-> is a content property, ignoring this.");
+				FormsDesignerLoggingService.Debug("-> is a content property, ignoring this.");
 				return false;
 			}
 			

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ToolboxService.cs

@@ -178,7 +178,7 @@ namespace ICSharpCode.FormsDesigner.Services
 		/// </remarks>
 		public void AddCreator(ToolboxItemCreatorCallback creator, string format, IDesignerHost host)
 		{
-			LoggingService.DebugFormatted("\tDefaultToolboxService:AddCreator({0}, {1}, {2})", creator, format, host);
+			FormsDesignerLoggingService.DebugFormatted("\tDefaultToolboxService:AddCreator({0}, {1}, {2})", creator, format, host);
 			if (host == null) {
 				creators.Add(format, creator);
 			} else {
@@ -249,7 +249,7 @@ namespace ICSharpCode.FormsDesigner.Services
 		
 		public ToolboxItem DeserializeToolboxItem(object serializedObject, IDesignerHost host)
 		{
-			LoggingService.DebugFormatted("DeserializeToolboxItem {0} host {1}", serializedObject, host);
+			FormsDesignerLoggingService.DebugFormatted("DeserializeToolboxItem {0} host {1}", serializedObject, host);
 			if (serializedObject is System.Windows.Forms.IDataObject) {
 				if (((System.Windows.Forms.IDataObject)serializedObject).GetDataPresent(typeof(ToolboxItem))) {
 					ToolboxItem item = (ToolboxItem) ((System.Windows.Forms.IDataObject)serializedObject).GetData(typeof(ToolboxItem));
@@ -258,7 +258,7 @@ namespace ICSharpCode.FormsDesigner.Services
 					if (host != null) {
 						list = (ArrayList)toolboxByHost[host];
 						if (list != null && list.Contains(item)) {
-							LoggingService.Warn(item.TypeName);
+							FormsDesignerLoggingService.Warn(item.TypeName);
 							return item;
 						}
 					}
@@ -268,7 +268,7 @@ namespace ICSharpCode.FormsDesigner.Services
 					}
 				}
 			}
-			LoggingService.WarnFormatted("DeserializeToolboxItem {0} host {1} return null", serializedObject, host);
+			FormsDesignerLoggingService.WarnFormatted("DeserializeToolboxItem {0} host {1} return null", serializedObject, host);
 			return null;
 		}
 		
@@ -293,7 +293,7 @@ namespace ICSharpCode.FormsDesigner.Services
 		
 		public ToolboxItemCollection GetToolboxItems()
 		{
-			LoggingService.Debug("ToolboxService: GetToolboxItems");
+			FormsDesignerLoggingService.Debug("ToolboxService: GetToolboxItems");
 			ToolboxItem[] items = new ToolboxItem[toolboxItems.Count];
 			toolboxItems.CopyTo(items);
 			return new ToolboxItemCollection(items);
@@ -301,7 +301,7 @@ namespace ICSharpCode.FormsDesigner.Services
 		
 		public ToolboxItemCollection GetToolboxItems(string category)
 		{
-			LoggingService.Debug("ToolboxService: GetToolboxItems category " + category);
+			FormsDesignerLoggingService.Debug("ToolboxService: GetToolboxItems category " + category);
 			if (category == null) {
 				category = ALL_CATEGORIES;
 			}
@@ -315,7 +315,7 @@ namespace ICSharpCode.FormsDesigner.Services
 		
 		public ToolboxItemCollection GetToolboxItems(string category, IDesignerHost host)
 		{
-			LoggingService.DebugFormatted("ToolboxService: GetToolboxItems category {0} host {1}", category, host);
+			FormsDesignerLoggingService.DebugFormatted("ToolboxService: GetToolboxItems category {0} host {1}", category, host);
 			if (category == null) {
 				category = ALL_CATEGORIES;
 			}

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeDiscoveryService.cs

@@ -33,7 +33,7 @@ namespace ICSharpCode.FormsDesigner.Services
 				baseType = typeof(object);
 			}
 			
-			LoggingService.Debug("TypeDiscoveryService.GetTypes for " + baseType.FullName
+			FormsDesignerLoggingService.Debug("TypeDiscoveryService.GetTypes for " + baseType.FullName
 			                     + "excludeGlobalTypes=" + excludeGlobalTypes.ToString());
 			//seek in all assemblies
 			//allow to work designers like columns editor in datagridview
@@ -50,7 +50,7 @@ namespace ICSharpCode.FormsDesigner.Services
 					// ignore assembly load errors
 				}
 			}
-			LoggingService.Debug("TypeDiscoveryService returns " + types.Count + " types");
+			FormsDesignerLoggingService.Debug("TypeDiscoveryService returns " + types.Count + " types");
 			
 			// TODO - Don't look in all assemblies.
 			// Should use the current project and its referenced assemblies

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeResolutionService.cs

@@ -99,10 +99,10 @@ namespace ICSharpCode.FormsDesigner.Services
 			try {
 				return new Uri(asm.CodeBase, UriKind.Absolute).LocalPath;
 			} catch (UriFormatException ex) {
-				LoggingService.Warn("Could not determine path for assembly '" + asm.ToString() + "', CodeBase='" + asm.CodeBase + "': " + ex.Message);
+				FormsDesignerLoggingService.Warn("Could not determine path for assembly '" + asm.ToString() + "', CodeBase='" + asm.CodeBase + "': " + ex.Message);
 				return asm.Location;
 			} catch (InvalidOperationException ex) {
-				LoggingService.Warn("Could not determine path for assembly '" + asm.ToString() + "', CodeBase='" + asm.CodeBase + "': " + ex.Message);
+				FormsDesignerLoggingService.Warn("Could not determine path for assembly '" + asm.ToString() + "', CodeBase='" + asm.CodeBase + "': " + ex.Message);
 				return asm.Location;
 			}
 		}
@@ -134,12 +134,12 @@ namespace ICSharpCode.FormsDesigner.Services
 				Assembly asm;
 				if (assemblyDict.TryGetValue(hash, out asm))
 					return asm;
-				LoggingService.Debug("Loading assembly " + fileName + " (hash " + hash + ")");
+				FormsDesignerLoggingService.Debug("Loading assembly " + fileName + " (hash " + hash + ")");
 				try {
 					asm = Assembly.Load(File.ReadAllBytes(fileName));
 				} catch (BadImageFormatException e) {
 					if (e.Message.Contains("HRESULT: 0x8013141D")) {
-						LoggingService.Debug("Get HRESULt 0x8013141D, loading netmodule");
+						FormsDesignerLoggingService.Debug("Get HRESULt 0x8013141D, loading netmodule");
 						//netmodule
 						string tempPath = Path.GetTempFileName();
 						File.Delete(tempPath);
@@ -171,14 +171,14 @@ namespace ICSharpCode.FormsDesigner.Services
 						// but do not prevent the designer from loading.
 						// The error might be caused by an assembly that is
 						// not even needed for the designer to load.
-						LoggingService.Error("Error loading assembly " + fileName, e);
+						FormsDesignerLoggingService.Error("Error loading assembly " + fileName, e);
 						messenger.ShowOutputPad();
 						messenger.AppendTextToBuildMessages("${res:FileUtilityService.ErrorWhileLoading}\r\n" + fileName + "\r\n" + e.Message + "\r\n");
 						return null;
 					}
 				} catch (FileLoadException e) {
 					if (e.Message.Contains("HRESULT: 0x80131402")) {
-						LoggingService.Debug("Get HRESULt 0x80131402, loading mixed modes asm from disk");
+						FormsDesignerLoggingService.Debug("Get HRESULt 0x80131402, loading mixed modes asm from disk");
 						//this is C++/CLI Mixed assembly which can only be loaded from disk, not in-memory
 						string tempPath = Path.GetTempFileName();
 						File.Delete(tempPath);
@@ -285,7 +285,7 @@ namespace ICSharpCode.FormsDesigner.Services
 			}
 			#if DEBUG
 			if (!name.StartsWith("System.")) {
-				LoggingService.Debug("TypeResolutionService: Looking for " + name);
+				FormsDesignerLoggingService.Debug("TypeResolutionService: Looking for " + name);
 			}
 			#endif
 			try {
@@ -323,7 +323,7 @@ namespace ICSharpCode.FormsDesigner.Services
 						try {
 							assembly = Assembly.Load(assemblyName);
 						} catch (Exception e) {
-							LoggingService.Error(e);
+							FormsDesignerLoggingService.Error(e);
 						}
 						if (assembly != null) {
 							string fileName = GetOriginalAssemblyFullPath(assembly);
@@ -365,14 +365,14 @@ namespace ICSharpCode.FormsDesigner.Services
 				
 				return type;
 			} catch (Exception e) {
-				LoggingService.Error(e);
+				FormsDesignerLoggingService.Error(e);
 			}
 			return null;
 		}
 		
 		public void ReferenceAssembly(AssemblyName name)
 		{
-			LoggingService.Warn("TODO: Add Assembly reference : " + name);
+			FormsDesignerLoggingService.Warn("TODO: Add Assembly reference : " + name);
 		}
 		
 		/// <summary>
@@ -442,7 +442,7 @@ namespace ICSharpCode.FormsDesigner.Services
 		
 		static Assembly AssemblyResolveEventHandler(object sender, ResolveEventArgs args)
 		{
-			LoggingService.Debug("TypeResolutionService: AssemblyResolveEventHandler: " + args.Name);
+			FormsDesignerLoggingService.Debug("TypeResolutionService: AssemblyResolveEventHandler: " + args.Name);
 			
 			Assembly lastAssembly = null;
 			
@@ -459,7 +459,7 @@ namespace ICSharpCode.FormsDesigner.Services
 			}
 			if (lastAssembly != null) {
 				TypeResolutionService.DesignerAssemblies.Add(lastAssembly);
-				LoggingService.Info("ICSharpAssemblyResolver found..." + args.Name);
+				FormsDesignerLoggingService.Info("ICSharpAssemblyResolver found..." + args.Name);
 			}
 			return lastAssembly;
 		}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj

@@ -133,6 +133,11 @@
       <Name>FormsDesigner.AddIn</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\FormsDesigner\Project\FormsDesigner.csproj">
+      <Project>{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}</Project>
+      <Name>FormsDesigner</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\WpfDesign.Designer\Project\WpfDesign.Designer.csproj">
       <Project>{78CC29AC-CC79-4355-B1F2-97936DF198AC}</Project>
       <Name>WpfDesign.Designer</Name>