Skip to content

Fix style inheritance by unapplying base style before reapplying#34529

Merged
StephaneDelcroix merged 1 commit intonet11.0from
31317-e706
Mar 30, 2026
Merged

Fix style inheritance by unapplying base style before reapplying#34529
StephaneDelcroix merged 1 commit intonet11.0from
31317-e706

Conversation

@StephaneDelcroix
Copy link
Copy Markdown
Contributor

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 from this PR and let us know in a comment if this change resolves your issue. Thank you!

Description of Change

Cherry-pick of #31317 targeting net11.0. Corrects style inheritance in Style.ApplyCore by unapplying the base style before reapplying it.

Test updated from NUnit to xUnit patterns (XamlInflator, [Theory], Assert.Equal) and renamed from Issue31280 to Maui31280 per conventions.

Issues Fixed

Fixes #31280

Cherry-pick of PR #31317 (commit 1d7b946) targeting net11.0.
Fixed test to use xUnit patterns (XamlInflator, [Theory], Assert.Equal)
instead of NUnit patterns ([TestFixture], [TestCase], Assert.AreEqual).
Renamed test files from Issue31280 to Maui31280 per naming conventions.

Fixes #31280

Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings March 18, 2026 11:13
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 18, 2026

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 34529

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 34529"

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@StephaneDelcroix
Copy link
Copy Markdown
Contributor Author

/azp run maui-pr-uitests, maui-pr-devicetests

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 2 pipeline(s).

@StephaneDelcroix StephaneDelcroix merged commit 0e3f193 into net11.0 Mar 30, 2026
69 of 75 checks passed
@StephaneDelcroix StephaneDelcroix deleted the 31317-e706 branch March 30, 2026 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants