Revert [Android] Fix CollectionView handler cleanup when DataTemplateSelector switches templates#35461
Merged
PureWeen merged 1 commit intoMay 15, 2026
Conversation
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 35461Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 35461" |
dotnet-policy-service
Bot
added
the
partner/syncfusion
Member
|
/azp run maui-pr-uitests, maui-pr-devicetests |
|
Azure Pipelines successfully started running 2 pipeline(s). |
github-actions
Bot
added
the
area-controls-collectionview
PureWeen
approved these changes
May 15, 2026
PureWeen
merged commit c3f6dfe
into
dotnet:release/10.0.1xx-sr7
79 of 121 checks passed
PureWeen
added
i/regression
This was referenced May 15, 2026
Open
This was referenced May 16, 2026
PureWeen
added a commit
that referenced
this pull request
May 18, 2026
- SKILL.md platform table: add /Handlers/*/iOS/, /Handlers/*/MacCatalyst/, and /Handlers/*/Windows/ to platform rows. Mirrors the Android row's handler-subdirectory pattern. iOS-directory row maps to platform/ios ONLY (not dual with platform/macos) because handler /iOS/ directories compile for iOS TFM only, unlike the *.iOS.cs file-extension pattern which compiles for both iOS and MacCatalyst. - eval.yaml PR #35461 scenario: rename to flag scope-restriction intent, add platform/android positive assertion (the PR touches Android files) and forbidden-label negatives for i/regression, partner/syncfusion, t/bug — those labels already exist on the PR but our labeler must NOT apply them. - eval.yaml PR #35385 scenario: add platform/macos and platform/windows assertions. The PR touches Platform/Windows/, Platform/Android/, and *.iOS.cs files — that last one triggers BOTH platform/ios AND platform/macos per our file-extension rule. - eval.yaml XAML scenario: rename 'issue' -> 'PR' (prompt targets a PR). - workflow.md frontmatter description: update from generic 'appropriate labels chosen from the existing repository label set' to explicitly state 'area-* and platform/* ONLY, does NOT apply triage, status, priority, type, severity, partner, regression, or any other label families'. Locked-yml regenerated by gh aw compile. Adversarial review findings deliberately NOT applied: - (?i) regex prefix: invalidated — skill-validator already passes RegexOptions.IgnoreCase and StringComparison.OrdinalIgnoreCase, so case is handled at the framework level. - output_not_contains 'area-' / 'platform/' on noop scenarios: too risky — agent prose may legitimately reference these prefixes when explaining why no labels apply. - Issue #35448 prompt change: existing-label contamination is a framework limitation (substring match in prose); not worth a scenario-level fix. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This was referenced May 21, 2026
Draft
This was referenced May 30, 2026
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.
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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
Reverts Android fix from #34534
Fixes #35344