KEMBAR78
[2025/06/16] Candidate - In Flight Branch by PureWeen · Pull Request #29886 · dotnet/maui · GitHub
Skip to content

Conversation

@PureWeen
Copy link
Member

@PureWeen PureWeen commented Jun 9, 2025

For more information about inflight process check
https://github.com/dotnet/maui/wiki/Inflight-Branch-Process

.NET MAUI Release Notes - inflight/candidate Branch

MAUI Product Fixes

Testing

Dependency Updates

  • No changes in this category

Docs

  • No changes in this category

Housekeeping

Full Changelog: origin/main...origin/inflight/candidate

@Copilot Copilot AI review requested due to automatic review settings June 9, 2025 19:28
@PureWeen PureWeen requested a review from a team as a code owner June 9, 2025 19:28
@PureWeen PureWeen added this to the .NET 9 SR9 milestone Jun 9, 2025
@PureWeen PureWeen moved this from Todo to Ready To Review in MAUI SDK Ongoing Jun 9, 2025
@PureWeen PureWeen added the p/0 Work that we can't release without label Jun 9, 2025
Copy link
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.

Pull Request Overview

This PR introduces a new feature matrix for selecting and configuring different ItemsSource types in CollectionView, extends the view model to support string- and model-typed collections, and updates navigation and asset handling in the test app. Key changes include:

  • Addition of ItemsSourceOptionsPage and integration into CollectionViewItemsSourcePage for runtime options.
  • Extension of CollectionViewViewModel with new ItemsSourceType values and support methods (AddSequentialItem, RemoveLastItem, etc.).
  • Updates to test host app project (new images) and navigation paths in CollectionViewFeaturePage.

Reviewed Changes

Copilot reviewed 194 out of 194 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ItemsSource/ItemsSourceOptionsPage.xaml.cs New options page backing code, sets viewModel flags.
src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ItemsSource/ItemsSourceOptionsPage.xaml XAML for options UI with radio buttons.
src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/CollectionViewViewModel.cs Extended view model with new items source collections and logic.
src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/CollectionViewItemsSourcePage.xaml.cs Page that hosts the collection view and navigation to options.
src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj Added an embedded image resource (royals.png).
Comments suppressed due to low confidence (4)

src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ItemsSource/ItemsSourceOptionsPage.xaml:66

  • AutomationId for EmptyGroupedListT RadioButton is missing the trailing 'T', causing a mismatch with the x:Name and potentially breaking UI test lookups. Rename AutomationId to "EmptyGroupedListT" to match the control name.
<RadioButton x:Name="EmptyGroupedListT" ... AutomationId="EmptyGroupedList"/>

src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ItemsSource/ItemsSourceOptionsPage.xaml.cs:3

  • No automated UI tests appear to target the new ItemsSourceOptionsPage. Please add tests in TestCases.Shared.Tests and ensure the host app (TestCases.HostApp) exposes the necessary AutomationIds to cover option selection scenarios.
public partial class ItemsSourceOptionsPage : ContentPage

src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/CollectionViewViewModel.cs:91

  • [nitpick] Private field fruitIndex does not follow the underscore prefix convention used by other private fields (e.g. _itemSizingStrategy). Consider renaming to _fruitIndex for consistency.
private int fruitIndex = 0;

src/Controls/src/Core/Handlers/Items/CarouselViewHandler.Android.cs:98

  • Subtracting the peek area insets but omitting the ItemSpacing may cause items to overflow or overlap if spacing is nonzero. Verify this change is intended or reintroduce spacing subtraction to preserve layout.
itemWidth = (int)(width - Context?.ToPixels(VirtualView.PeekAreaInsets.Left) - Context?.ToPixels(VirtualView.PeekAreaInsets.Right));

@sheiksyedm
Copy link
Contributor

@kubaflo The AppShouldNotCrash test has failed, which was added in PR #26153 . Could you please review and address this?

image

@sheiksyedm
Copy link
Contributor

@kubaflo The following device tests have failed due to changes introduced in your PR #26153. Can you look into these issues?

  • ChangingTextTypeWithFormattedTextSwitchesTextSource
  • FontStuffAppliesEvenInHtmlMode
  • FontStuffAfterTextTypeIsCorrect
image

@kubaflo
Copy link
Contributor

kubaflo commented Jun 10, 2025

@kubaflo The following device tests have failed due to changes introduced in your PR #26153. Can you look into these issues?

  • ChangingTextTypeWithFormattedTextSwitchesTextSource
  • FontStuffAppliesEvenInHtmlMode
  • FontStuffAfterTextTypeIsCorrect
image

@sheiksyedm here it is: #29906

@PureWeen
Copy link
Member Author

/rebase

@github-actions github-actions bot force-pushed the inflight/candidate branch from 5442a5e to a9ad676 Compare June 10, 2025 16:44
@PureWeen
Copy link
Member Author

/rebase

@github-actions github-actions bot force-pushed the inflight/candidate branch from a9ad676 to a653ab0 Compare June 11, 2025 16:12
@PureWeen
Copy link
Member Author

/rebase

@sheiksyedm
Copy link
Contributor

@kubaflo The AppShouldNotCrash test has failed, which was added in PR #26153 . Could you please review and address this?

image

@kubaflo Added the PR for this test failure
#30025

@kubaflo
Copy link
Contributor

kubaflo commented Jun 17, 2025

@kubaflo The AppShouldNotCrash test has failed, which was added in PR #26153 . Could you please review and address this?
image

@kubaflo Added the PR for this test failure #30025

Yes, I'm aware of this, and I believe the issue was already referenced in the original PR. Unfortunately, I can't work on Windows, so I really appreciate you taking care of it — thank you, @anandhan-rajagopal!

@PureWeen
Copy link
Member Author

/rebase

Anandhan Rajagopal and others added 7 commits June 19, 2025 18:41
* added sample and test class files

* Added android snap

* Updated images for android and ios

* Update CorePageView.cs

* updated base images for windows and catalyst platform

* removed unused references
)

* Don’t call NSAttributedString with HTML from a background thread

* Added a UITest

* Refactor

* add more comments and move to Controls

---------

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
#29371)

* Fixed the shadow transparent issue on android

* Updated the fix.

* Added the test case and updated the fix

* Added the output images.

* Updated the fix.

* Updated the comment.

* Added the output images for mac and Windows

* Updated the test case and added output images.

* Added the output images
* ToolbarItem behavior with ImageSource iOS - fix

* Added snapshots
* Update the comment for the test properties

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs

Co-authored-by: Rui Marinho <me@ruimarinho.net>

* Update src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs

* Update BaseBuildTest.cs

---------

Co-authored-by: Rui Marinho <me@ruimarinho.net>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
jonathanantoine and others added 17 commits June 19, 2025 18:41
#25393)

* [create-pull-request] automated change (#29793)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Convert HybridWebView.js to TypeScript and embed (#27183)

* Fix up relevant CA1416 warnings - Set 3 (#26751)

* [Testing] Feature Matrix UITest Cases for CollectionView Dynamic changes (#29424)

* Added FeatureTests for CollectionView

* changes updated

* changes updated

* [create-pull-request] automated change (#29505)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* CA1416 warning fix

* Added snapshots

* Reverting files changes

* Removed the old approach

* Revert unwanted changes

* Reverted unwanted changes

* Reverted unwanted changes

* Revert unwanted changes

---------

Co-authored-by: NafeelaNazhir <nafeela.nazhirhussain@syncfusion.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix up relevant CA1416 warnings - Set 1 (#26696)

* Changed Syncfusion toolkit version from 1.0.4 to 1.0.5 (#29659)

* [ci] Update dependencies from 9.0.4 to 9.0.5 (#29667)

* [ci] Update dependencies from 9.0.4 to 9.0.5

* Update the net8 version

* Add missing version MicrosoftJSInteropPackageVersion

* Page.OnBackButtonPressed remove outdated API documentation (#29543)

* Fixed KeepLastItemInView Does Not Scroll to Last Item When Adding Items at Top (#29632)

* Fixed KeepLastItem not scrolled to last item

* Updated Fix

* Updated test sample

* Added comment line

* Updated test sample for iOS and mac

* Added Snapshots for android and WinUI

* Added UI tests.

* Test sample changes.

* script changes

* script changes

* Added snapshots

* Resaved Mac images and the gradient image size issue has been fixed

* CA1416 warning changes

* Reverted unwanted changes

---------

Co-authored-by: Paul Anderson <42271912+PaulAndersonS@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com>

* [iOS/Mac]Fix StrokeDashArray Property not Rendering (#29670)

* fix added

* Test added

* snap added

* [Android/ iOS] Fix Flyout icon is displayed when flyout is disabled  (#29637)

* fix added

* modified the fix

* test case added

* test case added

* summary added

* Script name changed

* [Android & iOS] Fix for SearchHandler Character Spacing Property (#29497)

* [Android & iOS] Fix for character spacing in searchHandler

* Updated test sample concerns

* Update on naming

* Update on formatting

* Allowing updating character spacing to zero

* Updated Andorid, iOS, Mac images

* [create-pull-request] automated change (#29724)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [Windows] Fix for SearchHandler Visibility Not Updating During In-Section Navigation (#29441)

* fix-17521-Updates the SearchHandler when navigating to another page within same ShellSection.

* fix-17521-Added testcase and added snapshot for Android and iOS.

* fix-17521-Renamed Shell_Navigated to OnShellNavigated.

* fix-17521-Modified the Location string value from "Ethopia" to "Ethiopia".

* fix-17521-Snapshot updated.

* fix-17521-Updated Windows and Mac Snapshot.

* [Windows] - Fix view position shift when shadows are added or removed at runtime (#29681)

* Fix-view-position-shift-when-toggling-shadows

* Added-Pending-SnapShots

* Resaved-image

* [Testing] Feature Matrix UITest Cases for Shadows (#27701)

* Added sample to Matrix UITest Cases for Shadow

* Renamed sample page

* Renamed sample page

* More tests

* More tests

* More tests

* More tests

* Added shadow tests

* Updated sample

* Added Windows snapshots

* Updated tests

* Added link to issue

* More changes

* Updated sample reset logic

* Updated sample

* More changes

* More changes

* More changes

* Updated sample

* Added snapshots

* Hide cursor

* More changes

* More snapshots

* Updated tests

* Updated iOS snapshots

* Updated iOS snapshots

* Updated snapshots

* Updated snapshots

* Updated tests

* [housekeeping] Automated PR to fix formatting errors on uitest-shadow-feature

* Updated tests

* Fix build errors

* More changes

* More changes

* More changes

* More changes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [iOS] Fixed Shell.SearchHandler ClearPlaceholderIcon Color Issue (#28601)

* SearchHandler ClearPlaceholderIcon color fix

* Added Mac snapshot

* Updated SearchBar Icon changes

* Test script changes.

* Revert unwanted changes

* Updated custom icon changes

* Fix -[iOS] - CarouselView Throws ArgumentOutOfRangeException Immediately on Application Launch in CV2 (#29316)

* Update ItemsSourceFactory2.cs

* Update CarouselViewPositionVisibility.xaml

* [Windows] Fix for ItemsSource Does Not Dynamically Set to null in CarouselView (#29660)

* [Windows] Fix for ItemsSource Does Not Dynamically Set to null in CarouselView

* Have added test case

* Updated AutomationId for better clarity and readability

* Have modified the context of the description label

* Have committed the snapshots

* [Testing] Feature Matrix UITest Cases for Label (#29690)

* Added Label Feature tests

* changes updated

* changes updated

* changes updated

* Added Screenshots

* Added Snapshots for iOS

* Corrected Mistakes

* Added snapshots

* Added images

* Renamed file

---------

Co-authored-by: Rui Marinho <me@ruimarinho.net>

* updated base images for candidate PR failures (#29766)

* [Android] Fix: Modal Animation Repeats When Returning from Background 3 (#29702)

* fix

* dispose listner once not needed

* Revert "dispose listner once not needed"

* call invalidate

* add device test to check for leaks

* null check and remove strong references in callback

* Throw if rootview is null before adding animation

* fix spelling mistake

* [Testing] Include a tolerance parameter in the Verifyscreenshot method (#29776)

* Added tolerance parameter to the VerifyScreenshot method

* More changes

* Update src/Controls/tests/TestCases.Shared.Tests/UITest.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/Controls/tests/TestCases.Shared.Tests/UITest.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* [Testing] Update Appium to v8 (#29774)

* Update Appium to the latest version

* Removed deprecated logic

* Update comment

* [create-pull-request] automated change (#29831)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Perf : ButtonContentTypeConverter now using InvariantCulture to parse double

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Tamilarasan Paranthaman <93904422+Tamilarasan-Paranthaman@users.noreply.github.com>
Co-authored-by: NafeelaNazhir <nafeela.nazhirhussain@syncfusion.com>
Co-authored-by: Paul Anderson <42271912+PaulAndersonS@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
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: Subhiksha Chandrasekaran <subhiksha.c@syncfusion.com>
Co-authored-by: BagavathiPerumal <93652794+BagavathiPerumal@users.noreply.github.com>
Co-authored-by: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com>
Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
Co-authored-by: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Co-authored-by: SyedAbdulAzeemSF4852 <syedabdulazeem.a@syncfusion.com>
Co-authored-by: Anandhan Rajagopal <97146406+anandhan-rajagopal@users.noreply.github.com>
Co-authored-by: Bhavanesh N <bhavanesh001@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* Fixed ItemSpacing on CarouselView

* Added snapshot for Android and Mac

* Resaved image for CarouselViewShouldRenderCorrectly
* FeatureMatrix for stepper control

* Added the snapshot for windows platform

* Updated StepperFeatureTests.cs

* Updated StepperControlPage.xaml
…Feature (#29322)

* added ItemsSource feature Tests

* modified changes

* updated changes

* Update src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ItemsSource/CollectionViewItemsSourcePage.xaml.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* modified changes

* added snapshots

* modified changes

* modified changes

* modified changes

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…nView in the SelectionChanged event does not clear the selection (#29288)

* Fix for 10025 (Setting the CollectionView's SelectedItem to null on selection changed event does nothing)

* Have added the test case

* Have added the snapshots
… rotate your screen. (#29171)

* fix-15154-Added proper Auto Layout constraints to ensure content wraps instead of truncating in landscape mode.

* fix-15154-Prepared the testcase and snapshot added for android and iOS.

* fix-15154-Modified the test condition.

* fix-15154-Modified the code to align the edges of ContentView with the edges of platformView.

* fix-15154-Adjusted inset constraints to respect view margins in FlyoutItem and updated Android snapshot.

* fix-15154-Replaced individual .Active=true calls with batch NSLayoutConstraint.ActivateConstraints() for better performance with Shell flyout margins.
* Added changes

* Fixed broken test

* Updated test
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…29765)

* Fixed the issue and added the test case

* Modified the test case

* Modified the fix

* Committed the image
* added test cases

* modified test cases

* added test case

* added snapshots

* added iOS snapshots

* code modified

* added new test cases

* added new test cases

* Copilot suggestions

* modified UI

* added new snapshots

* added the windows and mac snapshots

---------

Co-authored-by: Anandhan Rajagopal <97146406+anandhan-rajagopal@users.noreply.github.com>
…ge class (#29138)

* Fix for GraphicsView ImagePaint

* update for the graphics view imagePaint

* Added testcase

* Implementation for Downsize

* Revert "Added testcase"

This reverts commit ef22fa8.

* Added test case

* Added CreateResizedMethod

* Implemented Resize method

* Fix modification

* Added testcase

* Revert "Added test case"

This reverts commit a79de0d.

* Updated the changes

* Update changes

* Updated the testcase

* Commited the changes

* Updating code

* Update TestCase

* Code Update

* Modify TestCase

* TestCase Updation

* Code update

* Adding Snapshots

* Added snapshots

* Revert "Added snapshots"

This reverts commit cac6f45.

* Refactor code
* Fixed Test case failure in PR 25642 - snapshots

* Fixed Test case failure in PR 25642 - snapshots
@github-actions github-actions bot force-pushed the inflight/candidate branch from afbda3c to 5e9310b Compare June 19, 2025 18:41
@PureWeen
Copy link
Member Author

@PureWeen PureWeen removed the request for review from tj-devel709 June 20, 2025 17:25
@github-project-automation github-project-automation bot moved this from Ready To Review to Approved in MAUI SDK Ongoing Jun 20, 2025
@PureWeen PureWeen merged commit e863130 into main Jun 21, 2025
102 of 129 checks passed
@PureWeen PureWeen deleted the inflight/candidate branch June 21, 2025 12:05
@github-project-automation github-project-automation bot moved this from Approved to Done in MAUI SDK Ongoing Jun 21, 2025
@github-actions github-actions bot locked and limited conversation to collaborators Jul 22, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

p/0 Work that we can't release without

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.