-
Notifications
You must be signed in to change notification settings - Fork 1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Handle semicolons in packageReferences #10909
Merged
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
requested changes
Nov 7, 2024
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs
Outdated
Show resolved
Hide resolved
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/PackageReferenceUpdater.cs
Outdated
Show resolved
Hide resolved
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/PackageReferenceUpdater.cs
Outdated
Show resolved
Hide resolved
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/AnalyzeWorker.cs
Outdated
Show resolved
Hide resolved
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/VersionFinder.cs
Outdated
Show resolved
Hide resolved
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/VersionFinder.cs
Outdated
Show resolved
Hide resolved
sebasgomez238
force-pushed
the
users/segomez/semicolons-in-package-reference
branch
from
November 14, 2024 18:20
c54ae04
to
9c015aa
Compare
brettfo
reviewed
Nov 18, 2024
brettfo
reviewed
Nov 18, 2024
nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunWorker.cs
Outdated
Show resolved
Hide resolved
brettfo
reviewed
Nov 18, 2024
@@ -229,7 +229,7 @@ async Task TrackOriginalContentsAsync(string directory, string fileName, string? | |||
// TODO: need to report if anything was actually updated | |||
if (updateResult.ErrorType is null || updateResult.ErrorType == ErrorType.None) | |||
{ | |||
if (dependencyLocation != dependencyFilePath) | |||
if (dependencyLocation != dependencyFilePath.EnsurePrefix("/")) | |||
{ | |||
updatedDependency.Requirements.All(r => r.File == dependencyFilePath); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note for future me: what's the purpose of this? It's computing a bool
and immediately discarding it.
brettfo
approved these changes
Nov 18, 2024
kbukum1
approved these changes
Nov 18, 2024
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.
Addresses #10766 but only in the pure C# updater.
This PR splits semi-colons in packageReferences and handles them as two separate dependencies. The resulting PR content does not separate the packages it only updates the version.
Semicolons will still cause the ruby side of things to fail.