enable updating transitive dependencies with solver #10776
Merged
Conversation
This file contains 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
brettfo
commented
Oct 10, 2024
| @@ -53,6 +60,54 @@ public static async Task UpdateDependencyAsync( | |||
| await SaveBuildFilesAsync(buildFiles, logger); | |||
| } | |||
|
|
|||
| public static async Task UpdateDependencyWithConflictResolution( | |||
There was a problem hiding this comment.
This function is what enables the correct behavior; updating a transitive dependency by updating a top-level one.
JamieMagee
approved these changes
Oct 11, 2024
|
@brettfo should this smoke test be merged too? dependabot/smoke-tests#219 |
brettfo
force-pushed
the
dev/brettfo/nuget-transitive-solve
branch
2 times, most recently
from
676f56e
to
eb32a82
Compare
JamieMagee
approved these changes
Oct 15, 2024
sebasgomez238
approved these changes
Oct 17, 2024
JamieMagee
force-pushed
the
dev/brettfo/nuget-transitive-solve
branch
from
d2cad34
to
4759dbd
Compare
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.
Previously if updating a transitive dependency, it was just pinned and no conflict resolution was performed.
This PR fixes that by elevating the check for using the dependency solver up one function. This enables a transitive dependency to be fixed by updating the top-level package. The solver has always had this capability, but it was bypassed in the transitive case.
The following other changes were performed:
DependencySolverEnvironmentto make unit testing the dependency solver easier; fewer magic strings.ResolveDependencyConflictsNew=>ResolveDependencyConflictsResolveDependencyConflictsOld=>ResolveDependencyConflictsWithBruteForce