Save tool to temp directory

Author: edvilme

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

@@ -24,7 +24,6 @@ internal class ToolRunCommand(
     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()
@@ -39,7 +38,7 @@ public override int Execute()
 
         if (commandspec == null && _fromSource)
         {
-            commandspec = GetRemoteCommandSpec();
+            return ExecuteFromSource();
         }
 
         if (commandspec == null)
@@ -51,11 +50,16 @@ public override int Execute()
         return result.ExitCode;
     }
 
-    public CommandSpec? GetRemoteCommandSpec()
+    public int ExecuteFromSource()
     {
+        string tempDirectory = PathUtilities.CreateTempSubdirectory();
         FilePath manifestFile = _toolManifest.FindFirst(true);
         PackageId packageId = new(_toolCommandName);
 
+        ToolInstallLocalInstaller _toolInstaller = new(_parseResult, new ToolPackageDownloader(
+            localToolDownloadDir: tempDirectory,
+            store: new ToolPackageStoreAndQuery(new DirectoryPath(tempDirectory))));
+
         IToolPackage toolPackage = _toolInstaller.Install(manifestFile, packageId);
 
         _toolManifestEditor.Add(
@@ -69,10 +73,21 @@ public override int Execute()
             toolPackage,
             _toolInstaller.TargetFrameworkToInstall);
 
-        return _localToolsCommandResolver.ResolveStrict(new CommandResolverArguments()
+        CommandSpec commandSpec = _localToolsCommandResolver.ResolveStrict(new CommandResolverArguments()
         {
             CommandName = $"dotnet-{toolPackage.Command.Name}",
             CommandArguments = _forwardArgument,
         }, _allowRollForward);
+
+        if (commandSpec == null)
+        {
+            throw new GracefulException([string.Format(CliCommandStrings.CannotFindCommandName, _toolCommandName)], isUserError: false);
+        }
+
+        var result = CommandFactoryUsingResolver.Create(commandSpec).Execute();
+
+        _toolManifestEditor.Remove(manifestFile, toolPackage.Id);
+
+        return result.ExitCode;
     }
 }

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

@@ -52,13 +52,14 @@ internal class ToolPackageDownloader : IToolPackageDownloader
     public ToolPackageDownloader(
         IToolPackageStore store,
         string runtimeJsonPathForTests = null,
-        string currentWorkingDirectory = null
+        string currentWorkingDirectory = null,
+        string localToolDownloadDir = null
     )
     {
         _toolPackageStore = store ?? throw new ArgumentNullException(nameof(store));
         _globalToolStageDir = _toolPackageStore.GetRandomStagingDirectory();
         ISettings settings = Settings.LoadDefaultSettings(currentWorkingDirectory ?? Directory.GetCurrentDirectory());
-        _localToolDownloadDir = new DirectoryPath(SettingsUtility.GetGlobalPackagesFolder(settings));
+        _localToolDownloadDir = new DirectoryPath(localToolDownloadDir ?? SettingsUtility.GetGlobalPackagesFolder(settings));
         _currentWorkingDirectory = currentWorkingDirectory;
 
         _localToolAssetDir = new DirectoryPath(PathUtilities.CreateTempSubdirectory());