Sync .NET 9 SR12 with .NET 10 GA release #32012

PureWeen · 2025-10-15T20:35:54Z

Description

This brings all the changes from our final .NET 9 SR 12 release in line with our .NET 10 GA release.

This ensures that all fixes and changes in SR 12 are also in .NET 10 GA

…ews in CI (#31823) This PR addresses the UI test image failures that occurred in the main branch and includes updates to improve rendering and test stability across platforms. - In the CookiesCorrectlyLoadWithMultipleWebViews test case, I changed the WebView source to match the cookies. ### Test cases: - CookiesCorrectlyLoadWithMultipleWebViews

…31831) * [iOS] Fix added for Navigation.SetTitleView does not work in ios 26. * changes added. * changed the version condition.

* Update androidApiLevels for device tests * [ci] Update provisioning of api 36

… in FlyoutPage (#31515) * mac fix added * Windows fix added * test case added * Update Issue31372.cs * Update Issue31372.cs * Update WindowHandler.iOS.cs * fix updated * Update WindowHandler.iOS.cs * Update WindowHandler.iOS.cs * Update PublicAPI.Shipped.txt * changes added in UnShipped file

…1868) * Initial plan * Temporarily disable flaky WebView tests with FlakyTest attribute Co-authored-by: rmarinho <1235097+rmarinho@users.noreply.github.com> * Add tracking issue link to FlakyTest attributes Co-authored-by: rmarinho <1235097+rmarinho@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: rmarinho <1235097+rmarinho@users.noreply.github.com>

…51004.2 (#31872) On relative base path root Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.25426.1 -> To Version 9.0.0-prerelease.25504.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…BindingContext update in template sample (#31954) * update ProjectListPage * Update MauiApp.1.csproj --------- Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>

…e is popped while dialo… (#31919) * [Android] -Picker dialog causes crash when page is popped while dialog is open * removed the dispose call. * Revert "removed the dispose call." This reverts commit e1e7a9f. * removed the dispose call. * Modified with Dismiss() method. --------- Co-authored-by: sheiksyedm <sheiksyedm@syncfusion.com>

…2 ItemsLayout PropertyChanged subscription (#31922)

…ppThemeBinding colors for text and placeholder reset to default on theme change (#31921) * added snapshots and fix * removed test cases * added the test cases and snapshots * added braces * added mac and windows snapshots * added mac and windows snapshots * added snapshot --------- Co-authored-by: TamilarasanSF4853 <tamilarasan.velu@syncfusion.com>

* Update arcade * Don t use internal feeds --------- Co-authored-by: Rui Marinho <me@ruimarinho.net>

Co-authored-by: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com>

…_sr12_ga # Conflicts: # .config/dotnet-tools.json # eng/Version.Details.xml # eng/Versions.props # eng/common/core-templates/job/job.yml # eng/common/core-templates/job/onelocbuild.yml # eng/common/core-templates/job/publish-build-assets.yml # eng/common/core-templates/job/source-index-stage1.yml # eng/common/core-templates/steps/generate-sbom.yml # eng/common/core-templates/steps/source-build.yml # eng/pipelines/device-tests.yml # global.json # src/Controls/src/Core/Items/CarouselLayoutTypeConverter.cs # src/Controls/src/Core/Items/ItemsLayoutTypeConverter.cs # src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt # src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs # src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs # src/Core/src/Platform/Android/EditTextExtensions.cs # src/Templates/src/templates/maui-mobile/Pages/ProjectListPage.xaml

Copilot

Pull Request Overview

Synchronizes .NET 9 SR12 changes into the .NET 10 GA branch, aligning behavior, platform fixes, and test coverage. Key adjustments include dialog dismissal logic on Android pickers, initialization timing for Flyout/FlyoutPage behaviors, updated ItemsLayout instantiation strategy, iOS/macOS title view rendering adjustments, and added regression/device tests (including leak tests).

Switch from shared static ItemsLayout instances to per-use factory-created instances; tests updated accordingly.
Android dialog lifecycle handling updated (Hide/Dispose -> Dismiss) plus additional picker disconnect safety.
Added regression/UI tests and leak tests for CarouselView and CollectionView; Flyout initial presentation logic adjusted on Windows and iOS; added WindowsAppSDK package reference.

Reviewed Changes

Copilot reviewed 26 out of 42 changed files in this pull request and generated 13 comments.

Show a summary per file

File	Description
Graphics.csproj	Adds WindowsAppSDK reference for Windows target support.
EditTextExtensions.cs	Alters fallback logic for text/placeholder color selection.
TimePickerHandler.Android.cs	Uses Dismiss instead of Hide for dialog cleanup.
PickerHandler.Android.cs	Properly detaches/dismisses dialog on disconnect.
FlyoutViewHandler.Windows.cs	Ensures initial IsPresented sync after load.
DatePickerHandler.Android.cs	Replaces Hide/Dispose with Dismiss only.
Issue31889 test files	New UI page and tests for theme-based Entry/Editor color retention.
Issue31731 test files	New UI + test for picker dialog during navigation pop scenario.
Issue31372 test files	New UI + test for initial IsPresented on FlyoutPage.
Issue12134.cs	Updates test WebView URL.
CollectionViewTests.iOS.cs	Adds leak test for default ItemsLayout.
CarouselViewTests.iOS.cs	Adds leak test with default ItemsLayout.
ItemsLayoutTypeConverterTests.cs	Updates assertions due to layout instance semantics change.
PublicAPI.Unshipped (iOS/macCatalyst)	Records removal of an overridden renderer method.
LinearItemsLayout.cs	Replaces static field initializers with factory methods.
ItemsView.cs	Changes default internal ItemsLayout provisioning (now per-instance).
ItemsLayoutTypeConverter.cs	Returns new layout instances instead of shared singletons.
CarouselView.cs	Alters default ItemsLayout creation via factory.
CarouselLayoutTypeConverter.cs	Returns new carousel layout instances.
NavigationRenderer.cs	Adjusts TitleView sizing logic for newer iOS versions.
PhoneFlyoutPageRenderer.cs	Moves initial presentation logic from layout phase to appearance.

Comments suppressed due to low confidence (1)

Copilot · 2025-10-15T20:37:41Z

src/Core/src/Platform/Android/EditTextExtensions.cs

 				editText.SetTextColor(c);
 			}
-			else
+			else if (textColor is null)


Changing the fallback from else to else if (textColor is null) means that when textColor is non-null but CreateEditTextColorStateList returns null, the previous fallback to system default will no longer execute, leaving the text color potentially unchanged. Restore an unconditional else or explicitly handle the failed ColorStateList creation when textColor is not null.

Suggested change

else if (textColor is null)

else

Copilot · 2025-10-15T20:37:42Z

src/Core/src/Platform/Android/EditTextExtensions.cs

 			if (placeholderTextColor is not null && PlatformInterop.CreateEditTextColorStateList(editText.HintTextColors, placeholderTextColor.ToPlatform()) is ColorStateList c)
 				editText.SetHintTextColor(c);
-			else
+			else if (placeholderTextColor is null)


Same pattern as text color: if placeholderTextColor is non-null but the ColorStateList creation returns null, the system default fallback will now be skipped. Replace with else or add a branch to handle the failed conversion while placeholderTextColor is not null.

Copilot · 2025-10-15T20:37:42Z

src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs

 				_dialog.DismissEvent -= OnDialogDismiss;
-				_dialog.Hide();
-				_dialog.Dispose();
+				_dialog.Dismiss();


Previously the code called Hide() then Dispose(); now only Dismiss() is invoked and the explicit Dispose() was removed, which may leave unmanaged window resources undisposed depending on dialog implementation. Reintroduce _dialog.Dispose() (after Dismiss) or confirm that Dismiss fully releases resources and add a comment documenting that guarantee.

Suggested change

_dialog.Dismiss();

_dialog.Dismiss();

// Explicitly dispose the dialog to release unmanaged resources.

_dialog.Dispose();

Copilot · 2025-10-15T20:37:42Z

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31731.cs

+		// Wait for a moment to ensure dialog is open, then wait for auto navigation
+		// The page will automatically pop after 3 seconds
+		// If the bug exists, this would cause a crash
+		System.Threading.Thread.Sleep(4000); // Wait longer than the 3-second delay


Using Thread.Sleep in tests can cause unnecessary delays and flakiness; prefer a polling wait (e.g., repeatedly checking for the main page elements or using a built-in wait method with timeout) to reduce test runtime and improve reliability.

Suggested change

System.Threading.Thread.Sleep(4000); // Wait longer than the 3-second delay

// Wait for the main page to reappear after the picker page pops

App.WaitForElement("statusLabel");

App.WaitForElement("navigateButton");

Copilot · 2025-10-15T20:37:43Z

src/Controls/src/Core/Items/ItemsView.cs

+				null, propertyChanged: OnInternalItemsLayoutPropertyChanged, 
+				defaultValueCreator: (b) => LinearItemsLayout.CreateVerticalDefault());


Changing the default from a shared singleton (LinearItemsLayout.Vertical) to a new instance per control alters reference equality semantics (code previously relying on ItemsLayout == LinearItemsLayout.Vertical will now fail), which is a potential breaking change in public behavior. Document this change and assess whether maintaining shared instances or overriding Equals is needed to preserve compatibility.

Copilot · 2025-10-15T20:37:44Z

src/Controls/src/Core/Items/CarouselLayoutTypeConverter.cs

 			if (strValue == "HorizontalList")
 			{
-				return LinearItemsLayout.CarouselDefault;
+				return LinearItemsLayout.CreateCarouselHorizontalDefault();


Converter now allocates new instances each call instead of returning shared static CarouselDefault/CarouselVertical, altering expected reference equality for converted values (potential breaking change). Consider caching or documenting the new semantics.

Copilot · 2025-10-15T20:37:44Z

src/Controls/src/Core/Items/CarouselLayoutTypeConverter.cs

 			if (strValue == "VerticalList")
 			{
-				return LinearItemsLayout.CarouselVertical;
+				return LinearItemsLayout.CreateCarouselVerticalDefault();


Converter now allocates new instances each call instead of returning shared static CarouselDefault/CarouselVertical, altering expected reference equality for converted values (potential breaking change). Consider caching or documenting the new semantics.

Copilot · 2025-10-15T20:37:45Z

src/Controls/src/Core/Items/LinearItemsLayout.cs

+		public static readonly IItemsLayout Vertical = CreateVerticalDefault();
 		/// <include file="../../../docs/Microsoft.Maui.Controls/LinearItemsLayout.xml" path="//Member[@MemberName='Horizontal']/Docs/*" />
-		public static readonly IItemsLayout Horizontal = new LinearItemsLayout(ItemsLayoutOrientation.Horizontal);
+		public static readonly IItemsLayout Horizontal = CreateHorizontalDefault();

 		/// <include file="../../../docs/Microsoft.Maui.Controls/LinearItemsLayout.xml" path="//Member[@MemberName='CarouselVertical']/Docs/*" />
-		public static readonly IItemsLayout CarouselVertical = new LinearItemsLayout(ItemsLayoutOrientation.Vertical)
-		{
-			SnapPointsType = SnapPointsType.MandatorySingle,
-			SnapPointsAlignment = SnapPointsAlignment.Center
-		};
+		public static readonly IItemsLayout CarouselVertical = CreateCarouselVerticalDefault();

-		internal static readonly LinearItemsLayout CarouselDefault = new LinearItemsLayout(ItemsLayoutOrientation.Horizontal)
-		{
-			SnapPointsType = SnapPointsType.MandatorySingle,
-			SnapPointsAlignment = SnapPointsAlignment.Center
-		};
+		internal static readonly LinearItemsLayout CarouselDefault = CreateCarouselHorizontalDefault();


Introducing factory methods enables creation of multiple distinct instances where previously code often reused the static fields; downstream code relying on reference equality against the public static fields may now fail when new factory instances are produced (via converters/defaultValueCreators). Either ensure converters/defaults return these static fields or document the shift away from singleton semantics and consider providing value-based equality.

Copilot · 2025-10-15T20:37:45Z

src/Controls/src/Core/Items/LinearItemsLayout.cs

+		internal static LinearItemsLayout CreateVerticalDefault()
+			=> new LinearItemsLayout(ItemsLayoutOrientation.Vertical);
+
+		internal static LinearItemsLayout CreateHorizontalDefault()
+			=> new LinearItemsLayout(ItemsLayoutOrientation.Horizontal);
+
+		internal static LinearItemsLayout CreateCarouselVerticalDefault()
+			=> new LinearItemsLayout(ItemsLayoutOrientation.Vertical)
+			{
+				SnapPointsType = SnapPointsType.MandatorySingle,
+				SnapPointsAlignment = SnapPointsAlignment.Center
+			};
+
+		internal static LinearItemsLayout CreateCarouselHorizontalDefault()
+			=> new LinearItemsLayout(ItemsLayoutOrientation.Horizontal)
+			{
+				SnapPointsType = SnapPointsType.MandatorySingle,
+				SnapPointsAlignment = SnapPointsAlignment.Center
+			};


Introducing factory methods enables creation of multiple distinct instances where previously code often reused the static fields; downstream code relying on reference equality against the public static fields may now fail when new factory instances are produced (via converters/defaultValueCreators). Either ensure converters/defaults return these static fields or document the shift away from singleton semantics and consider providing value-based equality.

Copilot · 2025-10-15T20:37:45Z

src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt

@@ -1,4 +1,5 @@
-#nullable enable
+#nullable enable
+*REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.ViewWillLayoutSubviews() -> void


Same public API removal on Mac Catalyst; ensure coordinated documentation and versioning strategy since removing overrides can alter lifecycle timing expectations for consumers subclassing or depending on renderer behavior.

PureWeen · 2025-10-15T21:10:57Z

/azp run

azure-pipelines · 2025-10-15T21:11:03Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

TamilarasanSF4853 and others added 16 commits October 1, 2025 10:31

[iOS] Fix added for Navigation.SetTitleView does not work in ios 26. (#…

d6bbe9d

…31831) * [iOS] Fix added for Navigation.SetTitleView does not work in ios 26. * changes added. * changed the version condition.

[testing] Update androidApiLevels for device tests (#31827)

1206ef5

* Update androidApiLevels for device tests * [ci] Update provisioning of api 36

Add reference (#31669)

11ce8c9

Invert NavigationPage UseMauiHandler flag (#31859)

ba41e49

[release/9.0.1xx-sr12] Fix ProjectList not displaying due to missing …

afdb4db

…BindingContext update in template sample (#31954) * update ProjectListPage * Update MauiApp.1.csproj --------- Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>

[release/9.0.1xx-sr12] [iOS] Fix memory leak in CollectionViewHandler…

15ecafe

…2 ItemsLayout PropertyChanged subscription (#31922)

9.0.120 Release Branding (#31979)

5a91e89

[release/9.0.1xx-sr12] [ci] Update arcade main (#31987)

a37ec72

* Update arcade * Don t use internal feeds --------- Co-authored-by: Rui Marinho <me@ruimarinho.net>

Update FlyoutViewHandler.Windows.cs (#32007)

c1f4f7d

Co-authored-by: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com>

Copilot AI review requested due to automatic review settings October 15, 2025 20:35

PureWeen added this to the .NET 10.0 GA milestone Oct 15, 2025

PureWeen added this to MAUI SDK Ongoing Oct 15, 2025

github-project-automation bot moved this to Todo in MAUI SDK Ongoing Oct 15, 2025

Copilot AI reviewed Oct 15, 2025

View reviewed changes

rmarinho approved these changes Oct 18, 2025

View reviewed changes

github-project-automation bot moved this from Todo to Approved in MAUI SDK Ongoing Oct 18, 2025

rmarinho merged commit 235ad46 into release/10.0.1xx Oct 18, 2025
7 checks passed

rmarinho deleted the merge_sr12_ga branch October 18, 2025 12:52

github-project-automation bot moved this from Approved to Done in MAUI SDK Ongoing Oct 18, 2025

-		System.Threading.Thread.Sleep(4000); // Wait longer than the 3-second delay
+		// Wait for the main page to reappear after the picker page pops
+		App.WaitForElement("statusLabel");
+		App.WaitForElement("navigateButton");

		null, propertyChanged: OnInternalItemsLayoutPropertyChanged,
		defaultValueCreator: (b) => LinearItemsLayout.CreateVerticalDefault());

Sync .NET 9 SR12 with .NET 10 GA release #32012

Sync .NET 9 SR12 with .NET 10 GA release #32012

Conversation

PureWeen commented Oct 15, 2025

Description

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

PureWeen commented Oct 15, 2025

Uh oh!

azure-pipelines bot commented Oct 15, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants