[2025/05/19] Candidate - In Flight Branch (#29473)

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

# .NET MAUI Release Notes

## New Release: May 21, 2025

We're excited to announce a new release of .NET MAUI with several bug
fixes and improvements across various platforms.

### Bug Fixes

#### iOS
- **Map Control**: Fixed crash when navigating to a page containing a
map more than once (#29369)
- **CarouselView**: Fixed bounce-back behavior when Loop=false, ensuring
proper scrolling experience (#29318)
- **UIView**: Fixed NullReferenceException for UIView not being in
UIWindow (#29460)

#### Windows
- **CarouselView**: Fixed HorizontalScrollBarVisibility="Never" not
working properly (#29343)
- **UI Controls**: Fixed the color not being applied to the
Expand/Collapse Chevron icon (#29140)

#### Windows & macOS
- **Modal Navigation**: Fixed issue where Disappearing event was not
triggered when closing a window with a modal page (#29129)

#### Android
- **Modal Pages**: Improved inheritance of StatusBar and NavigationBar
background colors (#28568)
- **Footer Scrolling**: Fixed footer scrolling issues in list controls
(#29381)
- **Modal Pages**: Improved inheritance of StatusBar and NavigationBar
background colors on modal pages (#28568)

#### Cross-Platform
- **CarouselView**: Fixed ItemsLayout runtime updates to ensure proper
layout behavior (#29447)
- **CollectionView**: Fixed various issues in CollectionView
implementation (#29423)

### Testing Improvements
- Added feature matrix UITest cases for CollectionView dynamic changes
(#29424)

### Code Quality
- Fixed code formatting issues across the codebase
- Minor typo corrections (#29379)

### Contributors

This release was made possible by the hard work of our dedicated team
and community contributors. We'd like to extend our gratitude to
everyone who has contributed to this release.

### Installation

This update is available through NuGet and the .NET SDK. Update your
projects to get access to these fixes.

### Known Issues

Please refer to our issue tracker for any known issues and their
workarounds.

---

For more information about .NET MAUI, visit [the official
documentation](https://docs.microsoft.com/dotnet/maui/).

Author: PureWeen

eng/Versions.props

@@ -5,7 +5,7 @@
     <PatchVersion>80</PatchVersion>
     <SdkBandVersion>9.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>ci.main</PreReleaseVersionLabel>
-    <PreReleaseVersionLabel Condition="'$(BUILD_SOURCEBRANCHNAME)' == 'refs/heads/inflight/current'">ci.inflight</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel Condition="'$(BUILD_SOURCEBRANCH)' == 'refs/heads/inflight/current'">ci.inflight</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>
     <!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->

src/Controls/src/Core/BindableObject.cs

@@ -482,7 +482,7 @@ public void SetValue(BindableProperty property, object value)
 			if (property == null)
 				throw new ArgumentNullException(nameof(property));
 
-			if (value is BindingBase binding && !property.ReturnType.IsAssignableFrom(typeof(BindableProperty)))
+			if (value is BindingBase binding && !property.ReturnType.IsAssignableFrom(typeof(BindingBase)))
 			{
 				SetBinding(property, binding);
 				return;

src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs

@@ -223,7 +223,7 @@ protected RecyclerView.ViewHolder CreateHeaderFooterViewHolder(object content, D
 			}
 
 			// No template, Footer is not a Forms View, so just display Footer.ToString
-			return SimpleViewHolder.FromText(content?.ToString(), context, false);
+			return SimpleViewHolder.FromText(content?.ToString(), context, fill: false);
 		}
 
 		protected RecyclerView.ViewHolder CreateEmptyViewHolder(object content, DataTemplate template, ViewGroup parent)
@@ -235,7 +235,7 @@ protected RecyclerView.ViewHolder CreateEmptyViewHolder(object content, DataTemp
 				if (content is not View formsView)
 				{
 					// No template, EmptyView is not a Forms View, so just display EmptyView.ToString
-					return SimpleViewHolder.FromText(content?.ToString(), context);
+					return SimpleViewHolder.FromText(content?.ToString(), context, () => GetWidth(parent), () => GetHeight(parent), ItemsView);
 				}
 
 				// EmptyView is a Forms View; display that
@@ -319,12 +319,47 @@ void UpdateHeaderFooterHeight(object item, bool isHeader)
 				size = content.Measure(double.PositiveInfinity, double.PositiveInfinity);
 			}
 
-			var itemHeight = size.Height;
+			if (item is string text)
+			{
+				Label label = new Label { Text = text };
+				TemplateHelpers.GetHandler(label, ItemsView.FindMauiContext());
+
+				size = label.Measure(double.PositiveInfinity, double.PositiveInfinity);
+			}
+
+			if (IsVerticalItemsLayout())
+			{
+				var itemHeight = size.Height;
 
-			if (isHeader)
-				_headerHeight = itemHeight;
-			else
-				_footerHeight = itemHeight;
+				if (isHeader)
+				{
+					_headerHeight = itemHeight;
+				}
+				else
+				{
+					_footerHeight = itemHeight;
+				}
+			}
+		}
+
+		bool IsVerticalItemsLayout()
+		{
+			if (ItemsView is CollectionView collectionView)
+			{
+				switch (collectionView.ItemsLayout)
+				{
+					case LinearItemsLayout linearLayout:
+						{
+							return linearLayout.Orientation == ItemsLayoutOrientation.Vertical;
+						}
+					case GridItemsLayout gridItemsLayout:
+						{
+							return gridItemsLayout.Orientation == ItemsLayoutOrientation.Vertical;
+						}
+				}
+			}
+			// Default
+			return true;
 		}
 	}
 }

src/Controls/src/Core/Handlers/Items/Android/SimpleViewHolder.cs

@@ -27,19 +27,19 @@ public void Recycle(ItemsView itemsView)
 			itemsView.RemoveLogicalChild(View);
 		}
 
-		public static SimpleViewHolder FromText(string text, Context context, bool fill = true)
+		public static SimpleViewHolder FromText(string text, Context context, Func<double> width = null, Func<double> height = null, ItemsView container = null, bool fill = true)
 		{
-			var textView = new TextView(context) { Text = text };
-
 			if (fill)
 			{
-				var layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MatchParent,
-					ViewGroup.LayoutParams.MatchParent);
-				textView.LayoutParameters = layoutParams;
+				// When displaying an EmptyView with Header and Footer, we need to account for the Header and Footer sizes in layout calculations.
+				// This prevents the EmptyView from occupying the full remaining space. 
+				Label label = new Label() { Text = text, VerticalOptions = LayoutOptions.Center, HorizontalOptions = LayoutOptions.Center };
+				SizedItemContentView itemContentControl = new SizedItemContentView(context, width, height);
+				itemContentControl.RealizeContent(label, container);
+				return new SimpleViewHolder(itemContentControl, null);
 			}
 
-			textView.Gravity = GravityFlags.Center;
-
+			TextView textView = new TextView(context) { Text = text, Gravity = GravityFlags.Center };
 			return new SimpleViewHolder(textView, null);
 		}
 

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

@@ -53,6 +53,15 @@ public static void MapCurrentItem(CarouselViewHandler handler, CarouselView caro
 			(handler.PlatformView as IMauiCarouselRecyclerView).UpdateFromCurrentItem();
 		}
 
+		// TODO: Change the modifier to public in .NET 10.
+		internal static void MapItemsLayout(CarouselViewHandler handler, CarouselView carouselView)
+		{
+			if (handler.PlatformView is IMauiRecyclerView<CarouselView> recyclerView)
+			{
+				recyclerView.UpdateLayoutManager();
+			}
+		}
+
 		public override Size GetDesiredSize(double widthConstraint, double heightConstraint)
 		{
 			_widthConstraint = widthConstraint;

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

@@ -98,7 +98,14 @@ protected override void OnScrollViewerFound(ScrollViewer scrollViewer)
 			_scrollViewer.ViewChanged += OnScrollViewChanged;
 			_scrollViewer.SizeChanged += OnScrollViewSizeChanged;
 
-			UpdateScrollBarVisibilityForLoop();
+			if (Element.Loop)
+			{
+				UpdateScrollBarVisibilityForLoop();
+			}
+			else
+			{
+				UpdateScrollBarVisibility();
+			}
 		}
 
 		protected override ICollectionView GetCollectionView(CollectionViewSource collectionViewSource)

src/Controls/src/Core/Handlers/Items/CarouselViewHandler.cs

@@ -14,7 +14,7 @@ public CarouselViewHandler(PropertyMapper mapper = null) : base(mapper ?? Mapper
 
 		public static PropertyMapper<CarouselView, CarouselViewHandler> Mapper = new(ItemsViewMapper)
 		{
-#if TIZEN
+#if TIZEN || ANDROID
 			[Controls.CarouselView.ItemsLayoutProperty.PropertyName] = MapItemsLayout,
 #endif
 			[Controls.CarouselView.IsSwipeEnabledProperty.PropertyName] = MapIsSwipeEnabled,

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

@@ -351,8 +351,7 @@ protected virtual void UpdateItemsLayout()
 
 			UpdateItemTemplate();
 			UpdateItemsSource();
-			UpdateVerticalScrollBarVisibility();
-			UpdateHorizontalScrollBarVisibility();
+			UpdateScrollBarVisibility();
 			UpdateEmptyView();
 		}
 
@@ -376,6 +375,12 @@ void ListViewLoaded(object sender, RoutedEventArgs e)
 			listView.Loaded += ListViewLoaded;
 		}
 
+		internal void UpdateScrollBarVisibility()
+		{
+			UpdateVerticalScrollBarVisibility();
+			UpdateHorizontalScrollBarVisibility();
+		}
+
 		void UpdateVerticalScrollBarVisibility()
 		{
 			if (Element.VerticalScrollBarVisibility != ScrollBarVisibility.Default)

src/Controls/src/Core/Handlers/Items2/CarouselViewHandler2.iOS.cs

@@ -27,7 +27,8 @@ public CarouselViewHandler2(PropertyMapper mapper = null) : base(mapper ?? Mappe
 			[Controls.CarouselView.PeekAreaInsetsProperty.PropertyName] = MapPeekAreaInsets,
 			[Controls.CarouselView.IsBounceEnabledProperty.PropertyName] = MapIsBounceEnabled,
 			[Controls.CarouselView.PositionProperty.PropertyName] = MapPosition,
-			[Controls.CarouselView.CurrentItemProperty.PropertyName] = MapCurrentItem
+			[Controls.CarouselView.CurrentItemProperty.PropertyName] = MapCurrentItem,
+			[Controls.CarouselView.ItemsLayoutProperty.PropertyName] = MapItemsLayout,
 		};
 	}
 
@@ -190,6 +191,12 @@ public static void MapIsBounceEnabled(CarouselViewHandler2 handler, CarouselView
 			handler.Controller.CollectionView.Bounces = carouselView.IsBounceEnabled;
 		}
 
+		// TODO: Change the modifier to public in .NET 10.
+		internal static void MapItemsLayout(CarouselViewHandler2 handler, CarouselView carouselView)
+		{
+			handler?.UpdateLayout();
+		}
+
 		public static void MapPeekAreaInsets(CarouselViewHandler2 handler, CarouselView carouselView)
 		{
 			handler.UpdateLayout();

src/Controls/src/Core/Handlers/Items2/iOS/LoopObservableItemsSource2.cs

@@ -59,7 +59,7 @@ public int LoopCount
 			get
 			{
 				var newCount = ItemCount;
-				if (newCount > 0)
+				if (Loop && newCount > 0)
 				{
 					newCount = ItemCount + 2;
 				}