Upgrade to Microsoft.UI.Xaml 2.6.2 (or equivalent) #10996
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
This commit moves us from MUX 2.5 to MUX 2.6. I have temporarily disabled the new control styles in TerminalApp\App.xaml by setting ControlsResourcesVersion to Version1. There is no significant expected visual impact.
DHowett
force-pushed
the
dev/duhowett/mux-2.6
branch
from
fc56767
to
8890734
Compare
zadjii-msft
approved these changes
Aug 20, 2021
ghost
added
Area-Build
miniksa
approved these changes
Aug 20, 2021
|
@msftbot merge this in 10 minutes |
ghost
added
the
AutoMerge
|
Hello @miniksa! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
ghost
merged commit
DHowett
added a commit
that referenced
this pull request
Aug 24, 2021
…11031) The upgrade to 2.6 revealed #11003 and microsoft/microsoft-ui-xaml#5435, and is impeding progress on PGO. This reverts commit cfdf03c. Reverts #10996
ghost
pushed a commit
that referenced
this pull request
Sep 20, 2021
* this is the same thing as #10996, but with the fix that caused us to #11031 * This includes microsoft/microsoft-ui-xaml#3769, so we had to make some adjustments to how we handle tab colors. It works the same as before. * Should enable #11231 to be started * [x] Closes #10508 * [x] Closes #7133 * [x] Closes #8948 * [ ] I need to finish letting my 19H1 VM boot to make sure unpackaged still works
This pull request was closed.
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 commit moves us from MUX 2.5 to MUX 2.6. I have temporarily
disabled the new control styles in
TerminalApp\App.xamlby settingControlsResourcesVersiontoVersion1. There is no significant expectedvisual impact.
Closes #10508