Skip to content

Commit e934562

Browse files
committed
C#: Turn reachable fallback feeds into a property.
1 parent 359408f commit e934562

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ internal sealed partial class FeedManager : IDisposable
7878
/// </summary>
7979
public ImmutableHashSet<string> ReachableFeeds => lazyReachableFeeds.Value;
8080

81+
private readonly Lazy<ImmutableHashSet<string>> lazyReachableFallbackFeeds;
82+
/// <summary>
83+
/// Gets the list of reachable NuGet feeds that are configured as fallback feeds.
84+
/// </summary>
85+
public ImmutableHashSet<string> ReachableFallbackFeeds => lazyReachableFallbackFeeds.Value;
86+
87+
8188
public FeedManager(ILogger logger, IDotNet dotnet, DependabotProxy? dependabotProxy, FileProvider fileProvider)
8289
{
8390
this.logger = logger;
@@ -101,6 +108,11 @@ public FeedManager(ILogger logger, IDotNet dotnet, DependabotProxy? dependabotPr
101108
CheckSpecifiedFeeds(InheritedFeeds, out var reachableInheritedFeeds);
102109
return ReachableExplicitFeeds.Union(reachableInheritedFeeds).ToImmutableHashSet();
103110
});
111+
lazyReachableFallbackFeeds = new Lazy<ImmutableHashSet<string>>(() =>
112+
{
113+
var reachableFallbackFeeds = GetReachableFallbackNugetFeeds();
114+
return reachableFallbackFeeds.ToImmutableHashSet();
115+
});
104116
}
105117

106118

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<Dep
307307
if (feedManager.CheckNugetFeedResponsiveness || feedManager.HasPrivateRegistryFeeds)
308308
{
309309
// Attempt to get the fallback configuration.
310-
var reachableFallbackFeeds = feedManager.GetReachableFallbackNugetFeeds();
310+
var reachableFallbackFeeds = feedManager.ReachableFallbackFeeds;
311311
compilationInfoContainer.CompilationInfos.Add(("Reachable fallback NuGet feed count", reachableFallbackFeeds.Count.ToString()));
312312

313313
if (reachableFallbackFeeds.Count == 0)

0 commit comments

Comments
 (0)