[DotNetCore] Fix detection of required runtime for the project being run

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/982889

Author: Rodrigo Moya

main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledInfoBar.cs

@@ -32,28 +32,17 @@ namespace MonoDevelop.DotNetCore
 {
 	class DotNetCoreNotInstalledInfoBar
 	{
-		string downloadUrl = DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl ();
+		string downloadUrl;
 
-		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 ()
+		public void Prompt (string message, DotNetCoreVersion requiredDotNetCoreVersion)
 		{
 			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) {
+			downloadUrl = requiredDotNetCoreVersion != null ? DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (requiredDotNetCoreVersion) : DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl ();
+			
+			IdeApp.Workbench.ShowInfoBar (false, new InfoBarOptions (message) {
 				Items = items
 			});
 		}

main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs

@@ -204,40 +204,38 @@ protected override Task OnExecute (
 			TargetFrameworkMoniker framework,
 			SolutionItemRunConfiguration runConfiguration)
 		{
+			var requiredVersion = DotNetCoreVersion.Parse (Project.TargetFramework.Id.Version);
 			if (DotNetCoreRuntime.IsMissing) {
-				return ShowCannotExecuteDotNetCoreApplicationDialog ();
+				return ShowCannotExecuteDotNetCoreApplicationDialog (DotNetCoreRuntime.GetNotInstalledVersionMessage (requiredVersion.OriginalString), requiredVersion);
+			}
+			if (Project.TargetFramework.IsNetCoreApp () &&
+				!DotNetCoreRuntime.Versions.Any (x => x.OriginalString.StartsWith (Project.TargetFramework.Id.Version, StringComparison.OrdinalIgnoreCase))) {
+				return ShowCannotExecuteDotNetCoreApplicationDialog (DotNetCoreRuntime.GetNotInstalledVersionMessage (requiredVersion.OriginalString), requiredVersion);
 			}
 
 			return base.OnExecute (monitor, context, configuration, framework, runConfiguration);
 		}
 
-		Task ShowCannotExecuteDotNetCoreApplicationDialog ()
+		Task ShowCannotExecuteDotNetCoreApplicationDialog (string message, DotNetCoreVersion requiredVersion)
 		{
-			return Runtime.RunInMainThread (() => {
-				CreateInfoBarInstance ().Prompt ();
-			});
+			return Runtime.RunInMainThread (() => CreateInfoBarInstance ().Prompt (message, requiredVersion));
 		}
 
-		Task ShowDotNetCoreNotInstalledDialog (bool unsupportedSdkVersion)
+		Task ShowDotNetCoreNotInstalledDialog (string message, DotNetCoreVersion requiredVersion)
 		{
 			return Runtime.RunInMainThread (() => {
 				if (ShownDotNetCoreSdkNotInstalledDialogForSolution ())
 					return;
 
 				Project.ParentSolution.ExtendedProperties [ShownDotNetCoreSdkInstalledExtendedPropertyName] = "true";
 
-				CreateInfoBarInstance (unsupportedSdkVersion).Prompt ();
+				CreateInfoBarInstance ().Prompt (message, requiredVersion);
 			});
 		}
 
-		DotNetCoreNotInstalledInfoBar CreateInfoBarInstance (bool unsupportedSdkVersion = false)
+		DotNetCoreNotInstalledInfoBar CreateInfoBarInstance ()
 		{
-			return new DotNetCoreNotInstalledInfoBar {
-				IsUnsupportedVersion = unsupportedSdkVersion,
-				RequiredDotNetCoreVersion = DotNetCoreVersion.Parse (Project.TargetFramework.Id.Version),
-				CurrentDotNetCorePath = sdkPaths.MSBuildSDKsPath,
-				IsNetStandard = Project.TargetFramework.Id.IsNetStandard ()
-			};
+			return new DotNetCoreNotInstalledInfoBar ();
 		}
 
 		bool ShownDotNetCoreSdkNotInstalledDialogForSolution ()
@@ -289,7 +287,8 @@ protected override void OnItemReady ()
 				return;
 
 			if (HasSdk && !IsDotNetCoreSdkInstalled ()) {
-				ShowDotNetCoreNotInstalledDialog (sdkPaths.IsUnsupportedSdkVersion);
+				var requiredVersion = DotNetCoreVersion.Parse (Project.TargetFramework.Id.Version);
+				ShowDotNetCoreNotInstalledDialog (DotNetCoreSdk.GetNotSupportedVersionMessage (requiredVersion.OriginalString), requiredVersion);
 			}
 
 			if (Project.ParentSolution == null)

main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreRuntime.cs

@@ -102,7 +102,7 @@ public static bool IsMissing {
 			get { return !IsInstalled; }
 		}
 
-		internal static DotNetCoreVersion[] Versions { get; private set; }
+		internal static DotNetCoreVersion [] Versions { get; private set; }
 
 		internal static bool IsNetCore1xInstalled ()
 		{
@@ -140,5 +140,10 @@ internal static void SetInstalled (bool installed)
 		{
 			IsInstalled = installed;
 		}
+
+		internal static string GetNotInstalledVersionMessage (string version = "")
+		{
+			return GettextCatalog.GetString (".NET Core {0} runtime is required to run this application, and is not installed. Install the latest update to the .NET Core {0} runtime by visiting {1}", version, DotNetCoreDownloadUrl.GetDotNetCoreDownloadUrl (version));
+		}
 	}
 }