improve packages directory detection #10912
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
Nov 8, 2024
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/PackagesConfigUpdaterTests.cs
Outdated
Show resolved
Hide resolved
brettfo
commented
Nov 8, 2024
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/PackagesConfigUpdater.cs
Outdated
Show resolved
Hide resolved
sebasgomez238
approved these changes
Nov 8, 2024
2620658 to
31d0776
Compare
brettfo
commented
Nov 8, 2024
| { | ||
| var hintPath = hintPathNode.GetContentValue(); | ||
| var match = Regex.Match(hintPath, @"^(?<PackagesPath>.*)[/\\](?<PackageNameAndVersion>[^/\\]+)[/\\]lib[/\\](?<Tfm>[^/\\]+)[/\\](?<AssemblyName>[^/\\]+)$"); | ||
| // e.g., ..\..\packages \ Some.Package.1.2.3 \ lib\ net45 \ Some.Package.dll |
There was a problem hiding this comment.
Improved regex and comment describing what it does. It's harder to read, but much more accurate.
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 came from a bug found in the wild where we didn't detect the packages directory from a
.csprojand went with the default of"../packages". That's not an unreasonable default, but there was one more check we could do to try and find a reasonable solution; check other<HintPath>values and see if any of those specify"packages"anywhere and use that.