Merge main into net10

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,6 +42,7 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 10.0.0-rc.2
         - 10.0.0-rc.1
         - 10.0.0-preview.7
         - 10.0.0-preview.6
@@ -50,6 +51,8 @@ body:
         - 10.0.0-preview.3
         - 10.0.0-preview.2
         - 10.0.0-preview.1
+        - 9.0.110 SR12
+        - 9.0.111 SR11.1
         - 9.0.110 SR11
         - 9.0.100 SR10
         - 9.0.90 SR9
@@ -133,6 +136,8 @@ body:
         - 9.0.90 SR9
         - 9.0.100 SR10
         - 9.0.110 SR11
+        - 9.0.111 SR11.1
+        - 9.0.120 SR12
         - 10.0.0-preview.1
         - 10.0.0-preview.2
         - 10.0.0-preview.3
@@ -141,6 +146,7 @@ body:
         - 10.0.0-preview.6
         - 10.0.0-preview.7
         - 10.0.0-rc.1
+        - 10.0.0-rc.2
     validations:
       required: true
   - type: dropdown

README.md

@@ -11,6 +11,8 @@
 * [.NET MAUI Samples](https://github.com/dotnet/maui-samples)
 * [Development Guide](./.github/DEVELOPMENT.md)
 
+Create a new app with `dotnet new maui -n NewApp` or a [sample app](https://github.com/dotnet/maui-samples/tree/main/10.0/Apps/DeveloperBalance#developer-balance) with `dotnet new maui -n NewApp -sc` that includes the [open-source Syncfusion Toolkit for .NET MAUI](https://www.syncfusion.com/net-maui-toolkit?utm_source=msftdotnet&utm_medium=banner&utm_campaign=mauipremium_sep25) with over 30 additional controls, the [.NET MAUI Community Toolkit](https://github.com/CommunityToolkit/Maui) with tons of helpers and views, and [MVVM Toolkit](https://github.com/CommunityToolkit/dotnet). 
+
 ## Overview
 
 .NET Multi-platform App UI (.NET MAUI) is the evolution of Xamarin.Forms that expand capabilities beyond mobile Android and iOS into desktop apps for Windows and macOS. With .NET MAUI, you can build apps that perform great on any device that runs Windows, macOS, Android, & iOS from a single codebase. Coupled with Visual Studio productivity tools and emulators, .NET and Visual Studio significantly speed up the development process for building apps that target the widest possible set of devices. Use a single development stack that supports the best-of-breed solutions for all modern workloads with a unified SDK, base class libraries, and a toolchain. [Read More](https://docs.microsoft.com/dotnet/maui/what-is-maui)

coverage.runsettings

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectionProviders>
+      <DataCollectionProvider friendlyName="Code Coverage">
+        <Configuration>
+          <Module>
+            <Exclude>
+              <Module name="*" />
+            </Exclude>
+            <Include>
+              <Module name="Microsoft.Maui*.dll" />
+            </Include>
+          </Module>
+        </Configuration>
+      </DataCollectionProvider>
+    </DataCollectionProviders>
+  </DataCollectionRunSettings>
+</RunSettings>

eng/common/core-templates/job/source-build.yml

@@ -34,6 +34,9 @@ parameters:
   #   container and pool.
   platform: {}
 
+  # Optional list of directories to ignore for component governance scans.
+  componentGovernanceIgnoreDirectories: []
+
   is1ESPipeline: ''
 
   # If set to true and running on a non-public project,
@@ -94,3 +97,4 @@ jobs:
     parameters:
       is1ESPipeline: ${{ parameters.is1ESPipeline }}
       platform: ${{ parameters.platform }}
+      componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

eng/common/core-templates/jobs/source-build.yml

@@ -15,6 +15,9 @@ parameters:
   # one job runs on 'defaultManagedPlatform'.
   platforms: []
 
+  # Optional list of directories to ignore for component governance scans.
+  componentGovernanceIgnoreDirectories: []
+
   is1ESPipeline: ''
 
   # If set to true and running on a non-public project,
@@ -31,6 +34,7 @@ jobs:
       is1ESPipeline: ${{ parameters.is1ESPipeline }}
       jobNamePrefix: ${{ parameters.jobNamePrefix }}
       platform: ${{ platform }}
+      componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
       enableInternalSources: ${{ parameters.enableInternalSources }}
 
 - ${{ if eq(length(parameters.platforms), 0) }}:
@@ -39,4 +43,5 @@ jobs:
       is1ESPipeline: ${{ parameters.is1ESPipeline }}
       jobNamePrefix: ${{ parameters.jobNamePrefix }}
       platform: ${{ parameters.defaultManagedPlatform }}
+      componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
       enableInternalSources: ${{ parameters.enableInternalSources }}

eng/common/core-templates/steps/get-delegation-sas.yml

@@ -26,6 +26,7 @@ steps:
   inputs:
     azureSubscription: ${{ parameters.federatedServiceConnection }}
     scriptType: 'pscore'
+    addSpnToEnvironment: true
     scriptLocation: 'inlineScript'
     inlineScript: |
       # Calculate the expiration of the SAS token and convert to UTC

eng/common/core-templates/steps/get-federated-access-token.yml

@@ -31,6 +31,7 @@ steps:
   inputs:
     azureSubscription: ${{ parameters.federatedServiceConnection }}
     scriptType: 'pscore'
+    addSpnToEnvironment: true
     scriptLocation: 'inlineScript'
     inlineScript: |
       $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv

eng/pipelines/arcade/setup-test-env.yml

@@ -28,7 +28,11 @@ steps:
     xcrun xcode-select --print-path
     xcodebuild -version
     sudo xcodebuild -license accept
-    sudo xcodebuild -downloadPlatform iOS
+    if [[ ${XCODE_VERSION/\.*/} -ge 26 ]]; then
+      sudo xcodebuild -downloadPlatform iOS -architectureVariant universal
+    else
+      sudo xcodebuild -downloadPlatform iOS
+    fi
     sudo xcodebuild -runFirstLaunch
   displayName: Select Xcode Version
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))

eng/pipelines/maui-release-internal.yml

@@ -74,6 +74,8 @@ extends:
   ${{ else }}:
     template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive
     pool: ${{ parameters.VM_IMAGE_HOST }}
     sdl:
       binskim:

src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs

@@ -124,6 +124,11 @@ public override void ViewDidAppear(bool animated)
 		{
 			base.ViewDidAppear(animated);
 			Page.SendAppearing();
+			if (!_intialLayoutFinished)
+			{
+				_intialLayoutFinished = true;
+				SetInitialPresented();
+			}
 		}
 
 		public override void ViewDidDisappear(bool animated)
@@ -158,19 +163,6 @@ void SetInitialPresented()
 			UpdateLeftBarButton();
 		}
 
-		public override void ViewWillLayoutSubviews()
-		{
-			// Orientation doesn't seem to be set to a stable correct value until here.
-			// So, we officially process orientation here.
-			if (!_intialLayoutFinished)
-			{
-				_intialLayoutFinished = true;
-				SetInitialPresented();
-			}
-
-			base.ViewWillLayoutSubviews();
-		}
-
 		public override void ViewDidLoad()
 		{
 			base.ViewDidLoad();

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

@@ -2089,7 +2089,13 @@ class Container : UIView
 
 			public Container(View view, UINavigationBar bar) : base(bar.Bounds)
 			{
-				if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11))
+				// For iOS 26+, we need to use autoresizing masks instead of constraints to ensure proper TitleView display
+				if (OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26))
+				{
+					TranslatesAutoresizingMaskIntoConstraints = true;
+					AutoresizingMask = UIViewAutoresizing.FlexibleHeight | UIViewAutoresizing.FlexibleWidth;
+				}
+				else if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11))
 				{
 					TranslatesAutoresizingMaskIntoConstraints = false;
 				}
@@ -2178,7 +2184,9 @@ public override CGRect Frame
 				{
 					if (Superview != null)
 					{
-						if (!(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)))
+						// For iOS 26+ and pre-iOS 11, we use autoresizing masks and need to adjust the frame manually
+						if (OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26) ||
+							!(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)))
 						{
 							value.Y = Superview.Bounds.Y;
 

src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs

@@ -18,6 +18,10 @@ public partial class StructuredItemsViewHandler<TItemsView> : ItemsViewHandler<T
 		View _currentFooter;
 		WeakNotifyPropertyChangedProxy _layoutPropertyChangedProxy;
 		PropertyChangedEventHandler _layoutPropertyChanged;
+		const string ListViewItemStyleKey = "DefaultListViewItemStyle";
+		const string GridViewItemStyleKey = "DefaultGridViewItemStyle";
+		static WStyle _listViewItemStyle;
+		static WStyle _gridViewItemStyle;
 
 		~StructuredItemsViewHandler() => _layoutPropertyChangedProxy?.Unsubscribe();
 
@@ -79,6 +83,9 @@ public static void MapItemSizingStrategy(StructuredItemsViewHandler<TItemsView>
 
 		protected override ListViewBase SelectListViewBase()
 		{
+			_listViewItemStyle = GetDefaultStyle(ListViewItemStyleKey);
+			_gridViewItemStyle = GetDefaultStyle(GridViewItemStyleKey);
+
 			switch (VirtualView.ItemsLayout)
 			{
 				case GridItemsLayout gridItemsLayout:
@@ -242,20 +249,35 @@ static WStyle GetItemContainerStyle(GridItemsLayout layout)
 
 			var style = new WStyle(typeof(GridViewItem));
 
+			if (_gridViewItemStyle is not null)
+			{
+				style.BasedOn = _gridViewItemStyle;
+			}
+
 			style.Setters.Add(new WSetter(FrameworkElement.MarginProperty, margin));
 			style.Setters.Add(new WSetter(Control.PaddingProperty, WinUIHelpers.CreateThickness(0)));
 			style.Setters.Add(new WSetter(Control.HorizontalContentAlignmentProperty, HorizontalAlignment.Stretch));
 
 			return style;
 		}
 
+		static WStyle GetDefaultStyle(string resourceKey)
+		{
+			return Microsoft.UI.Xaml.Application.Current.Resources[resourceKey] as WStyle;
+		}
+
 		static WStyle GetVerticalItemContainerStyle(LinearItemsLayout layout)
 		{
 			var v = layout?.ItemSpacing ?? 0;
 			var margin = WinUIHelpers.CreateThickness(0, v, 0, v);
 
 			var style = new WStyle(typeof(ListViewItem));
 
+			if (_listViewItemStyle is not null)
+			{
+				style.BasedOn = _listViewItemStyle;
+			}
+
 			style.Setters.Add(new WSetter(FrameworkElement.MinHeightProperty, 0));
 			style.Setters.Add(new WSetter(FrameworkElement.MarginProperty, margin));
 			style.Setters.Add(new WSetter(Control.PaddingProperty, WinUIHelpers.CreateThickness(0)));
@@ -271,6 +293,11 @@ static WStyle GetHorizontalItemContainerStyle(LinearItemsLayout layout)
 
 			var style = new WStyle(typeof(ListViewItem));
 
+			if (_listViewItemStyle is not null)
+			{
+				style.BasedOn = _listViewItemStyle;
+			}
+
 			style.Setters.Add(new WSetter(FrameworkElement.MinWidthProperty, 0));
 			style.Setters.Add(new WSetter(Control.PaddingProperty, padding));
 			style.Setters.Add(new WSetter(Control.VerticalContentAlignmentProperty, VerticalAlignment.Stretch));

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

@@ -19,12 +19,12 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destina
 
 			if (strValue == "HorizontalList")
 			{
-				return LinearItemsLayout.CarouselDefault;
+				return LinearItemsLayout.CreateCarouselHorizontalDefault();
 			}
 
 			if (strValue == "VerticalList")
 			{
-				return LinearItemsLayout.CarouselVertical;
+				return LinearItemsLayout.CreateCarouselVerticalDefault();
 			}
 
 			throw new InvalidOperationException($"Cannot convert \"{strValue}\" into {typeof(LinearItemsLayout)}");

src/Controls/src/Core/Items/CarouselView.cs

@@ -187,7 +187,7 @@ public object PositionChangedCommandParameter
 		/// <summary>Bindable property for <see cref="ItemsLayout"/>.</summary>
 		public static readonly BindableProperty ItemsLayoutProperty =
 			BindableProperty.Create(nameof(ItemsLayout), typeof(LinearItemsLayout), typeof(ItemsView),
-				LinearItemsLayout.CarouselDefault);
+				null, defaultValueCreator: (b) => LinearItemsLayout.CreateCarouselHorizontalDefault());
 
 		/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselView.xml" path="//Member[@MemberName='ItemsLayout']/Docs/*" />
 		[System.ComponentModel.TypeConverter(typeof(CarouselLayoutTypeConverter))]

src/Controls/src/Core/Items/ItemsLayoutTypeConverter.cs

@@ -26,11 +26,11 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destina
 
 			if (strValue == "VerticalList")
 			{
-				return LinearItemsLayout.Vertical;
+				return LinearItemsLayout.CreateVerticalDefault();
 			}
 			else if (strValue == "HorizontalList")
 			{
-				return LinearItemsLayout.Horizontal;
+				return LinearItemsLayout.CreateHorizontalDefault();
 			}
 			else if (strValue.StartsWith("VerticalGrid", StringComparison.Ordinal))
 			{

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

@@ -113,7 +113,8 @@ public int RemainingItemsThreshold
 
 		internal static readonly BindableProperty InternalItemsLayoutProperty =
 			BindableProperty.Create(nameof(ItemsLayout), typeof(IItemsLayout), typeof(ItemsView),
-				LinearItemsLayout.Vertical, propertyChanged: OnInternalItemsLayoutPropertyChanged);
+				null, propertyChanged: OnInternalItemsLayoutPropertyChanged,
+				defaultValueCreator: (b) => LinearItemsLayout.CreateVerticalDefault());
 
 		static void OnInternalItemsLayoutPropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{

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

@@ -12,22 +12,14 @@ public LinearItemsLayout([Parameter("Orientation")] ItemsLayoutOrientation orien
 		}
 
 		/// <include file="../../../docs/Microsoft.Maui.Controls/LinearItemsLayout.xml" path="//Member[@MemberName='Vertical']/Docs/*" />
-		public static readonly IItemsLayout Vertical = new LinearItemsLayout(ItemsLayoutOrientation.Vertical);
+		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();
 
 		/// <summary>Bindable property for <see cref="ItemSpacing"/>.</summary>
 		public static readonly BindableProperty ItemSpacingProperty =
@@ -40,5 +32,25 @@ public double ItemSpacing
 			get => (double)GetValue(ItemSpacingProperty);
 			set => SetValue(ItemSpacingProperty, value);
 		}
+
+		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
+			};
 	}
 }

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

@@ -1,4 +1,5 @@
-#nullable enable
+#nullable enable
+*REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.PhoneFlyoutPageRenderer.ViewWillLayoutSubviews() -> void
 *REMOVED*Microsoft.Maui.Controls.Accelerator
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.get -> System.Collections.Generic.IEnumerable<string>
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void

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
 *REMOVED*Microsoft.Maui.Controls.Accelerator
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.get -> System.Collections.Generic.IEnumerable<string>
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Keys.set -> void