C#: Remove the explicitfeeds argument from DownloadMissingPackagesFromSpecificFeeds as it is always called with this argument.

Author: michaelnebel

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

@@ -445,7 +445,7 @@ private List<string> GetReachableNuGetFeeds(HashSet<string> feedsToCheck, bool i
             return reachableFeeds;
         }
 
-        public List<string> GetReachableFallbackNugetFeeds(ImmutableHashSet<string>? feedsFromNugetConfigs)
+        public List<string> GetReachableFallbackNugetFeeds()
         {
             var fallbackFeeds = EnvironmentVariables.GetURLs(EnvironmentVariableNames.FallbackNugetFeeds).ToHashSet();
             if (fallbackFeeds.Count == 0)
@@ -456,12 +456,12 @@ public List<string> GetReachableFallbackNugetFeeds(ImmutableHashSet<string>? fee
                 var shouldAddNugetConfigFeeds = EnvironmentVariables.GetBooleanOptOut(EnvironmentVariableNames.AddNugetConfigFeedsToFallback);
                 logger.LogInfo($"Adding feeds from nuget.config to fallback restore: {shouldAddNugetConfigFeeds}");
 
-                if (shouldAddNugetConfigFeeds && feedsFromNugetConfigs?.Count > 0)
+                if (shouldAddNugetConfigFeeds && ExplicitFeeds.Count > 0)
                 {
-                    // There are some feeds in `feedsFromNugetConfigs` that have already been checked for reachability, we could skip those.
-                    // But we might use different responsiveness testing settings when we try them in the fallback logic, so checking them again is safer.
-                    fallbackFeeds.UnionWith(feedsFromNugetConfigs);
-                    logger.LogInfo($"Using NuGet feeds from nuget.config files as fallback feeds: {string.Join(", ", feedsFromNugetConfigs.OrderBy(f => f))}");
+                    // Feeds in `ExplicitFeeds` may already been checked for reachability.
+                    // But we might use different responsiveness testing settings when we try them in the fallback logic, so checking them again.
+                    fallbackFeeds.UnionWith(ExplicitFeeds);
+                    logger.LogInfo($"Using NuGet feeds from nuget.config files as fallback feeds: {string.Join(", ", ExplicitFeeds.OrderBy(f => f))}");
                 }
             }
 

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

@@ -133,7 +133,7 @@ public HashSet<AssemblyLookupLocation> Restore()
                 {
                     // If we experience a timeout, we use this fallback.
                     // todo: we could also check the reachability of the inherited nuget feeds, but to use those in the fallback we would need to handle authentication too.
-                    var unresponsiveMissingPackageLocation = DownloadMissingPackagesFromSpecificFeeds([], explicitFeeds);
+                    var unresponsiveMissingPackageLocation = DownloadMissingPackagesAndUseFallback([]);
                     return unresponsiveMissingPackageLocation is null
                         ? []
                         : [unresponsiveMissingPackageLocation];
@@ -196,7 +196,7 @@ public HashSet<AssemblyLookupLocation> Restore()
             var usedPackageNames = GetAllUsedPackageDirNames(dependencies);
 
             var missingPackageLocation = feedManager.CheckNugetFeedResponsiveness
-                ? DownloadMissingPackagesFromSpecificFeeds(usedPackageNames, explicitFeeds)
+                ? DownloadMissingPackagesAndUseFallback(usedPackageNames)
                 : DownloadMissingPackages(usedPackageNames);
 
             if (missingPackageLocation is not null)
@@ -303,9 +303,9 @@ private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<Dep
             compilationInfoContainer.CompilationInfos.Add(("Failed project restore with missing package error", nugetMissingPackageFailures.ToString()));
         }
 
-        private AssemblyLookupLocation? DownloadMissingPackagesFromSpecificFeeds(IEnumerable<string> usedPackageNames, ImmutableHashSet<string>? feedsFromNugetConfigs)
+        private AssemblyLookupLocation? DownloadMissingPackagesAndUseFallback(IEnumerable<string> usedPackageNames)
         {
-            var reachableFallbackFeeds = feedManager.GetReachableFallbackNugetFeeds(feedsFromNugetConfigs);
+            var reachableFallbackFeeds = feedManager.GetReachableFallbackNugetFeeds();
             compilationInfoContainer.CompilationInfos.Add(("Reachable fallback NuGet feed count", reachableFallbackFeeds.Count.ToString()));
 
             if (reachableFallbackFeeds.Count > 0)