[net10.0] Merge main to net10 by rmarinho · Pull Request #30606 · dotnet/maui

rmarinho · 2025-07-14T10:40:45Z

Description of Change

Bring latest changes from main to net10.0

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

* added test cases * modified test cases * added snapshots * added mac and windows snapshots

* Added ImageButton Feature tests * Changes updated * Modified tests * Added Images * Modified image * Added images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

…dows (#29966) * Update WebViewHelpers.Windows.cs * Update WebViewHelpers.Windows.cs * Update src/BlazorWebView/tests/MauiDeviceTests/WebViewHelpers.Windows.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…l image, even when disposeOriginal is set to true (#29936) * Fix for original image disposal when disposeOriginal is true in Resize and Downsize methods on Android and iOS * Updated the fix for iOS, and modified the test case to reflect the changes * Updated the issue link in test case

* Added Label Feature Tests * Changes updated * Added properties for Image control * Added Images * changes updated * Added images * changes updated * Added images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

* [iOS] SwipeView Closes when Content Changes - fix * Added snapshots

…er switching activities (#28767) * Fixing issue #24357 by removing outdated menu items as Android can delete them after switching activities * Disposing outdated IMenuItem just in case * Reduced memory allocation * Tuned performance a bit

…s into device tests - 6 (#28399) * Enabled the translation property for device tests * Added the helper method * Reverted the changes * Updated EditorTests.Android.cs * Fix formating

…m the navigation stack (#30049) * Update NavigationProxy.cs * test case added * Update Issue29923.cs * fix updated

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

…eration Disabled (#28934) * Update WebViewHandler.Android.cs * Test case added * Update WebView.cs * fix updated * Update WebView.cs * Create ControlsShouldRemainVisibleWithWebViewWhenHardwareAccelerationIsDisabled.png * updated test case codes * Update ControlsShouldRemainVisibleWithWebViewWhenHardwareAccelerationIsDisabled.png * Update Issue28798.cs * Update ControlsShouldRemainVisibleWithWebViewWhenHardwareAccelerationIsDisabled.png updated google with example.com as google logo keeps changing.

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

* added Feature Matrix for Entry Control * added a test cases for EntryControl * added a test cases for entry feature matrix * updated changes * updated changes * modified changes * updated * updated changes * added snapshots * added snapshot * updated changes * modified snapshots * updated changes * Updated snaps and added event features * Added tests * Added snapshots * modified changes * added modified snapshots * Added changed snapshot * updated changes * modified test case * Added snapshot * added snapshots for windows * Added snapshots * Added snapshot from CI --------- Co-authored-by: Anandhan Rajagopal <97146406+anandhan-rajagopal@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

* added test cases * added new test cases * added new test cases * added android and iOS snapshots * modified test case and added snapshots * added failing condition

* Skip useless initial handler mappings calls * Apply suggestions from code review, fixes check on Maximum* * Windows: automation properties are extremely costly * Fix broken UI tests * Workaround Windows broken tests --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com>

… DeviceInfo (#30288) * Initial plan * Fix OnIdiom threading issue by removing using statements in DeviceInfo.android.cs Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>

…rking with CV2 (#27056) * Fixed the ItemSpacing issue in CV2 * reenabled the test * changed the fix based on conflicts file * Optimized the fix in the LayoutFactory2

…ss fallback (#30289)

* updated changes * modified changes * added snapshot

…te (#30413) * Added test_fails and issue link * updated

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

# Conflicts: # eng/Versions.props # src/BlazorWebView/tests/MauiDeviceTests/WebViewHelpers.Windows.cs # src/Compatibility/Core/src/iOS/Renderers/ListViewRenderer.cs # src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs # src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs # src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs # src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs # src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs # src/Core/src/Platform/iOS/MauiSwipeView.cs

Copilot

Pull Request Overview

Merge the latest changes from the main branch into the net10.0 branch, synchronizing feature matrices, device tests, platform implementations, and refactorings.

Added new FeatureMatrix pages (ProgressBar, Switch, Entry, Image, ImageButton) and their registration in the CorePageView.
Introduced translation-consistency device tests across multiple controls on Android.
Refactored numerous platform-specific handlers and mappers to use null-conditional operators and updated mappings.

Reviewed Changes

Copilot reviewed 102 out of 527 changed files in this pull request and generated no comments.

File	Description
src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs	Registered new FeatureMatrix pages in the gallery list
src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs	Added translation consistency test for SwipeView
src/Controls/src/Core/NavigationProxy.cs	Added handler disconnection on page removal to avoid leaks

Comments suppressed due to low confidence (2)

src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs:81

New Feature Matrix pages are registered here; ensure there are corresponding automated test cases in TestCases.Shared.Tests and the HostApp UI for each of these new pages to verify functionality.

			new GalleryPageFactory(() => new SwitchControlPage(), "Switch Feature Matrix"),

src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs:194

Added an Android translation consistency test for SwipeView; consider adding equivalent tests for other platforms (iOS, Windows) to ensure translation behavior is consistently verified across all supported platforms.

		[Fact]

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

…#30628) * Improved the stability for UI test cases * Resaved the Images

* Local and Copilot dev can generate public apis Currently, the only way is to use the IDE and the lightbulb - or manually. This is often not successful and AI still struggles as well. The new version of the Mono.ApiTools.MSBuildTasks package now has the ability to generate the files and they can be checked in during development to show the actual API changes. The rules would be if this is release of CI, then it is set to Validate only, and then only if it is debug AND not CI (ie: local) will it enable generation.

…30656)

* [tests] Move to use latest for iOSsimulator # Conflicts: # eng/pipelines/common/ui-tests.yml * try fix cake hardcode version * Try remove this check # Conflicts: # src/Controls/tests/TestCases.Shared.Tests/UITest.cs

# Conflicts: # eng/pipelines/common/ui-tests.yml # src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt # src/Controls/tests/TestCases.Shared.Tests/UITest.cs

# Conflicts: # src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt

github-actions bot and others added 30 commits July 8, 2025 17:37

[create-pull-request] automated change (#30150)

0998efa

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

[Testing] Feature Matrix UITest Cases for ProgressBar Control (#29980)

79de13b

* added test cases * modified test cases * added snapshots * added mac and windows snapshots

[Testing] Feature matrix UITest Cases for ImageButton Control (#29968)

d2aa066

* Added ImageButton Feature tests * Changes updated * Modified tests * Added Images * Modified image * Added images --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

[iOS] SwipeView Closes when Content Changes - fix (#29088)

d27c94e

* [iOS] SwipeView Closes when Content Changes - fix * Added snapshots

[Testing] Migration of Compatibility.Core platform-specific unit test…

3ddd054

…s into device tests - 6 (#28399) * Enabled the translation property for device tests * Added the helper method * Reverted the changes * Updated EditorTests.Android.cs * Fix formating

Fix for Handler not disconnected when removing a non-visible page fro…

f42ad36

…m the navigation stack (#30049) * Update NavigationProxy.cs * test case added * Update Issue29923.cs * fix updated

[create-pull-request] automated change (#30184)

7db70b5

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

[create-pull-request] automated change (#30232)

d81425a

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

[Testing] Feature Matrix UITest Cases for Switch Control (#29950)

7f2d2e0

* added test cases * added new test cases * added new test cases * added android and iOS snapshots * modified test case and added snapshots * added failing condition

Update Permissions.ios.tvos.watchos.cs (#29180)

6023e3e

[iOS] Fix for CarouselView ItemSpacing property in ItemsLayout not wo…

9068a17

…rking with CV2 (#27056) * Fixed the ItemSpacing issue in CV2 * reenabled the test * changed the fix based on conflicts file * Optimized the fix in the LayoutFactory2

[iOS] Assign PresentationController.Delegate to handle swipe-to-dismi…

427d7e6

…ss fallback (#30289)

Fixed Test case failure in PR 30306 - [6/30/2025] Candidate (#30315)

a11e5bf

* updated changes * modified changes * added snapshot

Fixed Test case(Issue28798) failure in PR 30306 - [6/30/2025] Candida…

ef395b4

…te (#30413) * Added test_fails and issue link * updated

6/30/2025 Inflight Candidate (#30306)

cd4e60c

Update Visual Studio issue link in config.yml (#30530)

ae4d860

Update Versions.props 9.0.100 SR10 (#30520)

171c04c

Update bug-report.yml 9.0.82 (#30548)

311c748

[ci] Fix issue with duplicate License on msi (#30567)

a7cb612

[main] Fix formatting for dotnet format (#30587)

7d232dc

[housekeeping] Moved Issue28212 to a proper folder (#30599)

d372e2e

[create-pull-request] automated change (#30592)

2385478

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

Copilot AI review requested due to automatic review settings July 14, 2025 10:40

rmarinho requested a review from a team as a code owner July 14, 2025 10:40

rmarinho added the t/housekeeping ♻︎ label Jul 14, 2025

rmarinho requested review from jfversluis and jsuarezruiz July 14, 2025 10:40

Copilot AI reviewed Jul 14, 2025

View reviewed changes

rmarinho and others added 4 commits July 14, 2025 12:21

Fix merge

fafe73f

Update ControlsHandlerTestBase.Android.cs

ed31263

Update bug-report.yml 9.0.90 SR9 (#30621)

f82ad50

[create-pull-request] automated change (#30619)

f51591c

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

HarishKumarSF4517 mentioned this pull request Jul 15, 2025

[net10.0, Testing] Fixed test failures on merge main net10.0 PR 30606 #30628

Merged

PureWeen and others added 9 commits July 15, 2025 15:01

Update bug-report.yml with preview6 (#30639)

792e5b3

[net10.0, Testing] Fixed test failures on merge main net10.0 PR 30606 (…

75a4b74

…#30628) * Improved the stability for UI test cases * Resaved the Images

[ci] Add inflight/current to the schedule triggers for daily builds (#…

c4fc507

…30656)

Disabled the failing testcases in CI (#30650)

b6cf625

[testing] Use latest simulator main (#30664)

6137fa1

* [tests] Move to use latest for iOSsimulator # Conflicts: # eng/pipelines/common/ui-tests.yml * try fix cake hardcode version * Try remove this check # Conflicts: # src/Controls/tests/TestCases.Shared.Tests/UITest.cs

Fix merge

38c57eb

rmarinho merged commit a1d1292 into net10.0 Jul 17, 2025
125 of 129 checks passed

rmarinho deleted the merge-main-net10 branch July 17, 2025 21:14

github-actions bot locked and limited conversation to collaborators Aug 17, 2025

PureWeen added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Aug 19, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[net10.0] Merge main to net10#30606

[net10.0] Merge main to net10#30606
rmarinho merged 44 commits intonet10.0from
merge-main-net10

rmarinho commented Jul 14, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants

Conversation

rmarinho commented Jul 14, 2025

Description of Change

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants