Add some defensive code around layout propagation #24217
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
mattleibow
reviewed
Aug 14, 2024
PureWeen
requested review from
Eilon and
mattleibow
and removed request for
a team
mattleibow
approved these changes
Aug 15, 2024
|
The failure on CI is reporting the wrong result for some reason |
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/maui/actions/runs/10410298401 |
|
@PureWeen backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add some defensive code around layout propagation
.git/rebase-apply/patch:95: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add some defensive code around layout propagation
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@PureWeen an error occurred while backporting to main, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
PureWeen
added a commit
that referenced
this pull request
Aug 26, 2024
PureWeen
added a commit
that referenced
this pull request
Aug 26, 2024
This reverts commit d85c05f. # Conflicts: # eng/Versions.props
PureWeen
added a commit
that referenced
this pull request
Aug 26, 2024
samhouts
added
fixed-in-net9.0-nightly
samhouts
added
fixed-in-8.0.82
and removed
fixed-in-net9.0-nightly
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.
Description of Change
We still haven't been able to reproduce this issue ourselves, but based on users stack traces we have identified certain areas that might cause these exceptions.
All of the changes in this PR are good changes to make. None of these changes are purely a guess that doesn't have some other functional benefit.
My guess is that the fix to
NavigationRendererandWrapperVieware probably what's resolving the crash most directly. In .NET MAUI we try to never actually dispose of anything because it can lead to the exceptions that users are seeing.The fixes around
LayoutIfNeededare somewhat of a guess and do run the risk of just pushing this bug down the road.That being said, not calling
LayoutIfNeededwhen we aren't part of the visual tree is a valid change to make and this change will at least make this path not crash.Issues Fixed
Fixes #24032