From 763ddb4cba0160ef9890f77169b2b3505306bade Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 28 Jun 2024 14:39:22 -0500
Subject: [PATCH] Obsolete Frame for NET9 in favor of Border (#23184)

* Obsolete Frame for NET9

* - tizen fixes

* - tizen

* - fix deprecation errors

* - fix a few more frame areas

* - ignore tests not running on catalyst

* - remove a few more frames

* - few more test fixes

* - fix

* Update Issue15330.cs
---
 .../Controls/CardView/CardView.xaml           |  23 +--
 .../Pages/Compatibility/FramePage.xaml        | 185 ------------------
 .../Pages/Compatibility/FramePage.xaml.cs     |  50 -----
 .../CarouselItemsGallery.cs                   |   5 +-
 .../CarouselSnapGallery.cs                    |   5 +-
 .../CollectionCarouselViewGallery.cs          |   5 +-
 .../ExampleTemplateCarousel.xaml              |   4 +-
 .../ExampleTemplates.cs                       |  10 +-
 .../ViewModels/CompatibilityViewModel.cs      |   3 -
 .../Handlers/Android/FrameRenderer.cs         |   1 +
 .../Handlers/Tizen/FrameRenderer.cs           |   1 +
 .../Handlers/Windows/FrameRenderer.cs         |   1 +
 .../Handlers/iOS/FrameRenderer.cs             |   1 +
 src/Controls/src/Core/Frame/Frame.cs          |   2 +
 .../Shell/Tizen/ShellContentItemView.cs       |   2 +
 .../Shell/Tizen/ShellFlyoutItemView.cs        |   2 +
 .../Shell/Tizen/ShellSectionItemView.cs       |   2 +
 .../src/Core/Properties/AssemblyInfo.cs       |   2 +
 .../src/Core/TabbedPage/TabbedPage.Tizen.cs   |   2 +
 .../Xaml/Hosting/AppHostBuilderExtensions.cs  |   2 +
 .../FlyoutPage/FlyoutPageTests.Android.cs     |   2 +-
 .../Elements/FlyoutPage/FlyoutPageTests.cs    |   6 +-
 .../Frame/FrameHandlerTest.Android.cs         |   4 +-
 .../Elements/Frame/FrameHandlerTest.cs        |   6 +-
 .../Elements/Frame/FrameTests.Android.cs      |   4 +
 .../DeviceTests/Elements/Frame/FrameTests.cs  |   4 +-
 .../Elements/Frame/FrameTests.iOS.cs          |   4 +-
 .../NavigationPage/NavigationPageTests.cs     |   5 +-
 .../tests/DeviceTests/Memory/MemoryTests.cs   |   4 +
 .../tests/DeviceTests/Stubs/FrameStub.cs      |   6 +-
 .../TestCases/ControlsViewTypesTestCases.cs   |   4 +
 .../Issues/IsInvokeRequiredRaceCondition.cs   |   1 +
 .../Tests/Issues/Issue10947.cs                |   1 +
 .../Tests/Issues/Issue15330.cs                |   5 +-
 .../CollectionView/ExampleTemplates.cs        |  10 +-
 .../Elements/FrameCoreGalleryPage.cs          |   2 +
 .../tests/TestCases/Issues/Issue12567.cs      |   5 +-
 .../GestureRecognizerBenchmarker.cs           |   5 +-
 .../Benchmarks/VisualTreeBenchmarker.cs       |   5 +-
 src/Core/tests/UnitTests/Views/BorderTests.cs |  22 +--
 40 files changed, 110 insertions(+), 303 deletions(-)
 delete mode 100644 src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
 delete mode 100644 src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml.cs

diff --git a/src/Controls/samples/Controls.Sample/Controls/CardView/CardView.xaml b/src/Controls/samples/Controls.Sample/Controls/CardView/CardView.xaml
index c79b313ab8b8..a65f566399b7 100644
--- a/src/Controls/samples/Controls.Sample/Controls/CardView/CardView.xaml
+++ b/src/Controls/samples/Controls.Sample/Controls/CardView/CardView.xaml
@@ -3,16 +3,17 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Maui.Controls.Sample.Controls.CardView">
-    <Frame
+    <Border
         x:Name="Card"
         BackgroundColor="{Binding CardColor}"
-        BorderColor="{Binding BorderColor}"
-        CornerRadius="5"
-        HasShadow="True"
+        Stroke="{Binding BorderColor}"
         Padding="8"
         VerticalOptions="Center"
         HorizontalOptions="Center"
         Margin="0, 12, 0, 0">
+        <Border.StrokeShape>
+            <RoundRectangle CornerRadius="5" />
+        </Border.StrokeShape>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="75" />
@@ -23,23 +24,23 @@
                 <ColumnDefinition Width="75" />
                 <ColumnDefinition Width="200" />
             </Grid.ColumnDefinitions>
-            <Frame 
-                IsClippedToBounds="True"
-                BorderColor="{Binding BorderColor, FallbackValue='Black'}"
+            <Border 
+                Stroke="{Binding BorderColor, FallbackValue='Black'}"
                 BackgroundColor="{Binding IconBackgroundColor, FallbackValue='Gray'}"
-                CornerRadius="38"
                 HeightRequest="60"
                 WidthRequest="60"
                 HorizontalOptions="Center"
-                HasShadow="False"
                 VerticalOptions="Center">
+                <Border.StrokeShape>
+                    <RoundRectangle CornerRadius="38" />
+                </Border.StrokeShape>
                 <Image 
                     Source="{Binding IconImageSource}"
                     Margin="-20"
                     WidthRequest="100"
                     HeightRequest="100"
                     Aspect="AspectFill" />
-            </Frame>
+            </Border>
             <Label 
                 Grid.Column="1"
                 Text="{Binding CardTitle, FallbackValue='Card Title'}"
@@ -61,5 +62,5 @@
                 VerticalOptions="Fill"
                 HorizontalOptions="Fill" />
         </Grid>
-    </Frame>
+    </Border>
 </ContentView>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
deleted file mode 100644
index 0a700529a907..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
+++ /dev/null
@@ -1,185 +0,0 @@
-<views:BasePage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Maui.Controls.Sample.Pages.FramePage"
-    xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
-    Title="Frame">
-    <views:BasePage.Content>
-        <ScrollView>
-            <VerticalStackLayout
-                Margin="12">
-                <Label
-                    Text="Default"
-                    Style="{StaticResource Headline}"/>
-                <Frame      
-                    BackgroundColor="LightGray"
-                    HasShadow="False">
-                    <Label 
-                        Text="Only with BackgroundColor" />
-                </Frame>
-                <Label
-                    Text="Background"
-                    Style="{StaticResource Headline}"/>
-                <Frame>
-                    <Frame.Background>
-                        <LinearGradientBrush EndPoint="1,0">
-                            <GradientStop Color="Yellow" 
-                                          Offset="0.1" />
-                            <GradientStop Color="Green"                                   
-                                          Offset="1.0" />
-                        </LinearGradientBrush>
-                    </Frame.Background>
-                    <Label 
-                        Text="Background" />
-                </Frame>
-                <Label
-                    Text="Background (Gradient using a transparent color)"
-                    Style="{StaticResource Headline}"/>
-                <Frame>
-                    <Frame.Background>
-                        <LinearGradientBrush
-                            StartPoint="0,0"
-                            EndPoint="0,1">
-                            <GradientStop
-                                Color="Transparent"
-                                Offset="0.0"/>
-                            <GradientStop
-                                Color="Red"
-                                Offset="1.00"/>
-                        </LinearGradientBrush>
-                    </Frame.Background>
-                    <Label 
-                        Text="Background" />
-                </Frame>
-                <Label
-                    Text="Background (Gradient using multiple transparent colors)"
-                    Style="{StaticResource Headline}"/>
-                <Frame>
-                    <Frame.Background>
-                        <LinearGradientBrush
-                            StartPoint="0,0"
-                            EndPoint="0,1">
-                            <GradientStop
-                                Color="Transparent"
-                                Offset="0.0"/>
-                            <GradientStop
-                                Color="Red"
-                                Offset="0.3"/>
-                            <GradientStop
-                                Color="Transparent"
-                                Offset="0.6"/>
-                            <GradientStop
-                                Color="Red"
-                                Offset="1.00"/>
-                        </LinearGradientBrush>
-                    </Frame.Background>
-                    <Label 
-                        Text="Background" />
-                </Frame>
-                <Label
-                    Text="BorderColor"
-                    Style="{StaticResource Headline}"/>
-                <Frame      
-                    BackgroundColor="LightGray"
-                    BorderColor="Red"
-                    HasShadow="False">
-                    <Label 
-                        Text="Using BorderColor" />
-                </Frame>
-                <Label
-                    Text="Shadow"
-                    Style="{StaticResource Headline}"/>
-                <Frame
-                    x:Name="HasShadowFrame"
-                    BackgroundColor="LightGray"
-                    BorderColor="Red"
-                    HasShadow="True">
-                    <Label 
-                        Text="Has Shadow" />
-                </Frame>
-                <Label
-                    Text="Opacity"
-                    Style="{StaticResource Headline}"/>
-                <Frame
-                    BackgroundColor="LightGray"
-                    BorderColor="Red"
-                    Opacity="0.5"
-                    HasShadow="True">
-                    <Label 
-                        Text="Opacity 0.5" />
-                </Frame>
-                <Label
-                    Text="IsClippedToBounds (False)"
-                    Style="{StaticResource Headline}"/>
-                <Frame
-                    IsClippedToBounds="False"
-                    Padding="0"
-                    BackgroundColor="LightGray"
-                    BorderColor="Red"
-                    CornerRadius="24">
-                    <Image 
-                        Aspect="AspectFill"
-                        Source="cover1.jpg" />
-                </Frame>
-                <Label
-                    Text="IsClippedToBounds (True)"
-                    Style="{StaticResource Headline}"/>
-                <Frame
-                    IsClippedToBounds="True"
-                    Padding="0"
-                    BackgroundColor="LightGray"
-                    BorderColor="Red"
-                    CornerRadius="24">
-                    <Image 
-                        Aspect="AspectFill"
-                        Source="cover1.jpg" />
-                </Frame>
-                <Label
-                    Text="Content"
-                    Style="{StaticResource Headline}"/>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Button 
-                        Grid.Row="0" 
-                        Grid.Column="0" 
-                        x:Name="AddContentButton" 
-                        Text="Add Content" 
-                        Clicked="OnAddContentButtonClicked"
-                        Margin="10" />
-                    <Button 
-                        Grid.Row="0" 
-                        Grid.Column="1" 
-                        x:Name="ReplaceContentButton" 
-                        Text="Replace Content" 
-                        Clicked="OnReplaceContentButtonClicked"
-                        Margin="10" />
-                    <Button 
-                        Grid.Row="0" 
-                        Grid.Column="2" 
-                        x:Name="RemoveContentButton" 
-                        Text="Remove Content" 
-                        Clicked="OnRemoveContentButtonClicked"
-                        Margin="10" />
-                    <Frame 
-                        Grid.Row="1" 
-                        Grid.Column="0" 
-                        Grid.ColumnSpan="3" 
-                        x:Name="ContentFrame" 
-                        Padding="0"
-                        BorderColor="Black" 
-                        Margin="10">
-                        <!-- Empty on purpose -->
-                    </Frame>
-                </Grid>      
-            </VerticalStackLayout>
-        </ScrollView>
-    </views:BasePage.Content>
-</views:BasePage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml.cs
deleted file mode 100644
index 813a3b33ab8d..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Graphics;
-
-namespace Maui.Controls.Sample.Pages
-{
-	public partial class FramePage
-	{
-		public FramePage()
-		{
-			InitializeComponent();
-		}
-
-		void OnHasShadowButtonClicked(object sender, System.EventArgs e)
-		{
-			HasShadowFrame.HasShadow = !HasShadowFrame.HasShadow;
-		}
-
-		void OnAddContentButtonClicked(object sender, EventArgs e)
-		{
-			ContentFrame.Content = new Label
-			{
-				Text = "Content",
-				HorizontalOptions = LayoutOptions.Center,
-				VerticalOptions = LayoutOptions.Center,
-				Margin = 12
-			};
-		}
-
-		void OnReplaceContentButtonClicked(object sender, EventArgs e)
-		{
-			if (ContentFrame.Content == null)
-				return;
-
-			ContentFrame.Content = new Label
-			{
-				Text = "Updated Content",
-				BackgroundColor = Colors.Red,
-				HorizontalOptions = LayoutOptions.Center,
-				VerticalOptions = LayoutOptions.Center,
-				Margin = 12
-			};
-		}
-
-		void OnRemoveContentButtonClicked(object sender, EventArgs e)
-		{
-			ContentFrame.Content = null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselItemsGallery.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselItemsGallery.cs
index 682625bf3dbb..36d48fb79544 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselItemsGallery.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselItemsGallery.cs
@@ -196,10 +196,9 @@ internal DataTemplate GetCarouselTemplate()
 
 				grid.Children.Add(info);
 
-				var frame = new Frame
+				var frame = new Border
 				{
-					Content = grid,
-					HasShadow = false
+					Content = grid
 				};
 
 				frame.SetBinding(BackgroundColorProperty, new Binding("Color"));
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselSnapGallery.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselSnapGallery.cs
index 9f1b164381d0..3429cfe6605a 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselSnapGallery.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CarouselSnapGallery.cs
@@ -132,10 +132,9 @@ internal DataTemplate GetCarouselTemplate()
 
 				grid.Children.Add(info);
 
-				var frame = new Frame
+				var frame = new Border
 				{
-					Content = grid,
-					HasShadow = false
+					Content = grid
 				};
 
 				frame.SetBinding(BackgroundColorProperty, new Binding("Color"));
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CollectionCarouselViewGallery.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CollectionCarouselViewGallery.cs
index 8b0e3fabe092..16e4f34a7e04 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CollectionCarouselViewGallery.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/CollectionCarouselViewGallery.cs
@@ -135,10 +135,9 @@ internal DataTemplate GetCarouselTemplate()
 
 				grid.Children.Add(info);
 
-				var frame = new Frame
+				var frame = new Border
 				{
-					Content = grid,
-					HasShadow = false
+					Content = grid
 				};
 
 				frame.SetBinding(BackgroundColorProperty, new Binding("Color"));
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml
index b02ea8d961e0..a21406b02644 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CarouselViewGalleries/ExampleTemplateCarousel.xaml
@@ -25,10 +25,10 @@
             </VisualState>
         </VisualStateGroup>
     </VisualStateManager.VisualStateGroups>
-    <Frame x:Name="frame" HasShadow="True" Padding="0" HorizontalOptions="Center" VerticalOptions="Center" BackgroundColor="Yellow">
+    <Border x:Name="frame" Padding="0" HorizontalOptions="Center" VerticalOptions="Center" BackgroundColor="Yellow">
         <Grid>
             <Image Source="{Binding FeaturedImage}" InputTransparent="true" Aspect="AspectFit" />
             <Label Text="{Binding Index}" HorizontalOptions="Center" VerticalOptions="End" ></Label>
         </Grid>
-    </Frame>
+    </Border>
 </Grid>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ExampleTemplates.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ExampleTemplates.cs
index ce5e8fc14d75..940d664fbdb7 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ExampleTemplates.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ExampleTemplates.cs
@@ -144,14 +144,14 @@ public static DataTemplate CarouselTemplate()
 
 				Grid.SetRow(caption, 1);
 
-				var frame = new Frame
+				var border = new Border
 				{
 					Padding = new Thickness(5),
 					BackgroundColor = Colors.Transparent,
 					Content = grid
 				};
 
-				return frame;
+				return border;
 			});
 		}
 
@@ -319,7 +319,7 @@ public static DataTemplate VariableSizeTemplate()
 
 			return new DataTemplate(() =>
 			{
-				var layout = new Frame();
+				var layout = new Border();
 
 				layout.SetBinding(VisualElement.HeightRequestProperty, new Binding("Index", converter: indexHeightConverter));
 				layout.SetBinding(VisualElement.WidthRequestProperty, new Binding("Index", converter: indexWidthConverter));
@@ -349,7 +349,7 @@ public static DataTemplate RandomSizeTemplate()
 
 			return new DataTemplate(() =>
 			{
-				var layout = new Frame();
+				var layout = new Border();
 
 				layout.SetBinding(VisualElement.HeightRequestProperty, new Binding("Index", converter: indexHeightConverter));
 				layout.SetBinding(VisualElement.WidthRequestProperty, new Binding("Index", converter: indexWidthConverter));
@@ -380,7 +380,7 @@ public static DataTemplate DynamicTextTemplate()
 					Margin = 10
 				};
 
-				var frame = new Frame
+				var frame = new Border
 				{
 					HeightRequest = 50,
 					WidthRequest = 200,
diff --git a/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs
index 196b757d4a34..e80a0687e158 100644
--- a/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs
+++ b/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs
@@ -9,9 +9,6 @@ public class CompatibilityViewModel : BaseGalleryViewModel
 	{
 		protected override IEnumerable<SectionModel> CreateItems() => new[]
 		{
-			new SectionModel(typeof(FramePage), "Frame",
-				"The Frame class derives from ContentView and displays a border, or frame, around its child."),
-
 			new SectionModel(typeof(ListViewPage), "ListView",
 				"ListView derives from ItemsView and displays a scrollable list of selectable data items."),
 
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index bb64e53baf5b..4c0bd874b5af 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -14,6 +14,7 @@
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
+	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 	public class FrameRenderer : CardView, IPlatformViewHandler
 	{
 		public static IPropertyMapper<Frame, FrameRenderer> Mapper
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Tizen/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Tizen/FrameRenderer.cs
index be59266ddc16..e89fe93e83de 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Tizen/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Tizen/FrameRenderer.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
+	[System.Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 	public class FrameRenderer : ContentViewGroup, IPlatformViewHandler, IMeasurable
 	{
 		public static IPropertyMapper<Frame, FrameRenderer> Mapper
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
index 8b8ba15ae638..323e8188b7ef 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
+	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 	public class FrameRenderer : ViewRenderer<Frame, WBorder>
 	{
 		public static IPropertyMapper<Frame, FrameRenderer> Mapper
diff --git a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
index 08311ec4e968..df1d5ff989d9 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
+	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 	public class FrameRenderer : VisualElementRenderer<Frame>
 	{
 		public static IPropertyMapper<Frame, FrameRenderer> Mapper
diff --git a/src/Controls/src/Core/Frame/Frame.cs b/src/Controls/src/Core/Frame/Frame.cs
index 581f2f9c940b..ca79dcedefd4 100644
--- a/src/Controls/src/Core/Frame/Frame.cs
+++ b/src/Controls/src/Core/Frame/Frame.cs
@@ -7,6 +7,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Frame.xml" path="Type[@FullName='Microsoft.Maui.Controls.Frame']/Docs/*" />
 	[ContentProperty(nameof(Content))]
+	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 	public partial class Frame : ContentView, IElementConfiguration<Frame>, IPaddingElement, IBorderElement, IView, IContentView
 	{
 		/// <summary>Bindable property for <see cref="BorderColor"/>.</summary>
@@ -127,6 +128,7 @@ Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double he
 		}
 	}
 
+	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 	internal static class FrameExtensions
 	{
 		internal static bool IsClippedToBoundsSet(this Frame frame, bool defaultValue) =>
diff --git a/src/Controls/src/Core/Handlers/Shell/Tizen/ShellContentItemView.cs b/src/Controls/src/Core/Handlers/Shell/Tizen/ShellContentItemView.cs
index 118eff4edb9f..6d0999d95134 100644
--- a/src/Controls/src/Core/Handlers/Shell/Tizen/ShellContentItemView.cs
+++ b/src/Controls/src/Core/Handlers/Shell/Tizen/ShellContentItemView.cs
@@ -4,7 +4,9 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
+#pragma warning disable CS0618 // Type or member is obsolete
 	class ShellContentItemView : Frame
+#pragma warning restore CS0618 // Type or member is obsolete
 	{
 		static readonly BindableProperty SelectedStateProperty = BindableProperty.Create(nameof(IsSelected), typeof(bool), typeof(ShellContentItemView), false, propertyChanged: (b, o, n) => ((ShellContentItemView)b).UpdateViewColors());
 		internal static readonly BindableProperty SelectedTextColorProperty = BindableProperty.Create(nameof(SelectedTextColor), typeof(GColor), typeof(ShellContentItemView), null, propertyChanged: (b, o, n) => ((ShellContentItemView)b).UpdateViewColors());
diff --git a/src/Controls/src/Core/Handlers/Shell/Tizen/ShellFlyoutItemView.cs b/src/Controls/src/Core/Handlers/Shell/Tizen/ShellFlyoutItemView.cs
index 0cf30700ea87..020ccc33802f 100644
--- a/src/Controls/src/Core/Handlers/Shell/Tizen/ShellFlyoutItemView.cs
+++ b/src/Controls/src/Core/Handlers/Shell/Tizen/ShellFlyoutItemView.cs
@@ -3,7 +3,9 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
+#pragma warning disable CS0618 // Type or member is obsolete
 	class ShellFlyoutItemView : Frame
+#pragma warning restore CS0618 // Type or member is obsolete
 	{
 		static readonly BindableProperty SelectedStateProperty = BindableProperty.Create(nameof(IsSelected), typeof(bool), typeof(ShellFlyoutItemView), false, propertyChanged: (b, o, n) => ((ShellFlyoutItemView)b).UpdateSelectedState());
 
diff --git a/src/Controls/src/Core/Handlers/Shell/Tizen/ShellSectionItemView.cs b/src/Controls/src/Core/Handlers/Shell/Tizen/ShellSectionItemView.cs
index 1dea40bcadf6..5989f9244a9c 100644
--- a/src/Controls/src/Core/Handlers/Shell/Tizen/ShellSectionItemView.cs
+++ b/src/Controls/src/Core/Handlers/Shell/Tizen/ShellSectionItemView.cs
@@ -5,7 +5,9 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
+#pragma warning disable CS0618 // Type or member is obsolete
 	class ShellSectionItemView : Frame
+#pragma warning restore CS0618 // Type or member is obsolete
 	{
 		static readonly BindableProperty SelectedStateProperty = BindableProperty.Create(nameof(IsSelected), typeof(bool), typeof(ShellSectionItemView), false, propertyChanged: (b, o, n) => ((ShellSectionItemView)b).UpdateViewColors());
 		internal static readonly BindableProperty SelectedColorProperty = BindableProperty.Create(nameof(SelectedColor), typeof(GColor), typeof(ShellSectionItemView), null, propertyChanged: (b, o, n) => ((ShellSectionItemView)b).UpdateViewColors());
diff --git a/src/Controls/src/Core/Properties/AssemblyInfo.cs b/src/Controls/src/Core/Properties/AssemblyInfo.cs
index cd51bdfa3186..76fa4fb3ca65 100644
--- a/src/Controls/src/Core/Properties/AssemblyInfo.cs
+++ b/src/Controls/src/Core/Properties/AssemblyInfo.cs
@@ -83,7 +83,9 @@
 [assembly: StyleProperty("border-color", typeof(IBorderElement), nameof(BorderElement.BorderColorProperty))]
 [assembly: StyleProperty("border-radius", typeof(ICornerElement), nameof(CornerElement.CornerRadiusProperty))]
 [assembly: StyleProperty("border-radius", typeof(Button), nameof(Button.CornerRadiusProperty))]
+#pragma warning disable CS0618 // Type or member is obsolete
 [assembly: StyleProperty("border-radius", typeof(Frame), nameof(Frame.CornerRadiusProperty))]
+#pragma warning restore CS0618 // Type or member is obsolete
 [assembly: StyleProperty("border-radius", typeof(ImageButton), nameof(BorderElement.CornerRadiusProperty))]
 [assembly: StyleProperty("border-width", typeof(IBorderElement), nameof(BorderElement.BorderWidthProperty))]
 [assembly: StyleProperty("color", typeof(IColorElement), nameof(ColorElement.ColorProperty), Inherited = true)]
diff --git a/src/Controls/src/Core/TabbedPage/TabbedPage.Tizen.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.Tizen.cs
index 3e0c3b78d2a9..763fed32e83d 100644
--- a/src/Controls/src/Core/TabbedPage/TabbedPage.Tizen.cs
+++ b/src/Controls/src/Core/TabbedPage/TabbedPage.Tizen.cs
@@ -160,7 +160,9 @@ static DataTemplate GetTemplate(TabbedPage page)
 			}
 		}
 
+#pragma warning disable CS0618 // Type or member is obsolete
 		class TabbedItem : Frame
+#pragma warning restore CS0618 // Type or member is obsolete
 		{
 			static readonly BindableProperty SelectedStateProperty = BindableProperty.Create(nameof(IsSelected), typeof(bool), typeof(TabbedItem), false, propertyChanged: (b, o, n) => ((TabbedItem)b).UpdateSelectedState());
 			static readonly BindableProperty SelectedTabColorProperty = BindableProperty.Create(nameof(SelectedTabColor), typeof(GColor), typeof(TabbedItem), default(Color), propertyChanged: (b, o, n) => ((TabbedItem)b).UpdateSelectedState());
diff --git a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
index d7c8df8dbee6..f5deafe55c61 100644
--- a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
@@ -122,7 +122,9 @@ public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlers
 			handlersCollection.AddHandler(typeof(SwitchCell), typeof(Handlers.Compatibility.SwitchCellRenderer));
 #endif
 			handlersCollection.AddHandler(typeof(TableView), typeof(Handlers.Compatibility.TableViewRenderer));
+#pragma warning disable CS0618 // Type or member is obsolete
 			handlersCollection.AddHandler(typeof(Frame), typeof(Handlers.Compatibility.FrameRenderer));
+#pragma warning restore CS0618 // Type or member is obsolete
 #endif
 
 #if WINDOWS || MACCATALYST
diff --git a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Android.cs
index d5b53b5080e0..f021c8e96393 100644
--- a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Android.cs
@@ -22,7 +22,7 @@ public async Task SwappingDetailPageKeepsASingleToolbar()
 
 			var flyoutPage = CreateFlyoutPage(
 					typeof(FlyoutPage),
-					new NavigationPage(new ContentPage() { Content = new Frame(), Title = "Detail" }),
+					new NavigationPage(new ContentPage() { Content = new Border(), Title = "Detail" }),
 					new ContentPage() { Title = "Flyout" });
 
 			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Controls.Window(flyoutPage), async (handler) =>
diff --git a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
index 59bfdb5d9ce7..0fa98ee5b1f2 100644
--- a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
@@ -40,7 +40,7 @@ void SetupBuilder()
 					handlers.AddHandler(typeof(NavigationPage), typeof(NavigationViewHandler));
 #endif
 					handlers.AddHandler<Page, PageHandler>();
-					handlers.AddHandler<Frame, FrameRenderer>();
+					handlers.AddHandler<Border, BorderHandler>();
 					handlers.AddHandler<Controls.Window, WindowHandlerStub>();
 				});
 			});
@@ -57,7 +57,7 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async
 			{
 				var flyoutPage = CreateFlyoutPage(
 					flyoutPageType,
-					new NavigationPage(new ContentPage() { Content = new Frame(), Title = "Detail" }),
+					new NavigationPage(new ContentPage() { Content = new Border(), Title = "Detail" }),
 					new ContentPage() { Title = "Flyout" });
 
 				await navPage.PushAsync(flyoutPage);
@@ -73,7 +73,7 @@ public async Task SwappingDetailPageWorksForSplitFlyoutBehavior(Type flyoutPageT
 
 			var flyoutPage = CreateFlyoutPage(
 					flyoutPageType,
-					new NavigationPage(new ContentPage() { Content = new Frame(), Title = "Detail" }),
+					new NavigationPage(new ContentPage() { Content = new Border(), Title = "Detail" }),
 					new ContentPage() { Title = "Flyout" });
 
 			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(flyoutPage), async (handler) =>
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.Android.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.Android.cs
index 0b754454b489..3c5cd5ea6f28 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.Android.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+#pragma warning disable CS0618 // Type or member is obsolete
+using System.Threading.Tasks;
 using Java.Lang;
 using Microsoft.Maui.Controls;
 using Xunit;
@@ -27,3 +28,4 @@ public override async Task ReturnsNonEmptyNativeBoundingBox(int size)
 		}
 	}
 }
+#pragma warning restore CS0618 // Type or member is obsolete
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.cs
index db2f32b18406..91a2c3565536 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.cs
@@ -1,4 +1,5 @@
-#if WINDOWS || ANDROID
+#pragma warning disable CS0618 // Type or member is obsolete
+#if WINDOWS || ANDROID
 using Microsoft.Maui.Controls.Handlers.Compatibility;
 using Microsoft.Maui.DeviceTests.Stubs;
 
@@ -49,4 +50,5 @@ public FrameRendererWithEmptyCtor(IPropertyMapper mapper, CommandMapper commandM
 		}
 	}
 }
-#endif
\ No newline at end of file
+#endif
+#pragma warning restore CS0618 // Type or member is obsolete
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.Android.cs
index 60e13ac9ae63..a98d5c2ac4ed 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.Android.cs
@@ -22,6 +22,7 @@ public async Task UpdateFrameContentTest()
 
 			var layout = new StackLayout();
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			var frame = new Frame()
 			{
 				HeightRequest = 300,
@@ -33,6 +34,7 @@ public async Task UpdateFrameContentTest()
 					Text = "Content"
 				}
 			};
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			var button = new Button()
 			{
@@ -73,6 +75,7 @@ public async Task FrameContentAccountsForBorderThickness()
 			SetupBuilder();
 
 			double contentSize = 50;
+#pragma warning disable CS0618 // Type or member is obsolete
 			var innerFrame = new Frame()
 			{
 				BorderColor = Colors.Black,
@@ -92,6 +95,7 @@ public async Task FrameContentAccountsForBorderThickness()
 				WidthRequest = contentSize,
 				HeightRequest = contentSize
 			};
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			var layout = new StackLayout()
 			{
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
index 3a11dde592ae..cf78709f1d89 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
@@ -1,4 +1,5 @@
-using System;
+#pragma warning disable CS0618 // Type or member is obsolete
+using System;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Handlers.Compatibility;
@@ -531,3 +532,4 @@ async Task<Rect> LayoutFrame(Layout layout, Frame frame, double widthConstraint,
 #endif
 	}
 }
+#pragma warning restore CS0618 // Type or member is obsolete
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs
index 986a35534704..dc7a671455dd 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+#pragma warning disable CS0618 // Type or member is obsolete
+using System.Threading.Tasks;
 using CoreAnimation;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
@@ -158,3 +159,4 @@ CALayer GetBackgroundLayer(UIView platformView)
 		}
 	}
 }
+#pragma warning restore CS0618 // Type or member is obsolete
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
index 43bccb1d2ad7..367113fa0a81 100644
--- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
@@ -40,7 +40,6 @@ void SetupBuilder()
 					handlers.AddHandler<Button, ButtonHandler>();
 					handlers.AddHandler<CarouselView, CarouselViewHandler>();
 					handlers.AddHandler<CollectionView, CollectionViewHandler>();
-					handlers.AddHandler<Frame, FrameRenderer>();
 					handlers.AddHandler<IContentView, ContentViewHandler>();
 					handlers.AddHandler<Label, LabelHandler>();
 					handlers.AddHandler<Layout, LayoutHandler>();
@@ -60,7 +59,7 @@ public async Task PoppingNavigationPageDoesntCrash()
 
 			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async (handler) =>
 			{
-				await navPage.PushAsync(new NavigationPage(new ContentPage() { Content = new Frame(), Title = "Detail" }));
+				await navPage.PushAsync(new NavigationPage(new ContentPage() { Content = new Border(), Title = "Detail" }));
 				await navPage.PopAsync();
 			});
 		}
@@ -401,7 +400,7 @@ public async Task SettingTitleIconImageSourceDoesntCrash()
 
 			await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async (handler) =>
 			{
-				var page = new ContentPage() { Content = new Frame(), Title = "Detail" };
+				var page = new ContentPage() { Content = new Border(), Title = "Detail" };
 				await navPage.PushAsync(new NavigationPage(page));
 				NavigationPage.SetTitleIconImageSource(page, "red.png");
 			});
diff --git a/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs b/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
index 87b47ce0f66a..f8e96469ba49 100644
--- a/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
+++ b/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
@@ -33,7 +33,9 @@ void SetupBuilder()
 				handlers.AddHandler<Entry, EntryHandler>();
 				handlers.AddHandler<EntryCell, EntryCellRenderer>();
 				handlers.AddHandler<Editor, EditorHandler>();
+#pragma warning disable CS0618 // Type or member is obsolete
 				handlers.AddHandler<Frame, FrameRenderer>();
+#pragma warning restore CS0618 // Type or member is obsolete
 				handlers.AddHandler<GraphicsView, GraphicsViewHandler>();
 				handlers.AddHandler<Label, LabelHandler>();
 				handlers.AddHandler<ListView, ListViewRenderer>();
@@ -133,7 +135,9 @@ await CreateHandlerAndAddToWindow(new Window(navPage), async () =>
 	[InlineData(typeof(DatePicker))]
 	[InlineData(typeof(Entry))]
 	[InlineData(typeof(Editor))]
+#pragma warning disable CS0618 // Type or member is obsolete
 	[InlineData(typeof(Frame))]
+#pragma warning restore CS0618 // Type or member is obsolete
 	[InlineData(typeof(GraphicsView))]
 	[InlineData(typeof(Image))]
 	[InlineData(typeof(ImageButton))]
diff --git a/src/Controls/tests/DeviceTests/Stubs/FrameStub.cs b/src/Controls/tests/DeviceTests/Stubs/FrameStub.cs
index 7e99932294da..f39538cbed08 100644
--- a/src/Controls/tests/DeviceTests/Stubs/FrameStub.cs
+++ b/src/Controls/tests/DeviceTests/Stubs/FrameStub.cs
@@ -1,4 +1,5 @@
-using Microsoft.Maui.Controls;
+#pragma warning disable CS0618 // Type or member is obsolete
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Graphics;
 
@@ -108,4 +109,5 @@ public PropertyMapper PropertyMapperOverrides
 			set;
 		}
 	}
-}
\ No newline at end of file
+}
+#pragma warning restore CS0618 // Type or member is obsolete
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/TestCases/ControlsViewTypesTestCases.cs b/src/Controls/tests/DeviceTests/TestCases/ControlsViewTypesTestCases.cs
index b0a0669427cf..0ac0993902ed 100644
--- a/src/Controls/tests/DeviceTests/TestCases/ControlsViewTypesTestCases.cs
+++ b/src/Controls/tests/DeviceTests/TestCases/ControlsViewTypesTestCases.cs
@@ -31,7 +31,9 @@ public class ControlsViewTypesTestCases : IEnumerable<object[]>
             new object[] { typeof(Editor) },
             new object[] { typeof(Ellipse) },
             new object[] { typeof(Entry) },
+#pragma warning disable CS0618 // Type or member is obsolete
             new object[] { typeof(Frame) },
+#pragma warning restore CS0618 // Type or member is obsolete
             new object[] { typeof(GraphicsView) },
             new object[] { typeof(Image) },
             new object[] { typeof(ImageButton) },
@@ -77,7 +79,9 @@ public static void Setup(MauiAppBuilder builder)
                 handlers.AddHandler<DatePicker, DatePickerHandler>();
                 handlers.AddHandler<Entry, EntryHandler>();
                 handlers.AddHandler<Editor, EditorHandler>();
+#pragma warning disable CS0618 // Type or member is obsolete
                 handlers.AddHandler<Frame, FrameRenderer>();
+#pragma warning restore CS0618 // Type or member is obsolete
                 handlers.AddHandler<GraphicsView, GraphicsViewHandler>();
                 handlers.AddHandler<Label, LabelHandler>();
                 handlers.AddHandler<ListView, ListViewRenderer>();
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs
index 0775a2ae7970..c7ad197c31f8 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs
@@ -13,6 +13,7 @@ public IsInvokeRequiredRaceCondition(TestDevice device) : base(device)
 		public override string Issue => "Application.Current.Dispatcher.IsDispatchRequired race condition causes crash";
 		
 		[Test]
+		[Category(UITestCategories.Window)]
 		public void ApplicationDispatcherIsInvokeRequiredRaceConditionCausesCrash()
 		{
 			App.WaitForElement("crashButton");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs
index dac97f933764..b28c555cdd28 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs
@@ -16,6 +16,7 @@ public Issue10947(TestDevice device)
     string FooterEntry => "FooterEntry";
 
     [Test]
+    [Category(UITestCategories.CollectionView)]
 	public void CollectionViewHeaderShouldNotScroll()
 	{
 		var headerEntry = App.WaitForElement(HeaderEntry);
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15330.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15330.cs
index 8224b1293f68..f58d3b4d42e8 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15330.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15330.cs
@@ -1,4 +1,4 @@
-#if !IOS
+#if !IOS && !MACCATALYST
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -16,10 +16,9 @@ public Issue15330(TestDevice device)
 		[Test]
 		[Category(UITestCategories.Layout)]
 		[FailsOnMac("VerifyScreenshot method not implemented on macOS")]
+		[FailsOnIOS("Currently fails on iOS; see https://github.com/dotnet/maui/issues/17125")]
 		public void Issue15330Test()
 		{
-			// Currently fails on iOS; see https://github.com/dotnet/maui/issues/17125
-
 			App.WaitForElement("WaitForStubControl");
 			VerifyScreenshot();
 		}
diff --git a/src/Controls/tests/TestCases/Elements/CollectionView/ExampleTemplates.cs b/src/Controls/tests/TestCases/Elements/CollectionView/ExampleTemplates.cs
index 0aebed9c1546..40b40bf762d3 100644
--- a/src/Controls/tests/TestCases/Elements/CollectionView/ExampleTemplates.cs
+++ b/src/Controls/tests/TestCases/Elements/CollectionView/ExampleTemplates.cs
@@ -136,14 +136,14 @@ public static DataTemplate CarouselTemplate()
 
 				Grid.SetRow(caption, 1);
 
-				var frame = new Frame
+				var border = new Border
 				{
 					Padding = new Thickness(5),
 					BackgroundColor = Colors.Transparent,
 					Content = grid
 				};
 
-				return frame;
+				return border;
 			});
 		}
 
@@ -311,7 +311,7 @@ public static DataTemplate VariableSizeTemplate()
 
 			return new DataTemplate(() =>
 			{
-				var layout = new Frame();
+				var layout = new Border();
 
 				layout.SetBinding(VisualElement.HeightRequestProperty, new Binding("Index", converter: indexHeightConverter));
 				layout.SetBinding(VisualElement.WidthRequestProperty, new Binding("Index", converter: indexWidthConverter));
@@ -341,7 +341,7 @@ public static DataTemplate RandomSizeTemplate()
 
 			return new DataTemplate(() =>
 			{
-				var layout = new Frame();
+				var layout = new Border();
 
 				layout.SetBinding(VisualElement.HeightRequestProperty, new Binding("Index", converter: indexHeightConverter));
 				layout.SetBinding(VisualElement.WidthRequestProperty, new Binding("Index", converter: indexWidthConverter));
@@ -372,7 +372,7 @@ public static DataTemplate DynamicTextTemplate()
 					Margin = 10
 				};
 
-				var frame = new Frame
+				var frame = new Border
 				{
 					HeightRequest = 50,
 					WidthRequest = 200,
diff --git a/src/Controls/tests/TestCases/Elements/FrameCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/FrameCoreGalleryPage.cs
index f641308625c8..4d7d28c0e175 100644
--- a/src/Controls/tests/TestCases/Elements/FrameCoreGalleryPage.cs
+++ b/src/Controls/tests/TestCases/Elements/FrameCoreGalleryPage.cs
@@ -3,6 +3,7 @@
 
 namespace Maui.Controls.Sample;
 
+#pragma warning disable CS0618 // Type or member is obsolete
 internal class FrameCoreGalleryPage : CoreGalleryPage<Frame>
 {
 	protected override bool SupportsFocus => false;
@@ -19,3 +20,4 @@ protected override void Build()
 		base.Build();
 	}
 }
+#pragma warning restore CS0618 // Type or member is obsolete
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/Issue12567.cs b/src/Controls/tests/TestCases/Issues/Issue12567.cs
index c66cf122b75c..246d58b2a176 100644
--- a/src/Controls/tests/TestCases/Issues/Issue12567.cs
+++ b/src/Controls/tests/TestCases/Issues/Issue12567.cs
@@ -88,10 +88,9 @@ DataTemplate GetCarouselItemTemplate()
 				layout.Children.Add(nameLabel);
 				layout.Children.Add(numberLabel);
 
-				return new Frame
+				return new Border
 				{
-					Content = layout,
-					HasShadow = false
+					Content = layout
 				};
 			});
 		}
diff --git a/src/Core/tests/Benchmarks/Benchmarks/GestureRecognizerBenchmarker.cs b/src/Core/tests/Benchmarks/Benchmarks/GestureRecognizerBenchmarker.cs
index b433675048e9..07defe4dd0a2 100644
--- a/src/Core/tests/Benchmarks/Benchmarks/GestureRecognizerBenchmarker.cs
+++ b/src/Core/tests/Benchmarks/Benchmarks/GestureRecognizerBenchmarker.cs
@@ -14,7 +14,10 @@ public void Setup()
 	{
 		_views = [
 			new Border(), new BoxView(), new CarouselView(), new Grid(), new Entry(), new Picker(), new CollectionView(),
-			new CheckBox(), new DatePicker(), new Stepper(), new Slider(), new ActivityIndicator(), new Frame(),
+			new CheckBox(), new DatePicker(), new Stepper(), new Slider(), new ActivityIndicator(),
+			#pragma warning disable CS0618 // Type or member is obsolete
+			new Frame(),
+			#pragma warning restore CS0618 // Type or member is obsolete
 			new ContentView(), new ProgressBar(), new SearchBar(), new Switch(), new TimePicker(), new WebView(), new Button(),
 		];
 
diff --git a/src/Core/tests/Benchmarks/Benchmarks/VisualTreeBenchmarker.cs b/src/Core/tests/Benchmarks/Benchmarks/VisualTreeBenchmarker.cs
index b38b9a09e0e4..ef7384fb6f0d 100644
--- a/src/Core/tests/Benchmarks/Benchmarks/VisualTreeBenchmarker.cs
+++ b/src/Core/tests/Benchmarks/Benchmarks/VisualTreeBenchmarker.cs
@@ -8,7 +8,10 @@ public class VisualTreeBenchmarker
 	{
 		static readonly View[] Views = [
 			new Border(), new BoxView(), new CarouselView(), new Grid(), new Entry(), new Picker(), new CollectionView(),
-			new CheckBox(), new DatePicker(), new Stepper(), new Slider(), new ActivityIndicator(), new Frame(),
+			new CheckBox(), new DatePicker(), new Stepper(), new Slider(), new ActivityIndicator(), 
+			#pragma warning disable CS0618 // Type or member is obsolete
+			new Frame(),
+			#pragma warning restore CS0618 // Type or member is obsolete
 			new ContentView(), new ProgressBar(), new SearchBar(), new Switch(), new TimePicker(), new WebView(), new Button(),
 		];
 
diff --git a/src/Core/tests/UnitTests/Views/BorderTests.cs b/src/Core/tests/UnitTests/Views/BorderTests.cs
index 958ccfdd4188..baa091925cec 100644
--- a/src/Core/tests/UnitTests/Views/BorderTests.cs
+++ b/src/Core/tests/UnitTests/Views/BorderTests.cs
@@ -116,21 +116,21 @@ public async Task BorderStrokeShapeDoesNotLeak(Type type)
 		[Fact]
 		public void TestSetChild()
 		{
-			Frame frame = new Frame();
+			Border border = new Border();
 
 			var child1 = new Label();
 
 			bool added = false;
 
-			frame.ChildAdded += (sender, e) => added = true;
+			border.ChildAdded += (sender, e) => added = true;
 
-			frame.Content = child1;
+			border.Content = child1;
 
 			Assert.True(added);
-			Assert.Equal(child1, frame.Content);
+			Assert.Equal(child1, border.Content);
 
 			added = false;
-			frame.Content = child1;
+			border.Content = child1;
 
 			Assert.False(added);
 		}
@@ -138,24 +138,24 @@ public void TestSetChild()
 		[Fact]
 		public void TestReplaceChild()
 		{
-			Frame frame = new Frame();
+			Border border = new Border();
 
 			var child1 = new Label();
 			var child2 = new Label();
 
-			frame.Content = child1;
+			border.Content = child1;
 
 			bool removed = false;
 			bool added = false;
 
-			frame.ChildRemoved += (sender, e) => removed = true;
-			frame.ChildAdded += (sender, e) => added = true;
+			border.ChildRemoved += (sender, e) => removed = true;
+			border.ChildAdded += (sender, e) => added = true;
 
-			frame.Content = child2;
+			border.Content = child2;
 
 			Assert.True(removed);
 			Assert.True(added);
-			Assert.Equal(child2, frame.Content);
+			Assert.Equal(child2, border.Content);
 		}
 	}
 }
\ No newline at end of file