Improve dotnet tool exec UI

Author: dsplaisted

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -2485,10 +2485,14 @@ To display a value, specify the corresponding command-line option without provid
   <data name="ToolExecuteCommandMissingPackageId" xml:space="preserve">
     <value>Missing package ID</value>
   </data>
-  <data name="ToolRunFromSourceUserConfirmationPrompt" xml:space="preserve">
-    <value>Tool package {0}@{1} will be downloaded from source {2}.  Proceed? [y/n]</value>
+  <data name="ToolDownloadConfirmationPrompt" xml:space="preserve">
+    <value>Tool package {0}@{1} will be downloaded from source {2}.
+Proceed? [y/n]</value>
   </data>
-  <data name="ToolRunFromSourceUserConfirmationFailed" xml:space="preserve">
-    <value>Run from source approval denied by the user</value>
+  <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>
   </data>
 </root>

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

@@ -46,9 +46,6 @@ internal class ToolExecuteCommand(ParseResult result, ToolManifestFinder? toolMa
             IgnoreFailedSources: result.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption),
             Interactive: result.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption));
 
-        //  TODO: Use prerelease
-        private readonly bool _prerelease = result.GetValue(ToolExecuteCommandParser.PrereleaseOption);
-
         private readonly ToolManifestFinder _toolManifestFinder = toolManifestFinder ?? new ToolManifestFinder(new DirectoryPath(currentWorkingDirectory ?? Directory.GetCurrentDirectory()));
 
         public override int Execute()
@@ -106,9 +103,15 @@ public override int Execute()
             {
                 if (!UserAgreedToRunFromSource(packageId, bestVersion, packageSource))
                 {
-                    //  TODO: Refactor this to print a better message, and probably a different message depending on whether the user selected no
-                    //  or whether interactive mode was off
-                    throw new GracefulException(CliCommandStrings.ToolRunFromSourceUserConfirmationFailed, isUserError: true);
+                    if (_interactive)
+                    {
+                        //  TODO: Should we return an exit code that indicates the user canceled the operation?
+                        throw new GracefulException(CliCommandStrings.ToolDownloadCanceled, isUserError: true);
+                    }
+                    else
+                    {
+                        throw new GracefulException(CliCommandStrings.ToolDownloadNeedsConfirmation, isUserError: true);
+                    }
                 }
 
                 //  We've already determined which source we will use and displayed that in a confirmation message to the user.
@@ -149,21 +152,14 @@ 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.ToolRunFromSourceUserConfirmationPrompt, 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;
 
-            if (_verbosity >= VerbosityOptions.detailed)
-            {
-                Console.WriteLine();
-                Console.WriteLine(new String('-', promptMessage.Length));
-            }
-            else
-            {
-                // Clear the line
-                Console.Write("\r" + new string(' ', promptMessage.Length + 1) + "\r");
-            }
+            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));
 
             return userAccepted;
         }