From 64343f5182aaf94fd71c75db08249a8fcc4fb4a7 Mon Sep 17 00:00:00 2001
From: BagavathiPerumal <93652794+BagavathiPerumal@users.noreply.github.com>
Date: Wed, 11 Sep 2024 01:00:10 +0530
Subject: [PATCH 01/11] Fix for the Nested Entry View In A Frame Causes Crash 
 (#24543)

* Committed the changes of the issue

* properly fixed the Object disposed exception

* Added the proper name of test case

* Removing the unneccesary space

* fix-15196-Removed the Dispose method.

* fix-15196-Modified and removed the changes in test case and sample.

---------

Co-authored-by: AhamedAliNishad <ahamedalinishad.j@syncfusion.com>
---
 .../Handlers/Android/FrameRenderer.cs         |  1 -
 .../TestCases.HostApp/Issues/Issue15196.xaml  | 13 ++++++++
 .../Issues/Issue15196.xaml.cs                 | 30 +++++++++++++++++++
 .../Tests/Issues/Issue15196.cs                | 23 ++++++++++++++
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index bb64e53baf..c5cdb32231 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -131,7 +131,6 @@ namespace Microsoft.Maui.Controls.Handlers.Compatibility
 				{
 					var child = GetChildAt(0);
 					child?.RemoveFromParent();
-					child?.Dispose();
 				}
 
 				Element?.Handler?.DisconnectHandler();
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
new file mode 100644
index 0000000000..915d6836d2
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+              x:Class="Maui.Controls.Sample.Issues.Issue15196">
+
+  <StackLayout x:Name="stackLayout">
+    <Frame x:Name="frame" HeightRequest="200">
+      <Entry x:Name="entry" Text="This is entry inside the frame"/>
+    </Frame>
+    <Button Text="Remove the frame" AutomationId="RemoveButton" Clicked="OnButtonClicked"/>
+  </StackLayout>
+
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
new file mode 100644
index 0000000000..e6c042faa5
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Graphics;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 15196, "Nested Entry View In A Frame Causes Crash", PlatformAffected.Android)]
+	public partial class Issue15196 : ContentPage
+	{
+		public Issue15196()
+		{
+			InitializeComponent();
+		}
+
+		private void OnButtonClicked(object sender, EventArgs e)
+		{
+			if (stackLayout.Children.Contains(frame))
+			{
+				stackLayout.Children.Remove(frame);
+			}
+			
+		frame?.Handler?.DisconnectHandler();
+		entry?.Handler?.DisconnectHandler();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
new file mode 100644
index 0000000000..ac9ec01ea8
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
@@ -0,0 +1,23 @@
+#if !MACCATALYST
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+    internal class Issue15196 : _IssuesUITest
+	{
+		public override string Issue => "Nested Entry View In A Frame Causes Crash";
+
+		public Issue15196(TestDevice testDevice) : base(testDevice) { }
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		public void NestedEntryViewInFrameShouldNotCrash()
+		{
+			App.WaitForElement("RemoveButton");
+			App.Click("RemoveButton");
+		}
+	}
+}
+#endif
\ No newline at end of file

From 7d6c5a9253c9a25108db466810ae48f96f89deb8 Mon Sep 17 00:00:00 2001
From: Tamilarasan Paranthaman
 <93904422+Tamilarasan-Paranthaman@users.noreply.github.com>
Date: Wed, 11 Sep 2024 01:22:46 +0530
Subject: [PATCH 02/11] [iOS] Fix for CollectionView single item horizontal
 alignment issue when using ItemsLayout with a Footer. (#24564)

* fix added for collectionView single item alignment with footer,

* Test sample changes.

* Modified the automation sample.

* Added automation images.

* Added comments.
---
 .../Core/Handlers/Items/iOS/GridViewLayout.cs |   3 +-
 ...ctionViewSingleItemAlignmentWithFooter.png | Bin 0 -> 12447 bytes
 .../TestCases.HostApp/Issues/Issue21728.xaml  |  22 +++++++++++++++
 .../Issues/Issue21728.xaml.cs                 |  26 ++++++++++++++++++
 .../Tests/Issues/Issue21728.cs                |  26 ++++++++++++++++++
 ...ctionViewSingleItemAlignmentWithFooter.png | Bin 0 -> 6581 bytes
 ...ctionViewSingleItemAlignmentWithFooter.png | Bin 0 -> 14822 bytes
 7 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewSingleItemAlignmentWithFooter.png
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21728.cs
 create mode 100644 src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/CollectionViewSingleItemAlignmentWithFooter.png
 create mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewSingleItemAlignmentWithFooter.png

diff --git a/src/Controls/src/Core/Handlers/Items/iOS/GridViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/GridViewLayout.cs
index 3330227909..bda227c7cc 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/GridViewLayout.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/GridViewLayout.cs
@@ -243,7 +243,8 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 				return false;
 			}
 
-			if (layoutAttributesForRectElements[0].Frame.Top != CollectionView.Frame.Top + CollectionView.ContentInset.Bottom)
+			// We need to determine whether this 'if' statement is needed, as its relevance is currently uncertain.
+			if (layoutAttributesForRectElements[0].Frame.Top != CollectionView.Frame.Top)
 			{
 				return false;
 			}
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewSingleItemAlignmentWithFooter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewSingleItemAlignmentWithFooter.png
new file mode 100644
index 0000000000000000000000000000000000000000..13b2bb2daf8d3a7f5cc6ab484236ebe4b290033b
GIT binary patch
literal 12447
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
I|LgDn6JLyDng9R*

literal 0
HcmV?d00001

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml
new file mode 100644
index 0000000000..09fac4d85c
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue21728"
+             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+  <CollectionView x:Name="collectionview" AutomationId="collectionview" ItemsLayout="VerticalGrid, 2">
+		<CollectionView.ItemTemplate>
+			<DataTemplate>
+				<Label Text="{Binding Name}" BackgroundColor="Red" HeightRequest="200" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"/>
+			</DataTemplate>
+		</CollectionView.ItemTemplate>
+		<CollectionView.Footer>
+			<ContentView >
+				<ContentView.ControlTemplate>
+					<ControlTemplate>
+						<Label Text="CollectionView Footer"/>
+					</ControlTemplate>
+				</ContentView.ControlTemplate>
+			</ContentView>
+		</CollectionView.Footer>
+	</CollectionView>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml.cs
new file mode 100644
index 0000000000..da9a3efa0d
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21728.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 21728, "CollectionView item alignment issue when a single item is present with a footer", PlatformAffected.iOS)]
+public partial class Issue21728 : ContentPage
+{
+	public IList<TestItem> Items { get; set; }
+
+	public Issue21728()
+    {
+        InitializeComponent();
+		BindingContext = this;
+		Items = new List<TestItem>();
+		Items.Add(new TestItem() { Name = "Test Item 1" });
+		collectionview.ItemsSource = Items;
+	}
+	
+	public class TestItem
+	{
+		public string Name { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21728.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21728.cs
new file mode 100644
index 0000000000..dcd86a00f2
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21728.cs
@@ -0,0 +1,26 @@
+#if !MACCATALYST
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue21728 : _IssuesUITest
+	{
+		public override string Issue => "CollectionView item alignment issue when a single item is present with a footer";
+
+		public Issue21728(TestDevice device)
+		: base(device)
+		{ }
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void CollectionViewSingleItemAlignmentWithFooter()
+		{
+			App.WaitForElement("collectionview");
+
+			VerifyScreenshot();
+		}
+	}
+}
+#endif
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/CollectionViewSingleItemAlignmentWithFooter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/CollectionViewSingleItemAlignmentWithFooter.png
new file mode 100644
index 0000000000000000000000000000000000000000..79f72661d3affec6b82d11680e05ef2a7f6ec7cd
GIT binary patch
literal 6581
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

literal 0
HcmV?d00001

diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewSingleItemAlignmentWithFooter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewSingleItemAlignmentWithFooter.png
new file mode 100644
index 0000000000000000000000000000000000000000..20deb6211b8d2f902060af244a5a8bdeb2ac2248
GIT binary patch
literal 14822
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

literal 0
HcmV?d00001


From 0548772436ac86ab7d2704a729163780ae792956 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 11 Sep 2024 01:16:06 -0500
Subject: [PATCH 03/11] Update bug-report.yml RC1 (#24708)

---
 .github/ISSUE_TEMPLATE/bug-report.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 5a1ddaa59c..75ffe16998 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.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:
+        - 9.0.0-rc.1.24453.9
         - 9.0.0-preview.7.24407.4
         - 9.0.0-preview.6.24327.7
         - 9.0.0-preview.5.24307.10
@@ -129,6 +130,7 @@ body:
         - 9.0.0-preview.4.10690
         - 9.0.0-preview.5.24307.10
         - 9.0.0-preview.6.24327.7
+        - 9.0.0-preview.7.24407.4
     validations:
       required: true
   - type: dropdown

From 9055699a90010990d24d3e7c77bf0d6204b6349b Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 11 Sep 2024 08:19:47 -0500
Subject: [PATCH 04/11] Ensure disconnected ItemsViewHandler doesn't hold onto
 the items source (#24699)

* Ensure disconnected ItemsViewHandler doesn't hold onto the items source

* Update CarouselViewTests.cs
---
 .../Items/CarouselViewHandler.Windows.cs      |  6 +-
 .../Items/ItemsViewHandler.Windows.cs         | 10 +++-
 .../Handlers/Items/ItemsViewHandler.iOS.cs    |  1 +
 .../Handlers/Items/iOS/ItemsViewController.cs |  9 +++
 .../CarouselView/CarouselViewTests.cs         | 55 ++++++++++++++++++-
 5 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.Windows.cs
index fef0bedd6c..4d79bddb25 100644
--- a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.Windows.cs
@@ -38,7 +38,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 		protected override void ConnectHandler(ListViewBase platformView)
 		{
 			ItemsView.Scrolled += CarouselScrolled;
-			ListViewBase.SizeChanged += OnListViewSizeChanged;
+			platformView.SizeChanged += OnListViewSizeChanged;
 
 			UpdateScrollBarVisibilityForLoop();
 
@@ -50,9 +50,9 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 			if (ItemsView != null)
 				ItemsView.Scrolled -= CarouselScrolled;
 
-			if (ListViewBase != null)
+			if (platformView != null)
 			{
-				ListViewBase.SizeChanged -= OnListViewSizeChanged;
+				platformView.SizeChanged -= OnListViewSizeChanged;
 				_proxy.Unsubscribe();
 			}
 
diff --git a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
index 38bc29107c..8046dd7e7b 100644
--- a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
@@ -57,6 +57,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 		protected override void DisconnectHandler(ListViewBase platformView)
 		{
 			VirtualView.ScrollToRequested -= ScrollToRequested;
+			CleanUpCollectionViewSource(platformView);
 			base.DisconnectHandler(platformView);
 		}
 
@@ -154,6 +155,11 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 		protected abstract ListViewBase SelectListViewBase();
 
 		protected virtual void CleanUpCollectionViewSource()
+		{
+			CleanUpCollectionViewSource(ListViewBase);
+		}
+
+		private void CleanUpCollectionViewSource(ListViewBase platformView)
 		{
 			if (CollectionViewSource is not null)
 			{
@@ -174,7 +180,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 			// Remove all children inside the ItemsSource
 			if (VirtualView is not null)
 			{
-				foreach (var item in ListViewBase.GetChildren<ItemContentControl>())
+				foreach (var item in platformView.GetChildren<ItemContentControl>())
 				{
 					var element = item.GetVisualElement();
 					VirtualView.RemoveLogicalChild(element);
@@ -183,7 +189,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 
 			if (VirtualView?.ItemsSource is null)
 			{
-				ListViewBase.ItemsSource = null;
+				platformView.ItemsSource = null;
 				return;
 			}
 		}
diff --git a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.iOS.cs b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.iOS.cs
index 756aa3f6bf..c67911fb66 100644
--- a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.iOS.cs
+++ b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.iOS.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 		protected override void DisconnectHandler(UIView platformView)
 		{
 			ItemsView.ScrollToRequested -= ScrollToRequested;
+			Controller?.DisposeItemsSource();
 			base.DisconnectHandler(platformView);
 		}
 
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs
index 71b2086a82..3e10fd5c25 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs
@@ -329,6 +329,15 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 			(ItemsView as IView)?.InvalidateMeasure();
 		}
 
+		internal void DisposeItemsSource()
+		{
+			_measurementCells?.Clear();
+			ItemsViewLayout?.ClearCellSizeCache();
+			ItemsSource?.Dispose();
+			ItemsSource = new EmptySource();
+			CollectionView.ReloadData();
+		}
+
 		public virtual void UpdateFlowDirection()
 		{
 			CollectionView.UpdateFlowDirection(ItemsView);
diff --git a/src/Controls/tests/DeviceTests/Elements/CarouselView/CarouselViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CarouselView/CarouselViewTests.cs
index efb175da32..17c0b297ec 100644
--- a/src/Controls/tests/DeviceTests/Elements/CarouselView/CarouselViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CarouselView/CarouselViewTests.cs
@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Handlers.Items;
@@ -112,6 +113,45 @@ namespace Microsoft.Maui.DeviceTests
 				Assert.NotNull(handler.PlatformView);
 			});
 		}
+
+		#if !ANDROID //https://github.com/dotnet/maui/pull/24610
+		[Fact]
+		public async void DisconnectedCarouselViewDoesNotHookCollectionViewChanged()
+		{
+			SetupBuilder();
+
+			CollectionChangedObservableCollection<int> data = new CollectionChangedObservableCollection<int>()
+			{
+				1,
+				2,
+			};
+
+			var template = new DataTemplate(() =>
+			{
+				return new Grid()
+				{
+					new Label()
+				};
+			});
+
+			var carouselView = new CarouselView()
+			{
+				ItemTemplate = template,
+				ItemsSource = data
+			};
+
+			await CreateHandlerAndAddToWindow<CarouselViewHandler>(carouselView, async (handler) =>
+			{
+				await Task.Delay(100);
+				Assert.NotNull(handler.PlatformView);
+				Assert.False(data.IsCollectionChangedEventEmpty);
+			});
+
+			carouselView.Handler?.DisconnectHandler();
+
+			Assert.True(data.IsCollectionChangedEventEmpty);
+		}
+		#endif
 	}
 
 	internal class CustomDataTemplateSelectorSelector : DataTemplateSelector
@@ -129,4 +169,17 @@ namespace Microsoft.Maui.DeviceTests
 				return Template2;
 		}
 	}
-}
\ No newline at end of file
+
+	internal class CollectionChangedObservableCollection<T> : ObservableCollection<T>, INotifyCollectionChanged
+	{
+		NotifyCollectionChangedEventHandler collectionChanged;
+
+		event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
+		{
+			add { collectionChanged += value; base.CollectionChanged += value; }
+			remove { collectionChanged -= value; base.CollectionChanged -= value; }
+		}
+
+		public bool IsCollectionChangedEventEmpty => collectionChanged is null;
+	}
+}

From 19afb501b827b59d4ac03c5ef0432718adecc65a Mon Sep 17 00:00:00 2001
From: NirmalKumarYuvaraj
 <97871636+NirmalKumarYuvaraj@users.noreply.github.com>
Date: Thu, 12 Sep 2024 02:28:29 +0530
Subject: [PATCH 05/11] [IOS] - Fix error when running new template maui app on
 iOS (#24567)

* Fixed - 22452 - ios Shell

* Added Test case

* Modified test case file

* Modified test case

* Added images for test case

* Modified test case file

* Modified test cases

* Modified test case

* Modified test case

* Added image for test case
---
 .../Handlers/Shell/iOS/ShellItemRenderer.cs   |   2 +-
 .../android/NavigationBetweenFlyoutItems.png  | Bin 0 -> 9752 bytes
 .../TestCases.HostApp/Issues/Issue22452.xaml  |  13 +++++++
 .../Issues/Issue22452.xaml.cs                 |  32 ++++++++++++++++++
 .../Tests/Issues/Issue22452.cs                |  21 ++++++++++++
 .../windows/NavigationBetweenFlyoutItems.png  | Bin 0 -> 6515 bytes
 .../ios/NavigationBetweenFlyoutItems.png      | Bin 0 -> 12533 bytes
 7 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/NavigationBetweenFlyoutItems.png
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22452.cs
 create mode 100644 src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/NavigationBetweenFlyoutItems.png
 create mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/NavigationBetweenFlyoutItems.png

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
index 528eaa84a4..537a91a9a2 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
@@ -345,7 +345,7 @@ namespace Microsoft.Maui.Controls.Platform.Compatibility
 
 			UITableViewCell[] GetMoreNavigationCells()
 			{
-				if (MoreNavigationController.TopViewController.View is UITableView uITableView)
+				if (MoreNavigationController.TopViewController.View is UITableView uITableView && uITableView.Window is not null)
 					return uITableView.VisibleCells;
 
 				return EmptyUITableViewCellArray;
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/NavigationBetweenFlyoutItems.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/NavigationBetweenFlyoutItems.png
new file mode 100644
index 0000000000000000000000000000000000000000..12d33aa6b68c6c1e5a91b9c5c0caadae070ad0fe
GIT binary patch
literal 9752
zcmeI2YgCe1zrbml$;#3?O=*eR)TC2mqGpPU`gZZP#=_}hns-I>HE-Y*1x3rtl!;T6
zXkO?tWu=Liydx-#5~Y%wrlKGs-T@I65rISNyzg1(e0b;6`EWkC)?RC`y`TO6@4bKj
z%YL5q>^r|gop)|OupIyZ>^y(&>}3GpTQC5yg}!yOy64p+BM)_T5O(hJMF1el2mnY;
z2LRU8U8&OmK%5x>FzXKh*yaNOI`E>VOAr9y8?Rq4Ty@ejcb=S_oST~y2n0f*aA9FV
zEEX>=E=nYlrKP3i<>i%?6{%FZy1FWp$=24^<Z}7?`np1)P%4!wm1=%|UL+FD%*@Qr
z&Q4EHPfbnn`TU8AiQ(bl($dnJnws(PaR!6&;lqc{&d%=c?oXdS_4fAm_4W1l_YVvV
zeEITaaBy&FXecf&?*9GzOeT{`rPkNiH#ax8x3`asjD&`U-n@A;EG#S{A|fg(3J!-O
z5QymLXgnUDn3z~wTU%LKnU$3_Ha5oLaEL@=RaMoycki;Zvq>aUOG^uxOr}sMxw*M%
zX=ywjue`jxq@<*wp&>IfGcPX>iA0u_mHqbHZv+D2`Sa%wA3l8W;6Y<!Bb&`;u~@~$
z#W)=9$&)8&G`gdsqq@49Mx#A@_N<_wpsTAZKR^HJ)2E}Oqg*cc#fuj)F)^{Rv4w?&
z_wL<$_3G7|H*c_5Y)VQ>QBhH9YU=O5|DKeT^z!A)^z`(Mj0_A0^Z4=Oo}L~Q3iasG
zqq}$SCL|<${P?k=qJmDRfByWruCDHnKmKTIYrAvj&fB+d<KyGszki>coP7KC?bg=T
zoSd9L|NQgy>(@<9O(7v6hK7dr_V%8hp6AY;yMF!pwQJX$ot-^AJbwA*7jJLx@bK`<
zmoG!1(BR-;3kwTVQ&UGr$1`WnoIH8b%E}4`gB?A3^vIDTuCA`;=H@OgE<r&-r%#`D
zb8|a(?3js($>GC?!C<hHlT%<|;EfwMPMtb+>Cz=1A0H41boT67OG`@#1Y&Dz>+kP>
z<;s=F$Vek2BRe}gcXxNS<FUNfqSe)=Ko{q;-#_3mPO2LkvF9&3X-sd^+yvVDpvNBz
z036CYfA-W><gj2=-s}?>@I-7-u_^7xA5$McIrSaC`n&X`O=Smno!$N2?yKKl{q_5E
z<<?j4o!d+LY;p7W4DxNQz9`<-7RoBP$ttidb_^RBMiE@7+#f-;MSB$Jl=rd<(Qw$*
z#Kd(`&6i-21VzyR04l{M0N1C_u?}nbuw1*8zHP=1f<JIj2ie0b&>>Rd$GqcS8l_rw
z7b7^+>6=R~JL|^{o0sNt!Q4<ubhxic793D!$D1kDPhP8{8&ZJSE9sj(SSLzSKKE9A
z=yk#JVSBj%1JVAF3%PDsyMw?&?d|kTP!_!P%4|Um>=Dl@!WMB2dw9{q2|RXmx$`8}
zO)WpV<iQ_=(cwiu0b99)<_2ZJ6D<`M_Sdc_J~#tTbra}f-Ci2oU>&*X?KmKHQ+X(T
z>DK&AAFA~R{g|ZYIdv1{ez7JK!h7{R_xf%u4o^k2<^V$+=B_h+MGjjv!gn-xCw0dV
zq@)_A&6Es;Y-^k<Nl?mkyy24tg?UV@X$G$m$IvAB*W0gAvrSWaj)au_1YEEi@8w{`
zF20Msc=A#(2sIRp_lcMB@f37rSvs%RF~5^E{)oO!V;#CG&4kVE#Ra<y@7k@OCnoim
zK@~g04*?e*HqFk4RV1zm-F?wwO~3e|T2Rt*8L?S-l9(tk&(g=fWgbXED4g7jtKjS!
zKl1{TaOUkd);qiiOL~K6)re}trq+`qiI}0_C=ap$s)5_^kHMU%5r`gW#Ik@?)snJH
z3w$Vt3x*v98h5~p5R#y3)J&kDfaZ{lg||jgd?a&Kbn*-%9VQKm{&=@#b$~H(jho6z
zX^tGMN&-hB1%;f&0qc>Kx-0IPFcvF;lR~$P^nz%ty-R=^i9D-RCHC{5jXN_-i%?T<
z6Gl>&ZCt&)>)~H~K!aq(eqypzU(`5Bn%UGfnlO4YJ!Els=I-m`poX=U1d^x&Rj02s
zqHdZSWB1b#YssjU`QjwirH@?j%7BcID|0On67gCz*tK~|>CTT*sPmM9yMEu=2ka*$
zF(x(_MinvHwv&8&7k8Kg81<gz@UCGkpEi0H>~CLgfPG#uS`)&|QjHy!YV#Wwr`zEp
zOFiNTbMy|y3eStKSbi3O;47OW`d(h_JMkhUCpU5II6;>}y1@$kj;#_0i1%2#o~RUv
z_cp+Rz9>4G%hcA#APcu@lxMrq5R1mr`9^+QmzV44I>}WXp5k`+1tV>r%0zix1|q~E
zY{ZY4e?jOafc(kI(jY|z49@Q7^$%<6(98?gdoqk8IMs7F+H~&^CrV42!gTEgpRbgL
zHr{+s(}1$b$#dV;UoeWYEx(w)d4T?g3r=8`xH`tfM=zZ~NugN39dvm}hzV5xgSbiT
zAH15hd~6gPJSY(r`rt=b7J{lp4ei@W%Y!o$=iQ-3_4??SF%o!D^m6#~s-1S)usz(=
zxayl=1KG5*pCjc>bZ@B?YFeDdD=vKt#*2rza{?S=>e@E?D2|bpOUQLSpylpsr%mtD
zlrUKPh~)BDt(D5O_JimYi$<}T)ov{h<7_TiamSSI+nBJpPWQnk(}SYB7WfJrqg@>c
zsWYGpM)l!^ZvLTiZle&~@J&6`2;}Lly2Y4Sqp7{vzZhr%#E=pe$9Pl(1HMC?&IQj*
zGA1HiT$sT4r9Q1UtwT6Qt%lp!!@^Qy^BW}&C3Nt_SHI!kp;jf*kGONz*jWZi)06#F
zgc82X`~o?^B9YIdnZFF|>+Q`;+^yDNsDCx>L}t$v*-ScnJzT5m4!kuf@fLhU!j?q<
zZ@W<uqDpB=b+TN;2nTX-0J`t|x!x4Swrti`?Akkc(&oJuH+5&&G8{7Hx-u_YvWq0m
z-FG%<#MHv)9}8NVjd3hPL#(*2a<99K3T|N||HN&W9fOY?1Xc#TO>ztV@+l__TS(yP
z`kFyZfznRjs}S3Q_0qk><8@JuW4AQ1g~H)d6W0`^g^lPFSJzpSUS8=0_NRHC1Zs<h
zB$HiUU$)XKT`+;<J)Gu1m5;7eDWLDblvG*Phk6XhO~Z?<9J87pz+1P}-UL^S)Jzo}
z56j?n4;_E*RRLM}JJu!B{a|5zl->=I?_;|ti^TS$Srx4V$=UV!+cm<GWf{B)`!nE4
zia~$`pGQOR^JFPWA2#C{M|fk;7!xqMso`t%KjMvNgp3J$7h@Y?Atx{8)pj(T|99#p
zz2P)&zUo-L>-<nmmkH1d#BK&+8F3QDk`HZl8Ud$X#4+shx}&`<nsqH&44PNd9PrRd
zX-K(ent1Srk~_^C>X|Zi7%SI_u)p`!-x-&|zLY~iZEcWEH`^kem;XhiPen+33rEP1
z<SqpJ=R8xImc}6*lj$21o*1MnD$yd?1FMT{^hfPTR*g}tJ()0wel#;Yl0`Sh6@rQ!
zV(0K7qG-F%UtK1sA3ooZ_!Au!?}z4e@gjh@>^de@+{Bppx!yjhXZ0yi+r;3>J&;4B
zvQ@_+hEZI9Pjss=d42kP6tF{-vLqwy=K$r8c!bpk7^|`eAGzK)6TsZYD@C9e@9RKT
zhr^6<2|`HGKO=W=eXL8u6w8(l69|}<_FY(zLxR{STaL$QQ-}OK$<pzQ#!O>ZG_7~!
zOeqmT4J19WyN;F*zm$R^Vg=namO4Cq)XA)?nGMP0^%?pN#`gqOM@dY8){zu$G7l=R
z0+o;hOYON$#0v@hWWSc1vWdyp+T9K@Q`nk)uCFS5(<1Qq2&@y7?D@|%A$s-;A;v)A
zR}uk7f%J&sSZXx5F5E`>=7h*TMH$fk^9cm)g&m<z@i!KBXn6%iATK`|;zc&Zewkru
z&rF~|EdjD)jF-iDvH-z+x1v_$+GxCk{(*B1Gd+qa-lhS0k-qu;UlkavdAy2lz-nf5
zz6D+YTVW+2hxZ{m`yx3MjEbPzqQdI)B)$!7)nzP_T7~c?sSX;hcV+R|;zUDF5$32f
zggXdU(x~DBR%El_!4TXDe692Jk3c;-#se%gESaeKA6=HfsK%rr8*1B@BkBQ`KtBgK
z6g>EQI*hkV3#+SEU%nd)^2I2Y4M$HF4$B4txZI)Db-AySKv`M-$Vm{6^EhVZ%@J0l
z09{{IQ3i`hQR>lf=ok-hf(=lk8!MExvZIpaph)Ey>qfSp{s5#J-X`G4K8lq6X9)U6
z@gsF25LuDqDqvT!9gVEMQ7?XAtNKOO4P#Z<6b8h^0R^iQeoWWrN_;)r%u9x+QI~7D
zZoIp8I^<?_^>Pm%4g}jF`=pcE91K5Jc7(PtYPi}KF3i#ap;w5LbC}q+BvsKMK)olA
z!@v+Fa&@gWeD*DEfgWYJ#m=#Ie0wKf3UzlFf}?{IWybFJ_Q1d?O_ow?zg40OkFxxD
zGk5TB1GaR8Y+;$wwK7P^DbUq`omx??ACZ$K9D3WuzDK#*^hY?xmk#6on5Uv>uvU=|
zlJiar#F7r`zM>f9UhuWZ`ICu>l`&u5_M7LZ91Y~%oQrhp3aR$pWn(pXPi{k?x3rYk
zDWUiD)5dxTJ8n}9nZJ53XuEi+v#n+pB6?|FebmIU&6?zL+B8j50w<v%CXI6#XbeJS
zPYWvw*|}**)wHZURi#w#G(VGvQShF*=EP)kk^M+3UIwpoDyt1dJg|kRyM<#H)5N!@
z9OwY;cXl-eYVV+79vA<p7)N$Y2x{Q#;qkUB*LhYLN{lTzTsI}T1@mjUquMT7O)*P)
zypdl1U;_5iehtokwJx&nNdq@@G<n9ZV`sM?@&R{HMhjRS7}^}Kl$f#YHR+0)*Hc)Q
zx49lAL05V6U#bRn&?9)CC7Hl`#+DA&7rd>Z5HM$Hq&-=FK7)53vG`1OMWHk~^fT2w
zdC{HOAu`Bx^bi?-Kj*5BhfuIm*qm*uH<d?4&<NVkb4^U<4TxB*`>$-s4rOpCOZ<*+
zXaZrtArPn#<$r_3u8!)0ulFUXo_Jusx^(i?^ds6dh8ZuN(Nc5-EMW2sq`9=-N1Cn{
zKoJ}BJ6=;GY!5aECV+ce`hIU8MVDrRKnL*j>?)3D(n#(KQz$`R<|0*X+*Nn3f5can
z`dEFAK_;^)i1e^J2GLcIH;~rIobbkqySy*%6$^>~H4Hd@F_PzU57PomIcL!vxrRec
zX|rS>17?!HPTf~{wi~hl+NU*eNbM3or~^1)RU$TB0A0`l0S)aj@()xzJwwbRkx!yq
z;;j-^x%m$LG!11twars)a`0!?EXCYzlekNUa_abKi0^V&Fp%G#ATtG30cNVJOEG!s
zJRY#1Em4X1@bY|p&Toq~GS<Yt?!@lZQh4RQuNK~m&F!R$pUTFO_VKE@Qd-ywlh|R3
z4%A(bMiUuSdrb59Sg(%0A8JO*x6<zp&0G-_j_M^1)T@HgGlziXPHOX<$>7!0z#&bm
ze%2+s6zvM4vNJ650H=0Qfa+k_(Vfwvl{wRtkHi&F2F$Z4nSfet+f1#Bj$eb;5i!d>
zH4gP6x?HLnJN-{)i+fr-!YbsH=66CHM{mS;%TdC|-J=V&n?dDJnz%wn6{^Jp<GG2d
z1pePeBR>GkFMeG`CXdW-Ntx{tfdq3Z5|X}p#L=UuNmZE5^%$)2RHsB!6YqxgP5Klh
z7uor*rDyUw{j^;Yh#si^Gc`K89Mz{6E-^Y}G<r_1B%~ndl;asZH+QV4Q2k+(#`P%C
zpHGs`-?mOsj1M{Kas7`|5#R17;?Q$X8a0WimAC}M)dKG*im+S99{Gu8+9K?B$E+Y+
zkz@0Xe(V<cGt_|Gkg@v|7<*8AC$}NFg|f|K7xpltjBK6Glg%l7T5rLDr%ZJnljqvM
zw$6dEJ3>^`A&!3hk)!3>T(AWsB;`(A3q?EsKd^^sCP0)(A$8odzGW-@K6eDKT;doJ
zm&$%0Jos0~&0ilz|94MQT&PuS4q!cUx7NWu8)bvQ27wI%8w558Y!KKWut8vhzy^U0
z0viN22y778Ah1DTgTVhA0$y5lu`3X}(@*`6v-EQs7kmkvdWKc2i-k>b!J!7&<LV0(
zX+CxYFwiTv2)^!^I<49qeKac4VAq{a^`(^~u}&VbK>@MBwy@}6bp^06v#>mFW^>%!
z{HmF`t);cCh565BX0~Q#orv6D{+B>RR8Z)R#D6c)Vq(3b7WnDEXNV1r2#$#jh=Bil
VnOU2CN7XWb^G?vS6{r1g{U^Ve4G;hT

literal 0
HcmV?d00001

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml
new file mode 100644
index 0000000000..6461b54212
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Maui.Controls.Sample.Issues.Issue22452"
+    xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues"
+    Shell.FlyoutBehavior="Locked">
+
+  <FlyoutItem Title="FlyoutItem">
+    <Tab>
+      <ShellContent ContentTemplate="{DataTemplate ns:Issue22452Content}" />
+    </Tab>
+  </FlyoutItem>
+</Shell>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml.cs
new file mode 100644
index 0000000000..f27dc705dd
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22452.xaml.cs
@@ -0,0 +1,32 @@
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 22452, "Fix error when running new template maui app on iOS", PlatformAffected.iOS)]
+	public partial class Issue22452 : Shell
+	{
+		public Issue22452()
+		{
+			InitializeComponent();
+		}
+	}
+
+	public class Issue22452Content : ContentPage
+	{
+		public Issue22452Content()
+		{
+			Content = new StackLayout
+			{
+				Children =
+				{
+					new Label
+					{
+						AutomationId="TabContent",
+						Text = "TabContent"
+					}
+				},
+
+				IgnoreSafeArea = false
+			};
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22452.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22452.cs
new file mode 100644
index 0000000000..94c51e6ba3
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22452.cs
@@ -0,0 +1,21 @@
+using System.Diagnostics;
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue22452 : _IssuesUITest
+{
+	public Issue22452(TestDevice device) : base(device) { }
+
+	public override string Issue => "Fix error when running new template maui app on iOS";
+
+	[Test]
+	[Category(UITestCategories.Shell)]
+	public void NavigationBetweenFlyoutItems()
+	{
+		App.WaitForElement("TabContent");
+		VerifyScreenshot();
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/NavigationBetweenFlyoutItems.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/NavigationBetweenFlyoutItems.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8ed426de2cd7c9b08612186711e9a5dce50effa
GIT binary patch
literal 6515
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

literal 0
HcmV?d00001

diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/NavigationBetweenFlyoutItems.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/NavigationBetweenFlyoutItems.png
new file mode 100644
index 0000000000000000000000000000000000000000..95fb29ed2a83010a406ba574204690e3ec52f62c
GIT binary patch
literal 12533
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
D6%p)W

literal 0
HcmV?d00001


From fd718a1ffb019524476d26163b41d48c499b5d1d Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 11 Sep 2024 18:17:43 -0500
Subject: [PATCH 06/11] Clear out prototype cell when changing ItemSource
 (#24700)

* Clear out prototype cell which changing ItemSource

* Update ListViewTests.cs

* Update ListViewTests.cs
---
 .../Handlers/ListView/iOS/ListViewRenderer.cs |  6 +-
 .../Elements/ListView/ListViewTests.cs        | 72 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs
index 1249db56bf..ae7fd8cce6 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs
@@ -959,10 +959,8 @@ namespace Microsoft.Maui.Controls.Handlers.Compatibility
 			{
 				if (_prototype != null)
 				{
-					var element = _prototype.VirtualView;
-					element?.Handler?.DisconnectHandler();
-					//_prototype?.Dispose();
-					//_prototype = null;
+					_prototype?.DisconnectHandler();
+					_prototype = null;
 				}
 			}
 		}
diff --git a/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.cs b/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.cs
index fea5fc2123..b4f6e8cc74 100644
--- a/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.cs
@@ -28,10 +28,65 @@ namespace Microsoft.Maui.DeviceTests
 					handlers.AddHandler<ListView, ListViewRenderer>();
 					handlers.AddHandler<VerticalStackLayout, LayoutHandler>();
 					handlers.AddHandler<Label, LabelHandler>();
+					handlers.AddHandler<Entry, EntryHandler>();
 				});
 			});
 		}
 
+
+		[Fact
+#if ANDROID
+			(Skip = "https://github.com/dotnet/maui/issues/24701")
+#endif
+		]
+		public async Task ChangingTemplateTypeDoesNotCrash()
+		{
+			SetupBuilder();
+			ObservableCollection<string> data1 = new ObservableCollection<string>()
+			{
+				"cat",
+				"dog",
+			};
+			ObservableCollection<string> data2 = new ObservableCollection<string>()
+			{
+				"dog",
+				"cat",
+			};
+
+			var template1 =  new DataTemplate(() =>
+			{
+				return new ViewCell()
+				{
+					View = new Label()
+				};
+			});
+
+			var template2 =  new DataTemplate(() =>
+			{
+				return new ViewCell()
+				{
+					View = new Entry()
+				};
+			});
+
+			var listView = new ListView()
+			{
+				HasUnevenRows = true,
+				ItemTemplate = new FunctionalDataTemplateSelector((item, container) =>
+				{
+					return item.ToString() == "cat" ? template1 : template2;
+				}),
+				IsGroupingEnabled = true,
+				ItemsSource = new ObservableCollection<ObservableCollection<string>>(){data1}
+			};
+
+			await CreateHandlerAndAddToWindow<LayoutHandler>(new VerticalStackLayout(){ listView }, async (handler) =>
+			{
+				listView.ItemsSource = new ObservableCollection<ObservableCollection<string>>(){data2};
+				await Task.Delay(5000);
+			});
+		}
+
 		[Fact]
 		public async Task RemovingFirstItemOfListViewDoesntCrash()
 		{
@@ -346,5 +401,20 @@ namespace Microsoft.Maui.DeviceTests
 				Assert.Equal("6", cells[2].Text);
 			});
 		}
+
+		class FunctionalDataTemplateSelector : DataTemplateSelector
+		{
+			public Func<object, BindableObject, DataTemplate> Selector { get; }
+
+			public FunctionalDataTemplateSelector(Func<object, BindableObject, DataTemplate> selectTemplate)
+			{
+				Selector = selectTemplate;
+			}
+
+			protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+			{
+				return Selector.Invoke(item, container);
+			}
+		}
 	}
-}
\ No newline at end of file
+}

From 049ec597534a77c0c57a0207c856453387f1f54b Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 11 Sep 2024 19:19:14 -0500
Subject: [PATCH 07/11] Update to Version 8.0.99 (#24728)

---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3732a8fcf8..af94c7f1ef 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET product branding version -->
-    <ProductVersion>8.0.90</ProductVersion>
+    <ProductVersion>8.0.99</ProductVersion>
     <MajorVersion>8</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>90</PatchVersion>
+    <PatchVersion>99</PatchVersion>
     <SdkBandVersion>8.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>ci.net8</PreReleaseVersionLabel>
     <!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->

From abec5a87fcf0f441aa536346084d2a4af3a6f40c Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Fri, 13 Sep 2024 12:35:49 +0200
Subject: [PATCH 08/11] [C] Add ImageSource as LogicalChildren of MenuItem
 (#24688)

* [C] Add ImageSource as LogicalChildren of MenuItem

- fixes #20508

* -fixes #23201 as well

* well, it fixes another one too
---
 src/Controls/src/Core/Menu/MenuItem.cs        |  6 +-
 .../Xaml.UnitTests/Issues/Maui20508.xaml      | 12 ++++
 .../Xaml.UnitTests/Issues/Maui20508.xaml.cs   | 42 ++++++++++++++
 .../Xaml.UnitTests/Issues/Maui23201.xaml      | 23 ++++++++
 .../Xaml.UnitTests/Issues/Maui23201.xaml.cs   | 55 +++++++++++++++++++
 5 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml.cs

diff --git a/src/Controls/src/Core/Menu/MenuItem.cs b/src/Controls/src/Core/Menu/MenuItem.cs
index f140344b11..5b762e8054 100644
--- a/src/Controls/src/Core/Menu/MenuItem.cs
+++ b/src/Controls/src/Core/Menu/MenuItem.cs
@@ -31,7 +31,11 @@ namespace Microsoft.Maui.Controls
 		public static readonly BindableProperty IsDestructiveProperty = BindableProperty.Create(nameof(IsDestructive), typeof(bool), typeof(MenuItem), false);
 
 		/// <summary>Bindable property for <see cref="IconImageSource"/>.</summary>
-		public static readonly BindableProperty IconImageSourceProperty = BindableProperty.Create(nameof(IconImageSource), typeof(ImageSource), typeof(MenuItem), default(ImageSource));
+		public static readonly BindableProperty IconImageSourceProperty = BindableProperty.Create(nameof(IconImageSource), typeof(ImageSource), typeof(MenuItem), default(ImageSource),
+			propertyChanged: (bindable, oldValue, newValue) => {
+					((MenuItem)bindable).AddRemoveLogicalChildren(oldValue, newValue);
+				}
+		);
 
 		/// <summary>Bindable property for <see cref="IsEnabled"/>.</summary>
 		public static readonly BindableProperty IsEnabledProperty = BindableProperty.Create(
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml
new file mode 100644
index 0000000000..9af33226c9
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                    x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui20508">
+    <ContentPage.ToolbarItems>
+        <ToolbarItem>
+            <ToolbarItem.IconImageSource>
+                <FileImageSource File="{Binding Icon}" />
+            </ToolbarItem.IconImageSource>
+        </ToolbarItem>
+    </ContentPage.ToolbarItems>
+</ContentPage>
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml.cs
new file mode 100644
index 0000000000..b0fb4eb8c1
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui20508.xaml.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using Microsoft.Maui.Dispatching;
+using Microsoft.Maui.UnitTests;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+public partial class Maui20508
+{
+    public Maui20508()
+    {
+        InitializeComponent();
+    }
+
+    public Maui20508(bool useCompiledXaml)
+    {
+        //this stub will be replaced at compile time
+    }
+
+    [TestFixture]
+    class Test
+    {
+        [SetUp]
+        public void Setup()
+        {
+            Application.SetCurrentApplication(new MockApplication());
+            DispatcherProvider.SetCurrent(new DispatcherProviderStub());
+        }
+
+        [TearDown] public void TearDown() => AppInfo.SetCurrent(null);
+
+        [Test]
+        public void ToolBarItemBinding([Values(false, true)] bool useCompiledXaml)
+        {
+            var page = new Maui20508(useCompiledXaml) {BindingContext = new {Icon = "boundIcon.png"}};
+            Assert.That(((FileImageSource)page.ToolbarItems[0].IconImageSource).File, Is.EqualTo("boundIcon.png"));
+        }
+    }
+}
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml
new file mode 100644
index 0000000000..94edd21bb6
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                    x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui23201">
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="Search">
+            <ToolbarItem.IconImageSource>
+                <FontImageSource FontFamily="SegoeFluentIcons"
+                                Glyph="&#xE721;"
+                                Color="{AppThemeBinding Light={StaticResource Black},
+                                                        Dark={StaticResource White}}" />
+            </ToolbarItem.IconImageSource>
+        </ToolbarItem>
+        <ToolbarItem Text="23195">
+            <ToolbarItem.IconImageSource>
+                <FontImageSource FontFamily="SegoeFluentIcons"
+                                Glyph="&#xE721;"
+                                Color="{AppThemeBinding Light=Black,
+                                                        Dark=White}" />
+            </ToolbarItem.IconImageSource>
+        </ToolbarItem>
+    </ContentPage.ToolbarItems>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml.cs
new file mode 100644
index 0000000000..16c9a3c9a0
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui23201.xaml.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using Microsoft.Maui.Dispatching;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.UnitTests;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+public partial class Maui23201
+{
+    public Maui23201()
+    {
+        InitializeComponent();
+    }
+
+    public Maui23201(bool useCompiledXaml)
+    {
+        //this stub will be replaced at compile time
+    }
+
+    [TestFixture]
+    class Test
+    {
+        [SetUp]
+        public void Setup()
+        {
+            Application.SetCurrentApplication(new MockApplication());
+            DispatcherProvider.SetCurrent(new DispatcherProviderStub());
+        }
+
+        [TearDown] public void TearDown() => AppInfo.SetCurrent(null);
+
+        [Test]
+        public void ToolBarItemAppThemeBinding([Values(false, true)] bool useCompiledXaml)
+        {
+            Application.Current.Resources.Add("Black", Colors.DarkGray);
+            Application.Current.Resources.Add("White", Colors.LightGray);
+            
+			Application.Current.UserAppTheme = AppTheme.Light;
+            var page = new Maui23201(useCompiledXaml);
+            Application.Current.MainPage = page;
+
+            Assert.That(((FontImageSource)(page.ToolbarItems[0].IconImageSource)).Color, Is.EqualTo(Colors.DarkGray));
+            Assert.That(((FontImageSource)(page.ToolbarItems[1].IconImageSource)).Color, Is.EqualTo(Colors.Black));
+            
+            Application.Current.UserAppTheme = AppTheme.Dark;
+            Assert.That(((FontImageSource)(page.ToolbarItems[0].IconImageSource)).Color, Is.EqualTo(Colors.LightGray));
+            Assert.That(((FontImageSource)(page.ToolbarItems[1].IconImageSource)).Color, Is.EqualTo(Colors.White));
+            
+        }
+    }
+}
\ No newline at end of file

From 0de3f8aa021e6b88220f68b462f0afa108bc9257 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Fri, 13 Sep 2024 18:02:41 +0100
Subject: [PATCH 09/11] [ci] Use our own pool (#24754)

---
 eng/pipelines/device-tests.yml | 14 ++++++++++----
 eng/pipelines/ui-tests.yml     |  7 +++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
index 415d994068..049d8d9d5a 100644
--- a/eng/pipelines/device-tests.yml
+++ b/eng/pipelines/device-tests.yml
@@ -72,14 +72,20 @@ parameters:
   - name: iosPool
     type: object
     default:
-      name: $(macosTestsVmPool)
-      vmImage: macOS-14
+      name: $(iosTestsVmPool)
+      vmImage: $(iosTestsVmImage)
+      demands:
+        - macOS.Name -equals Sonoma
+        - macOS.Architecture -equals x64
 
   - name: catalystPool
     type: object
     default:
-      name: $(macosTestsVmPool)
-      vmImage: macOS-14
+      name: $(iosTestsVmPool)
+      vmImage: $(iosTestsVmImage)
+      demands:
+        - macOS.Name -equals Sonoma
+        - macOS.Architecture -equals x64
 
   - name: windowsPool
     type: object
diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
index b8f0be6778..cb13ae7aa6 100644
--- a/eng/pipelines/ui-tests.yml
+++ b/eng/pipelines/ui-tests.yml
@@ -88,8 +88,11 @@ parameters:
   - name: macosPool
     type: object
     default:
-      name: $(macosTestsVmPool)
-      vmImage: macOS-14
+      name: $(iosTestsVmPool)
+      vmImage: $(iosTestsVmImage)
+      demands:
+        - macOS.Name -equals Sonoma
+        - macOS.Architecture -equals x64
 
   - name: androidCompatibilityPool
     type: object

From 3de5be94b043d2d8cafdb2fedbae1bb363ec5f2e Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Sat, 14 Sep 2024 12:58:20 +0100
Subject: [PATCH 10/11] =?UTF-8?q?=C2=BAci=C2=B4Uitests=20on=20=20Pipelines?=
 =?UTF-8?q?=20(#24765)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eng/pipelines/ui-tests.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
index cb13ae7aa6..d6ea2bd6b5 100644
--- a/eng/pipelines/ui-tests.yml
+++ b/eng/pipelines/ui-tests.yml
@@ -88,11 +88,8 @@ parameters:
   - name: macosPool
     type: object
     default:
-      name: $(iosTestsVmPool)
-      vmImage: $(iosTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: Azure Pipelines
+      vmImage: macOS-14
 
   - name: androidCompatibilityPool
     type: object

From b2c1d25f7a71197666c2053c1e40dbdea6049cc7 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 16 Sep 2024 12:37:32 -0500
Subject: [PATCH 11/11] Update bug-report.yml with 8.0.90 SR9 (#24791)

---
 .github/ISSUE_TEMPLATE/bug-report.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 75ffe16998..510e3cbe95 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -50,6 +50,7 @@ body:
         - 9.0.0-preview.3.10457
         - 9.0.0-preview.2.10293
         - 9.0.0-preview.1.9973
+        - 8.0.90 SR9
         - 8.0.82 SR8.2
         - 8.0.80 SR8
         - 8.0.71 SR7.1
@@ -124,6 +125,7 @@ body:
         - 8.0.71 SR7.1
         - 8.0.80 SR8
         - 8.0.82 SR8.2
+        - 8.0.90 SR9
         - 9.0.0-preview.1.9973
         - 9.0.0-preview.2.10293
         - 9.0.0-preview.3.10457