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

34 files changed, 110 insertions, 61 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"