Pull release/6.0 into main #6071
Merged
Conversation
This file contains hidden or 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
requested review from
singhashish-wpf
approved these changes
Feb 8, 2022
Contributor
|
Thank you @ThomasGoulet73 ! |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Contains #5453 and #5329
Fixes #5448
Fixes #4119
Description
I recently noticed that a couple of changes were made in
release/6.0and were never pulled back intomainso I took the liberty of opening a PR targetingmainwith those changes.I did this by rebasing and squashing
release/6.0ontomainand then I removed changes that were specific torelease/6.0.Customer Impact
None.
Regression
No.
Testing
Local build + this code is already in
release/6.0.Risk
None.