Update to latest 6.0 .Net Runtime/SDK #10229
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
ghost
assigned 
RussKie
approved these changes
Oct 6, 2022
|
Thank you |
gerhardol
reviewed
Oct 6, 2022
Comment on lines
+2
to
+5
| "sdk": { | ||
| "version": "6.0.401", | ||
| "rollForward": "feature" | ||
| } |
There was a problem hiding this comment.
The update script should be updated to fix the formatting, to decrease noise in the changes
There was a problem hiding this comment.
See https://stackoverflow.com/questions/33145377/how-to-change-tab-width-when-converting-to-json-in-powershell. I didn't want to add another dependancy like Newtonsoft module and the hack with string manipulation feels too hacky. The json is valid and frankly managed by script. Why I didn't do that.
|
Should we cherry-pick this to the release/4.0 branch, too? |
RussKie
pushed a commit
that referenced
this pull request
Oct 8, 2022
(cherry picked from commit 1cc4173)
|
Done, thank you for the reminder. |
|
PowerShell handling of JSON is... imperfect.
|
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.
Proposed changes
.\scripts\Update-DotnetVersion.ps1git diff -U0 -w --no-color --ignore-blank-lines | git apply --cached --ignore-whitespace --unidiff-zero --to stage non whitespace changes. This time I also staged whitespace on the global.json file to make it not have much of a diff in the future. This prevents staging the blank line removal in the RepoLayout.props file that this script generates.Test methodology
Test environment(s)
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.