-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Revert default for UseSafeAreaProperty to value from .NET 6 for iOS #16093
Conversation
Tagging @tj-devel709 - you were looking at something similar recently. |
yay regression fixing! I'm curious though; why did changing the default break the property entirely? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PageAdjustsWhenTopTabsArePresent
Is currently failing on iOS
It didn't. There are two properties in play - So you might have a Page in .NET 6 with a Grid marked |
/backport to net7.0 |
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/5670519752 |
@PureWeen backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Revert default for UseSafeAreaProperty to value from .NET 6 for iOS Fixes #12823
Applying: Update to ignore broken iOS test for now
Using index info to reconstruct a base tree...
M src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
CONFLICT (content): Merge conflict in src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Update to ignore broken iOS test for now
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@PureWeen an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
…16093) * Revert default for UseSafeAreaProperty to value from .NET 6 for iOS Fixes #12823 * Update to ignore broken iOS test for now * Fix shell tab test # Conflicts: # src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
…16093) (#16379) * Revert default for UseSafeAreaProperty to value from .NET 6 for iOS Fixes #12823 * Update to ignore broken iOS test for now * Fix shell tab test # Conflicts: # src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
Description of Change
#10083 modified the default value for the
UseSafeAreaProperty
; this change sets it back to the original value from .NET 6 for iOS.This should be backported for 7 since the original PR caused a behavior change in 7.
Issues Fixed
Fixes #12823