Improve confirmation prompt and other text updates

Author: dsplaisted

src/Cli/dotnet/CliStrings.resx

@@ -813,6 +813,6 @@ For a list of locations searched, specify the "-d" option before the tool name.<
     <comment>{Locked="--version"}</comment>
   </data>
   <data name="YesOptionDescription" xml:space="preserve">
-    <value>Overrides confirmation prompt with "yes" value. </value>
+    <value>Suppresses confirmation prompt with "yes" value.</value>
   </data>
 </root>

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -2482,17 +2482,26 @@ To display a value, specify the corresponding command-line option without provid
   <data name="ToolExecuteCommandDescription" xml:space="preserve">
     <value>Executes a tool from source without permanently installing it.</value>
   </data>
-  <data name="ToolExecuteCommandMissingPackageId" xml:space="preserve">
-    <value>Missing package ID</value>
-  </data>
   <data name="ToolDownloadConfirmationPrompt" xml:space="preserve">
     <value>Tool package {0}@{1} will be downloaded from source {2}.
-Proceed? [y/n]</value>
+Proceed?</value>
+  </data>
+  <data name="ConfirmationPromptYesValue" xml:space="preserve">
+    <value>y</value>
+    <comment>For a command line connfirmation prompt, this is the key that should be pressed for "yes", ie to agree.</comment>
+  </data>
+  <data name="ConfirmationPromptNoValue" xml:space="preserve">
+    <value>n</value>
+    <comment>For a command line connfirmation prompt, this is the key that should be pressed for "no", ie to cancel the operation.</comment>
+  </data>
+  <data name="ConfirmationPromptInvalidChoiceMessage" xml:space="preserve">
+    <value>Please type '{0}' for yes or '{1}' for no.</value>
   </data>
   <data name="ToolDownloadCanceled" xml:space="preserve">
     <value>Tool package download canceled</value>
   </data>
   <data name="ToolDownloadNeedsConfirmation" xml:space="preserve">
     <value>Tool package download needs confirmation. Run in interactive mode or use the "--yes" command-line option to confirm.</value>
+    <comment>{Locked="--yes"}</comment>
   </data>
 </root>

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs

@@ -155,15 +155,37 @@ private bool UserAgreedToRunFromSource(PackageId packageId, NuGetVersion version
 
         //  TODO: Use a better way to ask for user input
         //  TODO: How to localize y/n and interpret keys correctly?  Does Spectre.Console handle this?
-        string promptMessage = string.Format(CliCommandStrings.ToolDownloadConfirmationPrompt + " ", packageId, version.ToString(), source.Source);
+        string promptMessage = string.Format(CliCommandStrings.ToolDownloadConfirmationPrompt, packageId, version.ToString(), source.Source);
 
-        Console.Write(promptMessage);
-        bool userAccepted = Console.ReadKey().Key == ConsoleKey.Y;
+        static string AddPromptOptions(string message)
+        {
+            return $"{message} [{CliCommandStrings.ConfirmationPromptYesValue}/{CliCommandStrings.ConfirmationPromptNoValue}] ({CliCommandStrings.ConfirmationPromptYesValue}): ";
+        }
+
+        Console.Write(AddPromptOptions(promptMessage));
+
+        static bool KeyMatches(ConsoleKeyInfo pressedKey, string valueKey)
+        {
+            //  Apparently you can't do invariant case insensitive comparison on a char directly, so we have to convert it to a string.
+            //  The resource string should be a single character, but we take the first character just to be sure.
+            return pressedKey.KeyChar.ToString().ToLowerInvariant().Equals(
+                    valueKey.ToLowerInvariant().Substring(0, 1));
+        }
 
-        Console.WriteLine();
-        //  TODO: Do we want a separator like this?  Seems like it's meant to separate the output of the tool from the prompt.
-        //Console.WriteLine(new String('-', promptMessage.Length + 2));
+        while (true)
+        {
+            var key = Console.ReadKey();
+            Console.WriteLine();
+            if (key.Key == ConsoleKey.Enter || KeyMatches(key, CliCommandStrings.ConfirmationPromptYesValue))
+            {
+                return true;
+            }
+            if (key.Key == ConsoleKey.Escape || KeyMatches(key, CliCommandStrings.ConfirmationPromptNoValue))
+            {
+                return false;
+            }
 
-        return userAccepted;
+            Console.Write(AddPromptOptions(string.Format(CliCommandStrings.ConfirmationPromptInvalidChoiceMessage, CliCommandStrings.ConfirmationPromptYesValue, CliCommandStrings.ConfirmationPromptNoValue)));
+        }
     }
 }