C#: Move feed prefix logic out of the feed manager.

Author: michaelnebel

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs

@@ -90,7 +90,8 @@ private List<string> GetRestoreArgs(RestoreSettings restoreSettings)
                 args.Add("/p:EnableWindowsTargeting=true");
             }
 
-            args.AddRange(restoreSettings.NugetSources);
+            var nugetSources = restoreSettings.NugetSources.SelectMany<string, string>(source => ["-s", source]).ToList();
+            args.AddRange(nugetSources);
 
             return args;
         }

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs

@@ -157,19 +157,16 @@ private IEnumerable<string> GetFeedsFromNugetConfig(string nugetConfigPath) =>
         /// If there are no feeds, a dummy source argument is added to override any default feeds that `restore` would use.
         /// </summary>
         /// <param name="feeds">The list of feeds to use for the restore command.</param>
-        /// <param name="sourceArgumentPrefix">The prefix to use for each source argument (e.g., "-s").</param>
         /// <returns>The list of NuGet sources arguments for the restore command.</returns>
-        public List<string> FeedsToRestoreArgument(IEnumerable<string> feeds, string sourceArgumentPrefix)
+        public List<string> RestoreFeeds(IEnumerable<string> feeds)
         {
             // If there are no feeds, we want to override any default feeds that `restore` would use by passing a dummy source argument.
             if (!feeds.Any())
             {
-                return [sourceArgumentPrefix, emptyPackageDirectory.DirInfo.FullName];
+                return [emptyPackageDirectory.DirInfo.FullName];
             }
 
-            // Add package sources. If any are present, they override all sources specified in
-            // the configuration file(s).
-            return feeds.SelectMany<string, string>(feed => [sourceArgumentPrefix, feed]).ToList();
+            return feeds.ToList();
         }
 
         private IEnumerable<string> FeedsToUseAux(HashSet<string> feedsToConsider)
@@ -202,24 +199,14 @@ public IEnumerable<string> FeedsToUse(string path)
             return FeedsToUseAux(feedsToConsider);
         }
 
-        /// <summary>
-        /// Constructs the NuGet sources argument for the `dotnet restore` command based on the given feeds.
-        /// </summary>
-        /// <param name="feeds">The list of NuGet feeds to use for the restore command.</param>
-        /// <returns>A list representing the NuGet sources arguments for the `dotnet restore` command.</returns>
-        public List<string> FeedsToDotnetRestoreArgument(IEnumerable<string> feeds)
-        {
-            return FeedsToRestoreArgument(feeds, "-s");
-        }
-
         /// <summary>
         /// Constructs the list of NuGet sources to use for dotnet restore.
         /// (1) Use the feeds we get from `dotnet nuget list source`
         /// (2) Use private registries, if they are configured
         /// </summary>
         /// <param name="path">Path to project/solution</param>
         /// <returns>A list representing the NuGet sources arguments for the `dotnet restore` command.</returns>
-        public List<string> MakeDotnetRestoreSourcesArguments(string path)
+        public List<string> MakeRestoreFeeds(string path)
         {
             // Do not construct a set of explicit NuGet sources to use for restore.
             if (!CheckNugetFeedResponsiveness && !HasPrivateRegistryFeeds)
@@ -229,7 +216,7 @@ public List<string> MakeDotnetRestoreSourcesArguments(string path)
 
             var feedsToUse = FeedsToUse(path);
 
-            return FeedsToDotnetRestoreArgument(feedsToUse);
+            return RestoreFeeds(feedsToUse);
         }
 
         private (int initialTimeout, int tryCount) GetFeedRequestSettings(bool isFallback)

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs

@@ -53,7 +53,7 @@ public NugetPackageRestorer(
         public string? TryRestore(string package)
         {
             var feeds = feedManager.CheckNugetFeedResponsiveness ? feedManager.ReachableFeeds : feedManager.AllFeeds;
-            var nugetSources = feedManager.FeedsToDotnetRestoreArgument(feeds);
+            var nugetSources = feedManager.RestoreFeeds(feeds);
             if (TryRestorePackageManually(package, nugetSources))
             {
                 var packageDir = DependencyManager.GetPackageDirectory(package, missingPackageDirectory.DirInfo);
@@ -216,7 +216,7 @@ private IEnumerable<string> RestoreSolutions(out DependencyContainer dependencie
             var projects = fileProvider.Solutions.SelectMany(solution =>
                 {
                     logger.LogInfo($"Restoring solution {solution}...");
-                    var nugetSources = feedManager.MakeDotnetRestoreSourcesArguments(solution);
+                    var nugetSources = feedManager.MakeRestoreFeeds(solution);
                     var res = dotnet.Restore(new(solution, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: nugetSources, TargetWindows: isWindows));
                     if (res.Success)
                     {
@@ -264,7 +264,7 @@ private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<Dep
                 foreach (var project in projectGroup)
                 {
                     logger.LogInfo($"Restoring project {project}...");
-                    var nugetSources = feedManager.MakeDotnetRestoreSourcesArguments(project);
+                    var nugetSources = feedManager.MakeRestoreFeeds(project);
                     var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: nugetSources, TargetWindows: isWindows));
                     assets.AddDependenciesRange(res.AssetsFilePaths);
                     lock (sync)
@@ -312,7 +312,7 @@ private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<Dep
                 feeds = feedManager.AllFeeds;
             }
 
-            var nugetSources = feedManager.FeedsToDotnetRestoreArgument(feeds);
+            var nugetSources = feedManager.RestoreFeeds(feeds);
             var alreadyDownloadedPackages = usedPackageNames.Select(p => p.ToLowerInvariant());
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
 

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -180,7 +179,8 @@ private bool TryRestoreNugetPackage(string packagesConfig)
                     {
                         feedsToUse.Add(FeedManager.PublicNugetOrgFeed);
                     }
-                    sourcesArgument = feedManager.FeedsToRestoreArgument(feedsToUse, "-Source");
+                    var restoreFeeds = feedManager.RestoreFeeds(feedsToUse);
+                    sourcesArgument = restoreFeeds.SelectMany<string, string>(feed => ["-Source", feed]).ToList();
                 }
 
                 /* Use nuget.exe to install a package.