Merge branch 'master' into editorconfig

58 files changed, 289 insertions, 104 deletions

diff --git a/.gitignore b/.gitignore
index 367c96c9ee..9f405ea34f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ Thumbs.db
 /main/external/Xamarin.Mac.registrar.full.a
 /main/external/Xamarin.Mac.dll*
 /main/external/libxammac.dylib
+/main/external/libxammac-system.a
 
 # Autogenerated stuff
 /local-config/
@@ -194,6 +195,7 @@ Thumbs.db
 /main/tests/MacPlatform.Tests/Makefile
 /main/tests/MonoDevelop.CSharpBinding.Tests/Makefile
 /main/tests/MonoDevelop.MacDev.Tests/Makefile
+/main/tests/MonoDevelop.Refactoring.Tests/Makefile
 /main/tests/UserInterfaceTests/Makefile
 /main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/Makefile
 /main/src/addins/MonoDevelop.PackageManagement/Makefile
@@ -203,6 +205,29 @@ Thumbs.db
 /main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Makefile
 /main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile
 /main/src/addins/MonoDevelop.UnitTesting/Makefile
+/main/msbuild/Makefile
+/main/src/addins/MonoDevelop.AspNetCore/Makefile
+/main/src/addins/MonoDevelop.AzureFunctions/Makefile
+/main/src/addins/MonoDevelop.ConnectedServices/Makefile
+/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile
+/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile
+/main/src/addins/MonoDevelop.Debugger.Win32/Makefile
+/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile
+/main/src/addins/MonoDevelop.DotNetCore/Makefile
+/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile
+/main/src/addins/MonoDevelop.Packaging/Makefile
+/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile
+/main/src/addins/PerformanceDiagnostics/Makefile
+/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile
+/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile
+/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile
+/main/src/addins/VersionControl/Subversion.Win32/Makefile
+/main/src/core/Mono.TextEditor.Platform/Makefile
+/main/src/core/Mono.TextEditor.Shared/Makefile
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile
+/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile
+/main/tests/MonoDevelop.Core.Tests/Makefile
+/main/tests/WindowsPlatform.Tests/Makefile
 
 # extras configure junk
 /extras/MonoDevelop.Database/INSTALL
diff --git a/Makefile b/Makefile
index c87bdb6694..8cd940aae7 100644
--- a/Makefile
+++ b/Makefile
@@ -103,15 +103,11 @@ dist: update_submodules remove-stale-tarballs dist-recursive
 	@echo Decompressing monodevelop-$(PACKAGE_VERSION).tar.bz2
 	@cd tarballs && tar xvjf monodevelop-$(PACKAGE_VERSION).tar.bz2
 	@cp version.config tarballs/monodevelop-$(PACKAGE_VERSION)
+	@cp NuGet.config tarballs/monodevelop-$(PACKAGE_VERSION)
 	@rm -f main/build/bin/buildinfo
 	@cd main && make buildinfo
 	@cp main/build/bin/buildinfo tarballs/monodevelop-$(PACKAGE_VERSION)/
 	@echo Generating merged tarball
-	@find tarballs/monodevelop-$(PACKAGE_VERSION)/ -type f -a \
-		\( -name \*.exe -o \
-		-name \*.dll -o \
-		-name \*.mdb \) \
-		-delete
 	@cd tarballs && tar -cjf monodevelop-$(PACKAGE_VERSION).tar.bz2 monodevelop-$(PACKAGE_VERSION)
 	@cd tarballs && rm -rf monodevelop-$(PACKAGE_VERSION)
 
diff --git a/main/Makefile.am b/main/Makefile.am
index 7f0efcc233..9a8c1aa67f 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/xbuild.include
 
-SUBDIRS = external . contrib src po man theme-icons build tests
+SUBDIRS = external . contrib src po man theme-icons msbuild build tests
 
 MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh
 
@@ -207,7 +207,7 @@ app-dir: all
 # we can't use the variables that are conditionally defined
 EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(appdata_DATA) $(pixmap_DATA) \
 	monodevelop.xml $(pkgconfig_in_files) external/Makefile.in \
-	Main.sln \
+	Main.sln MonoDevelop.props Directory.Build.props \
 	md.targets
 
 DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am
index fb0277af8f..1836b55a7f 100644
--- a/main/build/MacOSX/Makefile.am
+++ b/main/build/MacOSX/Makefile.am
@@ -8,8 +8,8 @@ EXTRAS=$(top_srcdir)/../extras
 ARTIFACTS=$(top_srcdir)/../../artifacts
 MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh
 EXTERNAL=../../external
-MONOSTUB_DEFINES=-DXM_REGISTRAR
-MONOSTUB_STATIC_LINK=$(EXTERNAL)/Xamarin.Mac.registrar.full.a
+MONOSTUB_DEFINES=-DXM_REGISTRAR -DXM_SYSTEM -DDYNAMIC_MONO_RUNTIME
+MONOSTUB_STATIC_LINK=$(EXTERNAL)/Xamarin.Mac.registrar.full.a $(EXTERNAL)/libxammac-system.a
 EXTERN_C_XM_REGISTRAR_DEFINE=$(shell ./check-xm-extern.sh)
 
 #SDK_PATH=$(shell xcrun --sdk macosx10.8 --show-sdk-path)
@@ -35,13 +35,15 @@ System_Native.o: System_Native.cpp
 	g++ -std=c++14 -c -Wall -mmacosx-version-min=10.10 -o $@ $^
 
 monostub.o: monostub.mm $(MONOSTUB_EXTRA_SOURCES)
-	g++ $(EXTERN_C_XM_REGISTRAR_DEFINE) $(MONOSTUB_DEFINES) -c -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub.mm
+	g++ -g $(EXTERN_C_XM_REGISTRAR_DEFINE) $(MONOSTUB_DEFINES) -c -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub.mm -I/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/include/xamarin
 
 monostub:  monostub.o System_Native.o $(MONOSTUB_STATIC_LINK)
-	clang++ -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ $^ -framework AppKit -framework Quartz -undefined dynamic_lookup
+	clang++ -g -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup
 #	gcc -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub.m -framework AppKit -isysroot $(SDK_PATH)
 	cp monostub ../bin/MonoDevelop
 	cp monostub ../bin/mdtool
+	mkdir -p ../bin/Contents
+	ln -sfh .. "../bin/Contents/MonoBundle"
 
 monostub-test: monostub-test.m $(MONOSTUB_EXTRA_SOURCES)
 	gcc -g -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ monostub-test.m -framework AppKit
diff --git a/main/build/MacOSX/monostub.mm b/main/build/MacOSX/monostub.mm
index db58b5f57a..bc24d663d1 100644
--- a/main/build/MacOSX/monostub.mm
+++ b/main/build/MacOSX/monostub.mm
@@ -12,15 +12,21 @@
 #include <ctype.h>
 #include <time.h>
 
-#include "monostub-utils.h"
-
-#import <Foundation/Foundation.h>
-
+#if XM_SYSTEM
+#include <main.h>
+#include <launch.h>
+#include <runtime.h>
+#else
 typedef int (* mono_main) (int argc, char **argv);
 typedef void (* mono_free) (void *ptr);
 typedef char * (* mono_get_runtime_build_info) (void);
+#endif
 typedef void (* gobject_tracker_init) (void *libmono);
 
+#include "monostub-utils.h"
+
+#import <Foundation/Foundation.h>
+
 #if XM_REGISTRAR
 extern
 #if EXTERN_C
@@ -37,7 +43,7 @@ extern
 void xamarin_create_classes ();
 #endif
 
-void *libmono, *libxammac;
+void *libmono;
 
 static void
 exit_with_message (const char *reason, char *argv0)
@@ -269,6 +275,56 @@ try_load_gobject_tracker (void *libmono, char *entry_executable)
 	}
 }
 
+static void
+run_md_bundle_if_needed(NSString *appDir, int argc, char **argv)
+{
+    // if we are running inside an app bundle and --start-app-bundle has been passed
+    // run the actual bundle and exit.
+    if (![appDir isEqualToString:@"."] && argc > 1 && !strcmp(argv[1], "--start-app-bundle")) {
+        NSArray *arguments = [NSArray array];
+        if (argc > 2) {
+            NSString *strings[argc-2];
+            for (int i = 0; i < argc-2; i++)
+                strings [i] = [[NSString alloc] initWithUTF8String:argv[i+2]];
+            arguments = [NSArray arrayWithObjects:strings count:argc-2];
+        }
+        run_md_bundle (appDir, arguments);
+    }
+}
+
+static void
+init_registrar()
+{
+#if XM_REGISTRAR
+    xamarin_create_classes_Xamarin_Mac ();
+#elif STATIC_REGISTRAR
+    xamarin_create_classes ();
+#endif
+}
+
+#ifdef XM_SYSTEM
+extern "C"
+void xamarin_app_initialize(xamarin_initialize_data *data)
+{
+	setenv ("MONO_GC_PARAMS", "major=marksweep-conc,nursery-size=8m", 0);
+
+    run_md_bundle_if_needed(data->app_dir, data->argc, data->argv);
+
+    data->requires_relaunch = update_environment ([[data->app_dir stringByAppendingPathComponent:@"Contents"] UTF8String], true);
+
+    if (data->requires_relaunch)
+        return;
+
+    correct_locale();
+}
+
+extern "C" int
+xammac_setup ()
+{
+    init_registrar();
+	return 0;
+}
+#else
 int main (int argc, char **argv)
 {
 	//clock_t start = clock();
@@ -286,18 +342,7 @@ int main (int argc, char **argv)
 
 	NSString *appDir = [[NSBundle mainBundle] bundlePath];
 
-	// if we are running inside an app bundle and --start-app-bundle has been passed
-	// run the actual bundle and exit.
-	if (![appDir isEqualToString:@"."] && argc > 1 && !strcmp(argv[1],"--start-app-bundle")) {
-		NSArray *arguments = [NSArray array];
-		if (argc > 2) {
-			NSString *strings[argc-2];
-		for (int i = 0; i < argc-2; i++)
-			strings [i] = [[NSString alloc] initWithUTF8String:argv[i+2]];
-			arguments = [NSArray arrayWithObjects:strings count:argc-2];
-		}
-		run_md_bundle (appDir, arguments);
-	}
+	run_md_bundle_if_needed(appDir, argc, argv);
 
 	// can be overridden with plist string MonoMinVersion
 	NSString *req_mono_version = @"5.2.0.171";
@@ -368,33 +413,7 @@ int main (int argc, char **argv)
 		exit_with_message ((char *)[msg UTF8String], argv[0]);
 	}
 
-#if XM_REGISTRAR
-	libxammac = dlopen ("@loader_path/libxammac.dylib", RTLD_LAZY);
-	if (!libxammac) {
-		libxammac = dlopen ("@loader_path/../Resources/lib/monodevelop/bin/libxammac.dylib", RTLD_LAZY);
-		if (!libxammac) {
-			fprintf (stderr, "Failed to load libxammac.dylib: %s\n", dlerror ());
-			NSString *msg = @"This application requires Xamarin.Mac native library side-by-side.";
-			exit_with_message ((char *)[msg UTF8String], argv[0]);
-		}
-	}
-
-	xamarin_create_classes_Xamarin_Mac ();
-#endif
-
-#if STATIC_REGISTRAR
-	libxammac = dlopen ("@loader_path/libxammac.dylib", RTLD_LAZY);
-	if (!libxammac) {
-		libxammac = dlopen ("@loader_path/../Resources/lib/monodevelop/bin/libxammac.dylib", RTLD_LAZY);
-		if (!libxammac) {
-			fprintf (stderr, "Failed to load libxammac.dylib: %s\n", dlerror ());
-			NSString *msg = @"This application requires Xamarin.Mac native library side-by-side.";
-			exit_with_message ((char *)[msg UTF8String], argv[0]);
-		}
-	}
-
-	xamarin_create_classes ();
-#endif
+	init_registrar();
 
 	try_load_gobject_tracker (libmono, argv [0]);
 
@@ -449,3 +468,4 @@ int main (int argc, char **argv)
 
 	return _mono_main (argc + extra_argc + injected, new_argv);
 }
+#endif
diff --git a/main/configure.ac b/main/configure.ac
index 4d6ee39a30..2ee270eba6 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -292,12 +292,17 @@ build/MacOSX/Makefile
 contrib/Makefile
 contrib/ICSharpCode.Decompiler/Makefile
 external/Makefile
+msbuild/Makefile
 src/Makefile
 src/core/Makefile
 src/core/Mono.Texteditor/Makefile
+src/core/Mono.TextEditor.Platform/Makefile
+src/core/Mono.TextEditor.Shared/Makefile
 src/core/MonoDevelop.Core/Makefile
 src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile
+src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile
 src/core/MonoDevelop.Ide/Makefile
+src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile
 src/core/MonoDevelop.Startup/Makefile
 src/core/MonoDevelop.TextEditor.Tests/Makefile
 src/tools/Makefile
@@ -311,12 +316,17 @@ src/addins/MonoDevelop.UnitTesting/Makefile
 src/addins/MonoDevelop.UnitTesting.NUnit/Makefile
 src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile
 src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Makefile
+src/addins/PerformanceDiagnostics/Makefile
+src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile
+src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile
 src/addins/VersionControl/MonoDevelop.VersionControl/Makefile
 src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile
 src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/Makefile
 src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/Makefile
 src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile
 src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/Makefile
+src/addins/VersionControl/Subversion.Win32.Tests/Makefile
+src/addins/VersionControl/Subversion.Win32/Makefile
 src/addins/VersionControl/Makefile
 src/addins/CSharpBinding/Makefile
 src/addins/CSharpBinding/Autotools/Makefile
@@ -349,13 +359,24 @@ src/addins/MonoDevelop.AssemblyBrowser/Makefile
 src/addins/MonoDevelop.SourceEditor2/Makefile
 src/addins/Xml/Makefile
 src/addins/MonoDevelop.Refactoring/Makefile
+src/addins/MonoDevelop.AspNetCore/Makefile
+src/addins/MonoDevelop.AzureFunctions/Makefile
+src/addins/MonoDevelop.ConnectedServices/Makefile
+src/addins/MonoDevelop.DotNetCore/Makefile
+src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile
 src/addins/MonoDevelop.Debugger/Makefile
 src/addins/MonoDevelop.Debugger.Gdb/Makefile
 src/addins/MonoDevelop.Debugger.Soft/Makefile
 src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile
 src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile
+src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile
+src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile
+src/addins/MonoDevelop.Debugger.Win32/Makefile
+src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile
 src/addins/MonoDevelop.HexEditor/Makefile
 src/addins/MonoDevelop.DocFood/Makefile
+src/addins/MonoDevelop.Packaging/Makefile
+src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile
 src/addins/MonoDevelop.PackageManagement/Makefile
 src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/Makefile
 tests/Makefile
@@ -364,7 +385,10 @@ tests/UserInterfaceTests/Makefile
 tests/TestRunner/Makefile
 tests/Ide.Tests/Makefile
 tests/MacPlatform.Tests/Makefile
+tests/MonoDevelop.Core.Tests/Makefile
 tests/MonoDevelop.CSharpBinding.Tests/Makefile
+tests/MonoDevelop.Refactoring.Tests/Makefile
+tests/WindowsPlatform.Tests/Makefile
 Makefile
 monodevelop
 mdtool
diff --git a/main/external/Makefile.am b/main/external/Makefile.am
index da5d48f480..b3d37ce3be 100644
--- a/main/external/Makefile.am
+++ b/main/external/Makefile.am
@@ -5,7 +5,7 @@ all:
 clean:
 
 if ENABLE_MACPLATFORM
-all: Xamarin.Mac.dll Xamarin.Mac.registrar.full.a libxammac.dylib
+all: Xamarin.Mac.dll Xamarin.Mac.registrar.full.a libxammac-system.a libxammac.dylib
 	$(MAKE) -C monomac/src
 
 Xamarin.Mac.dll: $(XAMMAC_PATH)/@MAC_ARCHITECTURE@/full/Xamarin.Mac.dll
@@ -15,6 +15,9 @@ Xamarin.Mac.dll: $(XAMMAC_PATH)/@MAC_ARCHITECTURE@/full/Xamarin.Mac.dll
 Xamarin.Mac.registrar.full.a: $(XAMMAC_PATH)/mmp/Xamarin.Mac.registrar.full.a
 	cp -p $< $@
 
+libxammac-system.a: $(XAMMAC_PATH)/libxammac-system.a
+	cp -p $< $@
+
 libxammac.dylib: $(XAMMAC_PATH)/libxammac.dylib
 	cp -p $< $@
 
diff --git a/main/external/mono-addins b/main/external/mono-addins
-Subproject e1a23bdc041eeeeea35100de192932410b6b09f
+Subproject ce49847463b9fd315619e23fb5d3011194fc1fa
diff --git a/main/external/nrefactory b/main/external/nrefactory
-Subproject db19caaa86f80ddc6cf8d0cd7d167d22e4e1c25
+Subproject 0607a4ad96ebdd16817e47dcae85b1cfcb5b5bf
diff --git a/main/external/xwt b/main/external/xwt
-Subproject 69ebc4b83a25a9c0ceffff067efbddf221e6a77
+Subproject 127edbda883158cd7527ec3ae578299db996e89
diff --git a/main/msbuild/Makefile.am b/main/msbuild/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/msbuild/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/po/Makefile.am b/main/po/Makefile.am
index 14d6750416..26584e928b 100644
--- a/main/po/Makefile.am
+++ b/main/po/Makefile.am
@@ -54,6 +54,6 @@ uninstall-local:
 	done
 
 CLEANFILES = $(GMO_FILES)
-EXTRA_DIST = Makefile $(FILES)
+EXTRA_DIST = Makefile po.mdproj $(FILES)
 
 include $(top_srcdir)/Makefile.include
diff --git a/main/src/addins/AspNet/Makefile.am b/main/src/addins/AspNet/Makefile.am
index 270cff592f..9039c5e753 100644
--- a/main/src/addins/AspNet/Makefile.am
+++ b/main/src/addins/AspNet/Makefile.am
@@ -2,4 +2,10 @@ include $(top_srcdir)/xbuild.include
 EXTRA_DIST += \
 		$(wildcard lib/*) \
 		$(wildcard Templates/MvcCommon/*.cshtml)\
+		$(wildcard Templates/*.cshtml)\
+		$(wildcard Templates/*.ts)\
+		$(wildcard Templates/*.css)\
+		$(wildcard Templates/*.scss)\
+		$(wildcard Templates/*.less)\
+		$(wildcard Templates/*.json)\
 		$(wildcard Templates/Projects/Files/*.aspx)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
index 7f64e0dcc3..fd51996c8f 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
@@ -347,6 +347,7 @@ namespace MonoDevelop.CSharp.Completion
 				foreach (var member in semanticModel.Compilation.GlobalNamespace.GetNamespaceMembers ())
 					stack.Push (member);
 				var extMethodDict = extensionMethodImport ? new Dictionary<INamespaceSymbol, List<ImportSymbolCompletionData>> () : null;
+				var typeDict = new Dictionary<INamespaceSymbol, HashSet<string>> ();
 				while (stack.Count > 0) {
 					if (cancellationToken.IsCancellationRequested)
 						break;
@@ -395,7 +396,14 @@ namespace MonoDevelop.CSharp.Completion
 								}
 							}
 						} else {
-							result.Add (new ImportSymbolCompletionData (this, type, false));
+							HashSet<string> existingTypeHashSet;
+							if (!typeDict.TryGetValue (type.ContainingNamespace, out existingTypeHashSet)) {
+								typeDict.Add (type.ContainingNamespace, existingTypeHashSet = new HashSet<string> ());
+							}
+							if (!existingTypeHashSet.Contains (type.Name)) {
+								result.Add (new ImportSymbolCompletionData (this, type, false));
+								existingTypeHashSet.Add (type.Name);
+							}
 						}
 					}
 				}
diff --git a/main/src/addins/GnomePlatform/GnomePlatform.cs b/main/src/addins/GnomePlatform/GnomePlatform.cs
index c5c77b58e1..f699d0a3e9 100644
--- a/main/src/addins/GnomePlatform/GnomePlatform.cs
+++ b/main/src/addins/GnomePlatform/GnomePlatform.cs
@@ -211,6 +211,20 @@ namespace MonoDevelop.Platform
 				title,
 				GenerateAppId (applicationId));
 		}
+		
+		private static string MateTerminalRunner (string command, string args, string dir, string title, bool pause, Guid applicationId)
+		{
+			string extra_commands = pause 
+				? BashPause.Replace ("'", "\\\"")
+				: String.Empty;
+			
+			return String.Format (@"--name ""{4}"" -e ""bash -c 'cd {3} ; {0} {1} ; {2}'""",
+				command,
+				EscapeArgs (args),
+				extra_commands,
+				EscapeDir (dir),
+				title);
+		}
 
 		private static string GenerateAppId (Guid applicationId)
  		{
@@ -298,7 +312,7 @@ namespace MonoDevelop.Platform
 			}
 			else if (!String.IsNullOrEmpty (Environment.GetEnvironmentVariable ("MATE_DESKTOP_SESSION_ID"))) {
 				preferred_terminal = "mate-terminal";
-				preferred_runner = GnomeTerminalRunner;
+				preferred_runner = MateTerminalRunner;
 				preferedOpenFolderRunner = GnomeTerminalOpenFolderRunner;
 			} 
 			else if (!String.IsNullOrEmpty (Environment.GetEnvironmentVariable ("KDE_SESSION_VERSION"))) { 
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index 6d521ef2c3..f1a790da4c 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -144,8 +144,7 @@ namespace MonoDevelop.MacIntegration
 
 			var dir = Path.GetDirectoryName (typeof(MacPlatformService).Assembly.Location);
 
-			if (ObjCRuntime.Dlfcn.dlopen (Path.Combine (dir, "libxammac.dylib"), 0) == IntPtr.Zero)
-				LoggingService.LogFatalError ("Unable to load libxammac");
+			ObjCRuntime.Dlfcn.dlopen (Path.Combine (dir, "libxammac.dylib"), 0);
 
 			mimemap = new Lazy<Dictionary<string, string>> (LoadMimeMapAsync);
 
diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am
index 6dd237dad5..9cb3223977 100644
--- a/main/src/addins/Makefile.am
+++ b/main/src/addins/Makefile.am
@@ -30,5 +30,13 @@ SUBDIRS = \
 	WindowsPlatform \

 	MonoDevelop.HexEditor \

 	MonoDevelop.DocFood \

+	MonoDevelop.AspNetCore \

+	MonoDevelop.AzureFunctions \

+	MonoDevelop.DotNetCore \

+	MonoDevelop.ConnectedServices \

+	MonoDevelop.Packaging \

+	MonoDevelop.Debugger.Win32 \

+	PerformanceDiagnostics \

+	MonoDevelop.Debugger.VSCodeDebugProtocol \

 	MonoDevelop.PackageManagement

 

diff --git a/main/src/addins/MonoDevelop.AspNetCore/Makefile.am b/main/src/addins/MonoDevelop.AspNetCore/Makefile.am
new file mode 100644
index 0000000000..0c03503f0f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AspNetCore/Makefile.am
@@ -0,0 +1,4 @@
+include $(top_srcdir)/xbuild.include
+
+EXTRA_DIST += \
+	$(wildcard Templates/*.cshtml)
diff --git a/main/src/addins/MonoDevelop.AzureFunctions/Makefile.am b/main/src/addins/MonoDevelop.AzureFunctions/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AzureFunctions/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.ConnectedServices/Makefile.am b/main/src/addins/MonoDevelop.ConnectedServices/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.ConnectedServices/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile.am b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile.am
new file mode 100644
index 0000000000..8f41a600f1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	MonoDevelop.Debugger.VsCodeDebugProtocol
+
diff --git a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile.am b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Win32/Makefile.am
new file mode 100644
index 0000000000..c4345c4a6f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	MonoDevelop.Debugger.Win32
+
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
index 43727e5ae4..816176ac7f 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
@@ -282,6 +282,11 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 					return true;
 
 				var icon = item.Icon;
+				if (!icon.HasFixedSize) {
+					var maxIconSize = Math.Min (itemDimension.Width, itemDimension.Height);
+					var fittingIconSize = maxIconSize > 32 ? Xwt.IconSize.Large : maxIconSize > 16 ? Xwt.IconSize.Medium : Xwt.IconSize.Small;
+					icon = item.Icon.WithSize (fittingIconSize);
+				}
 				if (item == SelectedItem) {
 					icon = icon.WithStyles ("sel");
 					cr.SetSourceColor (Style.Base (StateType.Selected).ToCairoColor ());
@@ -1121,9 +1126,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		
 		public Xwt.Drawing.Image Icon {
 			get {
-				if (node != null)
-					return node.Icon;
-				return icon ?? DefaultIcon;
+				return node?.Icon ?? icon ?? DefaultIcon;
 			}
 		}
 
diff --git a/main/src/addins/MonoDevelop.DotNetCore/Makefile.am b/main/src/addins/MonoDevelop.DotNetCore/Makefile.am
new file mode 100644
index 0000000000..96b2dda016
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DotNetCore/Makefile.am
@@ -0,0 +1,5 @@
+include $(top_srcdir)/xbuild.include
+
+SUBDIRS = \
+	MonoDevelop.DotNetCore.Tests
+
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile.am b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.Packaging/Makefile.am b/main/src/addins/MonoDevelop.Packaging/Makefile.am
new file mode 100644
index 0000000000..55e630e362
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Packaging/Makefile.am
@@ -0,0 +1,7 @@
+include $(top_srcdir)/xbuild.include
+
+SUBDIRS = \
+	MonoDevelop.Packaging.Tests
+
+EXTRA_DIST += \
+	PostBuild.proj
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile.am b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile.am
new file mode 100644
index 0000000000..c93d6852fa
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile.am
@@ -0,0 +1,2 @@
+include $(top_srcdir)/xbuild.include
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs
index 5754973567..44e028fb1a 100644
--- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs
@@ -79,6 +79,9 @@ namespace MonoDevelop.UnitTesting.NUnit
 
 		public static NUnitProjectTestSuite CreateTest (DotNetProject project)
 		{
+			if (project.TargetFramework.Id.Identifier == ".NETCoreApp")
+				return null;
+
 			if (!project.ParentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration).BuildEnabledForItem (project))
 				return null;
 
diff --git a/main/src/addins/PerformanceDiagnostics/Makefile.am b/main/src/addins/PerformanceDiagnostics/Makefile.am
new file mode 100644
index 0000000000..ead76902f1
--- /dev/null
+++ b/main/src/addins/PerformanceDiagnostics/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = \
+	PerformanceDiagnostics \
+	UIThreadMonitorDaemon
+
diff --git a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile.am b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile.am b/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/VersionControl/Makefile.am b/main/src/addins/VersionControl/Makefile.am
index 19a1809c7a..9b8e787dbb 100644
--- a/main/src/addins/VersionControl/Makefile.am
+++ b/main/src/addins/VersionControl/Makefile.am
@@ -5,4 +5,6 @@ SUBDIRS = \
 	MonoDevelop.VersionControl.Subversion.Unix \
 	MonoDevelop.VersionControl.Git \
 	MonoDevelop.VersionControl.Subversion.Tests \
+	Subversion.Win32 \
+	Subversion.Win32.Tests \
 	MonoDevelop.VersionControl.Git.Tests 
diff --git a/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile.am b/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/VersionControl/Subversion.Win32/Makefile.am b/main/src/addins/VersionControl/Subversion.Win32/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/VersionControl/Subversion.Win32/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/core/Makefile.am b/main/src/core/Makefile.am
index a71f67828c..c1366fb682 100644
--- a/main/src/core/Makefile.am
+++ b/main/src/core/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = \
 	MonoDevelop.Projects.Formats.MSBuild \
 	MonoDevelop.Core \
+	Mono.TextEditor.Shared \
+	Mono.TextEditor.Platform \
 	Mono.Texteditor \
 	MonoDevelop.Ide MonoDevelop.Startup \
 	MonoDevelop.TextEditor.Tests
diff --git a/main/src/core/Mono.TextEditor.Platform/Makefile.am b/main/src/core/Mono.TextEditor.Platform/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/core/Mono.TextEditor.Platform/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/core/Mono.TextEditor.Shared/Makefile.am b/main/src/core/Mono.TextEditor.Shared/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/core/Mono.TextEditor.Shared/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/core/Mono.Texteditor/Makefile.am b/main/src/core/Mono.Texteditor/Makefile.am
index f9131dc780..c9cc87438f 100644
--- a/main/src/core/Mono.Texteditor/Makefile.am
+++ b/main/src/core/Mono.Texteditor/Makefile.am
@@ -1,14 +1 @@
 include $(top_srcdir)/xbuild.include
-
-EXTRA_DIST += \
-		Styles/DarkStyle.json \
-		Styles/GruvboxStyle.json \
-		Styles/LightStyle.json \
-		Styles/MonokaiStyle.json \
-		Styles/NightshadeStyle.json \
-		Styles/OblivionStyle.json \
-		Styles/SolarizedDarkStyle.json \
-		Styles/SolarizedLightStyle.json \
-		Styles/TangoStyle.json \
-		Styles/VisualStudioStyle.json
-
diff --git a/main/src/core/MonoDevelop.Core/Makefile.am b/main/src/core/MonoDevelop.Core/Makefile.am
index 0f98ef2b7e..2e4bd93ffb 100644
--- a/main/src/core/MonoDevelop.Core/Makefile.am
+++ b/main/src/core/MonoDevelop.Core/Makefile.am
@@ -1,4 +1,7 @@
 include $(top_srcdir)/xbuild.include
 
 EXTRA_DIST += \
-	BuildVariables.cs.in
+	BuildVariables.cs
+
+BuildVariables.cs:
+	$(XBUILD) $(XBUILD_ARGS) /t:BeforeBuild
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index 30bc990dc2..9fdd2d303a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -800,7 +800,7 @@
     <InternalsVisibleTo Include="MonoDevelop.Ide.Tests" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="BeforeBuild" Inputs="BuildVariables.cs.in; $(MSBuildProjectDirectory)\..\..\..\..\version.config" Outputs="BuildVariables.cs">
+  <Target Name="BeforeBuild" Inputs="BuildVariables.cs.in; $(MSBuildProjectDirectory)\..\..\..\..\version.config" Outputs="BuildVariables.cs" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\..\version.config')" >
     <MakeDir Directories="$(FullBuildInfo)" />
     <Csc Sources="$(ConfigureScript)" OutputAssembly="$(ConfigureScriptExe)" ToolExe="$(CscToolExe)" ToolPath="$(CscToolPath)" Condition="!Exists('$(ConfigureScriptExe)')" />
     <Exec Command="$(MonoLauncher)$(ConfigureScriptExe) gen-buildinfo $(FullBuildInfo)" WorkingDirectory="$(MSBuildProjectDirectory)" />
diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am
index 76417ba6d3..fe8940e113 100644
--- a/main/src/core/MonoDevelop.Ide/Makefile.am
+++ b/main/src/core/MonoDevelop.Ide/Makefile.am
@@ -1,5 +1,8 @@
 include $(top_srcdir)/xbuild.include
 
+SUBDIRS = \
+	MonoDevelop.Ide.Editor.Highlighting
+
 EXTRA_DIST += \
 	gtkrc \
 	gtkrc.mac \
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionController.cs
index 5e904350c7..1263f0f5a7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionController.cs
@@ -259,7 +259,6 @@ namespace MonoDevelop.Ide.CodeCompletion
 		{
 			usingPreviewEntry = false;
 			previewCompletionEntryText = "";
-			StartOffset = 0;
 			HideWhenWordDeleted = false;
 			SelectedItemCompletionText = null;
 			ResetViewState();
@@ -407,8 +406,6 @@ namespace MonoDevelop.Ide.CodeCompletion
 		{
 			if (!object.ReferenceEquals (sender, mutableList))
 				return;
-			
-			ResetSizes ();
 
 			// Only hide the footer if it's finished changing
 			if (!mutableList.IsChanging)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile.am b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile.am
new file mode 100644
index 0000000000..fc16b3af83
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile.am
@@ -0,0 +1,6 @@
+include $(top_srcdir)/xbuild.include
+
+EXTRA_DIST += \
+	$(wildcard syntaxes/*) \
+	$(wildcard themes/*) \
+	$(wildcard VSCodeImport/*)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs
index 4b1d4137ad..f3c7aefd5a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs
@@ -553,10 +553,10 @@ namespace MonoDevelop.Ide.Gui.Components
 
 		protected void UnsafeBeginTask (LogViewProgressMonitor monitor, string name, int totalWork)
 		{
-			var indent = monitor.Indent;
-			if (!string.IsNullOrEmpty (name)) {
-				var tag = indent.Indent ();
-				buffer.TagTable.Add (tag);
+			if (!string.IsNullOrEmpty (name) && monitor != null) {
+				var indent = monitor.Indent;
+				var t = indent.Indent ();
+				buffer.TagTable.Add (t);
 				indents.Push (name);
 			} else
 				indents.Push (null);
@@ -567,14 +567,17 @@ namespace MonoDevelop.Ide.Gui.Components
 				UnsafeAddText (null, Environment.NewLine, null);
 			}
 
-			monitor.Marker = buffer.CreateMark (name, buffer.EndIter, false);
+			var marker = buffer.CreateMark (name, buffer.EndIter, false);
+			if (monitor != null) {
+				monitor.Marker = marker;
+			}
 			UnsafeAddText (null, Environment.NewLine, null);
 
 			// Move the mark to the line before EndIter, so other text inserted at EndIter
 			// doesn't move this mark.
-			buffer.MoveMark (monitor.Marker, buffer.GetIterAtOffset (buffer.CharCount - 1));
+			buffer.MoveMark (marker, buffer.GetIterAtOffset (buffer.CharCount - 1));
 		}
-		
+
 		public void BeginTask (string name, int totalWork)
 		{
 			BeginTask (null, name, totalWork);
@@ -585,7 +588,7 @@ namespace MonoDevelop.Ide.Gui.Components
 			var bt = new QueuedBeginTask (monitor, name, totalWork);
 			addQueuedUpdate (bt);
 		}
-		
+
 		public void EndTask ()
 		{
 			EndTask (null);
@@ -600,8 +603,10 @@ namespace MonoDevelop.Ide.Gui.Components
 		protected void UnsafeEndTask (LogViewProgressMonitor monitor)
 		{
 			if (indents.Count > 0 && indents.Pop () != null) {
-				buffer.TagTable.Remove (monitor.Indent.IndentTag);
-				monitor.Indent.Unindent ();
+				if (monitor != null) {
+					buffer.TagTable.Remove (monitor.Indent.IndentTag);
+					monitor.Indent.Unindent ();
+				}
 			}
 		}
 
@@ -736,7 +741,7 @@ namespace MonoDevelop.Ide.Gui.Components
 
 			public override void Execute (LogView pad)
 			{
-				pad.UnsafeAddText (Monitor.Marker, Text.ToString (), Tag);
+				pad.UnsafeAddText (Monitor?.Marker, Text.ToString (), Tag);
 			}
 			
 			public QueuedTextWrite (LogViewProgressMonitor monitor, string text, TextTag tag)
@@ -840,7 +845,7 @@ namespace MonoDevelop.Ide.Gui.Components
 
 			if (clearConsole)
 				outputPad.Clear ();
-			internalLogger.TextWritten += outputPad.WriteConsoleLogText;
+			internalLogger.TextWritten += WriteConsoleLogText;
 			console = new LogViewProgressConsole (this);
 		}
 
@@ -879,6 +884,11 @@ namespace MonoDevelop.Ide.Gui.Components
 			base.OnEndTask (name, totalWork, stepWork);
 		}
 
+		void WriteConsoleLogText (string text)
+		{
+			outputPad.WriteConsoleLogText (this, text);
+		}
+
 		Exception GetDisposedException ()
 		{
 			return new InvalidOperationException ("Output progress monitor already disposed.");
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
index ff34746672..375e33b18d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
@@ -40,13 +40,15 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 {
 	public static class ProgressHelper
 	{
-		public static void ShowResultDialog (this ProgressMonitor monitor)
+		public static void ShowResultDialog (this ProgressMonitor monitor) => ShowResultDialog (monitor, null);
+
+		public static void ShowResultDialog (this ProgressMonitor monitor, MonoDevelop.Components.Window parent)
 		{
 			if (monitor.Errors.Length == 1 && !monitor.HasWarnings) {
-				MessageService.ShowError (monitor.Errors [0].Message, monitor.Errors [0].Exception);
+				MessageService.ShowError (parent, monitor.Errors [0].Message, null, monitor.Errors [0].Exception);
 			}
 			else if (!monitor.HasErrors && monitor.Warnings.Length == 1) {
-				MessageService.ShowWarning (monitor.Warnings[0]);
+				MessageService.ShowWarning (parent, monitor.Warnings[0]);
 			}
 			else if (monitor.HasErrors || monitor.HasWarnings) {
 				using (var resultDialog = new MultiMessageDialog () {
@@ -56,7 +58,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 						resultDialog.AddError (m.DisplayMessage);
 					foreach (var m in monitor.Warnings)
 						resultDialog.AddWarning (m);
-					MessageService.ShowCustomDialog (resultDialog);
+					MessageService.ShowCustomDialog (resultDialog, parent);
 				}
 			}
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MessageDialogProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MessageDialogProgressMonitor.cs
index 9c0d1bf7a5..3e606b20c7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MessageDialogProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MessageDialogProgressMonitor.cs
@@ -137,8 +137,8 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 			
 			if (showDetails)
 				return;
-			
-			this.ShowResultDialog ();
+
+			this.ShowResultDialog (hideWhenDone ? MessageService.RootWindow : dialog);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am
index c9cc87438f..ab6bc88576 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am
@@ -1 +1,4 @@
 include $(top_srcdir)/xbuild.include
+
+SUBDIRS = \
+	MonoDevelop.Projects.MSBuild.Shared
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile.am b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/core/MonoDevelop.Startup/Makefile.am b/main/src/core/MonoDevelop.Startup/Makefile.am
index deb0ebdaf3..71cf1aec64 100644
--- a/main/src/core/MonoDevelop.Startup/Makefile.am
+++ b/main/src/core/MonoDevelop.Startup/Makefile.am
@@ -1 +1,4 @@
-include $(top_srcdir)/xbuild.include
\ No newline at end of file
+include $(top_srcdir)/xbuild.include
+
+EXTRA_DIST += \
+	app.manifest
diff --git a/main/tests/Makefile.am b/main/tests/Makefile.am
index e5b1f244d2..8c7a05944a 100644
--- a/main/tests/Makefile.am
+++ b/main/tests/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/xbuild.include
 
-SUBDIRS=UnitTests MacPlatform.Tests UserInterfaceTests TestRunner Ide.Tests MonoDevelop.CSharpBinding.Tests
+SUBDIRS=UnitTests MacPlatform.Tests UserInterfaceTests TestRunner Ide.Tests MonoDevelop.CSharpBinding.Tests WindowsPlatform.Tests MonoDevelop.Core.Tests MonoDevelop.Refactoring.Tests
 
 MONO=mono$(SGEN_SUFFIX)
 RUN_TEST=$(MDTOOL_RUN) run-md-tests
diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding/CSharpCompletionTextEditorTests.cs b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding/CSharpCompletionTextEditorTests.cs
index f5bb529882..770e747fcf 100644
--- a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding/CSharpCompletionTextEditorTests.cs
+++ b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding/CSharpCompletionTextEditorTests.cs
@@ -201,5 +201,16 @@ namespace console61
 				project.Dispose ();
 			}
 		}
+
+		/// <summary>
+		/// Bug 568065: Multiple identical entries for Tuple in completion list
+		/// </summary>
+		[Test]
+		public async Task TestVSTSBug568065 ()
+		{
+			IdeApp.Preferences.AddImportedItemsToCompletionList.Value = true;
+			await TestCompletion (@"$", list => Assert.AreEqual (1, list.Where (d => d.CompletionText == "Tuple").Count()));
+
+		}
 	}
 }
diff --git a/main/tests/MonoDevelop.Core.Tests/Makefile.am b/main/tests/MonoDevelop.Core.Tests/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/tests/MonoDevelop.Core.Tests/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/tests/MonoDevelop.Refactoring.Tests/Makefile.am b/main/tests/MonoDevelop.Refactoring.Tests/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/tests/MonoDevelop.Refactoring.Tests/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/tests/WindowsPlatform.Tests/Makefile.am b/main/tests/WindowsPlatform.Tests/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/tests/WindowsPlatform.Tests/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/xbuild.include b/main/xbuild.include
index 5f98a55672..65d3860f94 100644
--- a/main/xbuild.include
+++ b/main/xbuild.include
@@ -60,7 +60,7 @@ sln_clean:
 print_extradist:
 	@echo $(WILDCARDED_FILES)
 
-EXTS:=*.bmp *.cs *.csproj *.html *.png *.snk *.config *.stetic *.glade *.xml *.xsd *.exe.addins *.template *.tt *.txt *.targets *.props *.sh
+EXTS:=*.bmp *.cs *.csproj *.shproj *.projitems *.mdproj *.html *.png *.snk *.config *.stetic *.glade *.xml *.xsd *.exe.addins *.template *.tt *.txt *.targets *.props *.sh
 
 ALL_FILES:=	$(EXTS) \
 		$(addprefix */,$(EXTS))		\
@@ -69,6 +69,7 @@ ALL_FILES:=	$(EXTS) \
 		$(addprefix */*/*/*/,$(EXTS))	\
 		$(addprefix */*/*/*/*/,$(EXTS))	\
 		$(wildcard icons/*)		\
+		$(wildcard themes/*)		\
 		$(wildcard templates/*)
 
 WILDCARDED_FILES:=$(wildcard $(ALL_FILES))
diff --git a/version-checks b/version-checks
index 749b9eca19..848d10735b 100755
--- a/version-checks
+++ b/version-checks
@@ -17,7 +17,7 @@ DEP[0]=md-addins
 DEP_NAME[0]=MDADDINS
 DEP_PATH[0]=${top_srcdir}/../md-addins
 DEP_MODULE[0]=git@github.com:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=6582947335a7660ed0c39d9a19f8882c45a2a740
+DEP_NEEDED_VERSION[0]=940b03fe3ff53201ce1e19b241671be5483104bd
 DEP_BRANCH_AND_REMOTE[0]="master origin/master"
 
 # heap-shot