[release/10.0.1xx-sr7] [Android] Fix ScrollTo regression when IsGrouped true on CollectionView - #35428
Merged
PureWeen merged 3 commits intoMay 14, 2026
Conversation
Member
|
/azp run maui-pr-uitests, maui-pr-devicetests |
|
Azure Pipelines successfully started running 2 pipeline(s). |
This was referenced May 14, 2026
Open
This was referenced May 14, 2026
3 tasks
PureWeen
approved these changes
May 14, 2026
PureWeen
pushed a commit
that referenced
this pull request
Jun 8, 2026
Three improvements driven by SR8 dogfood: 1. New -InheritFromPriorSr flag for candidate mode. dotnet/maui's SR workflow is 'cut SRn+1 from main, then merge SRn into it' — so the SR-to-be contents = main-since-priorSR ∪ priorSR-only commits. The prior candidate model only saw main-since-priorSR, which made fixes that live only in SR7 look 'missing from SR8'. The new flag does a second 'git log priorSR ^main' pass and unions the source PRs, tagging each commit with origin = primary | inherited. Report header reads 'CANDIDATE for next SR (main + inherited from <prior>)' and the contents section splits into 'from main' vs 'inherited from <prior>'. 2. Skip Revert PRs as candidate fixes. If a 'Fixes #N' link points to a PR whose title starts with 'Revert ...', that PR is a rollback, not a fix — counting it as the fix produces false 'in-sr-active' verdicts when the actual fix has been backed out. When the only candidates are reverts the issue is classified needs-human-review with evidence 'All candidate fix PRs were Revert PRs — original fix may be missing or in a revert-of-revert chain.' This catches the #35584 / #35625 / #35694 chain cleanly. 3. Hard rule on the agent: report-only. The release-readiness agent and skill now declare in their first section that they NEVER mutate the dotnet/maui repo — no branch cuts, no SR merges, no tags, no pushes to release/* refs. If asked to perform a release operation, the agent refuses and surfaces copy-pasteable commands for the human release captain. Test coverage: 5 new tests cover the -InheritFromPriorSr happy path, the param-validation guard, the union semantics, and the well-known SR7-only backport (#35428) showing up via inheritance. All 26 tests pass. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
PureWeen
added a commit
that referenced
this pull request
Jun 11, 2026
…xx-sr8 (#35810) <!-- 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! ## Cut-then-merge step 2 of 2 SR8 was cut from `main` at [`e02d6b6dc2`](e02d6b6) (commit "Add gh-aw rerun review scanner (#35685)"). This PR pulls the SR7 stabilization work into SR8 so SR8 contains everything that's in SR7. - **Base:** `release/10.0.1xx-sr8` @ [`e02d6b6dc2`](e02d6b6) - **Merging in:** `release/10.0.1xx-sr7` @ [`9da598b4a1`](9da598b) (PatchVersion bump to 71) - **Merge base:** [`f8cb875e`](f8cb875eee) ("[Testing] The Windows WebView category is removed from CI…" #35335) - **Strategy:** non-fast-forward merge commit (preserves both branches' history) ## Conflict resolution Two trivial conflicts, both resolved by taking the SR8 (`HEAD`) side: | File | Why it conflicted | Resolution | | --- | --- | --- | | [`eng/Versions.props`](https://github.com/dotnet/maui/blob/release/10.0.1xx-sr8/eng/Versions.props) | SR7 bumped `PatchVersion` 70→71 (#35786); SR8 starts at 80 | Keep `PatchVersion=80` (SR8 is the higher patch band) | | `src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs` | Whitespace-only difference (`false; //` vs `false; //`) in two comments | Keep SR8's whitespace | No semantic conflicts. ## Inherited from SR7 26 SR7-only commits land in SR8 via this merge. The source PRs are: <details> <summary>Source PRs (43, deduped by commit)</summary> #35020, #35072, #35092, #35150, #35223, #35299, #35305, #35347, #35356, #35359, #35360, #35421, #35423, #35424, #35425, #35426, #35427, #35428, #35430, #35434, #35441, #35447, #35461, #35480, #35503, #35520, #35521, #35559, #35566, #35585, #35625, #35642, #35664, #35689, #35690, #35691, #35692, #35693, #35694, #35703, #35744, #35768, #35786 Includes the SR7 revert chain: - #35689 — Revert PR #30068 (FontImageSource centering on Windows) - #35694 — Revert TalkBack RadioButton fix - #35703 — Revert Shell.NavBarIsVisible fix - #35744 — Revert HybridWebView WebView fix - #35461, #35503 — additional Android reverts </details> After this lands, the release-readiness tracker can survey `release/10.0.1xx-sr8` directly instead of using `-Candidate -InheritFromPriorSr` mode against SR7.
PureWeen
pushed a commit
that referenced
this pull request
Jun 15, 2026
Three improvements driven by SR8 dogfood: 1. New -InheritFromPriorSr flag for candidate mode. dotnet/maui's SR workflow is 'cut SRn+1 from main, then merge SRn into it' — so the SR-to-be contents = main-since-priorSR ∪ priorSR-only commits. The prior candidate model only saw main-since-priorSR, which made fixes that live only in SR7 look 'missing from SR8'. The new flag does a second 'git log priorSR ^main' pass and unions the source PRs, tagging each commit with origin = primary | inherited. Report header reads 'CANDIDATE for next SR (main + inherited from <prior>)' and the contents section splits into 'from main' vs 'inherited from <prior>'. 2. Skip Revert PRs as candidate fixes. If a 'Fixes #N' link points to a PR whose title starts with 'Revert ...', that PR is a rollback, not a fix — counting it as the fix produces false 'in-sr-active' verdicts when the actual fix has been backed out. When the only candidates are reverts the issue is classified needs-human-review with evidence 'All candidate fix PRs were Revert PRs — original fix may be missing or in a revert-of-revert chain.' This catches the #35584 / #35625 / #35694 chain cleanly. 3. Hard rule on the agent: report-only. The release-readiness agent and skill now declare in their first section that they NEVER mutate the dotnet/maui repo — no branch cuts, no SR merges, no tags, no pushes to release/* refs. If asked to perform a release operation, the agent refuses and surfaces copy-pasteable commands for the human release captain. Test coverage: 5 new tests cover the -InheritFromPriorSr happy path, the param-validation guard, the union semantics, and the well-known SR7-only backport (#35428) showing up via inheritance. All 26 tests pass. 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.
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.
Backport of #35356 to release/10.0.1xx-sr7
/cc @kubaflo @SubhikshaSf4851