Updates to interface to support tool exec

GetNuGetVersion now returns the package source, and add method to check if tool is downloaded

Author: dsplaisted

src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs

@@ -241,9 +241,8 @@ private NuGetVersion GetBestMatchNugetVersion(PackageId packageId, VersionRange
             packageId: packageId,
             versionRange: versionRange,
             verbosity: _verbosity,
-            isGlobalTool: true,
             restoreActionConfig: restoreActionConfig
-        );
+        ).version;
     }
 
     private static bool ToolVersionAlreadyInstalled(IToolPackage oldPackageNullable, NuGetVersion nuGetVersion)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
+using NuGet.Configuration;
 using NuGet.Versioning;
 
 namespace Microsoft.DotNet.Cli.ToolPackage;
@@ -21,12 +22,16 @@ IToolPackage InstallPackage(PackageLocation packageLocation,
         RestoreActionConfig restoreActionConfig = null
     );
 
-    NuGetVersion GetNuGetVersion(
+    (NuGetVersion version, PackageSource source) GetNuGetVersion(
         PackageLocation packageLocation,
         PackageId packageId,
         VerbosityOptions verbosity,
         VersionRange versionRange = null,
-        bool isGlobalTool = false,
         RestoreActionConfig restoreActionConfig = null
     );
+
+    bool IsLocalToolDownloaded(
+        PackageId packageId,
+        NuGetVersion packageVersion,
+        string targetFramework = null);
 }

src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs

@@ -10,6 +10,7 @@
 using Newtonsoft.Json.Linq;
 using NuGet.Client;
 using NuGet.Commands;
+using NuGet.Commands.Restore;
 using NuGet.Common;
 using NuGet.Configuration;
 using NuGet.ContentModel;
@@ -272,10 +273,50 @@ protected virtual void DownloadTool(
             DownloadAndExtractPackage(packageId, nugetPackageDownloader, packageDownloadDir.Value, packageVersion, packageSourceLocation, includeUnlisted: givenSpecificVersion);
         }
 
-        CreateAssetFile(packageId, packageVersion, packageDownloadDir, Path.Combine(assetFileDirectory.Value, "project.assets.json"), _runtimeJsonPath, targetFramework);
+        CreateAssetFile(packageId, packageVersion, packageDownloadDir, Path.Combine(assetFileDirectory.Value, ToolPackageInstance.AssetsFileName), _runtimeJsonPath, targetFramework);
 
         //  Also download RID-specific package if needed
+        var ridSpecificPackage = ResolveRidSpecificPackage(packageId, packageVersion, packageDownloadDir, assetFileDirectory);
+        if (ridSpecificPackage != null)
+        {
+            if (!IsPackageInstalled(new PackageId(ridSpecificPackage.Id), ridSpecificPackage.Version, packageDownloadDir.Value))
+            {
+                DownloadAndExtractPackage(new PackageId(ridSpecificPackage.Id), nugetPackageDownloader, packageDownloadDir.Value, ridSpecificPackage.Version, packageSourceLocation, includeUnlisted: true);
+            }
+
+            CreateAssetFile(new PackageId(ridSpecificPackage.Id), ridSpecificPackage.Version, packageDownloadDir, Path.Combine(assetFileDirectory.Value, ToolPackageInstance.RidSpecificPackageAssetsFileName), _runtimeJsonPath, targetFramework);
+        }
+    }
+
+    public bool IsLocalToolDownloaded(
+        PackageId packageId,
+        NuGetVersion packageVersion,
+        string? targetFramework = null)
+    {
+        if (!IsPackageInstalled(packageId, packageVersion, _localToolDownloadDir.Value))
+        {
+            return false;
+        }
+        CreateAssetFile(packageId, packageVersion, _localToolDownloadDir, Path.Combine(_localToolAssetDir.Value, ToolPackageInstance.AssetsFileName), _runtimeJsonPath, targetFramework);
+
+        var ridSpecificPackage = ResolveRidSpecificPackage(packageId, packageVersion, _localToolDownloadDir, _localToolAssetDir);
+        if (ridSpecificPackage != null)
+        {
+            return IsPackageInstalled(new PackageId(ridSpecificPackage.Id), ridSpecificPackage.Version, _localToolDownloadDir.Value);
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    private PackageIdentity? ResolveRidSpecificPackage(PackageId packageId,
+        NuGetVersion packageVersion,
+        DirectoryPath packageDownloadDir,
+        DirectoryPath assetFileDirectory)
+    {
         var toolConfiguration = GetToolConfiguration(packageId, packageDownloadDir, assetFileDirectory);
+
         if (toolConfiguration.RidSpecificPackages?.Any() == true)
         {
             var runtimeGraph = JsonRuntimeFormat.ReadRuntimeGraph(_runtimeJsonPath);
@@ -288,16 +329,11 @@ protected virtual void DownloadTool(
 
             var resolvedPackage = toolConfiguration.RidSpecificPackages[bestRuntimeIdentifier];
 
-            if (!IsPackageInstalled(new PackageId(resolvedPackage.Id), resolvedPackage.Version, packageDownloadDir.Value))
-            {
-                DownloadAndExtractPackage(new PackageId(resolvedPackage.Id), nugetPackageDownloader, packageDownloadDir.Value, resolvedPackage.Version, packageSourceLocation, includeUnlisted: true);
-            }
-
-            CreateAssetFile(new PackageId(resolvedPackage.Id), resolvedPackage.Version, packageDownloadDir, Path.Combine(assetFileDirectory.Value, ToolPackageInstance.RidSpecificPackageAssetsFileName), _runtimeJsonPath, targetFramework);
+            return resolvedPackage;
         }
-    }
 
- 
+        return null;
+    }
 
     protected void UpdateRuntimeConfig(
         ToolPackageInstance toolPackageInstance
@@ -320,12 +356,11 @@ ToolPackageInstance toolPackageInstance
         }
     }
 
-    public virtual NuGetVersion GetNuGetVersion(
+    public virtual (NuGetVersion version, PackageSource source) GetNuGetVersion(
         PackageLocation packageLocation,
         PackageId packageId,
         VerbosityOptions verbosity,
         VersionRange? versionRange = null,
-        bool isGlobalTool = false,
         RestoreActionConfig? restoreActionConfig = null)
     {
         if (versionRange == null)
@@ -346,6 +381,6 @@ public virtual NuGetVersion GetNuGetVersion(
             additionalSourceFeeds: packageLocation.AdditionalFeeds,
             basePath: _currentWorkingDirectory);
 
-        return nugetPackageDownloader.GetBestPackageVersionAsync(packageId, versionRange, packageSourceLocation).GetAwaiter().GetResult();
+        return nugetPackageDownloader.GetBestPackageVersionAndSourceAsync(packageId, versionRange, packageSourceLocation).GetAwaiter().GetResult();
     }
 }

src/Cli/dotnet/ToolPackage/ToolPackageInstance.cs

@@ -37,7 +37,7 @@ internal class ToolPackageInstance : IToolPackage
 
     private IFileSystem _fileSystem;
 
-    private const string AssetsFileName = "project.assets.json";
+    public const string AssetsFileName = "project.assets.json";
     public const string RidSpecificPackageAssetsFileName = "project.assets.ridpackage.json";
     private const string ToolSettingsFileName = "DotnetToolSettings.xml";
 

test/Microsoft.DotNet.PackageInstall.Tests/ToolPackageDownloaderTests.cs

@@ -167,8 +167,7 @@ public void GivenAllButNoPackageVersionItReturnLatestStableVersion(bool testMock
             var package = downloader.GetNuGetVersion(
                 new PackageLocation(nugetConfig: testDir.WithFile("NuGet.config")),
                 packageId: TestPackageId,
-                verbosity: TestVerbosity,
-                isGlobalTool: true);
+                verbosity: TestVerbosity).version;
 
             package.OriginalVersion.Should().Be(TestPackageVersion);
         }
@@ -194,8 +193,7 @@ public void GivenASpecificVersionGetCorrectVersion(bool testMockBehaviorIsInSync
                     additionalFeeds: new[] { emptySource }),
                 packageId: TestPackageId,
                 verbosity: TestVerbosity,
-                versionRange: VersionRange.Parse(requestedVersion),
-                isGlobalTool: true);
+                versionRange: VersionRange.Parse(requestedVersion)).version;
 
             package.OriginalVersion.Should().Be(expectedVersion);
         }

test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageDownloaderMock.cs

@@ -10,6 +10,7 @@
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.Extensions.EnvironmentAbstractions;
+using NuGet.Configuration;
 using NuGet.Frameworks;
 using NuGet.Versioning;
 
@@ -309,12 +310,11 @@ private static bool ExcludeOtherFeeds(FilePath nugetConfig, MockFeed f)
                    || (f.Type == MockFeedType.ExplicitNugetConfig && f.Uri == nugetConfig.Value);
         }
 
-        public NuGetVersion GetNuGetVersion(
+        public (NuGetVersion version, PackageSource source) GetNuGetVersion(
             PackageLocation packageLocation,
             PackageId packageId,
             VerbosityOptions verbosity,
             VersionRange versionRange = null,
-            bool isGlobalTool = false,
             RestoreActionConfig restoreActionConfig = null)
         {
             versionRange = VersionRange.Parse(versionRange?.OriginalString ?? "*");
@@ -331,9 +331,11 @@ public NuGetVersion GetNuGetVersion(
                 packageLocation.RootConfigDirectory,
                 packageLocation.SourceFeedOverrides);
 
-            return NuGetVersion.Parse(feedPackage.Version);
+            return (NuGetVersion.Parse(feedPackage.Version), new PackageSource("http://mock-feed", "MockFeed"));
         }
 
+        public bool IsLocalToolDownloaded(PackageId packageId, NuGetVersion packageVersion, string targetFramework = null) => throw new NotImplementedException();
+
         private class TestToolPackage : IToolPackage
         {
             public PackageId Id { get; set; }