Download tool packages from NuGet feeds directly, instead of implicitly restoring

src/Cli/dotnet/NugetPackageDownloader/INuGetPackageDownloader.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.DotNet.ToolPackage;
 using Microsoft.Extensions.EnvironmentAbstractions;
+using NuGet.Configuration;
 using NuGet.Versioning;
 
 namespace Microsoft.DotNet.Cli.NuGetPackageDownloader
@@ -13,7 +14,8 @@ Task<string> DownloadPackageAsync(PackageId packageId,
             NuGetVersion packageVersion = null,
             PackageSourceLocation packageSourceLocation = null,
             bool includePreview = false,
-            DirectoryPath? downloadFolder = null);
+            DirectoryPath? downloadFolder = null,
+            PackageSourceMapping packageSourceMapping = null);
 
         Task<string> GetPackageUrl(PackageId packageId,
             NuGetVersion packageVersion = null,
@@ -25,5 +27,9 @@ Task<string> GetPackageUrl(PackageId packageId,
         Task<NuGetVersion> GetLatestPackageVersion(PackageId packageId,
              PackageSourceLocation packageSourceLocation = null,
              bool includePreview = false);
-    }
+
+        Task<NuGetVersion> GetBestPackageVersionAsync(PackageId packageId,
+            VersionRange versionRange,
+             PackageSourceLocation packageSourceLocation = null);
+    } 
 }

src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx

@@ -138,4 +138,10 @@
   <data name="FailedToValidatePackageSigning" xml:space="preserve">
     <value>Failed to validate package signing.</value>
   </data>
-</root>
+  <data name="FailedToFindSourceUnderPackageSourceMapping" xml:space="preserve">
+    <value>Package Source Mapping is enabled, but no source found under the specified package ID: {0}. See the documentation for Package Source Mapping at https://aka.ms/nuget-package-source-mapping for more details.</value>
+  </data>
+  <data name="FailedToMapSourceUnderPackageSourceMapping" xml:space="preserve">
+    <value>Package Source Mapping is enabled, but no source mapped under the specified package ID: {0}. See the documentation for Package Source Mapping at https://aka.ms/nuget-package-source-mapping for more details.</value>
+  </data>
+</root>

src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Threading;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.ToolPackage;
 using Microsoft.DotNet.Tools;
@@ -36,6 +37,7 @@ internal class NuGetPackageDownloader : INuGetPackageDownloader
         private readonly IFirstPartyNuGetPackageSigningVerifier _firstPartyNuGetPackageSigningVerifier;
         private bool _validationMessagesDisplayed = false;
         private IDictionary<PackageSource, SourceRepository> _sourceRepositories;
+        private readonly bool _isNuGetTool;
 
         private bool _verifySignatures;
 
@@ -47,7 +49,8 @@ public NuGetPackageDownloader(
             IReporter reporter = null,
             RestoreActionConfig restoreActionConfig = null,
             Func<IEnumerable<Task>> timer = null,
-            bool verifySignatures = false)
+            bool verifySignatures = false,
+            bool isNuGetTool = false)
         {
             _packageInstallDir = packageInstallDir;
             _reporter = reporter ?? Reporter.Output;
@@ -69,18 +72,20 @@ public NuGetPackageDownloader(
 
             DefaultCredentialServiceUtility.SetupDefaultCredentialService(new NuGetConsoleLogger(),
                 !_restoreActionConfig.Interactive);
+            _isNuGetTool = isNuGetTool;
         }
 
         public async Task<string> DownloadPackageAsync(PackageId packageId,
             NuGetVersion packageVersion = null,
             PackageSourceLocation packageSourceLocation = null,
             bool includePreview = false,
-            DirectoryPath? downloadFolder = null)
+            DirectoryPath? downloadFolder = null,
+            PackageSourceMapping packageSourceMapping = null)
         {
             CancellationToken cancellationToken = CancellationToken.None;
 
             (var source, var resolvedPackageVersion) = await GetPackageSourceAndVersion(packageId, packageVersion,
-                packageSourceLocation, includePreview);
+                packageSourceLocation, includePreview, packageSourceMapping).ConfigureAwait(false);
 
             FindPackageByIdResource resource = null;
             SourceRepository repository = GetSourceRepository(source);
@@ -214,13 +219,14 @@ public async Task<IEnumerable<string>> ExtractPackageAsync(string packagePath, D
         private async Task<(PackageSource, NuGetVersion)> GetPackageSourceAndVersion(PackageId packageId,
              NuGetVersion packageVersion = null,
              PackageSourceLocation packageSourceLocation = null,
-             bool includePreview = false)
+             bool includePreview = false,
+             PackageSourceMapping packageSourceMapping = null)
         {
             CancellationToken cancellationToken = CancellationToken.None;
 
             IPackageSearchMetadata packageMetadata;
 
-            IEnumerable<PackageSource> packagesSources = LoadNuGetSources(packageSourceLocation);
+            IEnumerable<PackageSource> packagesSources = LoadNuGetSources(packageId, packageSourceLocation, packageSourceMapping);
             PackageSource source;
 
             if (packageVersion is null)
@@ -284,9 +290,9 @@ private static bool PackageIsInAllowList(IEnumerable<string> files)
             return true;
         }
 
-        private IEnumerable<PackageSource> LoadNuGetSources(PackageSourceLocation packageSourceLocation = null)
+        private IEnumerable<PackageSource> LoadNuGetSources(PackageId packageId, PackageSourceLocation packageSourceLocation = null, PackageSourceMapping packageSourceMapping = null)
         {
-            IEnumerable<PackageSource> defaultSources = new List<PackageSource>();
+            List<PackageSource> defaultSources = new List<PackageSource>();
             string currentDirectory = Directory.GetCurrentDirectory();
             ISettings settings;
             if (packageSourceLocation?.NugetConfig != null)
@@ -304,8 +310,25 @@ private IEnumerable<PackageSource> LoadNuGetSources(PackageSourceLocation packag
             }
 
             PackageSourceProvider packageSourceProvider = new PackageSourceProvider(settings);
-            defaultSources = packageSourceProvider.LoadPackageSources().Where(source => source.IsEnabled);
+            defaultSources = packageSourceProvider.LoadPackageSources().Where(source => source.IsEnabled).ToList();
+
+            packageSourceMapping = packageSourceMapping ?? PackageSourceMapping.GetPackageSourceMapping(settings);
 
+            // filter package patterns if enabled            
+            if (_isNuGetTool && packageSourceMapping?.IsEnabled == true)
+            {
+                IReadOnlyList<string> sources = packageSourceMapping.GetConfiguredPackageSources(packageId.ToString());
+
+                if (sources.Count == 0)
+                {
+                    throw new NuGetPackageInstallerException(string.Format(LocalizableStrings.FailedToFindSourceUnderPackageSourceMapping, packageId));
+                }
+                defaultSources = defaultSources.Where(source => sources.Contains(source.Name)).ToList();
+                if (defaultSources.Count == 0)
+                {
+                    throw new NuGetPackageInstallerException(string.Format(LocalizableStrings.FailedToMapSourceUnderPackageSourceMapping, packageId));
+                }
+            }
 
             if (packageSourceLocation?.AdditionalSourceFeed?.Any() ?? false)
             {
@@ -325,7 +348,7 @@ private IEnumerable<PackageSource> LoadNuGetSources(PackageSourceLocation packag
                         continue;
                     }
 
-                    defaultSources = defaultSources.Append(packageSource);
+                    defaultSources.Add(packageSource);
                 }
             }
 
@@ -377,7 +400,61 @@ private IEnumerable<PackageSource> LoadNuGetSources(PackageSourceLocation packag
             return retrievedSources;
         }
 
-        private async Task<(PackageSource, IPackageSearchMetadata)> GetLatestVersionInternalAsync(
+        private async Task<(PackageSource, IPackageSearchMetadata)> GetMatchingVersionInternalAsync(
+            string packageIdentifier, IEnumerable<PackageSource> packageSources, VersionRange versionRange,
+            CancellationToken cancellationToken)
+        {
+            if (packageSources == null)
+            {
+                throw new ArgumentNullException(nameof(packageSources));
+            }
+
+            if (string.IsNullOrWhiteSpace(packageIdentifier))
+            {
+                throw new ArgumentException($"{nameof(packageIdentifier)} cannot be null or empty",
+                    nameof(packageIdentifier));
+            }
+
+            (PackageSource source, IEnumerable<IPackageSearchMetadata> foundPackages)[] foundPackagesBySource;
+
+            if (_restoreActionConfig.DisableParallel)
+            {
+                foundPackagesBySource = packageSources.Select(source => GetPackageMetadataAsync(source,
+                    packageIdentifier,
+                    true, cancellationToken).ConfigureAwait(false).GetAwaiter().GetResult()).ToArray();
+            }
+            else
+            {
+                foundPackagesBySource =
+                    await Task.WhenAll(
+                            packageSources.Select(source => GetPackageMetadataAsync(source, packageIdentifier,
+                                true, cancellationToken)))
+                        .ConfigureAwait(false);
+            }
+
+            IEnumerable<(PackageSource source, IPackageSearchMetadata package)> accumulativeSearchResults =
+                foundPackagesBySource
+                    .SelectMany(result => result.foundPackages.Select(package => (result.source, package)));
+
+            var availableVersions = accumulativeSearchResults.Select(t => t.package.Identity.Version).ToList();
+            var bestVersion = versionRange.FindBestMatch(availableVersions);
+            if (bestVersion != null)
+            {
+                var bestResult = accumulativeSearchResults.First(t => t.package.Identity.Version == bestVersion);
+                return bestResult;
+            }
+            else
+            {
+                throw new NuGetPackageNotFoundException(
+                    string.Format(
+                        LocalizableStrings.IsNotFoundInNuGetFeeds,
+                        packageIdentifier,
+                        string.Join(", ", packageSources.Select(source => source.Source))));
+            }
+
+        }
+
+            private async Task<(PackageSource, IPackageSearchMetadata)> GetLatestVersionInternalAsync(
             string packageIdentifier, IEnumerable<PackageSource> packageSources, bool includePreview,
             CancellationToken cancellationToken)
         {
@@ -444,6 +521,23 @@ await Task.WhenAll(
             return latestVersion;
         }
 
+        public async Task<NuGetVersion> GetBestPackageVersionAsync(PackageId packageId,
+            VersionRange versionRange,
+             PackageSourceLocation packageSourceLocation = null)
+        {
+            CancellationToken cancellationToken = CancellationToken.None;
+            IPackageSearchMetadata packageMetadata;
+
+            IEnumerable<PackageSource> packagesSources = LoadNuGetSources(packageId, packageSourceLocation);
+            PackageSource source;
+
+            (source, packageMetadata) = await GetMatchingVersionInternalAsync(packageId.ToString(), packagesSources,
+                    versionRange, cancellationToken).ConfigureAwait(false);
+
+            NuGetVersion packageVersion = packageMetadata.Identity.Version;
+            return packageVersion;
+        }
+
         private async Task<(PackageSource, IPackageSearchMetadata)> GetPackageMetadataAsync(string packageIdentifier,
             NuGetVersion packageVersion, IEnumerable<PackageSource> sources, CancellationToken cancellationToken)
         {
@@ -569,7 +663,7 @@ public async Task<NuGetVersion> GetLatestPackageVersion(PackageId packageId,
         {
             CancellationToken cancellationToken = CancellationToken.None;
             IPackageSearchMetadata packageMetadata;
-            IEnumerable<PackageSource> packagesSources = LoadNuGetSources(packageSourceLocation);
+            IEnumerable<PackageSource> packagesSources = LoadNuGetSources(packageId, packageSourceLocation);
 
             (_, packageMetadata) = await GetLatestVersionInternalAsync(packageId.ToString(), packagesSources,
                 includePreview, cancellationToken).ConfigureAwait(false);