[Net 11] Fix Windows Label Feature Matrix test failures - #37035
Merged
kubaflo merged 3 commits intoAug 7, 2026
Merged
Conversation
devanathan-vaithiyanathan
temporarily deployed
to
copilot-pat-pool
August 3, 2026 12:44 — with
GitHub Actions
Inactive
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 37035Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 37035" |
|
Azure Pipelines: Successfully started running 1 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run. |
devanathan-vaithiyanathan
temporarily deployed
to
copilot-pat-pool
August 3, 2026 12:45 — with
GitHub Actions
Inactive
devanathan-vaithiyanathan
temporarily deployed
to
copilot-pat-pool
August 3, 2026 12:46 — with
GitHub Actions
Inactive
devanathan-vaithiyanathan
temporarily deployed
to
copilot-pat-pool
August 3, 2026 12:49 — with
GitHub Actions
Inactive
devanathan-vaithiyanathan
temporarily deployed
to
copilot-pat-pool
August 3, 2026 12:49 — with
GitHub Actions
Inactive
devanathan-vaithiyanathan
temporarily deployed
to
copilot-pat-pool
August 3, 2026 12:50 — with
GitHub Actions
Inactive
Contributor
|
/azp run maui-pr-uitests , maui-pr-devicetests |
|
Azure Pipelines: Successfully started running 2 pipeline(s). |
This was referenced Aug 3, 2026
Contributor
|
/azp run maui-pr-uitests , maui-pr-devicetests |
|
Azure Pipelines: Successfully started running 2 pipeline(s). |
devanathan-vaithiyanathan
force-pushed
the
Revert-windows-Label-Images
branch
from
August 6, 2026 13:19
7665442 to
e484a1f
Compare
devanathan-vaithiyanathan
marked this pull request as ready for review
August 6, 2026 13:37
|
Azure Pipelines: Successfully started running 1 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the Windows TextBlock line-height mapping for Label so that resetting Label.LineHeight back to its default value clears the previously-applied platform LineHeight, preventing stale layout/screenshot behavior in subsequent updates (e.g., feature-matrix flows).
Changes:
- Clear the Windows
TextBlock.LineHeightdependency property whenILabel.LineHeightis reset (< 0 / default). - Add a Windows handler device test verifying the
LineHeightlocal value is removed whenLabel.LineHeightis reset to default.
Reviewed changes
Copilot reviewed 2 out of 26 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/Core/src/Platform/Windows/TextBlockExtensions.cs | Clears TextBlock.LineHeightProperty when ILabel.LineHeight is reset, ensuring the default platform value is restored. |
| src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.Windows.cs | Adds a regression test validating LineHeight local value resets to DependencyProperty.UnsetValue. |
Comment on lines
68
to
+77
| public static void UpdateLineHeight(this TextBlock platformControl, ILabel label) | ||
| { | ||
| if (label.LineHeight >= 0) | ||
| { | ||
| platformControl.LineHeight = label.LineHeight * platformControl.FontSize; | ||
| } | ||
| else | ||
| { | ||
| platformControl.ClearValue(TextBlock.LineHeightProperty); | ||
| } |
Contributor
|
/azp run maui-pr-uitests , maui-pr-devicetests |
|
Azure Pipelines: Successfully started running 2 pipeline(s). |
kubaflo
approved these changes
Aug 7, 2026
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
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.
Issue Details
n PR #35892, we modified the Windows Label feature matrix baseline image. Due to the image update, the tests failed. The image generated by the current CI matches the existing baseline image.
Description of Change
Added the ClearValue logic and updated the failed image test cases.
Note: Please do not merge the PR until the CI is complete.