tool-run: --from-source

Author: edvilme

src/Cli/dotnet/Commands/Tool/Run/ToolRunCommand.cs

@@ -4,7 +4,9 @@
 using System.CommandLine;
 using Microsoft.DotNet.Cli.CommandFactory;
 using Microsoft.DotNet.Cli.CommandFactory.CommandResolution;
+using Microsoft.DotNet.Cli.Commands.Tool.Install;
 using Microsoft.DotNet.Cli.ToolManifest;
+using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.Extensions.EnvironmentAbstractions;
 
@@ -20,7 +22,11 @@ internal class ToolRunCommand(
     private readonly IEnumerable<string> _forwardArgument = result.GetValue(ToolRunCommandParser.CommandArgument);
     public bool _allowRollForward = result.GetValue(ToolRunCommandParser.RollForwardOption);
     private readonly ToolManifestFinder _toolManifest = toolManifest ?? new ToolManifestFinder(new DirectoryPath(Directory.GetCurrentDirectory()));
+    private readonly bool _fromSource = result.GetValue(ToolRunCommandParser.FromSourceOption);
 
+    private readonly ToolInstallLocalInstaller _toolInstaller = new(result);
+    private readonly IToolManifestEditor _toolManifestEditor = new ToolManifestEditor();
+    private readonly ILocalToolsResolverCache _localToolsResolverCache = new LocalToolsResolverCache();
     public override int Execute()
     {
         CommandSpec commandspec = _localToolsCommandResolver.ResolveStrict(new CommandResolverArguments()
@@ -31,6 +37,11 @@ public override int Execute()
 
         }, _allowRollForward);
 
+        if (commandspec == null && _fromSource)
+        {
+            commandspec = GetRemoteCommandSpec();
+        }
+
         if (commandspec == null)
         {
             throw new GracefulException([string.Format(CliCommandStrings.CannotFindCommandName, _toolCommandName)], isUserError: false);
@@ -39,4 +50,29 @@ public override int Execute()
         var result = CommandFactoryUsingResolver.Create(commandspec).Execute();
         return result.ExitCode;
     }
+
+    public CommandSpec? GetRemoteCommandSpec()
+    {
+        FilePath manifestFile = _toolManifest.FindFirst(true);
+        PackageId packageId = new(_toolCommandName);
+
+        IToolPackage toolPackage = _toolInstaller.Install(manifestFile, packageId);
+
+        _toolManifestEditor.Add(
+            manifestFile,
+            toolPackage.Id,
+            toolPackage.Version,
+            [toolPackage.Command.Name],
+            _allowRollForward);
+
+        _localToolsResolverCache.SaveToolPackage(
+            toolPackage,
+            _toolInstaller.TargetFrameworkToInstall);
+
+        return _localToolsCommandResolver.ResolveStrict(new CommandResolverArguments()
+        {
+            CommandName = $"dotnet-{toolPackage.Command.Name}",
+            CommandArguments = _forwardArgument,
+        }, _allowRollForward);
+    }
 }

src/Cli/dotnet/Commands/Tool/Run/ToolRunCommandParser.cs

@@ -24,6 +24,8 @@ internal static class ToolRunCommandParser
         Arity = ArgumentArity.Zero
     };
 
+    public static readonly CliOption<bool> FromSourceOption = new("--from-source");
+
     private static readonly CliCommand Command = ConstructCommand();
 
     public static CliCommand GetCommand()
@@ -38,6 +40,7 @@ private static CliCommand ConstructCommand()
         command.Arguments.Add(CommandNameArgument);
         command.Arguments.Add(CommandArgument);
         command.Options.Add(RollForwardOption);
+        command.Options.Add(FromSourceOption);
 
         command.SetAction((parseResult) => new ToolRunCommand(parseResult).Execute());
 

src/Cli/dotnet/Commands/Tool/Runx/ToolRunxCommand.cs

@@ -6,7 +6,6 @@
 using Microsoft.DotNet.Cli.Commands.Tool.List;
 using Microsoft.DotNet.Cli.Commands.Tool.Restore;
 using Microsoft.DotNet.Cli.Commands.Tool.Run;
-using Microsoft.DotNet.Cli.Commands.Tool.Runx;
 using Microsoft.DotNet.Cli.Commands.Tool.Search;
 using Microsoft.DotNet.Cli.Commands.Tool.Uninstall;
 using Microsoft.DotNet.Cli.Commands.Tool.Update;
@@ -36,7 +35,6 @@ private static CliCommand ConstructCommand()
         command.Subcommands.Add(ToolRunCommandParser.GetCommand());
         command.Subcommands.Add(ToolSearchCommandParser.GetCommand());
         command.Subcommands.Add(ToolRestoreCommandParser.GetCommand());
-        command.Subcommands.Add(ToolRunxCommandParser.GetCommand());
 
         command.SetAction((parseResult) => parseResult.HandleMissingCommand());
 

src/Cli/dotnet/Commands/Tool/Runx/ToolRunxCommandParser.cs

@@ -189,7 +189,7 @@ public FilePath FindFirst(bool createIfNotFound = false)
 
     /*
     The --create-manifest-if-needed will use the following priority to choose the folder where the tool manifest goes:
-        1. Walk up the directory tree searching for one that has a.git subfolder
+        1. Walk up the directory tree searching for one that has a .git subfolder
         2. Walk up the directory tree searching for one that has a .sln(x)/git file in it
         3. Use the current working directory
     */