Disable NSToolbar Tabs#25137
Merged
Merged
Conversation
PureWeen
requested review from
drasticactions and
jfversluis
and removed request for
mattleibow and
rmarinho
pictos
reviewed
Oct 8, 2024
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
Member
Author
|
This one is on hold until we merge |
jsuarezruiz
reviewed
Oct 9, 2024
Member
Author
|
/backport to net9.0 |
Contributor
|
Started backporting to net9.0: https://github.com/dotnet/maui/actions/runs/11277901831 |
PureWeen
changed the base branch from
release/8.0.1xx-sr9
to
release/8.0.1xx-sr10
Member
Author
|
/rebase |
github-actions
Bot
force-pushed
the
fix_25136
branch
from
2e9c4ad to
1bc4cee
Compare
StephaneDelcroix
approved these changes
Nov 4, 2024
Redth
approved these changes
Nov 4, 2024
jsuarezruiz
approved these changes
Nov 5, 2024
jsuarezruiz
suggested changes
Nov 5, 2024
Contributor
|
Fixing CI, the changes works as expected. |
PureWeen
requested review from
Redth,
StephaneDelcroix,
jsuarezruiz and
pictos
jsuarezruiz
approved these changes
Nov 5, 2024
Member
Author
|
/backport to main |
Contributor
|
Started backporting to main: https://github.com/dotnet/maui/actions/runs/11694739135 |
Contributor
|
@PureWeen backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Disable NSToolbar Tabs
.git/rebase-apply/patch:44: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
M src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
M src/Core/src/Platform/iOS/TabbedViewExtensions.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Platform/iOS/TabbedViewExtensions.cs
CONFLICT (content): Merge conflict in src/Core/src/Platform/iOS/TabbedViewExtensions.cs
Auto-merging src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
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 Disable NSToolbar Tabs
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@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
Nov 6, 2024
* Disable NSToolbar Tabs * - fix OS check * - fix tabbedview extentions PR * - bump targets * - add missing file * - add if/def for NET18.0 target * - add catalyst check * - switch to newer APIs for iOS and catalyst 18+ * - if/def for iOS18 # Conflicts: # src/Core/src/Platform/iOS/TabbedViewExtensions.cs
PureWeen
added a commit
that referenced
this pull request
Nov 7, 2024
* Disable NSToolbar Tabs * - fix OS check * - fix tabbedview extentions PR * - bump targets * - add missing file * - add if/def for NET18.0 target * - add catalyst check * - switch to newer APIs for iOS and catalyst 18+ * - if/def for iOS18 # Conflicts: # src/Core/src/Platform/iOS/TabbedViewExtensions.cs
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 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.
Description of Change
Backport of this code from main
maui/src/Core/src/Platform/iOS/TabbedViewExtensions.cs
Line 11 in 76a76fb
Issues Fixed
Fixes #23380