Factorize PackageDwnloadRunner

Author: Nigusu-Allehu

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/Package/Download/PackageDownloadRunner.cs

@@ -238,53 +238,71 @@ private static bool TryGetRepositoriesForPackage(
             out IReadOnlyList<SourceRepository> repositories)
         {
             var mappedNames = packageSourceMapping.GetConfiguredPackageSources(packageId);
+            IReadOnlyList<SourceRepository> resultRepositories;
 
-            // Only validate insecure sources when mapping produced something
             if (mappedNames.Count > 0)
             {
-                var mappedRepos = new List<SourceRepository>(mappedNames.Count);
-                foreach (var mappedName in mappedNames)
-                {
-                    SourceRepository? repo = null;
-                    for (int i = 0; i < allRepos.Count; i++)
-                    {
-                        if (string.Equals(allRepos[i].PackageSource.Name, mappedName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            repo = allRepos[i];
-                            break;
-                        }
-                    }
+                resultRepositories = GetMappedRepositories(mappedNames, allRepos, packageId, logger);
 
-                    if (repo != null)
-                    {
-                        mappedRepos.Add(repo);
-                    }
-                    else
-                    {
-                        logger.LogVerbose(
-                            string.Format(
-                                CultureInfo.CurrentCulture,
-                                Strings.PackageDownloadCommand_PackageSourceMapping_NoSuchSource,
-                                mappedName,
-                                packageId));
-                    }
-                }
-
-                if (DetectAndReportInsecureSources(args.AllowInsecureConnections, mappedRepos.Select(repo => repo.PackageSource), logger))
+                if (DetectAndReportInsecureSources(args.AllowInsecureConnections, resultRepositories.Select(repo => repo.PackageSource), logger))
                 {
                     repositories = [];
                     return false;
                 }
-
-                repositories = mappedRepos;
-                return true;
             }
             else
             {
-                // No mapping for this package: fall back to all sources
-                repositories = allRepos;
-                return true;
+                // No mapping for this package
+                resultRepositories = allRepos;
             }
+
+            repositories = resultRepositories;
+            return true;
+        }
+
+        private static IReadOnlyList<SourceRepository> GetMappedRepositories(
+            IReadOnlyList<string> mappedNames,
+            IReadOnlyList<SourceRepository> allRepos,
+            string packageId,
+            ILoggerWithColor logger)
+        {
+            var mappedRepos = new List<SourceRepository>(mappedNames.Count);
+
+            foreach (var mappedName in mappedNames)
+            {
+                SourceRepository? repo = FindRepositoryByName(mappedName, allRepos);
+
+                if (repo != null)
+                {
+                    mappedRepos.Add(repo);
+                }
+                else
+                {
+                    logger.LogVerbose(
+                        string.Format(
+                            CultureInfo.CurrentCulture,
+                            Strings.PackageDownloadCommand_PackageSourceMapping_NoSuchSource,
+                            mappedName,
+                            packageId));
+                }
+            }
+
+            return mappedRepos;
+        }
+
+        private static SourceRepository? FindRepositoryByName(
+            string mappedName,
+            IReadOnlyList<SourceRepository> allRepos)
+        {
+            for (int i = 0; i < allRepos.Count; i++)
+            {
+                if (string.Equals(allRepos[i].PackageSource.Name, mappedName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return allRepos[i];
+                }
+            }
+
+            return null;
         }
 
         private static async Task<bool> DownloadPackageAsync(

test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Package/Download/PackageDownloadRunnerTests.cs

@@ -470,6 +470,18 @@ public static IEnumerable<object[]> Cases()
             false,
             null!
         };
+
+        // no --source, mapping -> A&B, package in both A and B. Latest version from A installed
+        yield return new object[]
+        {
+            new List<(string,string)> { ("Contoso.Mapped", "3.0.0") },                            // A
+            new List<(string,string)> { ("Contoso.Mapped", "2.0.0") },                           // B
+            new List<(string,string)> { ("A", "Contoso.*"), ("B", "Contoso.*") }, // mapped to A&B
+            null,
+            "Contoso.Mapped", null,
+            true,
+            ("Contoso.Mapped", "3.0.0")
+        };
     }
 
     [Theory]