Merge vNext into roslyn-ivt

# Conflicts:
#	main/external/debugger-libs
#	main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
#	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
#	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
#	main/src/core/MonoDevelop.Ide/packages.config
#	version-checks

2 files changed, 26 insertions, 2 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
index a356ab36fe..5b1bc7cce5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
@@ -472,7 +472,7 @@ namespace MonoDevelop.Components.MainToolbar
 				}
 
 				var target = item.ExecutionTarget;
-				if (target == null || !target.Enabled || item.Project != project)
+				if (target == null || item.Project != project)
 					continue;
 
 				if (target is ExecutionTargetGroup)
@@ -977,6 +977,18 @@ namespace MonoDevelop.Components.MainToolbar
 
 			public SolutionItem Project { get; }
 
+			public string Image {
+				get {
+					return ExecutionTarget?.Image;
+				}
+			}
+
+			public string Tooltip {
+				get {
+					return ExecutionTarget?.Tooltip;
+				}
+			}
+
 			public IRuntimeMutableModel GetMutableModel ()
 			{
 				if (Command != null)
@@ -1006,7 +1018,7 @@ namespace MonoDevelop.Components.MainToolbar
 
 			public RuntimeMutableModel (ExecutionTarget target, bool fullName)
 			{
-				Enabled = !(target is ExecutionTargetGroup);
+				Enabled = !(target is ExecutionTargetGroup) && target.Enabled;
 				Visible = true;
 				if (target == null)
 					DisplayString = FullDisplayString = string.Empty;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs
index 280e33fdac..3330c0f5d0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs
@@ -84,6 +84,18 @@ namespace MonoDevelop.Components.MainToolbar
 		bool Notable { get; }
 
 		/// <summary>
+		/// Gets the menu item's image.
+		/// </summary>
+		/// <value>The image name.</value>
+		string Image { get; }
+
+		/// <summary>
+		/// Gets the menu item's tooltip.
+		/// </summary>
+		/// <value>The tooltip text</value>
+		string Tooltip { get; }
+
+		/// <summary>
 		/// Gets the project to which this runtime belongs.
 		/// </summary>
 		/// <value>The project.</value>