Add method to NuGetPackageDownloader to get source with best package version

Author: dsplaisted

src/Cli/dotnet/NugetPackageDownloader/INuGetPackageDownloader.cs

@@ -39,4 +39,8 @@ Task<IEnumerable<NuGetVersion>> GetLatestPackageVersions(PackageId packageId,
     Task<NuGetVersion> GetBestPackageVersionAsync(PackageId packageId,
         VersionRange versionRange,
          PackageSourceLocation packageSourceLocation = null);
+
+    Task<(NuGetVersion version, PackageSource source)> GetBestPackageVersionAndSourceAsync(PackageId packageId,
+        VersionRange versionRange,
+        PackageSourceLocation packageSourceLocation = null);
 } 

src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs

@@ -614,14 +614,23 @@ public async Task<NuGetVersion> GetBestPackageVersionAsync(PackageId packageId,
             return versionRange.MinVersion;
         }
 
+        return (await GetBestPackageVersionAndSourceAsync(packageId, versionRange, packageSourceLocation)
+            .ConfigureAwait(false))
+            .version;
+    }
+
+    public async Task<(NuGetVersion version, PackageSource source)> GetBestPackageVersionAndSourceAsync(PackageId packageId,
+        VersionRange versionRange,
+         PackageSourceLocation packageSourceLocation = null)
+    {
         CancellationToken cancellationToken = CancellationToken.None;
         IPackageSearchMetadata packageMetadata;
 
         IEnumerable<PackageSource> packagesSources = LoadNuGetSources(packageId, packageSourceLocation);
-        (_, packageMetadata) = await GetMatchingVersionInternalAsync(packageId.ToString(), packagesSources,
+        (var source, packageMetadata) = await GetMatchingVersionInternalAsync(packageId.ToString(), packagesSources,
                 versionRange, cancellationToken).ConfigureAwait(false);
 
-        return packageMetadata.Identity.Version;
+        return (packageMetadata.Identity.Version, source);
     }
 
     private async Task<(PackageSource, IPackageSearchMetadata)> GetPackageMetadataAsync(string packageIdentifier,

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

@@ -130,18 +130,28 @@ public Task<NuGetVersion> GetLatestPackageVersion(PackageId packageId, PackageSo
         }
 
         public Task<NuGetVersion> GetBestPackageVersionAsync(PackageId packageId, VersionRange versionRange, PackageSourceLocation packageSourceLocation = null)
+        {
+            return GetBestPackageVersionAndSourceAsync(packageId, versionRange, packageSourceLocation)
+                .ContinueWith(t => t.Result.version, TaskContinuationOptions.OnlyOnRanToCompletion);
+        }
+
+        public Task<(NuGetVersion version, PackageSource source)> GetBestPackageVersionAndSourceAsync(PackageId packageId,
+            VersionRange versionRange,PackageSourceLocation packageSourceLocation = null)
         {
             if (!ShouldFindPackage(packageId, packageSourceLocation))
             {
-                return Task.FromException<NuGetVersion>(new NuGetPackageNotFoundException(string.Format(CliStrings.IsNotFoundInNuGetFeeds, packageId, MOCK_FEEDS_TEXT)));
+                return Task.FromException<(NuGetVersion version, PackageSource source)>(new NuGetPackageNotFoundException(string.Format(CliStrings.IsNotFoundInNuGetFeeds, packageId, MOCK_FEEDS_TEXT)));
             }
 
             var bestVersion = versionRange.FindBestMatch(_packageVersions);
             if (bestVersion == null)
             {
                 bestVersion = versionRange.MinVersion;
             }
-            return Task.FromResult(bestVersion);
+
+            var source = new PackageSource("http://mock-url", "MockSource");
+
+            return Task.FromResult((bestVersion, source));
         }
 
 

test/dotnet.Tests/CommandTests/Workload/Install/FailingNuGetPackageInstaller.cs

@@ -42,6 +42,10 @@ public Task<IEnumerable<string>> ExtractPackageAsync(string packagePath, Directo
         public Task<NuGetVersion> GetLatestPackageVersion(PackageId packageId, PackageSourceLocation packageSourceLocation = null, bool includePreview = false) => throw new NotImplementedException();
         public Task<IEnumerable<NuGetVersion>> GetLatestPackageVersions(PackageId packageId, int numberOfResults, PackageSourceLocation packageSourceLocation = null, bool includePreview = false) => throw new NotImplementedException();
         public Task<NuGetVersion> GetBestPackageVersionAsync(PackageId packageId, VersionRange versionRange, PackageSourceLocation packageSourceLocation = null) => throw new NotImplementedException();
+
+        public Task<(NuGetVersion version, PackageSource source)> GetBestPackageVersionAndSourceAsync(PackageId packageId,
+            VersionRange versionRange, PackageSourceLocation packageSourceLocation = null) => throw new NotImplementedException();
+
         public Task<string> GetPackageUrl(PackageId packageId,
             NuGetVersion packageVersion,
             PackageSourceLocation packageSourceLocation = null,