Fixed build.

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs

@@ -26,14 +26,11 @@ namespace ICSharpCode.WpfDesign.AddIn
 	/// <summary>
 	/// IViewContent implementation that hosts the WPF designer.
 	/// </summary>
-	public class WpfViewContent : AbstractViewContentHandlingLoadErrors, IHasPropertyContainer, IToolsHost
+	public class WpfViewContent : AbstractViewContentHandlingLoadErrors, IHasPropertyContainer, IToolsHost, IOutlineContentHost
 	{
 		public WpfViewContent(OpenedFile file) : base(file)
 		{
 			BasicMetadata.Register();
-			var outlineContent = GetService(typeof(IOutlineContentHost));
-			if(outlineContent==null)
-				this.Services.AddService(typeof(IOutlineContentHost),Outline);
 			
 			this.TabPageText = "${res:FormsDesigner.DesignTabPages.DesignTabPage}";
 			this.IsActiveViewContentChanged += OnIsActiveViewContentChanged;
@@ -230,5 +227,9 @@ namespace ICSharpCode.WpfDesign.AddIn
 				return outline;
 			}
 		}
+		
+		public object OutlineContent {
+			get { return this.Outline; }
+		}
 	}
 }

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/Outline.xaml.cs

@@ -14,12 +14,10 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.WpfDesign.Designer.OutlineView
 {
-	public partial class Outline : IOutlineContentHost
+	public partial class Outline
 	{
 		public Outline()
 		{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj

@@ -232,10 +232,6 @@
     <Resource Include="Images\Tag.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
-      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
-      <Name>ICSharpCode.SharpDevelop</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
       <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
       <Name>ICSharpCode.SharpDevelop.Widgets</Name>

src/AddIns/Misc/AddInManager/Project/AddInManager.csproj

@@ -17,7 +17,8 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>..\..\..\..\..\AddIns\Misc\AddInManager\</OutputPath>

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -35,7 +35,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <Optimize>False</Optimize>

src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj

@@ -21,7 +21,8 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <!-- workaround for bug compiling with 32-bit MSBuild 4.0 on 64-bit Windows without having VS2010 installed -->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj.user

@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <StartProgram>
     </StartProgram>

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

@@ -510,14 +510,20 @@ namespace ICSharpCode.SharpDevelop.Gui
 		#endregion
 		
 		#region IServiceProvider
-		ServiceContainer _services=new ServiceContainer();
+		ServiceContainer services = new ServiceContainer();
 		
-		public object GetService(Type serviceType){
-			return _services.GetService(serviceType);
+		public object GetService(Type serviceType)
+		{
+			object obj = services.GetService(serviceType);
+			if (obj == null) {
+				if (serviceType.IsInstanceOfType(this))
+					return this;
+			}
+			return obj;
 		}
 		
 		public ServiceContainer Services {
-			get { return _services; }
+			get { return services; }
 		}
 		
 		#endregion

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

@@ -17,8 +17,7 @@
     <DelaySign>False</DelaySign>
     <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <Optimize>False</Optimize>