-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
Fix loading of fragments that update multiple profiles #11598
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
ghost
added
Area-Settings
Issues related to settings and customizability, for console or terminal
Issue-Bug
It either shouldn't be doing this or needs an investigation.
Priority-1
A description (P1)
Product-Terminal
The new Windows Terminal.
labels
Oct 24, 2021
lhecker
force-pushed
the
dev/lhecker/11597-fix-fragment-loading
branch
from
October 24, 2021 18:38
d7bfcf9
to
bac197c
Compare
zadjii-msft
added
the
zPreview-Service-Queued-1.13
A floating label that tracks the current Preview version for servicing purposes.
label
Oct 26, 2021
DHowett
approved these changes
Oct 26, 2021
ghost
requested review from
zadjii-msft,
miniksa,
carlos-zamora,
leonMSFT and
PankajBhojwani
October 26, 2021 22:01
PankajBhojwani
approved these changes
Oct 26, 2021
lhecker
added
the
AutoMerge
Marked for automatic merge by the bot when requirements are met
label
Oct 27, 2021
Hello @lhecker! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
ghost
deleted the
dev/lhecker/11597-fix-fragment-loading
branch
October 27, 2021 01:43
DHowett
pushed a commit
that referenced
this pull request
Dec 13, 2021
The "updates" key is an alternative "guid" key for fragment profiles. But SettingsLoader::_appendProfile stores and deduplicates profiles according to their "guid" only. We need to modify the function to optionally store profiles by their "updates" key as well, otherwise multiple fragment profiles without "guid" might collide as they produce the same default GUID. ## PR Checklist * [x] Closes #11597 * [x] I work here * [ ] Tests added/passed * [ ] Schema updated. * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx ## Validation Steps Performed * Unit tests pass ✔️ * Issue #11597 doesn't reproduce anymore ✔️ (cherry picked from commit fe26a6e)
DHowett
removed
the
zPreview-Service-Queued-1.13
A floating label that tracks the current Preview version for servicing purposes.
label
Dec 13, 2021
🎉 Handy links: |
ghost
mentioned this pull request
Dec 14, 2021
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Area-Settings
Issues related to settings and customizability, for console or terminal
AutoMerge
Marked for automatic merge by the bot when requirements are met
Issue-Bug
It either shouldn't be doing this or needs an investigation.
Needs-Second
It's a PR that needs another sign-off
Priority-1
A description (P1)
Product-Terminal
The new Windows Terminal.
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.
The "updates" key is an alternative "guid" key for fragment profiles.
But SettingsLoader::_appendProfile stores and deduplicates profiles according
to their "guid" only. We need to modify the function to optionally store
profiles by their "updates" key as well, otherwise multiple fragment
profiles without "guid" might collide as they produce the same default GUID.
PR Checklist
Validation Steps Performed