From 5c84fa09c7d14b890a1a643de2a4612d62f212c1 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <jestedfa@microsoft.com>
Date: Tue, 16 Jul 2019 12:10:27 -0400
Subject: [Debugger] Log telemetry for async ops that stall out

Needed for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/802365/
---
 .../MonoDevelop.Debugger/Counters.cs                    |  1 +
 .../MonoDevelop.Debugger/DebuggingService.cs            | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Counters.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Counters.cs
index 4fed6bfbab..c8fd7030f7 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Counters.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Counters.cs
@@ -35,6 +35,7 @@ namespace MonoDevelop.Debugger
 		public static Counter EvaluationStats = InstrumentationService.CreateCounter ("Evaluation Statistics", "Debugger", id: "Debugger.EvaluationStatistics");
 		public static TimerCounter<DebuggerStartMetadata> DebuggerStart = InstrumentationService.CreateTimerCounter<DebuggerStartMetadata> ("Debugger Start", "Debugger", id: "Debugger.Start");
 		public static TimerCounter<DebuggerActionMetadata> DebuggerAction = InstrumentationService.CreateTimerCounter<DebuggerActionMetadata> ("Debugger Action", "Debugger", id: "Debugger.Action");
+		public static Counter DebuggerBusy = InstrumentationService.CreateCounter ("Debugger Busy", "Debugger", id: "Debugger.Busy");
 	}
 
 	class DebuggerStartMetadata : CounterMetadata
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 9e19487fc4..7f9ec70c8e 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -905,6 +905,23 @@ namespace MonoDevelop.Debugger
 			await Runtime.RunInMainThread (delegate {
 				busyEvaluator.UpdateBusyState (args);
 				if (args.IsBusy) {
+					var session = (DebuggerSession) s;
+
+					if (sessions.TryGetValue (session, out var manager)) {
+						var metadata = new Dictionary<string, object> {
+							["DebuggerType"] = manager.Engine.Id,
+							["Debugger.AsyncOperation.Description"] = args.Description,
+							["Debugger.EvaluationOptions.AllowDisplayStringEvaluation"] = args.EvaluationContext.Options.AllowDisplayStringEvaluation,
+							["Debugger.EvaluationOptions.AllowMethodEvaluation"] = args.EvaluationContext.Options.AllowMethodEvaluation,
+							["Debugger.EvaluationOptions.AllowTargetInvoke"] = args.EvaluationContext.Options.AllowTargetInvoke,
+							["Debugger.EvaluationOptions.AllowToString"] = args.EvaluationContext.Options.AllowToStringCalls,
+							["Debugger.EvaluationOptions.ChunkRawStrings"] = args.EvaluationContext.Options.ChunkRawStrings,
+							["Debugger.EvaluationOptions.EvaluationTimeout"] = args.EvaluationContext.Options.EvaluationTimeout,
+						};
+
+						Counters.DebuggerBusy.Inc (1, null, metadata);
+					}
+
 					if (busyStatusIcon == null) {
 						busyStatusIcon = IdeApp.Workbench.StatusBar.ShowStatusIcon (ImageService.GetIcon ("md-bug", Gtk.IconSize.Menu));
 						busyStatusIcon.SetAlertMode (100);
-- 
cgit v1.2.3


From a4547b579661f7d3df238e556e2f778a838122c8 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <jestedfa@microsoft.com>
Date: Wed, 17 Jul 2019 10:12:08 -0400
Subject: Update
 main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs

Co-Authored-By: Marius Ungureanu <marius.ungureanu@xamarin.com>
---
 .../MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 7f9ec70c8e..5ed2950d2e 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -914,7 +914,7 @@ namespace MonoDevelop.Debugger
 							["Debugger.EvaluationOptions.AllowDisplayStringEvaluation"] = args.EvaluationContext.Options.AllowDisplayStringEvaluation,
 							["Debugger.EvaluationOptions.AllowMethodEvaluation"] = args.EvaluationContext.Options.AllowMethodEvaluation,
 							["Debugger.EvaluationOptions.AllowTargetInvoke"] = args.EvaluationContext.Options.AllowTargetInvoke,
-							["Debugger.EvaluationOptions.AllowToString"] = args.EvaluationContext.Options.AllowToStringCalls,
+							["Debugger.EvaluationOptions.AllowToStringCalls"] = args.EvaluationContext.Options.AllowToStringCalls,
 							["Debugger.EvaluationOptions.ChunkRawStrings"] = args.EvaluationContext.Options.ChunkRawStrings,
 							["Debugger.EvaluationOptions.EvaluationTimeout"] = args.EvaluationContext.Options.EvaluationTimeout,
 						};
@@ -1439,9 +1439,9 @@ namespace MonoDevelop.Debugger
 				if (typeSymbol != null && (arity == 0 || arity == typeSymbol.Arity)) {
 					return symbol;
 				}
-				var namespaceSymbol = symbol as Microsoft.CodeAnalysis.INamespaceSymbol;
-				if (namespaceSymbol != null) {
-					return namespaceSymbol;
+				var namespaceSymbol = symbol as Microsoft.CodeAnalysis.INamespaceSymbol;
+				if (namespaceSymbol != null) {
+					return namespaceSymbol;
 				}
 			}
 			return null;
-- 
cgit v1.2.3


From 946215fe4261df2d9c9ff6fee3153f24f462147e Mon Sep 17 00:00:00 2001
From: Vsevolod Kukol <sevoku@microsoft.com>
Date: Thu, 18 Jul 2019 14:40:32 +0200
Subject: [Ide][Mac] Add Help button support to MessageService

---
 .../MacPlatform/Dialogs/MacAlertDialogHandler.cs   | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
index add27baa1b..a117c39102 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
@@ -42,6 +42,23 @@ using MonoDevelop.Components.AtkCocoaHelper;
 
 namespace MonoDevelop.MacIntegration
 {
+	sealed class AlertDelegate : NSAlertDelegate
+	{
+		readonly string HelpUrl;
+		public AlertDelegate (string helpUrl)
+		{
+			HelpUrl = helpUrl;
+		}
+
+		public override bool ShowHelp (NSAlert alert)
+		{
+			if (!string.IsNullOrEmpty (HelpUrl)) {
+				IdeServices.DesktopService.ShowUrl (HelpUrl);
+			}
+			return true;
+		}
+	}
+
 	class MacAlertDialogHandler : IAlertDialogHandler
 	{
 		public bool Run (AlertDialogData data)
@@ -78,6 +95,11 @@ namespace MonoDevelop.MacIntegration
 
 				alert.MessageText = data.Message.Text;
 
+				if (!string.IsNullOrEmpty (data.Message.HelpUrl)) {
+					alert.Delegate = new AlertDelegate (data.Message.HelpUrl);
+					alert.ShowsHelp = true;
+				}
+
 				int accessoryViewItemsCount = data.Options.Count;
 
 				string secondaryText = data.Message.SecondaryText ?? string.Empty;
-- 
cgit v1.2.3


From 8b8bcbf96b4632d4382ff7a6e6da0d71505e7b50 Mon Sep 17 00:00:00 2001
From: Mikayla Hutchinson <m.j.hutchinson@gmail.com>
Date: Thu, 18 Jul 2019 15:17:17 -0400
Subject: Map ShrinkSelection for new editor

And map ExpandSelection properly
---
 .../MonoDevelop.TextEditor/Properties/MonoDevelop.TextEditor.addin.xml | 3 +++
 .../MonoDevelop.TextEditor/TextViewContent.Commands.cs                 | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/Properties/MonoDevelop.TextEditor.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/Properties/MonoDevelop.TextEditor.addin.xml
index 977ce7d472..969f61f267 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/Properties/MonoDevelop.TextEditor.addin.xml
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/Properties/MonoDevelop.TextEditor.addin.xml
@@ -152,6 +152,9 @@
 		<Map id="MonoDevelop.Ide.Commands.EditCommands.ToggleAllFoldings" argsType="Microsoft.VisualStudio.Text.Editor.Commanding.Commands.ToggleAllOutliningCommandArgs" />
 		<Map id="MonoDevelop.Ide.Commands.EditCommands.FoldDefinitions" argsType="Microsoft.VisualStudio.Text.Editor.Commanding.Commands.ToggleOutliningDefinitionsCommandArgs" />
 		<Map id="MonoDevelop.Ide.Commands.EditCommands.EnableDisableFolding" argsType="Microsoft.VisualStudio.Text.Editor.Commanding.Commands.ToggleOutliningEnabledCommandArgs" />
+
+		<Map id="MonoDevelop.Ide.Commands.TextEditorCommands.ExpandSelection" argsType="Microsoft.VisualStudio.Text.Editor.Commanding.Commands.ExpandSelectionCommandArgs" />
+		<Map id="MonoDevelop.Ide.Commands.TextEditorCommands.ShrinkSelection" argsType="Microsoft.VisualStudio.Text.Editor.Commanding.Commands.ContractSelectionCommandArgs" />
 	</Extension>
 
 	<!--
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs
index bb7f8ea4ec..869774abef 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs
@@ -95,7 +95,6 @@ namespace MonoDevelop.TextEditor
 			[TextEditorCommands.MovePrevWord] = op => op.MoveToPreviousWord (extendSelection: false),
 			[TextEditorCommands.MoveNextWord] = op => op.MoveToNextWord (extendSelection: false),
 
-			[TextEditorCommands.ExpandSelection] = op => op.SelectEnclosing (),
 			[TextEditorCommands.ExpandSelectionToLine] = op => op.MoveToEndOfLine (extendSelection: true),
 
 			[TextEditorCommands.SelectionMoveLeft] = op => op.MoveToPreviousCharacter (extendSelection: true),
-- 
cgit v1.2.3


From d084f0da04ef9a6cebc1dc38605ccc7e0f779a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Kr=C3=BCger?= <mikkrg@microsoft.com>
Date: Fri, 19 Jul 2019 08:05:32 +0200
Subject: Fixes VSTS Bug 948635: [Feedback] Tab doesn't work in text files

https://devdiv.visualstudio.com/DevDiv/_workitems/edit/948635

EditorExtension no longer works on that level - it's moved to IDE
TextEditor for handling. Using the TextEditor from the document is
safer.
---
 .../MonoDevelop.SourceEditor/ExtensibleTextEditor.cs              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
index dcafc9625b..42e3275c59 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
@@ -550,8 +550,12 @@ namespace MonoDevelop.SourceEditor
 				LoggingService.LogError ("DoInsertTemplate(): Can't find valid document");
 				return false;
 			}
-
-			return DoInsertTemplate (EditorExtension.Editor, doc.DocumentContext);
+			try {
+				return DoInsertTemplate (doc.Editor, doc.DocumentContext);
+			} catch (Exception e) {
+				LoggingService.LogInternalError ($"Error while trying to insert template: Editor={doc.Editor}, Ctx={doc.DocumentContext}.", e);
+				return false;
+			}
 		}
 
 		public bool DoInsertTemplate (TextEditor editor, DocumentContext ctx)
-- 
cgit v1.2.3


From bd3cab4de1b12b474363435258ae4bda7f6390fe Mon Sep 17 00:00:00 2001
From: therzok <marius.ungureanu@xamarin.com>
Date: Sun, 21 Jul 2019 05:44:13 +0300
Subject: [DotNetCore] Remove unused file

---
 .../MonoDevelop.DotNetCore.csproj                  |  1 -
 .../MonoDevelop.DotNetCore/FilePathExtensions.cs   | 49 ----------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/FilePathExtensions.cs

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
index 2a1c0e630c..01aa705bac 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
@@ -39,7 +39,6 @@
     <Compile Include="MonoDevelop.DotNetCore\TargetFrameworkExtensions.cs" />
     <Compile Include="MonoDevelop.DotNetCore\DummyMSBuildOptionsPanel.cs" />
     <Compile Include="MonoDevelop.DotNetCore\TargetFrameworkMonikerExtensions.cs" />
-    <Compile Include="MonoDevelop.DotNetCore\FilePathExtensions.cs" />
     <Compile Include="MonoDevelop.DotNetCore.NodeBuilders\ProjectDependenciesNode.cs" />
     <Compile Include="MonoDevelop.DotNetCore\ProjectReferenceExtensions.cs" />
     <Compile Include="MonoDevelop.DotNetCore.NodeBuilders\ProjectDependenciesNodeBuilder.cs" />
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/FilePathExtensions.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/FilePathExtensions.cs
deleted file mode 100644
index 4c065a5a99..0000000000
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/FilePathExtensions.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// FilePathExtensions.cs
-//
-// Author:
-//       Matt Ward <matt.ward@xamarin.com>
-//
-// Copyright (c) 2017 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using MonoDevelop.Core;
-
-namespace MonoDevelop.DotNetCore
-{
-	static class FilePathExtensions
-	{
-		public static bool HasSupportedDotNetCoreProjectFileExtension (this FilePath file)
-		{
-			return file.HasExtension (".csproj") || file.HasExtension (".fsproj") || file.HasExtension (".vbproj");
-		}
-
-		/// <summary>
-		/// HACK: Hide certain files in Solution window. The solution's .userprefs
-		/// file is the only file is included properly with the .NET Core MSBuild
-		/// targets.
-		/// </summary>
-		public static bool ShouldBeHidden (this FilePath file)
-		{
-			return file.HasExtension (".userprefs") ||
-				file.FileName == ".DS_Store";
-		}
-	}
-}
-- 
cgit v1.2.3


From e64963ed91d983750beb2424950959eea269c999 Mon Sep 17 00:00:00 2001
From: therzok <marius.ungureanu@xamarin.com>
Date: Sun, 21 Jul 2019 22:43:35 +0300
Subject: [Linux] Attempt to fix unquoted mono on PATH breaking running

Possibly Fixes #8202
---
 main/src/addins/GnomePlatform/GnomePlatform.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/GnomePlatform/GnomePlatform.cs b/main/src/addins/GnomePlatform/GnomePlatform.cs
index d24bd6f705..f597e4a930 100644
--- a/main/src/addins/GnomePlatform/GnomePlatform.cs
+++ b/main/src/addins/GnomePlatform/GnomePlatform.cs
@@ -231,7 +231,7 @@ namespace MonoDevelop.Platform
 				? BashPause
 				: String.Empty;
 			
-			return String.Format (@" -title ""{4}"" -e bash -c ""cd {3} ; '{0}' {1} ; {2}""",
+			return String.Format (@" -title ""{4}"" -e bash -c ""cd {3} ; '""{0}""' {1} ; {2}""",
 				command,
 				EscapeArgs (args),
 				extra_commands,
@@ -259,7 +259,7 @@ namespace MonoDevelop.Platform
 				? BashPause.Replace ("'", "\"")
 					: String.Empty;
 
-			return String.Format (@" --nofork --workdir=""{3}"" -e ""bash"" -c '{0} {1} ; {2}'",
+			return String.Format (@" --nofork --workdir=""{3}"" -e ""bash"" -c '""{0}"" {1} ; {2}'",
 			                      command,
 			                      args,
 			                      extra_commands,
-- 
cgit v1.2.3


From c6950692db6d26daf06d3d555f124e39e3dfb749 Mon Sep 17 00:00:00 2001
From: Jose Miguel Torres <jostor@microsoft.com>
Date: Wed, 24 Jul 2019 08:20:34 -0400
Subject: [dotnetcore] Turns SDK Not Installed Dialog into a Infobar

---
 .../MonoDevelop.DotNetCore.csproj                  |  2 +-
 .../DotNetCoreNotInstalledDialog.cs                | 95 ----------------------
 .../DotNetCoreNotInstalledInfoBar.cs               | 63 ++++++++++++++
 .../DotNetCoreProjectExtension.cs                  | 25 +++---
 .../MonoDevelop.DotNetCore/DotNetCoreSdk.cs        |  6 +-
 5 files changed, 80 insertions(+), 111 deletions(-)
 delete mode 100644 main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs
 create mode 100644 main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledInfoBar.cs

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
index 01aa705bac..bb1c502dc0 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
@@ -26,7 +26,7 @@
     <Compile Include="MonoDevelop.DotNetCore\DotNetCorePath.cs" />
     <Compile Include="MonoDevelop.DotNetCore\DotNetCoreExecutionHandler.cs" />
     <Compile Include="MonoDevelop.DotNetCore.Templating\DotNetCoreProjectTemplateWizard.cs" />
-    <Compile Include="MonoDevelop.DotNetCore\DotNetCoreNotInstalledDialog.cs" />
+    <Compile Include="MonoDevelop.DotNetCore\DotNetCoreNotInstalledInfoBar.cs" />
     <Compile Include="MonoDevelop.DotNetCore\DotNetCoreSdkPaths.cs" />
     <Compile Include="MonoDevelop.DotNetCore\DotNetCoreCanReferenceProjectExtension.cs" />
     <Compile Include="MonoDevelop.DotNetCore\DotNetCliToolReference.cs" />
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs
deleted file mode 100644
index 9fb149f4f3..0000000000
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// DotNetCoreNotInstalledDialog.cs
-//
-// Author:
-//       Matt Ward <matt.ward@xamarin.com>
-//
-// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
-using System;
-
-namespace MonoDevelop.DotNetCore
-{
-	class DotNetCoreNotInstalledDialog : IDisposable
-	{
-		static readonly string defaultMessage = GettextCatalog.GetString (".NET Core SDK is not installed. This is required to build and run .NET Core projects.");
-
-		GenericMessage message;
-		AlertButton downloadButton;
-		string downloadUrl = DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl ();
-
-		public DotNetCoreNotInstalledDialog ()
-		{
-			Build ();
-		}
-
-		void Build ()
-		{
-			message = new GenericMessage {
-				Text = defaultMessage,
-				DefaultButton = 1,
-				Icon = Stock.Information
-			};
-
-			downloadButton = new AlertButton (GettextCatalog.GetString ("Download .NET Core..."));
-			message.Buttons.Add (AlertButton.Cancel);
-			message.Buttons.Add (downloadButton);
-
-			message.AlertButtonClicked += AlertButtonClicked;
-		}
-
-		void AlertButtonClicked (object sender, AlertButtonEventArgs e)
-		{
-			if (e.Button == downloadButton)
-				IdeServices.DesktopService.ShowUrl (downloadUrl);
-		}
-
-		public void Dispose ()
-		{
-			message.AlertButtonClicked -= AlertButtonClicked;
-		}
-
-		public void Show ()
-		{
-			if (IsUnsupportedVersion || IsNetStandard) //for .net standard we'll show generic message
-				Message = DotNetCoreSdk.GetNotSupportedVersionMessage ();
-			else {
-				Message = DotNetCoreSdk.GetNotSupportedVersionMessage (RequiredDotNetCoreVersion.OriginalString);
-				downloadUrl = DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (RequiredDotNetCoreVersion);
-			}
-
-			MessageService.GenericAlert (message);
-		}
-
-		public string Message {
-			get { return message.Text; }
-			set { message.Text = value; }
-		}
-
-		public bool IsUnsupportedVersion { get; set; }
-		public bool IsNetStandard { get; set; }
-		public DotNetCoreVersion RequiredDotNetCoreVersion { get; set; }
-		public string CurrentDotNetCorePath { get; set; }
-	}
-}
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledInfoBar.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledInfoBar.cs
new file mode 100644
index 0000000000..dd4578c87d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledInfoBar.cs
@@ -0,0 +1,63 @@
+//
+// DotNetCoreNotInstalledInfoBar.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui.Components;
+
+namespace MonoDevelop.DotNetCore
+{
+	class DotNetCoreNotInstalledInfoBar
+	{
+		string downloadUrl = DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl ();
+
+		public string Message { get; set; }
+		public bool IsUnsupportedVersion { get; set; }
+		public bool IsNetStandard { get; set; }
+		public DotNetCoreVersion RequiredDotNetCoreVersion { get; set; }
+		public string CurrentDotNetCorePath { get; set; }
+
+		public void Prompt ()
+		{
+			var items = new InfoBarItem [] {
+				new InfoBarItem (GettextCatalog.GetString ("Download .NET Core"), InfoBarItemKind.Button, DownloadButtonClicked, true)
+				};
+			
+			if (IsUnsupportedVersion || IsNetStandard || RequiredDotNetCoreVersion == null) //for .net standard we'll show generic message
+				Message = DotNetCoreSdk.GetNotSupportedVersionMessage ();
+			else {
+				Message = DotNetCoreSdk.GetNotSupportedVersionMessage (RequiredDotNetCoreVersion.OriginalString);
+				downloadUrl = DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (RequiredDotNetCoreVersion);
+			}
+
+			IdeApp.Workbench.ShowInfoBar (false, new InfoBarOptions (Message) {
+				Items = items
+			});
+		}
+
+		void DownloadButtonClicked () => IdeServices.DesktopService.ShowUrl (downloadUrl);
+	}
+}
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs
index df43588e79..217a718ff0 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs
@@ -194,10 +194,7 @@ namespace MonoDevelop.DotNetCore
 		Task ShowCannotExecuteDotNetCoreApplicationDialog ()
 		{
 			return Runtime.RunInMainThread (() => {
-				using (var dialog = new DotNetCoreNotInstalledDialog ()) {
-					dialog.Message = GettextCatalog.GetString (".NET Core is required to run this application.");
-					dialog.Show ();
-				}
+				CreateInfoBarInstance ().Prompt ();
 			});
 		}
 
@@ -206,19 +203,23 @@ namespace MonoDevelop.DotNetCore
 			return Runtime.RunInMainThread (() => {
 				if (ShownDotNetCoreSdkNotInstalledDialogForSolution ())
 					return;
-					
+
 				Project.ParentSolution.ExtendedProperties [ShownDotNetCoreSdkInstalledExtendedPropertyName] = "true";
 
-				using (var dialog = new DotNetCoreNotInstalledDialog ()) {
-					dialog.IsUnsupportedVersion = unsupportedSdkVersion;
-					dialog.RequiredDotNetCoreVersion = DotNetCoreVersion.Parse (Project.TargetFramework.Id.Version);
-					dialog.CurrentDotNetCorePath = sdkPaths.MSBuildSDKsPath;
-					dialog.IsNetStandard = Project.TargetFramework.Id.IsNetStandard ();
-					dialog.Show ();
-				}
+				CreateInfoBarInstance (unsupportedSdkVersion).Prompt ();
 			});
 		}
 
+		DotNetCoreNotInstalledInfoBar CreateInfoBarInstance (bool unsupportedSdkVersion = false)
+		{
+			return new DotNetCoreNotInstalledInfoBar {
+				IsUnsupportedVersion = unsupportedSdkVersion,
+				RequiredDotNetCoreVersion = DotNetCoreVersion.Parse (Project.TargetFramework.Id.Version),
+				CurrentDotNetCorePath = sdkPaths.MSBuildSDKsPath,
+				IsNetStandard = Project.TargetFramework.Id.IsNetStandard ()
+			};
+		}
+
 		bool ShownDotNetCoreSdkNotInstalledDialogForSolution ()
 		{
 			return Project.ParentSolution.ExtendedProperties.Contains (ShownDotNetCoreSdkInstalledExtendedPropertyName);
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
index 60028713d4..50992bf057 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
@@ -184,10 +184,10 @@ namespace MonoDevelop.DotNetCore
 		{
 			string GetMessage (DotNetCoreVersion currentVersion)
 			{
-				return GettextCatalog.GetString ("NET Core {0}.{1} SDK version {2} is not compatible with this version of Visual Studio for Mac. Install the latest update to the .NET Core {0}.{1} SDK by visiting {3}.", currentVersion.Major, currentVersion.Minor, currentVersion.ToString (), DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (currentVersion));
+				return GettextCatalog.GetString (".NET Core {0}.{1} SDK version {2} is not compatible with this version of Visual Studio for Mac. Install the latest update to the .NET Core {0}.{1} SDK by visiting {3}", currentVersion.Major, currentVersion.Minor, currentVersion.ToString (), DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (currentVersion));
 			}
 
-			var installedVersion = Versions.OrderByDescending (x => x).FirstOrDefault ();
+			var installedVersion = Versions?.OrderByDescending (x => x).FirstOrDefault ();
 			if (installedVersion != null) {
 				if (installedVersion < DotNetCoreVersion.MinimumSupportedSdkVersion) {
 					return GetMessage (installedVersion);
@@ -198,7 +198,7 @@ namespace MonoDevelop.DotNetCore
 				}
 			}
 
-			return GettextCatalog.GetString (".NET Core {0} SDK is required to build this application, and is not installed. Install the latest update to the .NET Core {0} SDK by visiting {1}.", version, DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (version));
+			return GettextCatalog.GetString (".NET Core {0} SDK is required to build this application, and is not installed. Install the latest update to the .NET Core {0} SDK by visiting {1}", version, DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (version));
 		}
 	}
 }
-- 
cgit v1.2.3


From dc2139c1c55e12620313ed8cb07b5cf6c7907535 Mon Sep 17 00:00:00 2001
From: nosami <jasonimison@gmail.com>
Date: Tue, 23 Jul 2019 21:35:19 +0100
Subject: Use support assemblies when trying to resolve

Support assemblies should always be used if they have already
been loaded.

Fixes UI tests when running locally.
---
 .../NUnit3Runner/NUnitTestRunner.cs                              | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnitTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnitTestRunner.cs
index 903745c6b0..2b1e9e1c16 100644
--- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnitTestRunner.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnitTestRunner.cs
@@ -56,6 +56,7 @@ namespace NUnit3Runner
 		{
 			engine = TestEngineActivator.CreateInstance ();
 			filterService = engine.Services.GetService<ITestFilterService>();
+			AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
 		}
 
 		[MessageHandler]
@@ -223,7 +224,13 @@ namespace NUnit3Runner
 				}
 			}
 		}
-		
+
+		Assembly CurrentDomain_AssemblyResolve (object sender, ResolveEventArgs args)
+		{
+			var name = new AssemblyName (args.Name);
+			return AppDomain.CurrentDomain.GetAssemblies ().FirstOrDefault (a => AssemblyName.ReferenceMatchesDefinition (name, a.GetName ()));
+		}
+
 		private TestFilter CreateTestFilter (string[] nameFilter)
 		{
 			ITestFilterBuilder builder = filterService.GetTestFilterBuilder();
-- 
cgit v1.2.3


From c6af3e627a728356c3ae44d2c35806862feaf583 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Wed, 17 Jul 2019 17:57:19 +0200
Subject: [AspNetCore] Add support for browsers as execution targets

---
 .../MonoDevelop.AspNetCore.csproj                  |  1 +
 .../AspNetCoreExecutionTarget.cs                   | 45 ++++++++++++++++++++++
 .../AspNetCoreProjectExtension.cs                  | 16 ++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj
index ba66ded95c..986ea86ede 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj
@@ -46,6 +46,7 @@
     <Compile Include="MonoDevelop.AspNetCore\LaunchProfileDataExtensions.cs" />
     <Compile Include="MonoDevelop.AspNetCore\LaunchProfileProvider.cs" />
     <Compile Include="MonoDevelop.AspNetCore\AspNetCoreNestingRulesProvider.cs" />
+    <Compile Include="MonoDevelop.AspNetCore\AspNetCoreExecutionTarget.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\MonoDevelop.AspNetCore.addin.xml" />
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs
new file mode 100644
index 0000000000..2b787a3517
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs
@@ -0,0 +1,45 @@
+//
+// AspNetCoreExecutionTarget.cs
+//
+// Author:
+//       Rodrigo Moya <rodrigo.moya@xamarin.com>
+//
+// Copyright (c) 2019 Microsoft, Inc. (http://www.microsoft.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core.Execution;
+using MonoDevelop.Ide.Desktop;
+
+namespace MonoDevelop.AspNetCore
+{
+	class AspNetCoreExecutionTarget : ExecutionTarget
+	{
+		readonly DesktopApplication desktopApplication;
+
+		internal AspNetCoreExecutionTarget (DesktopApplication desktopApplication)
+		{
+			this.desktopApplication = desktopApplication;
+		}
+
+		public override string Name => desktopApplication.DisplayName;
+
+		public override string Id => desktopApplication.Id;
+	}
+}
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs
index ae503d3388..4c05b87f32 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs
@@ -24,8 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using GLib;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.DotNetCore;
@@ -100,6 +102,20 @@ namespace MonoDevelop.AspNetCore
 			return base.OnExecute (monitor, context, configuration, runConfiguration);
 		}
 
+		protected override IEnumerable<ExecutionTarget> OnGetExecutionTargets (ConfigurationSelector configuration)
+		{
+			var result = new List<ExecutionTarget> ();
+			foreach (var browser in IdeServices.DesktopService.GetApplications ("https://localhost")) {
+				if (browser.IsDefault) {
+					result.Insert (0, new AspNetCoreExecutionTarget (browser));
+				} else {
+					result.Add (new AspNetCoreExecutionTarget (browser));
+				}
+			}
+
+			return result.Count > 0 ? result : base.OnGetExecutionTargets (configuration);
+		}
+
 		async Task CheckCertificateThenExecute (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration, SolutionItemRunConfiguration runConfiguration)
 		{
 			if (AspNetCoreCertificateManager.CheckDevelopmentCertificateIsTrusted (Project, runConfiguration)) {
-- 
cgit v1.2.3


From 4740ce100bad0328d90bdbae638a61d34816e292 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Thu, 18 Jul 2019 13:41:28 +0200
Subject: [MacPlatform] Fix retrieval of installed applications

Also, remove some old CoreFoundation bindings which are not needed
anymore, as same code is available in Xamarin.Mac already.
---
 .../MacPlatform/MacInterop/CoreFoundation.cs       | 70 ----------------------
 main/src/addins/MacPlatform/MacPlatform.cs         | 26 ++++----
 2 files changed, 15 insertions(+), 81 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs b/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs
index e2d4ab8949..8fbdcd6814 100644
--- a/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs
+++ b/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs
@@ -150,75 +150,5 @@ namespace MonoDevelop.MacInterop
 			Shell = 0x00000008,
 			All = 0xFFFFFFFF
 		}
-		
-		public static IntPtr CreatePathUrl (string path)
-		{
-			IntPtr str = IntPtr.Zero;
-			IntPtr url = IntPtr.Zero;
-			try {
-				str = CreateString (path);
-				if (str == IntPtr.Zero)
-					throw new Exception ("CreateString failed");
-				url = CFURLCreateWithFileSystemPath (IntPtr.Zero, str, CFUrlPathStyle.Posix, false);
-				if (url == IntPtr.Zero)
-					throw new Exception ("CFURLCreateWithFileSystemPath failed");
-				return url;
-			} finally {
-				if (str != IntPtr.Zero)
-					Release (str);
-			}
-		}
-		
-		public static string UrlToPath (IntPtr url)
-		{
-			IntPtr str = IntPtr.Zero;
-			try {
-				str = CFURLCopyFileSystemPath (url, CFUrlPathStyle.Posix);
-				return str == IntPtr.Zero? null : FetchString (str);
-			} finally {
-				if (str != IntPtr.Zero)
-					Release (str);
-			}
-		}
-		
-		public static string GetApplicationUrl (string filePath, LSRolesMask roles)
-		{
-			IntPtr url = IntPtr.Zero;
-			try {
-				url = CreatePathUrl (filePath);
-				IntPtr appUrl = IntPtr.Zero;
-				if (LSGetApplicationForURL (url, roles, IntPtr.Zero, ref appUrl) == 0 && appUrl != IntPtr.Zero)
-					return UrlToPath (appUrl);
-				return null;
-			} finally {
-				if (url != IntPtr.Zero)
-					Release (url);
-			}
-		}
-		
-		public static string[] GetApplicationUrls (string filePath, LSRolesMask roles)
-		{
-			IntPtr url = IntPtr.Zero;
-			IntPtr arr = IntPtr.Zero;
-			try {
-				url = CreatePathUrl (filePath);
-				arr = LSCopyApplicationURLsForURL (url, roles);
-				if (arr == IntPtr.Zero)
-					return new string[0];
-				int count = CFArrayGetCount (arr);
-				string[] values = new string [count];
-				for (int i = 0; i < values.Length; i++ ) {
-					var u = CFArrayGetValueAtIndex (arr, i);
-					if (u != IntPtr.Zero)
-						values[i] = UrlToPath (u);
-				}
-				return values;
-			} finally {
-				if (url != IntPtr.Zero)
-					Release (url);
-				if (arr != IntPtr.Zero)
-					Release (arr);
-			}
-		}
 	}
 }
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index 49cadaa103..aa7eea5109 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -980,18 +980,19 @@ namespace MonoDevelop.MacIntegration
 			checkUniqueName.Add ("MonoDevelop");
 			checkUniqueName.Add (BrandingService.ApplicationName);
 
-			string def = MonoDevelop.MacInterop.CoreFoundation.GetApplicationUrl (filename,
-				MonoDevelop.MacInterop.CoreFoundation.LSRolesMask.All);
+			var def = global::CoreServices.LaunchServices.GetDefaultApplicationUrlForUrl (NSUrl.FromString (filename));
 
 			var apps = new List<DesktopApplication> ();
 
-			foreach (var app in MonoDevelop.MacInterop.CoreFoundation.GetApplicationUrls (filename,
-				MonoDevelop.MacInterop.CoreFoundation.LSRolesMask.All)) {
-				if (string.IsNullOrEmpty (app) || !checkUniquePath.Add (app))
-					continue;
-				var name = NSFileManager.DefaultManager.DisplayName (app);
-				if (checkUniqueName.Add (name))
-					apps.Add (new MacDesktopApplication (app, name, def != null && def == app));
+			var retrievedApps = global::CoreServices.LaunchServices.GetApplicationUrlsForUrl (NSUrl.FromString (filename), global::CoreServices.LSRoles.All);
+			if (retrievedApps != null) {
+				foreach (var app in retrievedApps) {
+					if (string.IsNullOrEmpty (app.Path) || !checkUniquePath.Add (app.Path))
+						continue;
+					if (checkUniqueName.Add (app.LastPathComponent)) {
+						apps.Add (new MacDesktopApplication (app.Path, app.LastPathComponent, def != null && def == app));
+					}
+				}
 			}
 
 			apps.Sort ((DesktopApplication a, DesktopApplication b) => {
@@ -1012,8 +1013,11 @@ namespace MonoDevelop.MacIntegration
 
 			public override void Launch (params string[] files)
 			{
-				foreach (var file in files)
-					NSWorkspace.SharedWorkspace.OpenFile (file, Id);
+				NSWorkspace.SharedWorkspace.OpenUrls (
+					files.Select (NSUrl.FromString).ToArray (),
+					NSBundle.FromPath (Id).BundleIdentifier,
+					NSWorkspaceLaunchOptions.Default,
+					NSAppleEventDescriptor.DescriptorWithBoolean (true));
 			}
 		}
 
-- 
cgit v1.2.3


From d0bb1eb20d7fcad630b6cec32c24bb9f9dee1fd6 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Fri, 19 Jul 2019 12:54:49 +0200
Subject: [AspNetCore] Add support for launching any browser other than default

---
 .../AspNetCoreExecutionCommand.cs                    | 20 ++++++++++++++++++--
 .../AspNetCoreExecutionHandler.cs                    | 11 ++++++++---
 .../AspNetCoreExecutionTarget.cs                     | 10 +++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
index 2c1d3c471b..f7077b2cde 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
@@ -24,17 +24,33 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using MonoDevelop.Core.Execution;
 using MonoDevelop.DotNetCore;
 
 namespace MonoDevelop.AspNetCore
 {
-	public class AspNetCoreExecutionCommand : DotNetCoreExecutionCommand
+	public class AspNetCoreExecutionCommand : ProcessExecutionCommand
 	{
 		public AspNetCoreExecutionCommand (string directory, string outputPath, string arguments)
-			: base (directory, outputPath, arguments)
 		{
+			WorkingDirectory = directory;
+			OutputPath = outputPath;
+			DotNetArguments = arguments;
+
+			Command = DotNetCoreRuntime.FileName;
+			Arguments = string.Format ("\"{0}\" {1}", outputPath, arguments);
 		}
 
+		public string OutputPath { get; private set; }
+		public string DotNetArguments { get; private set; }
+
+		public bool PauseConsoleOutput { get; set; }
+		public bool ExternalConsole { get; set; }
+		public bool LaunchBrowser { get; set; }
+		public string LaunchURL { get; set; }
+		public string ApplicationURL { get; set; }
+		public PipeTransportSettings PipeTransport { get; set; }
+
 		// Since we are now supporting more than one url, we added this property
 		// so that it contains the raw value of AppUrl
 		// which might provide more than one url i.e. https://localhost:5000;http://localhost:5001
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
index 1c93be2f29..ec1ae1642f 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
@@ -58,13 +58,14 @@ namespace MonoDevelop.AspNetCore
 				console,
 				envVariables);
 			if (dotNetCoreCommand.LaunchBrowser) {
-				LaunchBrowser (dotNetCoreCommand.ApplicationURL, dotNetCoreCommand.LaunchURL, process.Task).Ignore ();
+				LaunchBrowser (dotNetCoreCommand.ApplicationURL, dotNetCoreCommand.LaunchURL, dotNetCoreCommand.Target, process.Task).Ignore ();
 			}
 			return process;
 		}
 
-		public static async Task LaunchBrowser (string appUrl, string launchUrl, Task processTask)
+		public static async Task LaunchBrowser (string appUrl, string launchUrl, ExecutionTarget target, Task processTask)
 		{
+			var aspNetCoreTarget = target as AspNetCoreExecutionTarget;
 			launchUrl = launchUrl ?? "";
 			Uri launchUri;
 			//Check if lanuchUrl is valid absolute url and use it if it is...
@@ -102,7 +103,11 @@ namespace MonoDevelop.AspNetCore
 			}
 
 			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
-			IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
+			if (aspNetCoreTarget != null && !aspNetCoreTarget.DesktopApplication.IsDefault) {
+				aspNetCoreTarget.DesktopApplication.Launch (launchUri.AbsoluteUri);
+			} else {
+				IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs
index 2b787a3517..86cef8a38e 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionTarget.cs
@@ -31,15 +31,15 @@ namespace MonoDevelop.AspNetCore
 {
 	class AspNetCoreExecutionTarget : ExecutionTarget
 	{
-		readonly DesktopApplication desktopApplication;
-
 		internal AspNetCoreExecutionTarget (DesktopApplication desktopApplication)
 		{
-			this.desktopApplication = desktopApplication;
+			DesktopApplication = desktopApplication;
 		}
 
-		public override string Name => desktopApplication.DisplayName;
+		public override string Name => DesktopApplication.DisplayName;
+
+		public override string Id => DesktopApplication.Id;
 
-		public override string Id => desktopApplication.Id;
+		public DesktopApplication DesktopApplication { get; }
 	}
 }
-- 
cgit v1.2.3


From 48103c130b838ec523fef7922b6418781a64edb4 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Fri, 19 Jul 2019 13:47:04 +0200
Subject: [AspNetCore] Remove unneeded using

---
 .../MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs                 | 1 -
 1 file changed, 1 deletion(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs
index 4c05b87f32..d7176986f1 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreProjectExtension.cs
@@ -27,7 +27,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using GLib;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.DotNetCore;
-- 
cgit v1.2.3


From bff6d46b154e7f650608f6f18cec84c1f131af2e Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Fri, 19 Jul 2019 14:15:42 +0200
Subject: [DotNetCore] Allow *Command's to provide post launch operations

Instead of duplicating code, just make the ExecutionHandler's call
the specific Command implementation of its PostLaunch logic.
---
 .../AspNetCoreExecutionCommand.cs                  | 74 ++++++++++++++++------
 .../AspNetCoreExecutionHandler.cs                  | 59 ++---------------
 .../DotNetCoreExecutionCommand.cs                  |  6 ++
 .../DotNetCoreExecutionHandler.cs                  | 54 ++--------------
 4 files changed, 70 insertions(+), 123 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
index f7077b2cde..439396d2b5 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
@@ -24,36 +24,74 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using MonoDevelop.Core.Execution;
+using System;
+using System.Threading.Tasks;
+using System.Net.Sockets;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
 using MonoDevelop.DotNetCore;
 
 namespace MonoDevelop.AspNetCore
 {
-	public class AspNetCoreExecutionCommand : ProcessExecutionCommand
+	public class AspNetCoreExecutionCommand : DotNetCoreExecutionCommand
 	{
 		public AspNetCoreExecutionCommand (string directory, string outputPath, string arguments)
+			: base (directory, outputPath, arguments)
 		{
-			WorkingDirectory = directory;
-			OutputPath = outputPath;
-			DotNetArguments = arguments;
-
-			Command = DotNetCoreRuntime.FileName;
-			Arguments = string.Format ("\"{0}\" {1}", outputPath, arguments);
 		}
 
-		public string OutputPath { get; private set; }
-		public string DotNetArguments { get; private set; }
-
-		public bool PauseConsoleOutput { get; set; }
-		public bool ExternalConsole { get; set; }
-		public bool LaunchBrowser { get; set; }
-		public string LaunchURL { get; set; }
-		public string ApplicationURL { get; set; }
-		public PipeTransportSettings PipeTransport { get; set; }
-
 		// Since we are now supporting more than one url, we added this property
 		// so that it contains the raw value of AppUrl
 		// which might provide more than one url i.e. https://localhost:5000;http://localhost:5001
 		public string ApplicationURLs { get; set; }
+
+		public override async Task PostLaunchAsync (Task processTask)
+		{
+			await base.PostLaunchAsync (processTask).ConfigureAwait (false);
+
+			var aspNetCoreTarget = Target as AspNetCoreExecutionTarget;
+			var launchUrl = LaunchURL ?? "";
+			Uri launchUri;
+			//Check if lanuchUrl is valid absolute url and use it if it is...
+			if (!Uri.TryCreate (launchUrl, UriKind.Absolute, out launchUri)) {
+				//Otherwise check if appUrl is valid absolute and lanuchUrl is relative then concat them...
+				Uri appUri;
+				if (!Uri.TryCreate (ApplicationURL, UriKind.Absolute, out appUri)) {
+					LoggingService.LogWarning ("Failed to launch browser because invalid launch and app urls.");
+					return;
+				}
+				if (!Uri.TryCreate (launchUrl, UriKind.Relative, out launchUri)) {
+					LoggingService.LogWarning ("Failed to launch browser because invalid launch url.");
+					return;
+				}
+				launchUri = new Uri (appUri, launchUri);
+			}
+
+			//Try to connect every 50ms while process is running
+			while (!processTask.IsCompleted) {
+				await Task.Delay (50).ConfigureAwait (false);
+				using (var tcpClient = new TcpClient ()) {
+					try {
+						await tcpClient.ConnectAsync (launchUri.Host, launchUri.Port).ConfigureAwait (false);
+						// pause briefly to allow the server process to initialize
+						await Task.Delay (TimeSpan.FromSeconds (1)).ConfigureAwait (false);
+						break;
+					} catch {
+					}
+				}
+			}
+
+			if (processTask.IsCompleted) {
+				LoggingService.LogDebug ("Failed to launch browser because process exited before server started listening.");
+				return;
+			}
+
+			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
+			if (aspNetCoreTarget != null && !aspNetCoreTarget.DesktopApplication.IsDefault) {
+				aspNetCoreTarget.DesktopApplication.Launch (launchUri.AbsoluteUri);
+			} else {
+				IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
+			}
+		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
index ec1ae1642f..63dd43a004 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
@@ -24,14 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Ide;
 using System;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Net.Sockets;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
 
 namespace MonoDevelop.AspNetCore
 {
@@ -57,57 +53,10 @@ namespace MonoDevelop.AspNetCore
 				dotNetCoreCommand.WorkingDirectory,
 				console,
 				envVariables);
-			if (dotNetCoreCommand.LaunchBrowser) {
-				LaunchBrowser (dotNetCoreCommand.ApplicationURL, dotNetCoreCommand.LaunchURL, dotNetCoreCommand.Target, process.Task).Ignore ();
-			}
-			return process;
-		}
-
-		public static async Task LaunchBrowser (string appUrl, string launchUrl, ExecutionTarget target, Task processTask)
-		{
-			var aspNetCoreTarget = target as AspNetCoreExecutionTarget;
-			launchUrl = launchUrl ?? "";
-			Uri launchUri;
-			//Check if lanuchUrl is valid absolute url and use it if it is...
-			if (!Uri.TryCreate (launchUrl, UriKind.Absolute, out launchUri)) {
-				//Otherwise check if appUrl is valid absolute and lanuchUrl is relative then concat them...
-				Uri appUri;
-				if (!Uri.TryCreate (appUrl, UriKind.Absolute, out appUri)) {
-					LoggingService.LogWarning ("Failed to launch browser because invalid launch and app urls.");
-					return;
-				}
-				if (!Uri.TryCreate (launchUrl, UriKind.Relative, out launchUri)) {
-					LoggingService.LogWarning ("Failed to launch browser because invalid launch url.");
-					return;
-				}
-				launchUri = new Uri (appUri, launchUri);
-			}
 
-			//Try to connect every 50ms while process is running
-			while (!processTask.IsCompleted) {
-				await Task.Delay (50);
-				using (var tcpClient = new TcpClient ()) {
-					try {
-						tcpClient.Connect (launchUri.Host, launchUri.Port);
-						// pause briefly to allow the server process to initialize
-						await Task.Delay (TimeSpan.FromSeconds (1));
-						break;
-					} catch {
-					}
-				}
-			}
+			dotNetCoreCommand.PostLaunchAsync (process.Task).Ignore ();
 
-			if (processTask.IsCompleted) {
-				LoggingService.LogDebug ("Failed to launch browser because process exited before server started listening.");
-				return;
-			}
-
-			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
-			if (aspNetCoreTarget != null && !aspNetCoreTarget.DesktopApplication.IsDefault) {
-				aspNetCoreTarget.DesktopApplication.Launch (launchUri.AbsoluteUri);
-			} else {
-				IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
-			}
+			return process;
 		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs
index 646fb372fc..db026228ca 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using System.Threading.Tasks;
 using MonoDevelop.Core.Execution;
 
 namespace MonoDevelop.DotNetCore
@@ -49,5 +50,10 @@ namespace MonoDevelop.DotNetCore
 		public string LaunchURL { get; set; }
 		public string ApplicationURL { get; set; }
 		public PipeTransportSettings PipeTransport { get; set; }
+
+		public virtual Task PostLaunchAsync (Task processTask)
+		{
+			return Task.FromResult (0);
+		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
index 01f0858897..bc532c6547 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
@@ -24,14 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Ide;
 using System;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Net.Sockets;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
 
 namespace MonoDevelop.DotNetCore
 {
@@ -56,52 +52,10 @@ namespace MonoDevelop.DotNetCore
 				dotNetCoreCommand.WorkingDirectory,
 				console,
 				envVariables);
-			if (dotNetCoreCommand.LaunchBrowser) {
-				LaunchBrowser (dotNetCoreCommand.ApplicationURL, dotNetCoreCommand.LaunchURL, process.Task).Ignore ();
-			}
-			return process;
-		}
-
-		public static async Task LaunchBrowser (string appUrl, string launchUrl, Task processTask)
-		{
-			launchUrl = launchUrl ?? "";
-			Uri launchUri;
-			//Check if lanuchUrl is valid absolute url and use it if it is...
-			if (!Uri.TryCreate (launchUrl, UriKind.Absolute, out launchUri)) {
-				//Otherwise check if appUrl is valid absolute and lanuchUrl is relative then concat them...
-				Uri appUri;
-				if (!Uri.TryCreate (appUrl, UriKind.Absolute, out appUri)) {
-					LoggingService.LogWarning ("Failed to launch browser because invalid launch and app urls.");
-					return;
-				}
-				if (!Uri.TryCreate (launchUrl, UriKind.Relative, out launchUri)) {
-					LoggingService.LogWarning ("Failed to launch browser because invalid launch url.");
-					return;
-				}
-				launchUri = new Uri (appUri, launchUri);
-			}
 
-			//Try to connect every 50ms while process is running
-			while (!processTask.IsCompleted) {
-				await Task.Delay (50);
-				using (var tcpClient = new TcpClient ()) {
-					try {
-						tcpClient.Connect (launchUri.Host, launchUri.Port);
-						// pause briefly to allow the server process to initialize
-						await Task.Delay (TimeSpan.FromSeconds (1));
-						break;
-					} catch {
-					}
-				}
-			}
+			dotNetCoreCommand.PostLaunchAsync (process.Task).Ignore ();
 
-			if (processTask.IsCompleted) {
-				LoggingService.LogDebug ("Failed to launch browser because process exited before server started listening.");
-				return;
-			}
-
-			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
-			IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
+			return process;
 		}
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3


From ff0c97f9667cad70267617512c0702d7e30ae9d4 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Fri, 19 Jul 2019 16:14:59 +0200
Subject: =?UTF-8?q?[DotNetCore]=C2=A0Remove=20execution=20logic=20from=20D?=
 =?UTF-8?q?otNetCoreExecutionCommand?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And move it to the ExecutionHandler's, as before
---
 .../AspNetCoreExecutionCommand.cs                  | 56 +---------------------
 .../AspNetCoreExecutionHandler.cs                  | 54 ++++++++++++++++++++-
 .../DotNetCoreExecutionCommand.cs                  | 12 +++--
 .../DotNetCoreExecutionHandler.cs                  |  2 -
 4 files changed, 61 insertions(+), 63 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
index 439396d2b5..da240f9e9a 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionCommand.cs
@@ -24,16 +24,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System;
-using System.Threading.Tasks;
-using System.Net.Sockets;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
 using MonoDevelop.DotNetCore;
 
 namespace MonoDevelop.AspNetCore
 {
-	public class AspNetCoreExecutionCommand : DotNetCoreExecutionCommand
+	public class AspNetCoreExecutionCommand : DotNetCoreBaseExecutionCommand
 	{
 		public AspNetCoreExecutionCommand (string directory, string outputPath, string arguments)
 			: base (directory, outputPath, arguments)
@@ -44,54 +39,5 @@ namespace MonoDevelop.AspNetCore
 		// so that it contains the raw value of AppUrl
 		// which might provide more than one url i.e. https://localhost:5000;http://localhost:5001
 		public string ApplicationURLs { get; set; }
-
-		public override async Task PostLaunchAsync (Task processTask)
-		{
-			await base.PostLaunchAsync (processTask).ConfigureAwait (false);
-
-			var aspNetCoreTarget = Target as AspNetCoreExecutionTarget;
-			var launchUrl = LaunchURL ?? "";
-			Uri launchUri;
-			//Check if lanuchUrl is valid absolute url and use it if it is...
-			if (!Uri.TryCreate (launchUrl, UriKind.Absolute, out launchUri)) {
-				//Otherwise check if appUrl is valid absolute and lanuchUrl is relative then concat them...
-				Uri appUri;
-				if (!Uri.TryCreate (ApplicationURL, UriKind.Absolute, out appUri)) {
-					LoggingService.LogWarning ("Failed to launch browser because invalid launch and app urls.");
-					return;
-				}
-				if (!Uri.TryCreate (launchUrl, UriKind.Relative, out launchUri)) {
-					LoggingService.LogWarning ("Failed to launch browser because invalid launch url.");
-					return;
-				}
-				launchUri = new Uri (appUri, launchUri);
-			}
-
-			//Try to connect every 50ms while process is running
-			while (!processTask.IsCompleted) {
-				await Task.Delay (50).ConfigureAwait (false);
-				using (var tcpClient = new TcpClient ()) {
-					try {
-						await tcpClient.ConnectAsync (launchUri.Host, launchUri.Port).ConfigureAwait (false);
-						// pause briefly to allow the server process to initialize
-						await Task.Delay (TimeSpan.FromSeconds (1)).ConfigureAwait (false);
-						break;
-					} catch {
-					}
-				}
-			}
-
-			if (processTask.IsCompleted) {
-				LoggingService.LogDebug ("Failed to launch browser because process exited before server started listening.");
-				return;
-			}
-
-			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
-			if (aspNetCoreTarget != null && !aspNetCoreTarget.DesktopApplication.IsDefault) {
-				aspNetCoreTarget.DesktopApplication.Launch (launchUri.AbsoluteUri);
-			} else {
-				IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
-			}
-		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
index 63dd43a004..7cfe068f93 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
@@ -26,8 +26,11 @@
 
 using System;
 using System.Linq;
+using System.Threading.Tasks;
+using System.Net.Sockets;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.AspNetCore
 {
@@ -54,9 +57,58 @@ namespace MonoDevelop.AspNetCore
 				console,
 				envVariables);
 
-			dotNetCoreCommand.PostLaunchAsync (process.Task).Ignore ();
+			if (dotNetCoreCommand.LaunchBrowser) {
+				LaunchBrowserAsync (dotNetCoreCommand.ApplicationURL, dotNetCoreCommand.LaunchURL, dotNetCoreCommand.Target, process.Task).Ignore ();
+			}
 
 			return process;
 		}
+
+		public static async Task LaunchBrowserAsync (string appUrl, string launchUrl, ExecutionTarget target, Task processTask)
+		{
+			var aspNetCoreTarget = target as AspNetCoreExecutionTarget;
+			launchUrl = launchUrl ?? "";
+			Uri launchUri;
+			//Check if lanuchUrl is valid absolute url and use it if it is...
+			if (!Uri.TryCreate (launchUrl, UriKind.Absolute, out launchUri)) {
+				//Otherwise check if appUrl is valid absolute and lanuchUrl is relative then concat them...
+				Uri appUri;
+				if (!Uri.TryCreate (appUrl, UriKind.Absolute, out appUri)) {
+					LoggingService.LogWarning ("Failed to launch browser because invalid launch and app urls.");
+					return;
+				}
+				if (!Uri.TryCreate (launchUrl, UriKind.Relative, out launchUri)) {
+					LoggingService.LogWarning ("Failed to launch browser because invalid launch url.");
+					return;
+				}
+				launchUri = new Uri (appUri, launchUri);
+			}
+
+			//Try to connect every 50ms while process is running
+			while (!processTask.IsCompleted) {
+				await Task.Delay (50).ConfigureAwait (false);
+				using (var tcpClient = new TcpClient ()) {
+					try {
+						await tcpClient.ConnectAsync (launchUri.Host, launchUri.Port).ConfigureAwait (false);
+						// pause briefly to allow the server process to initialize
+						await Task.Delay (TimeSpan.FromSeconds (1)).ConfigureAwait (false);
+						break;
+					} catch {
+					}
+				}
+			}
+
+			if (processTask.IsCompleted) {
+				LoggingService.LogDebug ("Failed to launch browser because process exited before server started listening.");
+				return;
+			}
+
+			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
+			if (aspNetCoreTarget != null && !aspNetCoreTarget.DesktopApplication.IsDefault) {
+				aspNetCoreTarget.DesktopApplication.Launch (launchUri.AbsoluteUri);
+			} else {
+				IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs
index db026228ca..de4542a37b 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionCommand.cs
@@ -24,14 +24,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System.Threading.Tasks;
 using MonoDevelop.Core.Execution;
 
 namespace MonoDevelop.DotNetCore
 {
-	public class DotNetCoreExecutionCommand : ProcessExecutionCommand
+	public class DotNetCoreBaseExecutionCommand : ProcessExecutionCommand
 	{
-		public DotNetCoreExecutionCommand (string directory, string outputPath, string arguments)
+		public DotNetCoreBaseExecutionCommand (string directory, string outputPath, string arguments)
 		{
 			WorkingDirectory = directory;
 			OutputPath = outputPath;
@@ -50,10 +49,13 @@ namespace MonoDevelop.DotNetCore
 		public string LaunchURL { get; set; }
 		public string ApplicationURL { get; set; }
 		public PipeTransportSettings PipeTransport { get; set; }
+	}
 
-		public virtual Task PostLaunchAsync (Task processTask)
+	public class DotNetCoreExecutionCommand : DotNetCoreBaseExecutionCommand
+	{
+		public DotNetCoreExecutionCommand (string directory, string outputPath, string arguments)
+			: base (directory, outputPath, arguments)
 		{
-			return Task.FromResult (0);
 		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
index bc532c6547..272092479d 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
@@ -53,8 +53,6 @@ namespace MonoDevelop.DotNetCore
 				console,
 				envVariables);
 
-			dotNetCoreCommand.PostLaunchAsync (process.Task).Ignore ();
-
 			return process;
 		}
 	}
-- 
cgit v1.2.3


From 5bc1b6f8ad06cb373856b559fab28af3e26cb05d Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Fri, 19 Jul 2019 16:47:14 +0200
Subject: [MacPlatform] Improve array creation

Co-Authored-By: Marius Ungureanu <marius.ungureanu@xamarin.com>
---
 main/src/addins/MacPlatform/MacPlatform.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index aa7eea5109..60e609ef2c 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -1014,7 +1014,7 @@ namespace MonoDevelop.MacIntegration
 			public override void Launch (params string[] files)
 			{
 				NSWorkspace.SharedWorkspace.OpenUrls (
-					files.Select (NSUrl.FromString).ToArray (),
+					Array.ConvertAll (files, file => NSUrl.FromString (file)),
 					NSBundle.FromPath (Id).BundleIdentifier,
 					NSWorkspaceLaunchOptions.Default,
 					NSAppleEventDescriptor.DescriptorWithBoolean (true));
-- 
cgit v1.2.3


From 402e8568208399d8140022176249ec4c2822a2dd Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Fri, 19 Jul 2019 16:53:11 +0200
Subject: [AspNetCore] Declare variables just before being used

---
 .../MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
index 7cfe068f93..0453fd8c30 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
@@ -66,7 +66,6 @@ namespace MonoDevelop.AspNetCore
 
 		public static async Task LaunchBrowserAsync (string appUrl, string launchUrl, ExecutionTarget target, Task processTask)
 		{
-			var aspNetCoreTarget = target as AspNetCoreExecutionTarget;
 			launchUrl = launchUrl ?? "";
 			Uri launchUri;
 			//Check if lanuchUrl is valid absolute url and use it if it is...
@@ -104,6 +103,7 @@ namespace MonoDevelop.AspNetCore
 			}
 
 			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
+			var aspNetCoreTarget = target as AspNetCoreExecutionTarget;
 			if (aspNetCoreTarget != null && !aspNetCoreTarget.DesktopApplication.IsDefault) {
 				aspNetCoreTarget.DesktopApplication.Launch (launchUri.AbsoluteUri);
 			} else {
-- 
cgit v1.2.3


From 28759e2469b00597f8a3d9d35fb82eef74960525 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Tue, 23 Jul 2019 12:19:17 +0200
Subject: [Tests] Check execution targets on ASP.NET Core projects

---
 .../DotNetCoreProjectTemplateTests.cs                    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
index f4485c2e44..473e38e4d1 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
@@ -286,7 +286,7 @@ namespace MonoDevelop.DotNetCore.Tests
 				Assert.Ignore ("Node is not installed - required by project template");
 			}
 
-			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules);
+			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules, true);
 		}
 
 		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore22=true")]
@@ -311,10 +311,9 @@ namespace MonoDevelop.DotNetCore.Tests
 				Assert.Ignore ("Node is not installed - required by project template");
 			}
 
-			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules);
+			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules, true);
 		}
 
-		[Ignore ("Requires .NET Core App 3.0 runtime")]
 		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore30=true")]
 		[TestCase ("Microsoft.Web.Empty.FSharp", "UseNetCore30=true")]
 		[TestCase ("Microsoft.Web.Mvc.CSharp", "UseNetCore30=true")]
@@ -337,7 +336,7 @@ namespace MonoDevelop.DotNetCore.Tests
 				Assert.Ignore ("Node is not installed - required by project template");
 			}
 
-			await CreateFromTemplateAndBuild ("NetCore30", templateId, parameters, CheckAspNetCoreNestingRules);
+			await CreateFromTemplateAndBuild ("NetCore30", templateId, parameters, CheckAspNetCoreNestingRules, true);
 		}
 
 		static bool IsDotNetCoreSdk2xInstalled ()
@@ -366,7 +365,7 @@ namespace MonoDevelop.DotNetCore.Tests
 			return DotNetCoreSdk.Versions.Any (version => version.Major == 3 && version.Minor == 0);
 		}
 
-		static async Task CreateFromTemplateAndBuild (string basename, string templateId, string parameters, Action<Solution> preBuildChecks = null)
+		static async Task CreateFromTemplateAndBuild (string basename, string templateId, string parameters, Action<Solution> preBuildChecks = null, bool checkExecutionTargets = false)
 		{
 			using (var ptt = new ProjectTemplateTest (basename, templateId)) {
 
@@ -377,6 +376,13 @@ namespace MonoDevelop.DotNetCore.Tests
 				var template = await ptt.CreateAndBuild (preBuildChecks);
 
 				CheckProjectTypeGuids (ptt.Solution, GetProjectTypeGuid (template));
+				if (checkExecutionTargets) {
+					foreach (var p in ptt.Solution.GetAllProjects ()) {
+						foreach (var config in p.Configurations) {
+							Assert.True (p.GetExecutionTargets (config.Selector)?.Any (x => x.Name.Contains ("Safari")) ?? false, $"Configuration {config.Name} didn't contain Safari");
+						}
+					}
+				}
 			}
 		}
 
-- 
cgit v1.2.3


From aadbe47f37da405f6b05032d52a95b9ec26f8a97 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Tue, 23 Jul 2019 14:03:45 +0200
Subject: [MacPlatform] Remove .app suffix from app's DisplayName's

---
 main/src/addins/MacPlatform/MacPlatform.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index 60e609ef2c..354d857363 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -990,7 +990,7 @@ namespace MonoDevelop.MacIntegration
 					if (string.IsNullOrEmpty (app.Path) || !checkUniquePath.Add (app.Path))
 						continue;
 					if (checkUniqueName.Add (app.LastPathComponent)) {
-						apps.Add (new MacDesktopApplication (app.Path, app.LastPathComponent, def != null && def == app));
+						apps.Add (new MacDesktopApplication (app.Path, Path.GetFileNameWithoutExtension (app.LastPathComponent), def != null && def == app));
 					}
 				}
 			}
-- 
cgit v1.2.3


From b03c1c39c7a8c858f44f03bc0c26d3ac8809b5c2 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Wed, 24 Jul 2019 12:41:00 +0200
Subject: [Tests] Check for specific browsers only if they are installed

---
 .../DotNetCoreProjectTemplateTests.cs                      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
index 473e38e4d1..ebfe72c417 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using MonoDevelop.Ide.Templates;
@@ -32,7 +33,7 @@ using MonoDevelop.Projects;
 using NUnit.Framework;
 using IdeUnitTests;
 using MonoDevelop.Projects.FileNesting;
-
+using MonoDevelop.Core.Execution;
 
 namespace MonoDevelop.DotNetCore.Tests
 {
@@ -376,10 +377,15 @@ namespace MonoDevelop.DotNetCore.Tests
 				var template = await ptt.CreateAndBuild (preBuildChecks);
 
 				CheckProjectTypeGuids (ptt.Solution, GetProjectTypeGuid (template));
-				if (checkExecutionTargets) {
-					foreach (var p in ptt.Solution.GetAllProjects ()) {
+				// Blacklist library projects, which don't get any execution target
+				if (checkExecutionTargets && templateId != "Microsoft.Web.Razor.Library.CSharp") {
+					foreach (var p in ptt.Solution.GetAllProjects ().OfType<DotNetProject> ()) {
 						foreach (var config in p.Configurations) {
-							Assert.True (p.GetExecutionTargets (config.Selector)?.Any (x => x.Name.Contains ("Safari")) ?? false, $"Configuration {config.Name} didn't contain Safari");
+							var targets = p.GetExecutionTargets (config.Selector)?.ToList () ?? new List<ExecutionTarget> ();
+							if (System.IO.Directory.Exists ("/Applications/Safari.app"))
+								Assert.True (targets.Any (x => x.Name.Contains ("Safari")), $"Configuration {config.Name} didn't contain Safari");
+							if (System.IO.Directory.Exists ("/Applications/Google Chrome.app"))
+								Assert.True (targets.Any (x => x.Name.Contains ("Google Chrome")), $"Configuration {config.Name} didn't contain Chrome");
 						}
 					}
 				}
-- 
cgit v1.2.3


From cfec082b1c89dcdfca75bc94378fbf705a379538 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo.moya@xamarin.com>
Date: Thu, 25 Jul 2019 12:03:22 +0200
Subject: [DotNetCore] Disable test for ExecutionTarget's per template

---
 .../DotNetCoreProjectTemplateTests.cs              | 80 +++++++++++-----------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'main/src/addins')

diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
index ebfe72c417..b27555e83c 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
@@ -265,18 +265,18 @@ namespace MonoDevelop.DotNetCore.Tests
 			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters);
 		}
 
-		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.Empty.FSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.Mvc.CSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.Mvc.FSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.RazorPages.CSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.WebApi.CSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.WebApi.FSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.Razor.Library.CSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.Spa.Angular.CSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.Spa.React.CSharp", "UseNetCore21=true")]
-		[TestCase ("Microsoft.Web.Spa.ReactRedux.CSharp", "UseNetCore21=true")]
-		public async Task AspNetCore21 (string templateId, string parameters)
+		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.Empty.FSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.Mvc.CSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.Mvc.FSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.RazorPages.CSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.WebApi.CSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.WebApi.FSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.Razor.Library.CSharp", "UseNetCore21=true", false)]
+		[TestCase ("Microsoft.Web.Spa.Angular.CSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.Spa.React.CSharp", "UseNetCore21=true", true)]
+		[TestCase ("Microsoft.Web.Spa.ReactRedux.CSharp", "UseNetCore21=true", true)]
+		public async Task AspNetCore21 (string templateId, string parameters, bool checkExecutionTargets)
 		{
 			if (!IsDotNetCoreSdk21Installed ()) {
 				Assert.Ignore (".NET Core 2.1 SDK is not installed - required by project template.");
@@ -287,21 +287,21 @@ namespace MonoDevelop.DotNetCore.Tests
 				Assert.Ignore ("Node is not installed - required by project template");
 			}
 
-			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules, true);
+			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules, checkExecutionTargets);
 		}
 
-		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.Empty.FSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.Mvc.CSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.Mvc.FSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.RazorPages.CSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.WebApi.CSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.WebApi.FSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.Razor.Library.CSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.Spa.Angular.CSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.Spa.React.CSharp", "UseNetCore22=true")]
-		[TestCase ("Microsoft.Web.Spa.ReactRedux.CSharp", "UseNetCore22=true")]
-		public async Task AspNetCore22 (string templateId, string parameters)
+		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.Empty.FSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.Mvc.CSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.Mvc.FSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.RazorPages.CSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.WebApi.CSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.WebApi.FSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.Razor.Library.CSharp", "UseNetCore22=true", false)]
+		[TestCase ("Microsoft.Web.Spa.Angular.CSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.Spa.React.CSharp", "UseNetCore22=true", true)]
+		[TestCase ("Microsoft.Web.Spa.ReactRedux.CSharp", "UseNetCore22=true", true)]
+		public async Task AspNetCore22 (string templateId, string parameters, bool checkExecutionTargets)
 		{
 			if (!IsDotNetCoreSdk22Installed ()) {
 				Assert.Ignore (".NET Core 2.2 SDK is not installed - required by project template.");
@@ -312,21 +312,21 @@ namespace MonoDevelop.DotNetCore.Tests
 				Assert.Ignore ("Node is not installed - required by project template");
 			}
 
-			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules, true);
+			await CreateFromTemplateAndBuild ("NetCore2x", templateId, parameters, CheckAspNetCoreNestingRules, checkExecutionTargets);
 		}
 
-		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.Empty.FSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.Mvc.CSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.Mvc.FSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.RazorPages.CSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.WebApi.CSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.WebApi.FSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.Razor.Library.CSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.Spa.Angular.CSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.Spa.React.CSharp", "UseNetCore30=true")]
-		[TestCase ("Microsoft.Web.Spa.ReactRedux.CSharp", "UseNetCore30=true")]
-		public async Task AspNetCore30 (string templateId, string parameters)
+		[TestCase ("Microsoft.Web.Empty.CSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.Empty.FSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.Mvc.CSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.Mvc.FSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.RazorPages.CSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.WebApi.CSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.WebApi.FSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.Razor.Library.CSharp", "UseNetCore30=true", false)]
+		[TestCase ("Microsoft.Web.Spa.Angular.CSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.Spa.React.CSharp", "UseNetCore30=true", true)]
+		[TestCase ("Microsoft.Web.Spa.ReactRedux.CSharp", "UseNetCore30=true", true)]
+		public async Task AspNetCore30 (string templateId, string parameters, bool checkExecutionTargets)
 		{
 			if (!IsDotNetCoreSdk30Installed ()) {
 				Assert.Ignore (".NET Core 3.0 SDK is not installed - required by project template.");
@@ -337,7 +337,7 @@ namespace MonoDevelop.DotNetCore.Tests
 				Assert.Ignore ("Node is not installed - required by project template");
 			}
 
-			await CreateFromTemplateAndBuild ("NetCore30", templateId, parameters, CheckAspNetCoreNestingRules, true);
+			await CreateFromTemplateAndBuild ("NetCore30", templateId, parameters, CheckAspNetCoreNestingRules, checkExecutionTargets);
 		}
 
 		static bool IsDotNetCoreSdk2xInstalled ()
@@ -378,7 +378,7 @@ namespace MonoDevelop.DotNetCore.Tests
 
 				CheckProjectTypeGuids (ptt.Solution, GetProjectTypeGuid (template));
 				// Blacklist library projects, which don't get any execution target
-				if (checkExecutionTargets && templateId != "Microsoft.Web.Razor.Library.CSharp") {
+				if (checkExecutionTargets) {
 					foreach (var p in ptt.Solution.GetAllProjects ().OfType<DotNetProject> ()) {
 						foreach (var config in p.Configurations) {
 							var targets = p.GetExecutionTargets (config.Selector)?.ToList () ?? new List<ExecutionTarget> ();
-- 
cgit v1.2.3