C#: Re-factor feed handling logic into its own component.#22011
Draft
michaelnebel wants to merge 6 commits into
Draft
C#: Re-factor feed handling logic into its own component.#22011michaelnebel wants to merge 6 commits into
michaelnebel wants to merge 6 commits into
Conversation
michaelnebel
force-pushed
the
csharp/removeafallback
branch
from
b12d21a to
62bfb70
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+197
to
+210
| catch (Exception exc) | ||
| { | ||
| if (exc is TaskCanceledException tce && | ||
| tce.CancellationToken == cts.Token && | ||
| cts.Token.IsCancellationRequested) | ||
| { | ||
| logger.LogInfo($"Didn't receive answer from NuGet feed '{feed}' in {timeoutMilliSeconds}ms."); | ||
| timeoutMilliSeconds *= 2; | ||
| continue; | ||
| } | ||
|
|
||
| logger.LogInfo($"Querying NuGet feed '{feed}' failed. The reason for the failure: {exc.Message}"); | ||
| return false; | ||
| } |
michaelnebel
changed the title
…ot the entire FileProvider.
michaelnebel
force-pushed
the
csharp/removeafallback
branch
from
2ccca0d to
5f31632
Compare
Comment on lines
+49
to
+52
| catch (Exception exc) | ||
| { | ||
| logger.LogWarning($"Failed to get directory of '{path}': {exc}"); | ||
| } |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors NuGet feed handling in the C# dependency fetching extractor by moving feed discovery/reachability/restore-source construction into a dedicated FeedManager component, reducing responsibility and complexity in NugetPackageRestorer.
Changes:
- Introduces
FeedManagerto encapsulate NuGet feed enumeration, reachability checks (incl. Dependabot proxy support), and restore source argument construction. - Updates
NugetPackageRestorerto delegate feed-related logic toFeedManagerand to dispose it appropriately. - Simplifies
PackagesConfigRestorer’s no-op implementation by passing only thepackages.configcollection it needs, and reuses the moved public NuGet feed constant.
Show a summary per file
| File | Description |
|---|---|
| csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs | Adjusts the no-op packages.config restorer to depend only on the packages.config list; switches default feed constant reference. |
| csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs | Delegates feed logic to FeedManager, removes inlined feed-handling code, and disposes the new component. |
| csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs | New component containing NuGet feed discovery, reachability checks, fallback feed handling, and restore source argument creation. |
Copilot's findings
- Files reviewed: 3/3 changed files
- Comments generated: 1
michaelnebel
added
the
no-change-note-required
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a semantics preserving re-factor, where the logic related feed checking/discovery is moved into its own component, which will enable re-use in subsequent PR(s).