Permit comments and trailing commas in solution filter files #6346
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
Forgind
changed the title
rainersigwald
approved these changes
Apr 14, 2021
| @@ -415,7 +415,7 @@ internal static string ParseSolutionFromSolutionFilter(string solutionFilterFile | |||
| { | |||
| try | |||
| { | |||
| JsonDocument text = JsonDocument.Parse(File.ReadAllText(solutionFilterFile)); | |||
| JsonDocument text = JsonDocument.Parse(File.ReadAllText(solutionFilterFile), new JsonDocumentOptions() { AllowTrailingCommas = true, CommentHandling = JsonCommentHandling.Skip}); | |||
There was a problem hiding this comment.
I'd go ahead and create a variable for JsonDocumentOptions so that you can comment that it should match the VS behavior.
benvillalobos
approved these changes
Apr 14, 2021
benvillalobos
added
the
merge-when-branch-open
rainersigwald
added a commit
to rainersigwald/msbuild
that referenced
this pull request
May 10, 2021
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.
Fixes #6317
We previously added support for building solution filter files. With that support, we did not allow them to contain lists of projects with a trailing comma or comments. These are both permitted by VS, so this PR updates our handling of solution filter files to permit building with trailing commas or comments.
Also adds a test.