diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs index a497060bdd5..744b60f3d3f 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs @@ -90,7 +90,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching public string FeedsToRestoreArgument(IEnumerable feeds, string sourceArgumentPrefix) { - // If there are no feeds, we want to override any default feeds that `dotnet restore` would use by passing a dummy source argument. + // 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}\""; @@ -112,7 +112,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching /// (1) Use the feeds we get from `dotnet nuget list source` /// (2) Use private registries, if they are configured /// - /// Path to project/solution + /// Path to project/solution/packages.config /// The set of reachable NuGet feeds. /// The list of NuGet feeds to use for this restore. public IEnumerable FeedsToUse(string path, HashSet reachableFeeds) diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs index 64ba2c5b637..af484ba406e 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs @@ -72,8 +72,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching private bool IsDefaultFeedReachable => isDefaultFeedReachable ??= feedManager.IsDefaultFeedReachable(); - - /// /// Create the package manager for a specified source tree. /// @@ -175,7 +173,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching var feedsToUse = feedManager.FeedsToUse(packagesConfig, reachableFeeds).ToList(); var useDefaultFeed = feedsToUse.Count == 0 && IsDefaultFeedReachable; - // Explicitly construct the sources to be used for the restore command if any of the following is true: + // Explicitly construct the sources to be used for the restore command when checking feed + // responsiveness, using private registries, or falling back to nuget.org. if (feedManager.CheckNugetFeedResponsiveness || feedManager.HasPrivateRegistryFeeds || useDefaultFeed) { if (useDefaultFeed)