Merge remote-tracking branch 'origin/master' into roslyn-dark-skin

212 files changed, 620 insertions, 320 deletions

diff --git a/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs b/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs
index 40deaca04d..634c5edd0c 100644
--- a/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs
+++ b/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using Mono.Addins;
 using MonoDevelop.AspNet.Projects;
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
index 16f968ad82..a89616bfb6 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
@@ -312,6 +312,43 @@ namespace MonoDevelop.CSharp.Completion
 			}
 		}
 
+
+		public override Task<ICompletionDataList> HandleBackspaceOrDeleteCodeCompletionAsync (CodeCompletionContext completionContext, SpecialKey key, char triggerCharacter, CancellationToken token = default(CancellationToken))
+		{
+			if (!IdeApp.Preferences.EnableAutoCodeCompletion)
+				return null;
+			if (!char.IsLetterOrDigit (triggerCharacter) && triggerCharacter != '_')
+				return null;
+			//char completionChar = Editor.GetCharAt (completionContext.TriggerOffset - 1);
+			//Console.WriteLine ("completion char: " + completionChar);
+			//	var timer = Counters.ResolveTime.BeginTiming ();
+			try {
+				int triggerWordLength = 0;
+				//if (char.IsLetterOrDigit (completionChar) || completionChar == '_') {
+				//	if (completionContext.TriggerOffset > 1 && char.IsLetterOrDigit (Editor.GetCharAt (completionContext.TriggerOffset - 2)))
+				//		return null;
+				//	triggerWordLength = 1;
+				//}
+				return InternalHandleCodeCompletion (completionContext, triggerCharacter, true, triggerWordLength, token).ContinueWith ( t => {
+					var result = (CompletionDataList)t.Result;
+					if (result == null)
+						return null;
+					result.AutoCompleteUniqueMatch = false;
+					result.AutoCompleteEmptyMatch = false;
+					return (ICompletionDataList)result;
+				});
+			} catch (Exception e) {
+				LoggingService.LogError ("Unexpected code completion exception." + Environment.NewLine + 
+				                         "FileName: " + DocumentContext.Name + Environment.NewLine + 
+				                         "Position: line=" + completionContext.TriggerLine + " col=" + completionContext.TriggerLineOffset + Environment.NewLine + 
+				                         "Line text: " + Editor.GetLineText (completionContext.TriggerLine), 
+				                         e);
+				return null;
+			} finally {
+				//			if (timer != null)
+				//				timer.Dispose ();
+			}		}
+
 		class CSharpCompletionDataList : CompletionDataList
 		{
 		}
@@ -392,7 +429,7 @@ namespace MonoDevelop.CSharp.Completion
 		Task<ICompletionDataList> InternalHandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, bool ctrlSpace, int triggerWordLength, CancellationToken token, bool forceSymbolCompletion = false)
 		{
 			if (Editor.EditMode != MonoDevelop.Ide.Editor.EditMode.Edit)
-				return null;
+				return Task.FromResult ((ICompletionDataList)null);
 //			var data = Editor;
 //			if (data.CurrentMode is TextLinkEditMode) {
 //				if (((TextLinkEditMode)data.CurrentMode).TextLinkMode == TextLinkMode.EditIdentifier)
@@ -404,7 +441,7 @@ namespace MonoDevelop.CSharp.Completion
 			list.TriggerWordLength = triggerWordLength;
 			var analysisDocument = DocumentContext.AnalysisDocument;
 			if (analysisDocument == null)
-				return null;
+				return Task.FromResult ((ICompletionDataList)null);
 			return Task.Run (async delegate {
 				try {
 					
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerReason.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerReason.cs
index 4c27c4727b..6bb76e2aa1 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerReason.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerReason.cs
@@ -31,7 +31,8 @@ namespace ICSharpCode.NRefactory6.CSharp.Completion
 	public enum CompletionTriggerReason
 	{
 		CharTyped,
-		CompletionCommand
+		CompletionCommand,
+		BackspaceOrDeleteCommand
 	}
 }
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CastCompletionContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CastCompletionContextHandler.cs
index 7467415d3a..9332cb2ee2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CastCompletionContextHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CastCompletionContextHandler.cs
@@ -85,7 +85,7 @@ namespace ICSharpCode.NRefactory6.CSharp.Completion
 		{
 			var startType = type;
 
-			while (type.SpecialType != SpecialType.System_Object) {
+			while (type != null && type.SpecialType != SpecialType.System_Object) {
 				foreach (var member in type.GetMembers ()) {
 					cancellationToken.ThrowIfCancellationRequested ();
 					if (member.IsImplicitlyDeclared || member.IsStatic)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
index 99e0b6ff48..b285a0843c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
@@ -33,7 +33,7 @@ using MonoDevelop.Core.Serialization;
 using MonoDevelop.Core;
 using Mono.Collections.Generic;
 using System.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs
index ce66e1cd0d..7dd7239f66 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Serialization;
 using MonoDevelop.Projects.Extensions;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
index b2ace92110..83ecac0135 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
@@ -34,7 +34,7 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.CSharp.Project
 {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs
index 54a2dadc20..1c60770696 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs
@@ -26,7 +26,7 @@
 using System;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.CSharp.Project
 {
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
index 2cc61ed8d8..aed6187f73 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
@@ -4,7 +4,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
 using System.Xml;
 using System.IO;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Deployment.Linux
 {
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs
index e956190e7a..fd428d98ef 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs
@@ -4,7 +4,7 @@ using System.Collections;
 using System.IO;
 using MonoDevelop.Projects;
 using MonoDevelop.Deployment.Targets;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Linq;
 
 namespace MonoDevelop.Deployment.Gui
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs
index 26e9cd891c..5cf009cc19 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs
@@ -7,7 +7,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Deployment.Targets
 {
diff --git a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
index feaeedbf75..3a3bf90904 100644
--- a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
@@ -463,7 +463,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				return searchEntry.StringValue;
 			}
 			set {
-				searchEntry.LogMessage ("Setting text to '${value}'");
+				searchEntry.LogMessage ($"Setting text to '{value}'");
 				searchEntry.StringValue = value;
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
index 0942715e79..e510cd1e26 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
@@ -43,9 +43,9 @@ namespace MonoDevelop.AssemblyBrowser
 			private set;
 		}
 		
-		Task<AssemblyDefinition> assemblyLoaderTask;
+		Task<Tuple<AssemblyDefinition, IUnresolvedAssembly>> assemblyLoaderTask;
 
-		public Task<AssemblyDefinition> LoadingTask {
+		public Task<Tuple<AssemblyDefinition, IUnresolvedAssembly>> LoadingTask {
 			get {
 				return assemblyLoaderTask;
 			}
@@ -56,34 +56,32 @@ namespace MonoDevelop.AssemblyBrowser
 
 		public AssemblyDefinition Assembly {
 			get {
-				return assemblyLoaderTask.Result;
+				return assemblyLoaderTask.Result.Item1;
 			}
 		}
-		
-		IUnresolvedAssembly unresolvedAssembly;
+
 		public IUnresolvedAssembly UnresolvedAssembly {
 			get {
-				return unresolvedAssembly;
+				return assemblyLoaderTask.Result.Item2;
 			}
 		}
 		
 		public AssemblyLoader (AssemblyBrowserWidget widget, string fileName)
 		{
 			if (widget == null)
-				throw new ArgumentNullException ("widget");
+				throw new ArgumentNullException (nameof (widget));
 			if (fileName == null)
-				throw new ArgumentNullException ("fileName");
+				throw new ArgumentNullException (nameof (fileName));
 			this.widget = widget;
-			this.FileName = fileName;
+			FileName = fileName;
 			if (!File.Exists (fileName))
-				throw new ArgumentException ("File doesn't exist.", "fileName");
-			this.assemblyLoaderTask = Task.Run (() => {
+				throw new ArgumentException ("File doesn't exist.", nameof (fileName));
+			assemblyLoaderTask = Task.Run (() => {
 				try {
 					var asm = AssemblyDefinition.ReadAssembly (FileName, new ReaderParameters {
 						AssemblyResolver = this
 					});
-					unresolvedAssembly = widget.CecilLoader.LoadAssembly (asm);
-					return asm;
+					return Tuple.Create (asm, widget.CecilLoader.LoadAssembly (asm));
 				} catch (Exception e) {
 					LoggingService.LogError ("Error while reading assembly " + FileName, e);
 					return null;
@@ -120,7 +118,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public string LookupAssembly (string fullAssemblyName)
 		{
 			var assemblyFile = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (fullAssemblyName, null);
-			if (assemblyFile != null && System.IO.File.Exists (assemblyFile))
+			if (assemblyFile != null && File.Exists (assemblyFile))
 				return assemblyFile;
 			
 			var name = AssemblyNameReference.Parse (fullAssemblyName);
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
index 21fdf47598..627885294c 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
@@ -34,10 +34,8 @@ using Mono.Cecil;
 
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.IO;
 using MonoDevelop.Ide.Editor;
 
@@ -67,17 +65,17 @@ namespace MonoDevelop.AssemblyBrowser
 			nodeInfo.Icon = Context.GetIcon (Stock.Reference);
 		}
 		
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
 		{
 			var compilationUnit = (AssemblyLoader)dataObject;
 			
 			var references = new AssemblyReferenceFolder (compilationUnit.Assembly);
 			if (references.AssemblyReferences.Any () || references.ModuleReferences.Any ())
-				builder.AddChild (references);
+				treeBuilder.AddChild (references);
 			
 			var resources = new AssemblyResourceFolder (compilationUnit.Assembly);
 			if (resources.Resources.Any ())
-				builder.AddChild (resources);
+				treeBuilder.AddChild (resources);
 			
 			var namespaces = new Dictionary<string, Namespace> ();
 			bool publicOnly = Widget.PublicApiOnly;
@@ -94,14 +92,14 @@ namespace MonoDevelop.AssemblyBrowser
 			foreach (var ns in namespaces.Values) {
 				if (publicOnly && !ns.Types.Any (t => t.IsPublic))
 					continue;
-				builder.AddChild (ns);
+				treeBuilder.AddChild (ns);
 			}
 		}
 		
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
 		{
 			var compilationUnit = (AssemblyLoader)dataObject;
-			return compilationUnit.Assembly.MainModule.HasTypes;
+			return compilationUnit?.Assembly?.MainModule.HasTypes == true;
 		}
 		
 		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
@@ -119,7 +117,7 @@ namespace MonoDevelop.AssemblyBrowser
 				if (e2 == null)
 					return -1;
 				
-				return e1.Assembly.Name.Name.CompareTo (e2.Assembly.Name.Name);
+				return string.Compare (e1.Assembly.Name.Name, e2.Assembly.Name.Name, StringComparison.Ordinal);
 			} catch (Exception e) {
 				LoggingService.LogError ("Exception in assembly browser sort function.", e);
 				return -1;
@@ -131,7 +129,7 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			result.Append ("<span style=\"comment\">");
 			result.Append ("// " +
-                               String.Format (GettextCatalog.GetString ("Assembly <b>{0}</b>, Version {1}"),
+							   string.Format (GettextCatalog.GetString ("Assembly <b>{0}</b>, Version {1}"),
 			                                  assemblyDefinition.Name.Name,
 			                                  assemblyDefinition.Name.Version));
 			result.Append ("</span>");
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
index 452b56c66e..a11cb8d733 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
@@ -39,7 +39,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Ide;
 using System.Xml;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Autotools
 {
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
index d0575adc6e..7c39600a08 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.Autotools
 {
 	public class MakefileProjectServiceExtension : SolutionExtension
 	{
-		protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.SlnFile file)
+		protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.SlnFile file)
 		{
 			base.OnReadSolution (monitor, file);
 
@@ -77,7 +77,7 @@ namespace MonoDevelop.Autotools
 			set { data = value; }
 		}
 
-		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject)
+		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
 			base.OnReadProject (monitor, msproject);
 			var ext = msproject.GetMonoDevelopProjectExtension ("MonoDevelop.Autotools.MakefileInfo");
@@ -102,7 +102,7 @@ namespace MonoDevelop.Autotools
 			}
 		}
 
-		protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject)
+		protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
 			base.OnWriteProject (monitor, msproject);
 
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
index be96b93843..04e2b66bd2 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
@@ -19,7 +19,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return base.SupportsObject (item) && IdeApp.IsInitialized;
 		}
 
-		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject)
+		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
 			base.OnReadProject (monitor, msproject);
 			if (info != null)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs
index d9208fab12..10d81693ac 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Linq;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NUnit.Framework;

 

 namespace MonoDevelop.PackageManagement.Tests

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs
index 10cadb76af..fa1377e91d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs
@@ -2,7 +2,7 @@
 using System;

 using System.Xml;

 using ICSharpCode.PackageManagement;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NuGet;

 using NUnit.Framework;

 using System.Linq;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs
index 501413c166..5a183aca78 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs
@@ -33,7 +33,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Assemblies;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using MonoDevelop.Projects;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NuGet;

 using NUnit.Framework;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs
index 8dc4aeaf35..f566b47309 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Linq;

 using System.Xml;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 

 namespace MonoDevelop.PackageManagement

 {

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs
index c4f6703b87..429b8ad619 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Xml;

 

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NuGet;

 

 namespace ICSharpCode.PackageManagement

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs
index 9526a211f3..4e6a65ae4f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs
@@ -27,7 +27,7 @@
 using System;

 using MonoDevelop.Core;

 using MonoDevelop.Projects;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 

 namespace MonoDevelop.PackageManagement

 {

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs
index 80ac36fa0b..90323a333d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide;

 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NuGet;

 

 namespace ICSharpCode.PackageManagement

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs
index e3ded9d31d..2678d02fe1 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs
@@ -28,6 +28,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Mono.TextEditor;
 using MonoDevelop.Ide;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.SourceEditor.Wrappers
 {
@@ -46,7 +47,7 @@ namespace MonoDevelop.SourceEditor.Wrappers
 		public TooltipProviderWrapper (MonoDevelop.Ide.Editor.TooltipProvider provider)
 		{
 			if (provider == null)
-				throw new ArgumentNullException ("provider");
+				throw new ArgumentNullException (nameof (provider));
 			this.provider = provider;
 		}
 
@@ -69,7 +70,12 @@ namespace MonoDevelop.SourceEditor.Wrappers
 			var doc = IdeApp.Workbench.ActiveDocument;
 			if (doc == null)
 				return null;
-			var item = await provider.GetItem (wrappedEditor, doc, offset, token);
+			var task = provider.GetItem (wrappedEditor, doc, offset, token);
+			if (task == null) {
+				LoggingService.LogWarning ("Tooltip provider " + provider + " gave back null on GetItem (should always return a non null task).");
+				return null;
+			}
+			var item = await task;
 			if (item == null)
 				return null;
 			if (lastUnwrappedItem != null) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index 6e41d4b955..3c28ce37d8 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -458,6 +458,10 @@ namespace MonoDevelop.SourceEditor
 			}
 			x += widgetExtension.OffsetX;
 			y += widgetExtension.OffsetY;
+
+			//We don't want Widget to appear outside TextArea(cut off)...
+			x = Math.Max (0, x);
+			y = Math.Max (0, y);
 			return true;
 		}
 
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs
index 5e5618ab16..422fbf91fa 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs
@@ -26,7 +26,7 @@
 
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.WebReferences.WCF
 {
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs
index 0fd31876e4..435f76d8e6 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs
@@ -26,7 +26,7 @@
 
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.WebReferences.WCF
 {
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
index 1d582d730d..bd5d77331e 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
@@ -44,7 +44,7 @@ namespace MonoDevelop.WebReferences.WS
 			UpdateFromURL = url;
 		}
 
-		protected override void Read (Project project, MonoDevelop.Projects.Formats.MSBuild.IMSBuildItemEvaluated buildItem)
+		protected override void Read (Project project, MonoDevelop.Projects.MSBuild.IMSBuildItemEvaluated buildItem)
 		{
 			base.Read (project, buildItem);
 		}
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs
index 8e0ab40f3f..317e5d1840 100644
--- a/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs
+++ b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs
@@ -27,7 +27,7 @@ using System;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.IO;
 using System.Text;
 using System.Collections.Generic;
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs
index 1506211283..3679b6f860 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs
@@ -121,13 +121,17 @@ namespace Mono.TextTemplating
 		
 		Assembly ResolveReferencedAssemblies (object sender, ResolveEventArgs args)
 		{
-			Assembly asm = null;
+			AssemblyName asmName = new AssemblyName (args.Name);
 			foreach (var asmFile in assemblyFiles) {
-				var name = System.IO.Path.GetFileNameWithoutExtension (asmFile);
-				if (args.Name.StartsWith (name, StringComparison.Ordinal))
-					asm = Assembly.LoadFrom (asmFile);
+				if (asmName.Name == System.IO.Path.GetFileNameWithoutExtension (asmFile))
+					return Assembly.LoadFrom (asmFile);
 			}
-			return asm;
+
+			var path = host.ResolveAssemblyReference (asmName.Name + ".dll");
+			if (System.IO.File.Exists (path))
+				return Assembly.LoadFrom (path);
+
+			return null;
 		}
 		
 		public void Dispose ()
diff --git a/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs b/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs
index 42b87c14eb..c1bef2c519 100644
--- a/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs
+++ b/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs
@@ -31,7 +31,7 @@ using System;
 using System.IO;
 using System.Text;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.VBNetBinding
 {
diff --git a/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs
index 40321526c3..66973b5080 100644
--- a/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs
+++ b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Core.Serialization;
 using System.Diagnostics;
 using MonoDevelop.Core;
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml
index 13be39a06c..545b7163d1 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml
@@ -49,6 +49,7 @@
                 Padding="7,1,0,2"

                 Foreground="{Binding StatusTextBrush}"

                 Text="{Binding Message}"

+                TextTrimming="WordEllipsis"

                 UseLayoutRounding="True" 

                 MouseLeftButtonUp="OnShowPad" />

             <StackPanel x:Name="BuildResultPanel"

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
index 4a39347649..d03f1e7c1d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
@@ -4,7 +4,7 @@
 	<ConditionType id="PackageNotInstalled" type="MonoDevelop.Core.AddIns.PackageNotInstalledCondition" />
 	<ConditionType id="Platform" type="MonoDevelop.Core.AddIns.PlatformCondition" />
 	<ConditionType id="AssemblyInstalled" type="MonoDevelop.Core.AddIns.AssemblyInstalledCondition" />
-	<ConditionType id="MSBuildTargetIsAvailable" type="MonoDevelop.Projects.Formats.MSBuild.TargetsAvailableCondition" />
+	<ConditionType id="MSBuildTargetIsAvailable" type="MonoDevelop.Projects.MSBuild.TargetsAvailableCondition" />
 
 	
 	<!-- Extension points -->
@@ -129,7 +129,7 @@
 	</ExtensionPoint>
 	
 	<ExtensionPoint path = "/MonoDevelop/ProjectModel/MSBuildGlobalPropertyProviders" name = "MSBuild Global Property Providers">
-		<ExtensionNode objectType="MonoDevelop.Projects.Formats.MSBuild.IMSBuildGlobalPropertyProvider"/>
+		<ExtensionNode objectType="MonoDevelop.Projects.MSBuild.IMSBuildGlobalPropertyProvider"/>
 	</ExtensionPoint>
 	
 	<ExtensionPoint path = "/MonoDevelop/ProjectModel/MonoDocSources" name = "MonoDoc Sources">
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index 4ba3f30c2d..b3875375ac 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -323,26 +323,26 @@
     <Compile Include="MonoDevelop.Projects.Extensions\MonoDocSourceNode.cs" />
     <Compile Include="MonoDevelop.Projects.Extensions\ProjectLanguageCondition.cs" />
     <Compile Include="MonoDevelop.Projects.Extensions\IAssemblyReferenceHandler.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1DotNetProjectHandler.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1FileFormat.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildFileFormat.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\SlnFileFormat.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildProjectService.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildProject.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildImportAttribute.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\RemoteProjectBuilder.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MergeToProjectAttribute.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionAndExpression.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionExpression.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionFactorExpresion.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionFunctionExpression.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionNotExpression.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionOrExpression.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionParser.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionRelationalExpression.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionTokenizer.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ExpressionParseException.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\Token.cs" />
+    <Compile Include="MonoDevelop.Projects.MD1\MD1DotNetProjectHandler.cs" />
+    <Compile Include="MonoDevelop.Projects.MD1\MD1FileFormat.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildFileFormat.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\SlnFileFormat.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildProjectService.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildProject.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildImportAttribute.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\RemoteProjectBuilder.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MergeToProjectAttribute.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionAndExpression.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionExpression.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionFactorExpresion.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionFunctionExpression.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionNotExpression.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionOrExpression.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionParser.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionRelationalExpression.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionTokenizer.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ExpressionParseException.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\Token.cs" />
     <Compile Include="MonoDevelop.Projects.Policies\PolicyBag.cs" />
     <Compile Include="MonoDevelop.Projects.Policies\PolicyService.cs" />
     <Compile Include="MonoDevelop.Projects.Policies\PolicySet.cs" />
@@ -407,7 +407,7 @@
     <Compile Include="MonoDevelop.Core\IPasswordProvider.cs" />
     <Compile Include="MonoDevelop.Projects.Utility\ByteOrderMark.cs" />
     <Compile Include="MonoDevelop.Core.AddIns\FilePathExtensionNode.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\TargetsAvailableCondition.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\TargetsAvailableCondition.cs" />
     <Compile Include="MonoDevelop.Core.AddIns\AssemblyInstalledCondition.cs" />
     <Compile Include="MonoDevelop.Core\WebCertificateService.cs" />
     <Compile Include="MonoDevelop.Core\IWebCertificateProvider.cs" />
@@ -419,7 +419,7 @@
     <Compile Include="BuildVariables.cs" />
     <Compile Include="AddinInfo.cs" />
     <Compile Include="MonoDevelop.Core.Logging\AssertLoggingTraceListener.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1ProjectService.cs" />
+    <Compile Include="MonoDevelop.Projects.MD1\MD1ProjectService.cs" />
     <Compile Include="MonoDevelop.Projects\UnknownProject.cs" />
     <Compile Include="MonoDevelop.Projects.SharedAssetsProjects\SharedAssetsProject.cs" />
     <Compile Include="MonoDevelop.Projects.SharedAssetsProjects\SharedAssetsProjectMSBuildExtension.cs" />
@@ -447,7 +447,7 @@
     <Compile Include="MonoDevelop.Core.Text\TextFileUtility.cs" />
     <Compile Include="MonoDevelop.Core.Text\ITextSourceVersion.cs" />
     <Compile Include="MonoDevelop.Projects\IDotNetFileContainer.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IMSBuildGlobalPropertyProvider.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\IMSBuildGlobalPropertyProvider.cs" />
     <Compile Include="MonoDevelop.Projects\DotNetProjectImport.cs" />
     <Compile Include="MonoDevelop.Core.Text\TextSourceVersionProvider.cs" />
     <Compile Include="MonoDevelop.Core.LogReporting\CrashReporter.cs" />
@@ -467,19 +467,19 @@
     <Compile Include="MonoDevelop.Projects\WorkspaceObject.cs" />
     <Compile Include="MonoDevelop.Projects\WorkspaceObjectExtension.cs" />
     <Compile Include="MonoDevelop.Core.Execution\ProcessAsyncOperation.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildProperty.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildPropertyGroupMerged.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildPropertyGroup.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildItem.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildItemGroup.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildEvaluationContext.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildImport.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildObject.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildProperty.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildPropertyGroupMerged.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildPropertyGroup.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildItem.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildItemGroup.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildEvaluationContext.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildImport.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildObject.cs" />
     <Compile Include="MonoDevelop.Projects\IPropertySet.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IMSBuildPropertySet.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildPropertyGroupEvaluated.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\SlnFile.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\UnknownSolutionItemTypeException.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\IMSBuildPropertySet.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildPropertyGroupEvaluated.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\SlnFile.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\UnknownSolutionItemTypeException.cs" />
     <Compile Include="MonoDevelop.Projects\DotNetCompilerParameters.cs" />
     <Compile Include="MonoDevelop.Projects\PortableDotNetProjectFlavor.cs" />
     <Compile Include="MonoDevelop.Projects\SolutionItemFactory.cs" />
@@ -507,11 +507,11 @@
     <Compile Include="MonoDevelop.Projects\WorkspaceSerializationExtension.cs" />
     <Compile Include="MonoDevelop.Projects\IMSBuildFileObject.cs" />
     <Compile Include="MonoDevelop.Projects.Extensions\TypeTagCondition.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildEngine.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\ProjectEvaluationException.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildEngine.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\ProjectEvaluationException.cs" />
     <Compile Include="MonoDevelop.Projects.Extensions\ImportRedirectTypeNode.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\FileUtil.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\DefaultMSBuildEngine.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\FileUtil.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\DefaultMSBuildEngine.cs" />
     <Compile Include="MonoDevelop.Projects\SolutionDataSectionAttribute.cs" />
     <Compile Include="MonoDevelop.Core.Serialization\DataDeletedValue.cs" />
     <Compile Include="MonoDevelop.Projects\WorkspaceObjectReader.cs" />
@@ -522,44 +522,44 @@
     <Compile Include="MonoDevelop.Core.Execution\OperationConsoleFactory.cs" />
     <Compile Include="MonoDevelop.Projects\PathBasedProjectItem.cs" />
     <Compile Include="MonoDevelop.Projects\ExportProjectItemTypeAttribute.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildProjectInstance.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildEngineV12.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildEngineV4.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildEngineManager.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ExpressionEvaluationException.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildValueType.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildProjectInstance.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildEngineV12.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildEngineV4.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildEngineManager.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ExpressionEvaluationException.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildValueType.cs" />
     <Compile Include="MonoDevelop.Projects\ConfigurationKind.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IMetadataProperty.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IMSBuildPropertyEvaluated.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildPropertyEvaluated.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildPropertyCore.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\IMetadataProperty.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\IMSBuildPropertyEvaluated.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildPropertyEvaluated.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildPropertyCore.cs" />
     <Compile Include="MonoDevelop.Projects\TargetEvaluationResult.cs" />
     <Compile Include="MonoDevelop.Projects\TargetEvaluationContext.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildImportGroup.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildChoose.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildImportGroup.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildChoose.cs" />
     <Compile Include="MonoDevelop.Core.StringParsing\StringTagModelExtensions.cs" />
     <Compile Include="MonoDevelop.Projects\OperationContext.cs" />
     <Compile Include="MonoDevelop.Projects\ProjectOperationContext.cs" />
     <Compile Include="MonoDevelop.Projects\AsyncCriticalSection.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildTarget.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildTarget.cs" />
     <Compile Include="MonoDevelop.Projects.Extensions\SupportsTargetCondition.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildTask.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildProjectExtensions.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildWhitespace.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildXmlReader.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildElement.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildXmlNode.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildFileFormatException.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildXmlElement.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IMSBuildProjectObject.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IntrinsicFunctions.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild\EscapingUtilities.cs" />
-    <Compile Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\ConditionedPropertyCollection.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildTask.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildProjectExtensions.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildWhitespace.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildXmlReader.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildElement.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildXmlNode.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildFileFormatException.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\MSBuildXmlElement.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\IMSBuildProjectObject.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\IntrinsicFunctions.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild\EscapingUtilities.cs" />
+    <Compile Include="MonoDevelop.Projects.MSBuild.Conditions\ConditionedPropertyCollection.cs" />
     <Compile Include="MonoDevelop.Core\FileWriteableState.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
-    <None Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\InvalidProjectFileException.cs" />
+    <None Include="MonoDevelop.Projects.MSBuild.Conditions\InvalidProjectFileException.cs" />
     <None Include="BuildVariables.cs.in" />
     <None Include="packages.config" />
     <None Include="MSBuild\CodeSharing.Common.props">
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
index f13e1aa795..5db30ff3e2 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
@@ -43,7 +43,6 @@ using System.Net.Security;
 using System.Net;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using MonoDevelop.Projects.Formats.MSBuild;
 
 
 namespace MonoDevelop.Core
@@ -513,7 +512,7 @@ namespace MonoDevelop.Core
 		public readonly ConfigurationProperty<bool> EnableInstrumentation = ConfigurationProperty.Create ("MonoDevelop.EnableInstrumentation", false);
 		public readonly ConfigurationProperty<bool> EnableAutomatedTesting = ConfigurationProperty.Create ("MonoDevelop.EnableAutomatedTesting", false);
 		public readonly ConfigurationProperty<string> UserInterfaceLanguage = ConfigurationProperty.Create ("MonoDevelop.Ide.UserInterfaceLanguage", "");
-		public readonly ConfigurationProperty<MSBuildVerbosity> MSBuildVerbosity = ConfigurationProperty.Create ("MonoDevelop.Ide.MSBuildVerbosity", MonoDevelop.Projects.Formats.MSBuild.MSBuildVerbosity.Normal);
+		public readonly ConfigurationProperty<MonoDevelop.Projects.MSBuild.MSBuildVerbosity> MSBuildVerbosity = ConfigurationProperty.Create ("MonoDevelop.Ide.MSBuildVerbosity", MonoDevelop.Projects.MSBuild.MSBuildVerbosity.Normal);
 		public readonly ConfigurationProperty<bool> ParallelBuild = ConfigurationProperty.Create ("MonoDevelop.ParallelBuild", true);
 
 		public readonly ConfigurationProperty<string> AuthorName = ConfigurationProperty.Create ("Author.Name", Environment.UserName, oldName:"ChangeLogAddIn.Name");
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs
index 2d577cb4ab..202a41f0c7 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs
@@ -28,7 +28,7 @@
 using System;
 using Mono.Addins;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Projects.Extensions;
 using System.Threading.Tasks;
 using System.Collections.Generic;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs
index 4aa9ae352e..c8b7870ae3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Linq;
 using Mono.Addins;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Collections.Generic;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs
index 7d5fe64b30..64b07d9a7a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs
@@ -27,7 +27,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using Mono.Addins;
 using MonoDevelop.Core;
 
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs
index 2d61c39b43..46fa87c880 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs
@@ -29,7 +29,7 @@ using System;
 using System.IO;
 using System.Xml;
 using Mono.Addins;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
 using MonoDevelop.Core.ProgressMonitoring;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs
index a18ad05e3a..cc1afe825c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs
@@ -26,7 +26,7 @@
 using System;
 using System.Linq;
 using Mono.Addins;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects.Extensions
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MD1/MD1DotNetProjectHandler.cs
index d26ca800c1..df991ed4ee 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MD1/MD1DotNetProjectHandler.cs
@@ -36,9 +36,9 @@ using MonoDevelop.Core.Execution;
 using MonoDevelop.Projects.Extensions;
 using Microsoft.Build.BuildEngine;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild.Conditions;
+using MonoDevelop.Projects.MSBuild.Conditions;
 	
-namespace MonoDevelop.Projects.Formats.MD1
+namespace MonoDevelop.Projects.MD1
 {
 	class MD1DotNetProjectHandler
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1FileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MD1/MD1FileFormat.cs
index 5957a62baf..bd2360350b 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1FileFormat.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MD1/MD1FileFormat.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Projects.Extensions;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MD1
+namespace MonoDevelop.Projects.MD1
 {
 	class MD1FileFormat
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MD1/MD1ProjectService.cs
index b408f55d37..8dae9be020 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1ProjectService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MD1/MD1ProjectService.cs
@@ -28,7 +28,7 @@
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
 
-namespace MonoDevelop.Projects.Formats.MD1
+namespace MonoDevelop.Projects.MD1
 {
 	static class MD1ProjectService
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionAndExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionAndExpression.cs
index 9655b4f9a4..634a202b4d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionAndExpression.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionAndExpression.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	internal sealed class ConditionAndExpression : ConditionExpression {
 	
 		readonly ConditionExpression left;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionExpression.cs
index 90575a3367..f97da39df7 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionExpression.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionExpression.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	internal abstract class ConditionExpression {
 	
 		public abstract bool BoolEvaluate (IExpressionContext context);
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFactorExpresion.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionFactorExpresion.cs
index e17b8f1ce7..73aa9bc4d7 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFactorExpresion.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionFactorExpresion.cs
@@ -31,7 +31,7 @@ using System.Collections.Specialized;
 using System.Globalization;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	internal sealed class ConditionFactorExpression : ConditionExpression {
 	
 		readonly Token token;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFunctionExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionFunctionExpression.cs
index 8a9c7f211c..175403ef4d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFunctionExpression.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionFunctionExpression.cs
@@ -31,7 +31,7 @@ using System.IO;
 using System.Reflection;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	internal sealed class ConditionFunctionExpression : ConditionExpression {
 	
 		List <ConditionFactorExpression> 	args;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionNotExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionNotExpression.cs
index 173b2f9762..f53c5f0bc2 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionNotExpression.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionNotExpression.cs
@@ -30,7 +30,7 @@
 using System;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	internal sealed class ConditionNotExpression : ConditionExpression {
 	
 		readonly ConditionExpression expression;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionOrExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionOrExpression.cs
index a3a92d3ea0..e0d2fa2b20 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionOrExpression.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionOrExpression.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	internal sealed class ConditionOrExpression : ConditionExpression {
 	
 		readonly ConditionExpression left;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionParser.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionParser.cs
index 638b428bda..17622a6a48 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionParser.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionParser.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
 using System.Text;
 using Microsoft.Build.BuildEngine;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 
 	internal class ConditionParser {
 	
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionRelationalExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionRelationalExpression.cs
index 3f8e1dac98..d6fc6fdc56 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionRelationalExpression.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionRelationalExpression.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	internal sealed class ConditionRelationalExpression : ConditionExpression {
 	
 		readonly ConditionExpression left;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionTokenizer.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionTokenizer.cs
index e948548f00..97722fe338 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionTokenizer.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionTokenizer.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Text;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 
 	internal sealed class ConditionTokenizer {
 	
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionedPropertyCollection.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionedPropertyCollection.cs
index bf2e4452b2..7ff9f3a970 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionedPropertyCollection.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ConditionedPropertyCollection.cs
@@ -26,7 +26,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions
+namespace MonoDevelop.Projects.MSBuild.Conditions
 {
 	class ConditionedPropertyCollection : Dictionary<string, List<string>>
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionEvaluationException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ExpressionEvaluationException.cs
index a60a64fa68..b15103fe15 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionEvaluationException.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ExpressionEvaluationException.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	[Serializable]
 	internal class ExpressionEvaluationException : Exception {
 
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionParseException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ExpressionParseException.cs
index 40c37e6d89..2b2c8c84ae 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionParseException.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/ExpressionParseException.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	[Serializable]
 	internal class ExpressionParseException : Exception {
 	
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/InvalidProjectFileException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/InvalidProjectFileException.cs
index f4df5a9bf1..a57de35ae1 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/InvalidProjectFileException.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/InvalidProjectFileException.cs
@@ -30,7 +30,7 @@ using System.Runtime.Serialization;
 using System.Security.Permissions;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 	[Serializable]
 	public sealed class InvalidProjectFileException : Exception {
 		
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/Token.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/Token.cs
index ed189a4d47..0b0a8420f3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/Token.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild.Conditions/Token.cs
@@ -29,7 +29,7 @@
 
 using System;
 
-namespace MonoDevelop.Projects.Formats.MSBuild.Conditions {
+namespace MonoDevelop.Projects.MSBuild.Conditions {
 
 	internal class Token {
 	
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/DefaultMSBuildEngine.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs
index 6873111dd5..2765286835 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/DefaultMSBuildEngine.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs
@@ -33,9 +33,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.Build.BuildEngine;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild.Conditions;
+using MonoDevelop.Projects.MSBuild.Conditions;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class DefaultMSBuildEngine: MSBuildEngine
 	{
@@ -317,8 +317,9 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 					baseDir = "";
 				else if (!baseDir.EndsWith ("\\", StringComparison.Ordinal))
 					baseDir += '\\';
+				var recursiveDir = baseRecursiveDir.IsNullOrEmpty ? FilePath.Null : basePath.ToRelative (baseRecursiveDir);
 				res = res.Concat (Directory.GetFiles (basePath, path).Select (f => {
-					context.SetItemContext (f, basePath.ToRelative (baseRecursiveDir));
+					context.SetItemContext (f, recursiveDir);
 					var ev = baseDir + Path.GetFileName (f);
 					return CreateEvaluatedItem (context, project, sourceItem, ev);
 				}));
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/EscapingUtilities.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/EscapingUtilities.cs
index 94a180f36d..94a180f36d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/EscapingUtilities.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/EscapingUtilities.cs
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/FileUtil.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/FileUtil.cs
index 53f9f1c797..00d87ca022 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/FileUtil.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/FileUtil.cs
@@ -27,7 +27,7 @@ using System;
 using System.IO;
 using MonoDevelop.Projects.Utility;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	static class FileUtil
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildGlobalPropertyProvider.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildGlobalPropertyProvider.cs
index df7c76e443..3297443bdf 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildGlobalPropertyProvider.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildGlobalPropertyProvider.cs
@@ -26,7 +26,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public interface IMSBuildGlobalPropertyProvider
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildProject.cs
index a43393337c..a43393337c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildProject.cs
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProjectObject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildProjectObject.cs
index bf056e59a6..5ee831fa8a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProjectObject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildProjectObject.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	interface IMSBuildProjectObject
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertyEvaluated.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildPropertyEvaluated.cs
index 3fc9a91c63..fc9590437f 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertyEvaluated.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildPropertyEvaluated.cs
@@ -31,7 +31,7 @@ using System.Xml.Linq;
 using MonoDevelop.Core;
 using System.Globalization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	public interface IMSBuildPropertyEvaluated
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertySet.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildPropertySet.cs
index 6332fb1e6e..c50d165ac6 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertySet.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMSBuildPropertySet.cs
@@ -38,7 +38,7 @@ using System.Reflection;
 using MonoDevelop.Core.Serialization;
 using System.Globalization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public interface IMSBuildPropertySet: IPropertySet
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMetadataProperty.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMetadataProperty.cs
index 560c743de3..23bbbb74bc 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMetadataProperty.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IMetadataProperty.cs
@@ -31,7 +31,7 @@ using System.Xml.Linq;
 using MonoDevelop.Core;
 using System.Globalization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	public interface IMetadataProperty
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IntrinsicFunctions.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IntrinsicFunctions.cs
index d6335e62f2..d6335e62f2 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IntrinsicFunctions.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/IntrinsicFunctions.cs
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildChoose.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildChoose.cs
index dec11b4c0a..c6091d7a45 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildChoose.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildChoose.cs
@@ -28,7 +28,7 @@ using System.Xml;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildChoose: MSBuildElement
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildElement.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildElement.cs
index afb4f5351b..dd18b5dd6a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildElement.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildElement.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public abstract class MSBuildElement: MSBuildObject
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngine.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngine.cs
index 38c85d37a6..a97eb2edde 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngine.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngine.cs
@@ -38,7 +38,7 @@ using Microsoft.Build.BuildEngine;
 using MSProject = Microsoft.Build.BuildEngine.Project;
 using MonoDevelop.Core;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	abstract class MSBuildEngine: IDisposable
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineManager.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngineManager.cs
index e6b41249fb..1a48a53aca 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineManager.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngineManager.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class MSBuildEngineManager: IDisposable
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV12.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngineV12.cs
index 2477b7a2a2..039a67ccbf 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV12.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngineV12.cs
@@ -36,7 +36,7 @@ using MSProject = Microsoft.Build.Evaluation.Project;
 using MSProjectItem = Microsoft.Build.Evaluation.ProjectItem;
 using MonoDevelop.Core;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	class MSBuildEngineV12: MSBuildEngine
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV4.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngineV4.cs
index 35abf2fd8e..472cba4d5c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV4.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEngineV4.cs
@@ -34,7 +34,7 @@ using Microsoft.Build.BuildEngine;
 using MSProject = Microsoft.Build.BuildEngine.Project;
 using MonoDevelop.Core;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	#if !WINDOWS
 	class MSBuildEngineV4: MSBuildEngine
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluationContext.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEvaluationContext.cs
index baed7df467..3f09106dc4 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluationContext.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildEvaluationContext.cs
@@ -35,11 +35,11 @@ using Microsoft.Build.BuildEngine;
 using MonoDevelop.Core;
 using System.Reflection;
 using Microsoft.Build.Utilities;
-using MonoDevelop.Projects.Formats.MSBuild.Conditions;
+using MonoDevelop.Projects.MSBuild.Conditions;
 using System.Globalization;
 using Microsoft.Build.Evaluation;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class MSBuildEvaluationContext: IExpressionContext
 	{
@@ -193,7 +193,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 						return ToMSBuildDir (Path.GetFullPath (itemFile).Substring (root.Length));
 					return ToMSBuildDir (Path.GetFullPath (itemFile));
 				}
-			case "recursivedir": return ToMSBuildDir (recursiveDir);
+			case "recursivedir": return recursiveDir != null ? ToMSBuildDir (recursiveDir) : "";
 			case "identity": return ToMSBuildPath (itemFile);
 			case "modifiedtime": {
 					try {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildFileFormat.cs
index 697f3c09fd..12a69d7c01 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildFileFormat.cs
@@ -36,7 +36,7 @@ using MonoDevelop.Projects.Extensions;
 using System.Threading.Tasks;
 using System.Linq;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public abstract class MSBuildFileFormat
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormatException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildFileFormatException.cs
index 989566f354..4881170d82 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormatException.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildFileFormatException.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildFileFormatException: Exception
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImport.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImport.cs
index 91bcbeaa9a..c758e31212 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImport.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImport.cs
@@ -27,7 +27,7 @@
 using System.Xml;
 
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildImport: MSBuildElement
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImportAttribute.cs
index 04e8c4d260..f1493475b1 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportAttribute.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImportAttribute.cs
@@ -26,7 +26,7 @@
 
 using System;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	[AttributeUsage (AttributeTargets.Class)]
 	public class MSBuildImportAttribute: Attribute
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportGroup.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImportGroup.cs
index afc3d07757..48d2e81d64 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportGroup.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildImportGroup.cs
@@ -28,7 +28,7 @@ using System.Xml;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildImportGroup: MSBuildElement
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildItem.cs
index 7fae0d97aa..62c2c9c633 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildItem.cs
@@ -30,7 +30,7 @@ using System;
 using System.Collections.Immutable;
 
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildItem: MSBuildElement
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItemGroup.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildItemGroup.cs
index 37bd43bea2..1e7a745691 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItemGroup.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildItemGroup.cs
@@ -29,7 +29,7 @@ using System.Xml;
 using System.Linq;
 using System;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildItemGroup: MSBuildElement
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildObject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildObject.cs
index 4bd2ab0cad..c9f1d3a2e4 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildObject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildObject.cs
@@ -33,7 +33,7 @@ using System.Linq;
 using System.Xml;
 
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public abstract class MSBuildObject: MSBuildNode
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProject.cs
index 3332104fa1..ed9ebf32ec 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProject.cs
@@ -37,7 +37,7 @@ using System.Linq;
 using MonoDevelop.Projects.Text;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public sealed partial class MSBuildProject : MSBuildObject, IDisposable
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectExtensions.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectExtensions.cs
index dfed253c66..2f0a36142a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectExtensions.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectExtensions.cs
@@ -29,7 +29,7 @@ using System.IO;
 using System.Linq;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildProjectExtensions: MSBuildElement
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectFromFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectFromFile.cs
index 5dc76c4283..5dc76c4283 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectFromFile.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectFromFile.cs
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectInstance.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectInstance.cs
index 1ace679304..850c6654ca 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectInstance.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectInstance.cs
@@ -29,7 +29,7 @@ using System.Xml;
 using MonoDevelop.Core;
 using System.Linq;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public sealed class MSBuildProjectInstance: IDisposable
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs
index 96edba0592..aa7b299bd4 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs
@@ -44,7 +44,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public static class MSBuildProjectService
 	{
@@ -956,7 +956,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 							engine = (IBuildEngine)bf.Deserialize (ms);
 						} else {
 							var asm = System.Reflection.Assembly.LoadFrom (exe);
-							var t = asm.GetType ("MonoDevelop.Projects.Formats.MSBuild.BuildEngine");
+							var t = asm.GetType ("MonoDevelop.Projects.MSBuild.BuildEngine");
 							engine = (IBuildEngine)Activator.CreateInstance (t);
 						}
 						engine.SetCulture (GettextCatalog.UICulture);
@@ -1017,7 +1017,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 			if ((runtime is MsNetTargetRuntime) && int.Parse (toolsVersion.Split ('.')[0]) >= 4)
 				toolsVersion = "dotnet." + toolsVersion;
 
-			var exe = sourceExe.ParentDirectory.Combine ("MSBuild", toolsVersion, "MonoDevelop.Projects.Formats.MSBuild.exe");
+			var exe = sourceExe.ParentDirectory.Combine ("MSBuild", toolsVersion, "MonoDevelop.Projects.MSBuild.exe");
 			if (File.Exists (exe))
 				return exe;
 			
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProperty.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProperty.cs
index f67ad00227..823aa5be85 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProperty.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProperty.cs
@@ -34,7 +34,7 @@ using System.Text;
 using System.IO;
 using System.Linq;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildProperty: MSBuildPropertyCore, IMetadataProperty, IMSBuildPropertyEvaluated
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyCore.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyCore.cs
index a0346a22b0..a4ebb44cdb 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyCore.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyCore.cs
@@ -31,7 +31,7 @@ using System.Xml.Linq;
 using MonoDevelop.Core;
 using System.Globalization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	public abstract class MSBuildPropertyCore: MSBuildElement
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyEvaluated.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyEvaluated.cs
index 78ca9c5113..2fa900ddd2 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyEvaluated.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyEvaluated.cs
@@ -31,7 +31,7 @@ using System.Xml.Linq;
 using MonoDevelop.Core;
 using System.Globalization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	class MSBuildPropertyEvaluated: MSBuildPropertyCore, IMSBuildPropertyEvaluated
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroup.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyGroup.cs
index f7e1ae1309..624b94a372 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroup.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyGroup.cs
@@ -34,7 +34,7 @@ using System.Xml.Linq;
 using Microsoft.Build.BuildEngine;
 using System.Collections.Immutable;

 

-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildPropertyGroup: MSBuildElement, IMSBuildPropertySet, IMSBuildEvaluatedPropertyCollection
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyGroupEvaluated.cs
index 2a6b3cd06f..0636e757e7 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyGroupEvaluated.cs
@@ -28,7 +28,7 @@ using System.Collections.Generic;
 using System.Xml.Linq;
 using MonoDevelop.Core;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class MSBuildPropertyGroupEvaluated: IMSBuildPropertyGroupEvaluated, IMSBuildProjectObject
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupMerged.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyGroupMerged.cs
index 46f0612c63..291f3f9a6a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupMerged.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildPropertyGroupMerged.cs
@@ -32,7 +32,7 @@ using System.Xml;
 using MonoDevelop.Core;
 using System.Xml.Linq;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	
 	class MSBuildPropertyGroupMerged: IMSBuildPropertySet
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTarget.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildTarget.cs
index 8405304be5..48499bd3f1 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTarget.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildTarget.cs
@@ -36,7 +36,7 @@ using System.Linq;
 using MonoDevelop.Projects.Text;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	
 	public class MSBuildTarget: MSBuildElement
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTask.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildTask.cs
index 12a169a501..95716a4644 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTask.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildTask.cs
@@ -36,7 +36,7 @@ using System.Linq;
 using MonoDevelop.Projects.Text;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	public class MSBuildTask: MSBuildElement
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildValueType.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildValueType.cs
index 920c315b95..d64ef6a9a4 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildValueType.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildValueType.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class MSBuildValueType
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildWhitespace.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildWhitespace.cs
index 65c88349a7..c7115cb3d3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildWhitespace.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildWhitespace.cs
@@ -36,7 +36,7 @@ using System.Linq;
 using MonoDevelop.Projects.Text;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class MSBuildWhitespace
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlElement.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildXmlElement.cs
index 5802283275..ce45e64c85 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlElement.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildXmlElement.cs
@@ -30,7 +30,7 @@ using System.IO;
 using System.Text;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	class MSBuildXmlElement : MSBuildObject
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildXmlNode.cs
index 8938e427c9..814892f5d9 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlNode.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildXmlNode.cs
@@ -29,7 +29,7 @@ using System.IO;
 using System.Text;
 using System.Xml;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class MSBuildNode: IMSBuildProjectObject
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlReader.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildXmlReader.cs
index 6e02f2492d..3dc429738b 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlReader.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildXmlReader.cs
@@ -36,7 +36,7 @@ using System.Linq;
 using MonoDevelop.Projects.Text;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	class MSBuildXmlReader
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MergeToProjectAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MergeToProjectAttribute.cs
index a04b220e29..2053557750 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MergeToProjectAttribute.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MergeToProjectAttribute.cs
@@ -26,7 +26,7 @@
 
 using System;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	/// <summary>
 	/// Specifies that a property of a project configuration has to be stored as a project property
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/ProjectEvaluationException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/ProjectEvaluationException.cs
index 9c545c4360..000fcea525 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/ProjectEvaluationException.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/ProjectEvaluationException.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class ProjectEvaluationException: ApplicationException
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/RemoteProjectBuilder.cs
index 1e08a4e2a5..e2ddb4c12a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/RemoteProjectBuilder.cs
@@ -33,8 +33,9 @@ using System.Threading.Tasks;
 using MonoDevelop.Core;
 using System.IO;
 using System.Linq;
+using MonoDevelop.Projects.MSBuild;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class RemoteBuildEngine: IBuildEngine
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/SlnFile.cs
index 30a01b337f..834f702baf 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFile.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/SlnFile.cs
@@ -10,7 +10,7 @@ using MonoDevelop.Projects.Text;
 using System.Text.RegularExpressions;
 using System.Globalization;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class SlnFile
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/SlnFileFormat.cs
index c425e815a7..9bf684a17c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFileFormat.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/SlnFileFormat.cs
@@ -40,7 +40,7 @@ using System.Reflection;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class SlnFileFormat
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/TargetsAvailableCondition.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/TargetsAvailableCondition.cs
index 81e7119165..4057b33d8d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/TargetsAvailableCondition.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/TargetsAvailableCondition.cs
@@ -32,7 +32,7 @@ using Mono.Addins;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Assemblies;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class TargetsAvailableCondition : ConditionType
 	{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/UnknownSolutionItemTypeException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/UnknownSolutionItemTypeException.cs
index ce2af4ae34..d1d977b40e 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/UnknownSolutionItemTypeException.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/UnknownSolutionItemTypeException.cs
@@ -34,7 +34,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
 using MonoDevelop.Core.Assemblies;
-using MonoDevelop.Projects.Formats.MD1;
+using MonoDevelop.Projects.MD1;
 using MonoDevelop.Projects.Extensions;
 using Mono.Addins;
 using System.Linq;
@@ -42,7 +42,7 @@ using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Core.ProgressMonitoring;
 using System.Threading.Tasks;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	
 	class UnknownSolutionItemTypeException : InvalidOperationException
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs
index 24fcd20038..d63250d896 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs
@@ -32,7 +32,7 @@ using System.IO;
 using System.Xml;
 using MonoDevelop.Projects.Policies;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects.SharedAssetsProjects
 {
@@ -110,7 +110,7 @@ namespace MonoDevelop.Projects.SharedAssetsProjects
 			base.SaveProjectItems (monitor, projitemsProject, usedMSBuildItems, "$(MSBuildThisFileDirectory)");
 		}
 
-		protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject)
+		protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
 			if (projItemsPath == FilePath.Null)
 				projItemsPath = Path.ChangeExtension (FileName, ".projitems");
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs
index 566cc5816d..b2c68ad756 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs
@@ -28,7 +28,7 @@ using System.Linq;
 using System.IO;
 using MonoDevelop.Core;
 using System.Collections.Generic;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects.SharedAssetsProjects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
index 6d81aca415..6b5226d49c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
@@ -36,7 +36,7 @@ using Mono.Cecil.Mdb;
 using Mono.Cecil.Cil;
 using System.Threading.Tasks;
 using MonoDevelop.Core.Serialization;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
index a04d3d15c6..f6b72ebf64 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
@@ -28,7 +28,7 @@ using System;
 using MonoDevelop.Core.Serialization;
 using System.Collections.Generic;
 using System.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
index ec73f3e7e3..44b9bb4d6f 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
@@ -36,14 +36,14 @@ using System.Threading;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.Projects.Policies;
-using MonoDevelop.Projects.Formats.MD1;
+using MonoDevelop.Projects.MD1;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Core.Assemblies;
 using System.Globalization;
 using System.Threading.Tasks;
 using System.Collections.Immutable;
-using MonoDevelop.Projects.Formats.MSBuild.Conditions;
+using MonoDevelop.Projects.MSBuild.Conditions;
 
 namespace MonoDevelop.Projects
 {
@@ -1440,40 +1440,47 @@ namespace MonoDevelop.Projects
 		protected async override Task DoExecute (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
 		{
 			DotNetProjectConfiguration dotNetProjectConfig = GetConfiguration (configuration) as DotNetProjectConfiguration;
+			if (dotNetProjectConfig == null) {
+				monitor.ReportError (GettextCatalog.GetString ("Configuration '{0}' not found in project '{1}'", configuration, Name), null);
+				return;
+			}
+
 			monitor.Log.WriteLine (GettextCatalog.GetString ("Running {0} ...", dotNetProjectConfig.CompiledOutputName));
 
-			OperationConsole console = dotNetProjectConfig.ExternalConsole
-				? context.ExternalConsoleFactory.CreateConsole (!dotNetProjectConfig.PauseConsoleOutput, monitor.CancellationToken)
-				: context.ConsoleFactory.CreateConsole (monitor.CancellationToken);
+			ExecutionCommand executionCommand = CreateExecutionCommand (configuration, dotNetProjectConfig);
+			if (context.ExecutionTarget != null)
+				executionCommand.Target = context.ExecutionTarget;
 
-			try {
-				try {
-					ExecutionCommand executionCommand = CreateExecutionCommand (configuration, dotNetProjectConfig);
-					if (context.ExecutionTarget != null)
-						executionCommand.Target = context.ExecutionTarget;
+			if (!context.ExecutionHandler.CanExecute (executionCommand)) {
+				monitor.ReportError (GettextCatalog.GetString ("Can not execute \"{0}\". The selected execution mode is not supported for .NET projects.", dotNetProjectConfig.CompiledOutputName), null);
+				return;
+			}
 
-					if (!context.ExecutionHandler.CanExecute (executionCommand)) {
-						monitor.ReportError (GettextCatalog.GetString ("Can not execute \"{0}\". The selected execution mode is not supported for .NET projects.", dotNetProjectConfig.CompiledOutputName), null);
-						return;
-					}
+			try {
+				await ProjectExtension.OnExecuteCommand (monitor, context, configuration, executionCommand);
+			} catch (Exception ex) {
+				LoggingService.LogError (string.Format ("Cannot execute \"{0}\"", dotNetProjectConfig.CompiledOutputName), ex);
+				monitor.ReportError (GettextCatalog.GetString ("Cannot execute \"{0}\"", dotNetProjectConfig.CompiledOutputName), ex);
+			}
+		}
 
-					ProcessAsyncOperation asyncOp = context.ExecutionHandler.Execute (executionCommand, console);
-					var stopper = monitor.CancellationToken.Register (asyncOp.Cancel);
+		protected virtual async Task OnExecuteCommand (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration, ExecutionCommand executionCommand)
+		{
+			var dotNetProjectConfig = GetConfiguration (configuration) as DotNetProjectConfiguration;
+			var console = dotNetProjectConfig.ExternalConsole
+			                                                  ? context.ExternalConsoleFactory.CreateConsole (!dotNetProjectConfig.PauseConsoleOutput, monitor.CancellationToken)
+			                                                  : context.ConsoleFactory.CreateConsole (monitor.CancellationToken);
+			using (console) {
+				ProcessAsyncOperation asyncOp = context.ExecutionHandler.Execute (executionCommand, console);
 
+				using (var stopper = monitor.CancellationToken.Register (asyncOp.Cancel))
 					await asyncOp.Task;
 
-					stopper.Dispose ();
-
-					monitor.Log.WriteLine (GettextCatalog.GetString ("The application exited with code: {0}", asyncOp.ExitCode));
-				} finally {
-					console.Dispose ();
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError (string.Format ("Cannot execute \"{0}\"", dotNetProjectConfig.CompiledOutputName), ex);
-				monitor.ReportError (GettextCatalog.GetString ("Cannot execute \"{0}\"", dotNetProjectConfig.CompiledOutputName), ex);
+				monitor.Log.WriteLine (GettextCatalog.GetString ("The application exited with code: {0}", asyncOp.ExitCode));
 			}
 		}
 
+
 		protected override void OnReadProjectHeader (ProgressMonitor monitor, MSBuildProject msproject)
 		{
 			base.OnReadProjectHeader (monitor, msproject);
@@ -1597,6 +1604,11 @@ namespace MonoDevelop.Projects
 				return Project.OnGetDefaultResourceId (projectFile);
 			}
 
+			internal protected override Task OnExecuteCommand (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration, ExecutionCommand executionCommand)
+			{
+				return Project.OnExecuteCommand (monitor, context, configuration, executionCommand);
+			}
+
 			#region Framework management
 
 			internal protected override TargetFrameworkMoniker OnGetDefaultTargetFrameworkId ()
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs
index 7abccf1b47..fe1968af99 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Core.Serialization;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core.StringParsing;
 using System.Collections.Generic;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs
index 85fcd202c5..4281c40a73 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs
@@ -29,7 +29,7 @@ using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
@@ -102,6 +102,11 @@ namespace MonoDevelop.Projects
 			return next.OnGetDefaultResourceId (projectFile);
 		}
 
+		internal protected virtual Task OnExecuteCommand (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration, ExecutionCommand executionCommand)
+		{
+			return next.OnExecuteCommand (monitor, context, configuration, executionCommand);
+		}
+
 		#region Framework management
 
 		internal protected virtual TargetFrameworkMoniker OnGetDefaultTargetFrameworkId ()
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs
index 7fc3746e8c..1d108c12f3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs
@@ -26,7 +26,7 @@
 using System;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using Mono.Addins;
 
 namespace MonoDevelop.Projects
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs
index d3565a68b4..329d253fcc 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs
index e8b7e9ef5d..b86d8715e1 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs
@@ -27,7 +27,7 @@ using System;
 using System.Xml;
 using MonoDevelop.Core;
 using System.Xml.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Collections.Generic;
 
 namespace MonoDevelop.Projects
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs
index 0c8f6de583..58165373e2 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs
@@ -32,7 +32,7 @@ using System.Collections.ObjectModel;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs
index f3fc026b42..0b2e8efdf9 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
 
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs
index 4ba0a56777..3ad5203a43 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs
index 581d4eedc4..6ffc5cb2e2 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs
@@ -27,7 +27,7 @@ using System;
 using System.Collections.Generic;
 using MonoDevelop.Core.Assemblies;
 using System.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Threading.Tasks;
 
 namespace MonoDevelop.Projects
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
index 856786c0d7..fd01b79470 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
@@ -37,7 +37,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Serialization;
 using MonoDevelop.Projects;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Xml;
 using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Core.Assemblies;
@@ -370,7 +370,14 @@ namespace MonoDevelop.Projects
 		public async Task<ProjectFile[]> GetSourceFilesAsync (ProgressMonitor monitor, ConfigurationSelector configuration)
 		{
 			// pre-load the results with the current list of files in the project
-			var results = new List<ProjectFile> (this.Files);
+			var results = new List<ProjectFile> ();
+
+			var buildActions = GetBuildActions ().Where (a => a != "Folder" && a != "--").ToArray ();
+
+			var config = GetConfiguration (configuration);
+			var pri = await CreateProjectInstaceForConfiguration (config.Name, config.Platform, false);
+			foreach (var it in pri.EvaluatedItems.Where (i => buildActions.Contains (i.Name)))
+				results.Add (CreateProjectFile (it));
 
 			// add in any compile items that we discover from running the CoreCompile dependencies
 			var evaluatedCompileItems = await GetCompileItemsFromCoreCompileDependenciesAsync (monitor, configuration);
@@ -415,7 +422,7 @@ namespace MonoDevelop.Projects
 						if (evalResult != null && !evalResult.BuildResult.HasErrors) {
 							var evalItems = evalResult
 								.Items
-								.Select (i => new ProjectFile (MSBuildProjectService.FromMSBuildPath (sourceProject.BaseDirectory, i.Include), "Compile") { Project = this })
+								.Select (i => CreateProjectFile (i))
 								.ToList ();
 
 							result.AddRange (evalItems);
@@ -430,6 +437,11 @@ namespace MonoDevelop.Projects
 			return await evaluatedCompileItemsTask.Task;
 		}
 
+		ProjectFile CreateProjectFile (IMSBuildItemEvaluated item)
+		{
+			return new ProjectFile (MSBuildProjectService.FromMSBuildPath (sourceProject.BaseDirectory, item.Include), item.Name) { Project = this };
+		}
+
 		/// <summary>
 		/// Called just after the MSBuild project is loaded but before it is evaluated.
 		/// </summary>
@@ -1002,7 +1014,7 @@ namespace MonoDevelop.Projects
 			else {
 				CleanupProjectBuilder ();
 				if (this is DotNetProject) {
-					var handler = new MonoDevelop.Projects.Formats.MD1.MD1DotNetProjectHandler ((DotNetProject)this);
+					var handler = new MonoDevelop.Projects.MD1.MD1DotNetProjectHandler ((DotNetProject)this);
 					return new TargetEvaluationResult (await handler.RunTarget (monitor, target, configuration));
 				}
 			}
@@ -1927,7 +1939,7 @@ namespace MonoDevelop.Projects
 				// We use a dummy configuration and platform to avoid loading default values from the configurations
 				// while evaluating
 				var c = Guid.NewGuid ().ToString ();
-				pi = CreateProjectInstaceForConfiguration (c, c);
+				pi = CreateProjectInstaceForConfiguration (c, c).Result;
 
 				IMSBuildPropertySet globalGroup = sourceProject.GetGlobalPropertyGroup ();
 
@@ -2191,24 +2203,25 @@ namespace MonoDevelop.Projects
 			if (cgrp.FullySpecified)
 				config.Properties = cgrp.Group;
 
-			var pi = CreateProjectInstaceForConfiguration (conf, platform);
+			var pi = CreateProjectInstaceForConfiguration (conf, platform).Result;
 
 			config.Platform = platform;
 			projectExtension.OnReadConfiguration (monitor, config, pi.EvaluatedProperties);
 			Configurations.Add (config);
 		}
 
-		MSBuildProjectInstance CreateProjectInstaceForConfiguration (string conf, string platform)
+		Task<MSBuildProjectInstance> CreateProjectInstaceForConfiguration (string conf, string platform, bool onlyEvaluateProperties = true)
 		{
 			var pi = sourceProject.CreateInstance ();
+			pi.SetGlobalProperty ("BuildingInsideVisualStudio", "true");
 			pi.SetGlobalProperty ("Configuration", conf);
 			if (platform == string.Empty)
 				pi.SetGlobalProperty ("Platform", "AnyCPU");
 			else
 				pi.SetGlobalProperty ("Platform", platform);
-			pi.OnlyEvaluateProperties = true;
+			pi.OnlyEvaluateProperties = onlyEvaluateProperties;
 			pi.Evaluate ();
-			return pi;
+			return Task.FromResult (pi);
 		}
 
 		protected virtual void OnReadConfiguration (ProgressMonitor monitor, ProjectConfiguration config, IMSBuildEvaluatedPropertyCollection grp)
@@ -2405,7 +2418,7 @@ namespace MonoDevelop.Projects
 						MSBuildPropertyGroup pg = (MSBuildPropertyGroup)conf.Properties;
 						ConfigData cdata = configData.FirstOrDefault (cd => cd.Group == pg);
 
-						var pi = CreateProjectInstaceForConfiguration (conf.Name, conf.Platform);
+						var pi = CreateProjectInstaceForConfiguration (conf.Name, conf.Platform).Result;
 
 						if (cdata == null) {
 							msproject.AddPropertyGroup (pg, true);
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs
index 48660182df..d07c46e2ef 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs
@@ -32,7 +32,7 @@ using System.IO;
 using System.Collections.Generic;
 using MonoDevelop.Core.StringParsing;
 using System.Xml.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs
index 8dd4526ab4..dddda00224 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs
@@ -31,7 +31,7 @@ using System.IO;
 using System.Collections.Generic;
 using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs
index 86133060a6..e709017ad8 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs
@@ -27,7 +27,7 @@ using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using Mono.Addins;
 using System.Linq;
 using System.Collections.Immutable;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
index 5b5697fc85..5e12fb87b1 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
@@ -37,7 +37,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Serialization;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Projects.Policies;
 
 namespace MonoDevelop.Projects
@@ -320,7 +320,7 @@ namespace MonoDevelop.Projects
 			set {
 				if (link != value) {
 					if (value.IsAbsolute || value.ToString ().StartsWith ("..", StringComparison.Ordinal))
-						throw new ArgumentException ("value");
+						throw new ArgumentException ("Invalid value for Link property");
 
 					var oldLink = link;
 					link = value;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs
index dfd1fc06e3..cdfd4f90a7 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using MonoDevelop.Core.Serialization;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs
index 14be1c22ce..2a4f870b2b 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Collections.Generic;
 using System.Xml;
 using System.Linq;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
index 7630cb9951..3d502486ba 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
@@ -37,7 +37,7 @@ using System.ComponentModel;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
 using MonoDevelop.Core.Assemblies;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs
index c8ff8722ed..8c0dc3ec33 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs
@@ -42,7 +42,7 @@ using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Projects.Extensions;
 using Mono.Unix;
 using System.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Threading.Tasks;
 
 namespace MonoDevelop.Projects
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs
index c8779dd79f..d02a445446 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs
@@ -38,7 +38,7 @@ using MonoDevelop.Core.StringParsing;
 using MonoDevelop.Projects.Policies;
 using MonoDevelop.Core.Execution;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs
index a772ae4f2c..98e1d282eb 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs
index b03eb6c60b..1907ade73c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs
@@ -28,7 +28,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs
index 3405074ef0..3421f40c46 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs
@@ -34,7 +34,7 @@ using MonoDevelop.Projects.Extensions;
 using MonoDevelop.Core.StringParsing;
 using MonoDevelop.Projects.Policies;
 using System.Collections.Generic;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs
index 1bf201f4cf..11848fc18d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs
@@ -47,7 +47,7 @@ using Mono.Addins;
 using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Core.Collections;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Collections.Immutable;
 
 namespace MonoDevelop.Projects
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs
index 1bebb7e5d1..012f1b3c58 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs
@@ -29,7 +29,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.StringParsing;
 using MonoDevelop.Core.Execution;
 using System.Xml;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Projects.Extensions;
 using System.Threading.Tasks;
 using System.Linq;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs
index 95c97b9c47..aaff7ecbab 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs
index 607f6cd0d5..e37bd6b611 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs
@@ -27,7 +27,7 @@ using System;
 using MonoDevelop.Core;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Workspace.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Workspace.cs
index 2a6342bfdc..528872fadb 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Workspace.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Workspace.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Serialization;
 using System.Linq;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MD1;
+using MonoDevelop.Projects.MD1;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceItem.cs
index ff688b095e..c0d02ffd33 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceItem.cs
@@ -44,7 +44,7 @@ using MonoDevelop.Projects.Extensions;
 using Mono.Addins;
 using System.Linq;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MD1;
+using MonoDevelop.Projects.MD1;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs
index 681dfa9362..9c0a453544 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs
@@ -29,7 +29,7 @@
 using System;
 using MonoDevelop.Core;
 using System.Threading.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceSerializationExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceSerializationExtension.cs
index cf0de17836..3076efafc3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceSerializationExtension.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceSerializationExtension.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 using MonoDevelop.Core;
 using System.Xml;
 using MonoDevelop.Core.Serialization;
-using MonoDevelop.Projects.Formats.MD1;
+using MonoDevelop.Projects.MD1;
 
 namespace MonoDevelop.Projects
 {
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
index a0e1306313..740b7afeaa 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
@@ -6,24 +6,62 @@
 </ExtensionPoint>
 
 <Extension path="/MonoDevelop/Core/StockIcons">
+	<Condition id="Platform" value="!windows">
+		<StockIcon stockid="md-closed-folder" resource="folder-generic-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-closed-reference-folder" resource="folder-special-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-closed-resource-folder" resource="folder-special-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-solution-folder-closed" resource="folder-special-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-component-folder-closed" resource="folder-special-mac-16.png" size="Menu" />
+
+		<StockIcon stockid="md-open-folder" resource="folder-generic-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-open-reference-folder" resource="folder-special-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-open-resource-folder" resource="folder-special-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-solution-folder-open" resource="folder-special-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-component-folder-open" resource="folder-special-mac-16.png" size="Menu" />
+		
+		<StockIcon stockid="md-searchbox-search" resource="searchbox-search-mac-16.png" size="Menu" />
+		<StockIcon stockid="md-searchbox-clear" resource="searchbox-clear-mac-16.png" size="Menu" />
+	</Condition>
+
+	<Condition id="Platform" value="windows">
+		<StockIcon stockid="md-closed-folder" resource="folder-generic-win-16.png" size="Menu" />
+		<StockIcon stockid="md-closed-reference-folder" resource="folder-special-win-16.png" size="Menu" />
+		<StockIcon stockid="md-closed-resource-folder" resource="folder-special-win-16.png" size="Menu" />
+		<StockIcon stockid="md-solution-folder-closed" resource="folder-special-win-16.png" size="Menu" />
+		<StockIcon stockid="md-component-folder-closed" resource="folder-special-win-16.png" size="Menu" />
+
+		<StockIcon stockid="md-open-folder" resource="folder-generic-win-16.png" size="Menu" />
+		<StockIcon stockid="md-open-reference-folder" resource="folder-special-win-16.png" size="Menu" />
+		<StockIcon stockid="md-open-resource-folder" resource="folder-special-win-16.png" size="Menu" />
+		<StockIcon stockid="md-solution-folder-open" resource="folder-special-win-16.png" size="Menu" />
+		<StockIcon stockid="md-component-folder-open" resource="folder-special-win-16.png" size="Menu" />
+		
+		<StockIcon stockid="md-searchbox-search" resource="searchbox-search-win-24.png" size="Menu" />
+		<StockIcon stockid="md-searchbox-clear" resource="searchbox-clear-win-24.png" size="Menu" />
+	</Condition>
+
 	<!-- GTK icons redefined -->
+	<StockIcon stockid="gtk-about" resource="about-16.png" size="Menu" />
 	<StockIcon stockid="gtk-add" resource="add-16.png" size="Menu" />
 	<StockIcon stockid="gtk-apply" resource="done-16.png" size="Menu" />
 	<StockIcon stockid="gtk-cancel" resource="remove-16.png" size="Menu" />
 	<StockIcon stockid="gtk-clear" resource="clear-16.png" size="Menu" />
 	<StockIcon stockid="gtk-close" resource="remove-16.png" size="Menu" />
 	<StockIcon stockid="gtk-copy" resource="copy-16.png" size="Menu" />
+	<StockIcon stockid="gtk-cut" resource="cut-16.png" size="Menu" />
 	<StockIcon stockid="gtk-delete" resource="remove-16.png" size="Menu" />
 	<StockIcon stockid="gtk-edit" resource="edit-16.png" size="Menu" />
 	<StockIcon stockid="gtk-execute" resource="execute-16.png" size="Menu" />
 	<StockIcon stockid="gtk-find" resource="find-16.png" size="Menu" />
 	<StockIcon stockid="gtk-find-and-replace" resource="find-and-replace-16.png" size="Menu" />
+	<StockIcon stockid="gtk-fullscreen" resource="fullscreen-16.png" size="Menu" />
 	<StockIcon stockid="gtk-go-back" resource="go-back-16.png" size="Menu" />
 	<StockIcon stockid="gtk-go-down" resource="go-down-16.png" size="Menu" />
 	<StockIcon stockid="gtk-go-forward" resource="go-forward-16.png" size="Menu" />
 	<StockIcon stockid="gtk-go-up" resource="go-up-16.png" size="Menu" />
 	<StockIcon stockid="gtk-help" resource="help-16.png" size="Menu" />
 	<StockIcon stockid="gtk-home" resource="home-16.png" size="Menu" />
+	<StockIcon stockid="gtk-indent" resource="indent-16.png" size="Menu" />
 	<StockIcon stockid="gtk-jump-to" resource="jump-to-16.png" size="Menu" />
 	<StockIcon stockid="gtk-info" resource="information-16.png" size="Menu" />
 	<StockIcon stockid="gtk-media-play" resource="media-play-16.png" size="Menu" />
@@ -31,12 +69,23 @@
 	<StockIcon stockid="gtk-new" resource="add-16.png" size="Menu" />
 	<StockIcon stockid="gtk-ok" resource="done-16.png" size="Menu" />
 	<StockIcon stockid="gtk-open" resource="open-16.png" size="Menu" />
+	<StockIcon stockid="gtk-page-setup" resource="page-setup-16.png" size="Menu" />
+	<StockIcon stockid="gtk-paste" resource="paste-16.png" size="Menu" />
+	<StockIcon stockid="gtk-preferences" resource="preferences-16.png" size="Menu" />
+	<StockIcon stockid="gtk-print" resource="print-16.png" size="Menu" />
+	<StockIcon stockid="gtk-print-preview" resource="print-preview-16.png" size="Menu" />
 	<StockIcon stockid="gtk-properties" resource="properties-16.png" size="Menu" />
+	<StockIcon stockid="gtk-quit" resource="quit-16.png" size="Menu" />
+	<StockIcon stockid="gtk-redo" resource="redo-16.png" size="Menu" />
 	<StockIcon stockid="gtk-refresh" resource="refresh-16.png" size="Menu" />
 	<StockIcon stockid="gtk-remove" resource="remove-16.png" size="Menu" />
+	<StockIcon stockid="gtk-revert-to-saved" resource="revert-to-saved-16.png" size="Menu" />
 	<StockIcon stockid="gtk-save" resource="save-16.png" size="Menu" />
+	<StockIcon stockid="gtk-save-as" resource="save-16.png" size="Menu" />
 	<StockIcon stockid="gtk-stop" resource="stop-16.png" size="Menu" />
 	<StockIcon stockid="gtk-undo" resource="undo-16.png" size="Menu" />
+	<StockIcon stockid="gtk-unindent" resource="unindent-16.png" size="Menu" />
+	<StockIcon stockid="gtk-zoom-100" resource="zoom-100-16.png" size="Menu" />
 	<StockIcon stockid="gtk-zoom-in" resource="zoom-in-16.png" size="Menu" />
 	<StockIcon stockid="gtk-zoom-out" resource="zoom-out-16.png" size="Menu" />
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs
index 517141246a..b57db6adb0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs
@@ -172,11 +172,12 @@ namespace MonoDevelop.Ide.CodeCompletion
 		{
 			if (!IsVisible)
 				return;
-			if (wnd.IsInCompletion)
+			if (wnd.IsInCompletion || isShowing)
 				return;
 			var caretOffset = wnd.CompletionWidget.CaretOffset;
-			if (caretOffset < wnd.StartOffset || caretOffset > wnd.EndOffset)
+			if (caretOffset < wnd.StartOffset || caretOffset > wnd.EndOffset) {
 				HideWindow ();
+			}
 		}
 
 		public static void UpdateWordSelection (string text)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs
index ef21f1d43d..941765a559 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs
@@ -159,7 +159,7 @@ namespace MonoDevelop.Ide.CustomTools
 					return false;
 				}
 				bool byDefault, require;
-				MonoDevelop.Projects.Formats.MSBuild.MSBuildProjectService.CheckHandlerUsesMSBuildEngine (file.Project, out byDefault, out require);
+				MonoDevelop.Projects.MSBuild.MSBuildProjectService.CheckHandlerUsesMSBuildEngine (file.Project, out byDefault, out require);
 				var usesMSBuild = require || (file.Project.UseMSBuildEngine ?? byDefault);
 				if (!usesMSBuild) {
 					return false;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
index 2b253cc230..7ae779383a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
@@ -110,10 +110,16 @@ namespace MonoDevelop.Ide.Editor.Extension
 				if (ParameterInformationWindowManager.ProcessKeyEvent (this, CompletionWidget, descriptor))
 					return false;
 				autoHideCompletionWindow = autoHideParameterWindow = false;
-			}

-

-			//			int oldPos = Editor.CursorPosition;

-			//			int oldLen = Editor.TextLength;

+			}
+
+			//			int oldPos = Editor.CursorPosition;
+			//			int oldLen = Editor.TextLength;
+			char deleteOrBackspaceTriggerChar = '\0';
+			if (descriptor.SpecialKey == SpecialKey.Delete && Editor.CaretOffset < Editor.Length)
+				deleteOrBackspaceTriggerChar = Editor.GetCharAt (Editor.CaretOffset);
+			if (descriptor.SpecialKey == SpecialKey.BackSpace && Editor.CaretOffset > 0)
+				deleteOrBackspaceTriggerChar = Editor.GetCharAt (Editor.CaretOffset - 1);
+			

 			res = base.KeyPress (descriptor);
 
 			CompletionWindowManager.PostProcessKeyEvent (descriptor);
@@ -131,7 +137,6 @@ namespace MonoDevelop.Ide.Editor.Extension
 			// don't complete on block selection

 			if (/*!EnableCodeCompletion ||*/ Editor.SelectionMode == MonoDevelop.Ide.Editor.SelectionMode.Block)
 				return res;

-

 			// Handle code completion
 			if (descriptor.KeyChar != '\0' && CompletionWidget != null && !CompletionWindowManager.IsVisible) {
 				CurrentCompletionContext = CompletionWidget.CurrentCodeCompletionContext;
@@ -181,6 +186,67 @@ namespace MonoDevelop.Ide.Editor.Extension
 				}
 			}
 
+			if ((descriptor.SpecialKey == SpecialKey.Delete || descriptor.SpecialKey == SpecialKey.BackSpace) && CompletionWidget != null && !CompletionWindowManager.IsVisible) {
+				CurrentCompletionContext = CompletionWidget.CurrentCodeCompletionContext;
+
+				int cpos, wlen;
+				if (!GetCompletionCommandOffset (out cpos, out wlen)) {
+					cpos = Editor.CaretOffset;
+					wlen = 0;
+				}
+				CurrentCompletionContext.TriggerOffset = cpos;
+				CurrentCompletionContext.TriggerWordLength = wlen;
+				
+				completionTokenSrc.Cancel ();
+				completionTokenSrc = new CancellationTokenSource ();
+				var caretOffset = Editor.CaretOffset;
+				var token = completionTokenSrc.Token;
+				try {
+					var task = HandleBackspaceOrDeleteCodeCompletionAsync (CurrentCompletionContext, descriptor.SpecialKey, deleteOrBackspaceTriggerChar, token);
+					if (task != null) {
+						// Show the completion window in two steps. The call to PrepareShowWindow creates the window but
+						// it doesn't show it. It is used only to process the keys while the completion data is being retrieved.
+						CompletionWindowManager.PrepareShowWindow (this, descriptor.KeyChar, CompletionWidget, CurrentCompletionContext);
+						EventHandler windowClosed = delegate (object o, EventArgs a) {
+							completionTokenSrc.Cancel ();
+						};
+						CompletionWindowManager.WindowClosed += windowClosed;
+
+						task.ContinueWith (t => {
+							CompletionWindowManager.WindowClosed -= windowClosed;
+							if (token.IsCancellationRequested)
+								return;
+							var result = t.Result;
+							if (result != null) {
+								int triggerWordLength = result.TriggerWordLength + (Editor.CaretOffset - caretOffset);
+
+								if (triggerWordLength > 0 && (triggerWordLength < Editor.CaretOffset
+								                              || (triggerWordLength == 1 && Editor.CaretOffset == 1))) {
+									CurrentCompletionContext = CompletionWidget.CreateCodeCompletionContext (Editor.CaretOffset - triggerWordLength);
+									CurrentCompletionContext.TriggerWordLength = triggerWordLength;
+								}
+								// Now show the window for real.
+								if (!CompletionWindowManager.ShowWindow (result, CurrentCompletionContext)) {
+									CurrentCompletionContext = null;
+								} else {
+									CompletionWindowManager.Wnd.StartOffset = CurrentCompletionContext.TriggerOffset;
+									CompletionWindowManager.Wnd.EndOffset = Editor.CaretOffset;
+								}
+							} else {
+								CompletionWindowManager.HideWindow ();
+								CurrentCompletionContext = null;
+							}
+						}, Runtime.MainTaskScheduler);
+					} else {
+						CurrentCompletionContext = null;
+					}
+				} catch (TaskCanceledException) {
+					CurrentCompletionContext = null;
+				} catch (AggregateException) {
+					CurrentCompletionContext = null;
+				}
+			}
+
 			if (CompletionWidget != null) {
 				CodeCompletionContext ctx = CompletionWidget.CurrentCodeCompletionContext;
 				parameterHintingSrc.Cancel ();
@@ -362,6 +428,11 @@ namespace MonoDevelop.Ide.Editor.Extension
 			return Task.FromResult (emptyList);
 		}
 
+		public virtual Task<ICompletionDataList> HandleBackspaceOrDeleteCodeCompletionAsync (CodeCompletionContext completionContext, SpecialKey key, char triggerCharacter, CancellationToken token = default(CancellationToken))
+		{
+			return Task.FromResult (emptyList);
+		}
+
 		public virtual Task<ParameterHintingResult> HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 			return Task.FromResult (ParameterHintingResult.Empty);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
index f8a6fc139f..2724a28aff 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
@@ -140,7 +140,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				}
 				foreach (Project project in IdeApp.Workspace.GetAllProjects ()) {
 					monitor.Log.WriteLine (GettextCatalog.GetString ("Looking in project '{0}'", project.Name));
-					foreach (ProjectFile file in project.Files.Where (f => filterOptions.NameMatches (f.Name) && File.Exists (f.Name))) {
+					foreach (ProjectFile file in project.GetSourceFilesAsync (project.DefaultConfiguration.Selector).Result.Where (f => filterOptions.NameMatches (f.Name) && File.Exists (f.Name))) {
 						if ((file.Flags & ProjectItemFlags.Hidden) == ProjectItemFlags.Hidden)
 							continue;
 						if (!IncludeBinaryFiles && !DesktopService.GetFileIsText (file.FilePath))
@@ -184,7 +184,7 @@ namespace MonoDevelop.Ide.FindInFiles
 			if (IdeApp.Workspace.IsOpen) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Looking in project '{0}'", project.Name));
 				var alreadyVisited = new HashSet<string> ();
-				foreach (ProjectFile file in project.Files.Where (f => filterOptions.NameMatches (f.Name) && File.Exists (f.Name))) {
+				foreach (ProjectFile file in project.GetSourceFilesAsync (project.DefaultConfiguration.Selector).Result.Where (f => filterOptions.NameMatches (f.Name) && File.Exists (f.Name))) {
 					if ((file.Flags & ProjectItemFlags.Hidden) == ProjectItemFlags.Hidden)
 						continue;
 					if (!IncludeBinaryFiles && !DesktopService.GetFileIsText (file.Name))
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs
index d92cee1e4c..11909769fa 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Ide.Gui.Dialogs
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs
index 7160e6da6b..bac0ec7fb6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs
@@ -29,7 +29,7 @@
 using System;
 using Gtk;
 using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Ide.Gui.OptionPanels
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
index 0f80aa067f..1f5c44f993 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
@@ -89,7 +89,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 			if (((ProjectReferenceCollection) dataObject).Count > 0)
 				return true;
 
-			var p = (DotNetProject) builder.GetParentDataItem (typeof(DotNetProject), false);
+			var p = (DotNetProject) builder.GetParentDataItem (typeof(DotNetProject), true);
 			return p != null && p.IsPortableLibrary;
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
index 7005a33116..bc54046b53 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
@@ -165,8 +165,7 @@ namespace MonoDevelop.Ide.Gui
 
 		void TypeSystemService_WorkspaceItemLoaded (object sender, EventArgs e)
 		{
-			if (adhocProject == null)
-				analysisDocument = null;
+			analysisDocument = null;
 			EnsureAnalysisDocumentIsOpen ().ContinueWith (delegate {
 				if (analysisDocument != null)
 					StartReparseThread ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs
index 00ddb8d815..3f393ce1cb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 using System;

 using MonoDevelop.Ide.Gui.Dialogs;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using MonoDevelop.Core;

 using MonoDevelop.Components;

 

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs
index f716da17e7..3a14ecec9a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs
@@ -30,7 +30,7 @@ using System;
 using System.IO;
 using MonoDevelop.Components;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Linq;
 
 namespace MonoDevelop.Ide.Projects
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
index dbf4869b78..78a24d98b3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
@@ -34,7 +34,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Xml;
 using System.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 
 namespace MonoDevelop.Ide.Templates
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs
index 15d18b8557..51eebafb51 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs
@@ -42,7 +42,7 @@ using MonoDevelop.Components.Commands;
 using System.Collections.Generic;
 using System.Xml;
 using Mono.Addins;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Ide.Templates
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs
index 57c1bd4d58..eedf7fc4f8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs
@@ -80,6 +80,13 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 		}
 
+		public static void Clear ()
+		{
+			lock (cache) {
+				cache.Clear ();
+			}
+		}
+
 		//static Timer timer;
 
 		static MetadataReferenceCache ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs
index a15792309a..3e43f15ca1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs
@@ -288,8 +288,8 @@ namespace MonoDevelop.Ide.TypeSystem
 		{
 			var project = args.SolutionItem as MonoDevelop.Projects.Project;
 			if (project != null) {
-				var ws = GetWorkspace (project.ParentSolution);
-				await ws.AddProject (project);
+				Unload (project.ParentSolution);
+				Load (project.ParentSolution,  new ProgressMonitor()); 
 			}
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index 63dd179648..8bd80b2811 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -3303,6 +3303,12 @@
     <EmbeddedResource Include="icons\error-48~dark~sel%402x.png">
       <LogicalName>error-48~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute-16.png">
+      <LogicalName>execute-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute-16%402x.png">
+      <LogicalName>execute-16@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\done-16.png">
       <LogicalName>done-16.png</LogicalName>
     </EmbeddedResource>
@@ -5580,6 +5586,90 @@
     <EmbeddedResource Include="icons\status-warning-count-16~dark%402x.png">
       <LogicalName>status-warning-count-16~dark@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\zoom-100-16.png">
+      <LogicalName>zoom-100-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\zoom-100-16%402x.png">
+      <LogicalName>zoom-100-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unindent-16%402x.png">
+      <LogicalName>unindent-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unindent-16.png">
+      <LogicalName>unindent-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\about-16.png">
+      <LogicalName>about-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\about-16%402x.png">
+      <LogicalName>about-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\cut-16.png">
+      <LogicalName>cut-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\cut-16%402x.png">
+      <LogicalName>cut-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\fullscreen-16.png">
+      <LogicalName>fullscreen-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\fullscreen-16%402x.png">
+      <LogicalName>fullscreen-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\help-16.png">
+      <LogicalName>help-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\help-16%402x.png">
+      <LogicalName>help-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\indent-16.png">
+      <LogicalName>indent-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\indent-16%402x.png">
+      <LogicalName>indent-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\page-setup-16.png">
+      <LogicalName>page-setup-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\page-setup-16%402x.png">
+      <LogicalName>page-setup-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\paste-16.png">
+      <LogicalName>paste-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\paste-16%402x.png">
+      <LogicalName>paste-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\print-16.png">
+      <LogicalName>print-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\print-16%402x.png">
+      <LogicalName>print-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\print-preview-16.png">
+      <LogicalName>print-preview-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\print-preview-16%402x.png">
+      <LogicalName>print-preview-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\quit-16.png">
+      <LogicalName>quit-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\quit-16%402x.png">
+      <LogicalName>quit-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\redo-16.png">
+      <LogicalName>redo-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\redo-16%402x.png">
+      <LogicalName>redo-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-to-saved-16.png">
+      <LogicalName>revert-to-saved-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-to-saved-16%402x.png">
+      <LogicalName>revert-to-saved-16@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MonoDevelop.Ide.Commands\CustomStringTagProvider.cs" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs
index b45b19d2be..1df740073b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs
@@ -28,7 +28,7 @@
 using System;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Assemblies;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using MonoDevelop.Ide.Fonts;
 using MonoDevelop.Ide.Editor;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
index 74f6ea058a..9eeec61399 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -52,7 +52,7 @@ using System.Threading.Tasks;
 using System.Threading;
 using ExecutionContext = MonoDevelop.Projects.ExecutionContext;
 using MonoDevelop.Ide.Tasks;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using System.Collections.Immutable;
 using MonoDevelop.Ide.Editor;
 using MonoDevelop.Core.Text;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
index 369bdd3200..574979ff78 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
@@ -964,12 +964,16 @@ namespace MonoDevelop.Ide
 			if (WorkspaceItemClosed != null)
 				WorkspaceItemClosed (this, args);
 
-			if (Items.Count == 0 && !reloading) {
+			bool lastWorkspaceItemClosing = Items.Count == 0 && !reloading;
+			if (lastWorkspaceItemClosing) {
 				if (LastWorkspaceItemClosed != null)
 					LastWorkspaceItemClosed (this, EventArgs.Empty);
 			}
 			MonoDevelop.Ide.TypeSystem.TypeSystemService.Unload (item);
 
+			if (lastWorkspaceItemClosing)
+				MonoDevelop.Ide.TypeSystem.MetadataReferenceCache.Clear ();
+
 			NotifyDescendantItemRemoved (this, args);
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/icons/about-16.png b/main/src/core/MonoDevelop.Ide/icons/about-16.png
new file mode 100644
index 0000000000..010d294a76
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/about-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/about-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/about-16@2x.png
new file mode 100644
index 0000000000..967143eae9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/about-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/cut-16.png b/main/src/core/MonoDevelop.Ide/icons/cut-16.png
new file mode 100644
index 0000000000..ff87558fcd
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/cut-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/cut-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/cut-16@2x.png
new file mode 100644
index 0000000000..ce98d5ccbd
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/cut-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16.png b/main/src/core/MonoDevelop.Ide/icons/execute-16.png
new file mode 100644
index 0000000000..cf578ba7aa
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/execute-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-16@2x.png
new file mode 100644
index 0000000000..5e69bde9af
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/execute-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16.png
new file mode 100644
index 0000000000..b9e9ea6321
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16@2x.png
new file mode 100644
index 0000000000..46604c39c8
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16.png b/main/src/core/MonoDevelop.Ide/icons/help-16.png
new file mode 100644
index 0000000000..af99ef09df
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/help-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/help-16@2x.png
new file mode 100644
index 0000000000..923d626671
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/help-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/indent-16.png b/main/src/core/MonoDevelop.Ide/icons/indent-16.png
new file mode 100644
index 0000000000..86024f1f7b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/indent-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/indent-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/indent-16@2x.png
new file mode 100644
index 0000000000..f604e0faa5
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/indent-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/page-setup-16.png b/main/src/core/MonoDevelop.Ide/icons/page-setup-16.png
new file mode 100644
index 0000000000..ea7ae273c7
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/page-setup-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/page-setup-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/page-setup-16@2x.png
new file mode 100644
index 0000000000..1ca76c3a2a
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/page-setup-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/paste-16.png b/main/src/core/MonoDevelop.Ide/icons/paste-16.png
new file mode 100644
index 0000000000..67edc0d95d
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/paste-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/paste-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/paste-16@2x.png
new file mode 100644
index 0000000000..1868224055
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/paste-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/print-16.png b/main/src/core/MonoDevelop.Ide/icons/print-16.png
new file mode 100644
index 0000000000..5997b9222e
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/print-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/print-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/print-16@2x.png
new file mode 100644
index 0000000000..1dfe6417c5
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/print-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/print-preview-16.png b/main/src/core/MonoDevelop.Ide/icons/print-preview-16.png
new file mode 100644
index 0000000000..45b44f324f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/print-preview-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/print-preview-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/print-preview-16@2x.png
new file mode 100644
index 0000000000..4591d9fc8a
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/print-preview-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/quit-16.png b/main/src/core/MonoDevelop.Ide/icons/quit-16.png
new file mode 100644
index 0000000000..d070809f1c
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/quit-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/quit-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/quit-16@2x.png
new file mode 100644
index 0000000000..f646d9406f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/quit-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16.png b/main/src/core/MonoDevelop.Ide/icons/redo-16.png
new file mode 100644
index 0000000000..f7923083ba
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/redo-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/redo-16@2x.png
new file mode 100644
index 0000000000..8fe5d8c7cd
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/redo-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16.png b/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16.png
new file mode 100644
index 0000000000..b038fa84e2
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16@2x.png
new file mode 100644
index 0000000000..d9528249be
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/unindent-16.png b/main/src/core/MonoDevelop.Ide/icons/unindent-16.png
new file mode 100644
index 0000000000..b9ff704c19
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/unindent-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/unindent-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/unindent-16@2x.png
new file mode 100644
index 0000000000..c2e54ac2ff
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/unindent-16@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-100-16.png b/main/src/core/MonoDevelop.Ide/icons/zoom-100-16.png
new file mode 100644
index 0000000000..92dddd2ea8
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/zoom-100-16.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-100-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-100-16@2x.png
new file mode 100644
index 0000000000..33b069a1b4
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/zoom-100-16@2x.png
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs
index eff9423485..d8ee3d5e30 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs
@@ -1,6 +1,6 @@
 [assembly: System.Reflection.AssemblyTitle ("MonoDevelop MSBuild 12.0 Builder")]

 

-namespace MonoDevelop.Projects.Formats.MSBuild

+namespace MonoDevelop.Projects.MSBuild

 {

 	static class MSBuildConsts

 	{

diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs
index 6b3d27577c..09cae154f2 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs
@@ -1,6 +1,6 @@
 [assembly: System.Reflection.AssemblyTitle ("MonoDevelop MSBuild 14.0 Builder")]

 

-namespace MonoDevelop.Projects.Formats.MSBuild

+namespace MonoDevelop.Projects.MSBuild

 {

 	static class MSBuildConsts

 	{

diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs
index de5f65ec45..5ea952f86d 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs
@@ -1,6 +1,6 @@
 [assembly: System.Reflection.AssemblyTitle ("MonoDevelop MSBuild 4.0 Builder")]

 

-namespace MonoDevelop.Projects.Formats.MSBuild

+namespace MonoDevelop.Projects.MSBuild

 {

 	static class MSBuildConsts

 	{

diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs
index 7436777040..d1b85e7c26 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs
@@ -33,7 +33,7 @@ using System.Runtime.Remoting.Channels.Tcp;
 using System.Threading;
 using System.Diagnostics;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	class MainClass
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs
index 538e5d08ac..1fe71fd699 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs
@@ -34,7 +34,7 @@ using System.IO;
 //this is the builder for the deprecated build engine API
 #pragma warning disable 618
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	partial class BuildEngine: MarshalByRefObject, IBuildEngine
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
index 61dc37af7d..676ff9d933 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
@@ -33,7 +33,7 @@ using System.Globalization;
 //this is the builder for the deprecated build engine API
 #pragma warning disable 618
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public partial class BuildEngine: MarshalByRefObject, IBuildEngine
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
index e69d3b275a..4afa977d9b 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
@@ -34,7 +34,7 @@ using Microsoft.Build.Construction;
 using System.Linq;

 using System.Globalization;

 

-namespace MonoDevelop.Projects.Formats.MSBuild

+namespace MonoDevelop.Projects.MSBuild

 {

 	public partial class BuildEngine: MarshalByRefObject, IBuildEngine

 	{

diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs
index a64fcab1f3..05aa2407a7 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs
@@ -35,7 +35,7 @@ using System.Text;
 using Microsoft.Build.Framework;
 using Microsoft.Build.BuildEngine;
 
-namespace MonoDevelop.Projects.Formats.MSBuild {
+namespace MonoDevelop.Projects.MSBuild {
 	public class MDConsoleLogger : ILogger {
 	
 		string		parameters;
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
index 60b1172476..d926143452 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
@@ -28,7 +28,7 @@ using System;
 using System.Globalization;
 using System.Collections.Generic;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public interface IBuildEngine: IDisposable
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs
index 8373877c11..10f7982178 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs
@@ -28,7 +28,7 @@ using System;
 using System.IO;
 using System.Runtime.Remoting.Messaging;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public interface ILogWriter
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs
index 542c29d5c3..886a5937a9 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public interface IProjectBuilder : IDisposable
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs
index 7d08df441e..6dcc8dd153 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using Microsoft.Build.Utilities;
 using Microsoft.Build.Framework;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public class LocalLogger: Logger
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs
index 221eb11b24..6e2d31916f 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 
 	[Serializable]
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs
index 358659d42a..843961a150 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	[Serializable]
 	public class MSBuildResult
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs
index 78115749b3..ba37f3ef32 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Text;
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	[Serializable]
 	public class MSBuildTargetResult
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs
index c22e4d7284..ec79d80dc5 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs
@@ -30,7 +30,7 @@ using Microsoft.Build.Framework;
 using System.Xml;

 using System.IO;

 

-namespace MonoDevelop.Projects.Formats.MSBuild

+namespace MonoDevelop.Projects.MSBuild

 {

 	partial class ProjectBuilder

 	{

diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
index 8e4f3881e3..73a986555b 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
@@ -40,7 +40,7 @@ using System.Linq;
 
 #pragma warning disable 618
 
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
 {
 	public partial class ProjectBuilder: MarshalByRefObject, IProjectBuilder
 	{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
index 55abc76f01..5f0b8a06f1 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
@@ -36,7 +36,7 @@ using Microsoft.Build.Logging;
 using Microsoft.Build.Execution;

 using System.Xml;

 

-namespace MonoDevelop.Projects.Formats.MSBuild

+namespace MonoDevelop.Projects.MSBuild

 {

 	public partial class ProjectBuilder: MarshalByRefObject, IProjectBuilder

 	{

diff --git a/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins b/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins
index d0f63c1fbd..9daab66b83 100644
--- a/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins
+++ b/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins
@@ -1,5 +1,4 @@
 <Addins>
 	<Directory include-subdirs="true">../AddIns</Directory>
 	<Directory include-subdirs="true">../../../local-config</Directory>
-	<Directory include-subdirs="true">../tests</Directory>
 </Addins>