[automated] Merge branch 'net11.0' => 'release/11.0.1xx-preview3' - #34875
Closed
github-actions[bot] wants to merge 2 commits into
Closed
[automated] Merge branch 'net11.0' => 'release/11.0.1xx-preview3'#34875github-actions[bot] wants to merge 2 commits into
github-actions[bot] wants to merge 2 commits into
Conversation
> [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could <a href="https://github.com/dotnet/maui/wiki/Testing-PR-Builds">test the resulting artifacts</a> from this PR and let us know in a comment if this change resolves your issue. Thank you! ## Description Adds badge notification support to Shell bottom tabs on all platforms (Android, iOS, MacCatalyst, Windows). Closes #8305 (first iteration — bottom tabs) ### New API Three new bindable properties on `BaseShellItem`: | Property | Type | Description | |----------|------|-------------| | `BadgeText` | `string?` | Text/number displayed on the badge. `null` = no badge, `""` = dot indicator, non-empty = text/count badge. | | `BadgeColor` | `Color?` | Background color of the badge. `null` uses the platform default. | | `BadgeTextColor` | `Color?` | Foreground (text) color of the badge. `null` uses the platform default (typically white). | ### XAML Usage ```xml <Shell> <TabBar> <ShellContent Title="Home" BadgeText="3" BadgeColor="Red" BadgeTextColor="White" /> <ShellContent Title="Alerts" BadgeText="" /> <!-- dot indicator --> </TabBar> </Shell> ``` ### Platform Implementation | Platform | Approach | Notes | |----------|----------|-------| | **Android** | `BottomNavigationView.GetOrCreateBadge()` / `BadgeDrawable` | Full text + color support. `ClearNumber()` for dot mode. | | **iOS/MacCatalyst** | `UITabBarItem.BadgeValue` / `BadgeColor` / `SetBadgeTextAttributes` | Full text + color support. Empty string shows native dot. | | **Windows** | `InfoBadge` on `NavigationViewItem` via ViewModel binding | Numeric values show number; non-numeric/empty shows dot indicator. | ### Dot Badge Support Setting `BadgeText = ""` (empty string) displays a small dot indicator without text on all platforms. This is distinct from `null` which hides the badge entirely. ### What's Included - 3 BindableProperties on `BaseShellItem` with full XML documentation - Platform handlers for Android, iOS/MacCatalyst, and Windows - 28 unit tests (`ShellBadgeTests.cs`) - 4 UI screenshot tests (`Issue8305.cs`) - Interactive sample gallery page (`ShellBadgeGallery`) - PublicAPI.Unshipped.txt entries for all 7 TFMs ### What's NOT Included (follow-up work) - Flyout item badges - Top tab badges - These are tracked in the original issue #8305 for future iterations ### Screenshots <img width="1080" height="2400" alt="screen12" src="https://github.com/user-attachments/assets/b2b0cd76-a022-4e5a-88a2-82dd89da79d7"/> ### Testing - All 28 unit tests pass - All 85 existing Shell unit tests pass (no regression) - UI test projects compile successfully - Manually tested on physical Android device --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/*
Contributor
|
/review -b feature/refactor-copilot-yml |
Collaborator
|
|
PureWeen
added a commit
that referenced
this pull request
Jun 27, 2026
<!-- Please let the below note in for people that find this PR --> > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! ### Description Fixes the broken `net11.0` → release down-merge automation. The `Merge net11.0 to next release` workflow (`.github/workflows/merge-net11-to-release.yml`) delegates to the shared arcade `inter-branch-merge-base.yml`, which reads its merge-flow configuration from the **default branch (`main`)** — the `configuration_file_branch` input [defaults to `'main'`](https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml). On `main`, `github-merge-flow-release-11.jsonc` still pointed at the stale `release/11.0.1xx-preview4`. The bump to `preview6` (#36110) was applied only to the copy on the `net11.0` branch, which the workflow never reads. As a result the workflow targeted `preview4`, tried to update the leftover stale `merge/net11.0-to-release/11.0.1xx-preview4` branch, hit a non-fast-forward push rejection, and exited 1 on every `push`-from-`net11.0` run — so no `preview6` down-merge PR was ever created. This one-line change updates the **main** copy to `release/11.0.1xx-preview6` so the automation targets the current preview release branch. ### Evidence - Run [`28241084988`](https://github.com/dotnet/maui/actions/runs/28241084988) Merge step: `read-configuration.ps1 -ConfigurationFileBranch main … github-merge-flow-release-11.jsonc` → `[MergeToBranch, release/11.0.1xx-preview4]`, then non-fast-forward push rejection → `WARNING: Failed to update existing PR` → exit code 1. - `git show origin/main:github-merge-flow-release-11.jsonc` → `preview4`; `git show origin/net11.0:…` → `preview6` (unread by the workflow). - `release/11.0.1xx-preview6` exists on origin, so this was a stale-config issue, not a missing-branch issue. ### Follow-up (not in this PR) Stale leftover branches `merge/net11.0-to-release/11.0.1xx-preview4` and `…preview3` (and stale PR #34875) can be cleaned up separately. The misleading comments in `merge-net11-to-release.yml` (claiming the config is read from `net11.0`, and that the daily schedule works from `net11.0`) are also worth revisiting, since scheduled workflows and config reads both happen from the default branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
4 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.
I detected changes in the net11.0 branch which have not been merged yet to release/11.0.1xx-preview3. I'm a robot and am configured to help you automatically keep release/11.0.1xx-preview3 up to date, so I've opened this PR.
This PR merges commits made on net11.0 by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/net11.0-to-release/11.0.1xx-preview3'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.