[release/10.0.1xx-sr7] [Windows] Fix COMException when restoring a ScrollView as ContentPage.Content after swapping it out#35427
Merged
PureWeen merged 2 commits intoMay 15, 2026
Conversation
…d set it back later in mainthread on Windows
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
Contributor
Author
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 35427Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 35427" |
Contributor
|
/azp run maui-pr-uitests, maui-pr-devicetests |
|
Azure Pipelines successfully started running 2 pipeline(s). |
3 tasks
PureWeen
approved these changes
May 15, 2026
This was referenced May 15, 2026
kubaflo
pushed a commit
that referenced
this pull request
May 19, 2026
<!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- 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! Cherry-picks test fixes and snapshot additions from multiple backport PRs: - **PR #35434** — Fixed CI failure (removed flaky test attributes from Bugzilla40333) and removed Issue9095 test - **PR #35426** — Added mac and Windows snapshots for `VerifySearchBarHeightRequestValues`, updated iOS snapshots - **PR #35427** — Resolved device test failures in `ScrollViewHandler.Windows.cs` - **PR #35424** — Added mac and Windows snapshots for `LinearGradientBrushTransparentStopsShouldNotBeOpaque` - **PR #35425** — Removed failing test: "Missing ControlTemplate with exception handler should throw" (`StaticResourceTests.cs`) ## Changes | File | Change | |------|--------| | `Bugzilla40333.cs` | Removed 2 lines (CI fix) | | `Issue9095.cs` | Deleted | | `ScrollViewHandler.Windows.cs` | Fixed device test failures | | `StaticResourceTests.cs` | Deleted | | SearchBar snapshots (mac/windows/iOS) | Added/updated | | LinearGradientBrush snapshots (mac/windows) | Added | --------- Co-authored-by: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com> Co-authored-by: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>
PureWeen
pushed a commit
that referenced
this pull request
Jun 2, 2026
<!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- 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! Cherry-picks test fixes and snapshot additions from multiple backport PRs: - **PR #35434** — Fixed CI failure (removed flaky test attributes from Bugzilla40333) and removed Issue9095 test - **PR #35426** — Added mac and Windows snapshots for `VerifySearchBarHeightRequestValues`, updated iOS snapshots - **PR #35427** — Resolved device test failures in `ScrollViewHandler.Windows.cs` - **PR #35424** — Added mac and Windows snapshots for `LinearGradientBrushTransparentStopsShouldNotBeOpaque` - **PR #35425** — Removed failing test: "Missing ControlTemplate with exception handler should throw" (`StaticResourceTests.cs`) ## Changes | File | Change | |------|--------| | `Bugzilla40333.cs` | Removed 2 lines (CI fix) | | `Issue9095.cs` | Deleted | | `ScrollViewHandler.Windows.cs` | Fixed device test failures | | `StaticResourceTests.cs` | Deleted | | SearchBar snapshots (mac/windows/iOS) | Added/updated | | LinearGradientBrush snapshots (mac/windows) | Added | --------- Co-authored-by: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com> Co-authored-by: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@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 11, 2026
<!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- 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! Cherry-picks test fixes and snapshot additions from multiple backport PRs: - **PR #35434** — Fixed CI failure (removed flaky test attributes from Bugzilla40333) and removed Issue9095 test - **PR #35426** — Added mac and Windows snapshots for `VerifySearchBarHeightRequestValues`, updated iOS snapshots - **PR #35427** — Resolved device test failures in `ScrollViewHandler.Windows.cs` - **PR #35424** — Added mac and Windows snapshots for `LinearGradientBrushTransparentStopsShouldNotBeOpaque` - **PR #35425** — Removed failing test: "Missing ControlTemplate with exception handler should throw" (`StaticResourceTests.cs`) ## Changes | File | Change | |------|--------| | `Bugzilla40333.cs` | Removed 2 lines (CI fix) | | `Issue9095.cs` | Deleted | | `ScrollViewHandler.Windows.cs` | Fixed device test failures | | `StaticResourceTests.cs` | Deleted | | SearchBar snapshots (mac/windows/iOS) | Added/updated | | LinearGradientBrush snapshots (mac/windows) | Added | --------- Co-authored-by: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com> Co-authored-by: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@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 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.
Backport of #35360 to release/10.0.1xx-sr7
/cc @kubaflo @Vignesh-SF3580