diff --git a/eng/BannedSymbols.txt b/eng/BannedSymbols.txt
index 346bb7356dba..4c25dda60acb 100644
--- a/eng/BannedSymbols.txt
+++ b/eng/BannedSymbols.txt
@@ -1,2 +1,18 @@
-M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddSingleton`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to create the service instead
 M:Android.Content.Res.ColorStateList.#ctor(System.Int32[][],System.Int32[]);Use Microsoft.Maui.PlatformInterop.Get*ColorStateList() Java methods instead
+M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddScoped(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddScoped`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddSingleton(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddSingleton`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddTransient(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddTransient`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.ServiceCollectionServiceExtensions.AddScoped(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.ServiceCollectionServiceExtensions.AddScoped`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.ServiceCollectionServiceExtensions.AddSingleton(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.ServiceCollectionServiceExtensions.AddSingleton`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.ServiceCollectionServiceExtensions.AddTransient(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Extensions.DependencyInjection.ServiceCollectionServiceExtensions.AddTransient`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to register the service instead
+M:Microsoft.Maui.Hosting.ImageSourceServiceCollectionExtensions.AddService`2(Microsoft.Maui.Hosting.IImageSourceServiceCollection);Use a Factory method to register the service instead
+M:Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler(Microsoft.Maui.Hosting.IMauiHandlersCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler`2(Microsoft.Maui.Hosting.IMauiHandlersCollection);Use a Factory method to register the service instead
+M:Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler(Microsoft.Maui.Hosting.IMauiHandlersCollection,System.Type,System.Type);Use a Factory method to register the service instead
+M:Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler`2(Microsoft.Maui.Hosting.IMauiHandlersCollection);Use a Factory method to register the service instead
diff --git a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
index 20150d38c056..25dfac32b907 100644
--- a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
+++ b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
@@ -43,7 +43,7 @@ public static IMauiBlazorWebViewBuilder AddMauiBlazorWebView(this IServiceCollec
 			services.TryAddSingleton(new BlazorWebViewDeveloperTools { Enabled = false });
 #if WEBVIEW2_MAUI
 			services.TryAddSingleton<MauiBlazorMarkerService>();
-			services.ConfigureMauiHandlers(static handlers => handlers.AddHandler<IBlazorWebView, BlazorWebViewHandler>());
+			services.ConfigureMauiHandlers(static handlers => handlers.AddHandler<IBlazorWebView>(_ => new BlazorWebViewHandler()));
 			return new MauiBlazorWebViewBuilder(services);
 #elif WEBVIEW2_WINFORMS
 			services.TryAddSingleton<WindowsFormsBlazorMarkerService>();
diff --git a/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs b/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs
index df004cad2fc7..7d049eff5cb0 100644
--- a/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs
+++ b/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs
@@ -13,9 +13,9 @@ public static IMauiHandlersCollection TryAddCompatibilityRenderer(this IMauiHand
 			Internals.Registrar.Registered.Register(controlType, rendererType);
 
 #if PLATFORM
-#pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0612, RS0030 // Type or member is obsolete
 			handlersCollection.TryAddHandler(controlType, typeof(RendererToHandlerShim));
-#pragma warning restore CS0612 // Type or member is obsolete
+#pragma warning restore CS0612, RS0030 // Type or member is obsolete
 #endif
 
 			return handlersCollection;
@@ -28,9 +28,9 @@ public static IMauiHandlersCollection AddCompatibilityRenderer(this IMauiHandler
 			Internals.Registrar.Registered.Register(controlType, rendererType);
 
 #if PLATFORM
-#pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0612, RS0030 // Type or member is obsolete
 			handlersCollection.AddHandler(controlType, typeof(RendererToHandlerShim));
-#pragma warning restore CS0612 // Type or member is obsolete
+#pragma warning restore CS0612, RS0030 // Type or member is obsolete
 #endif
 
 			return handlersCollection;
@@ -44,9 +44,9 @@ public static IMauiHandlersCollection AddCompatibilityRenderer<TControlType, TMa
 			Internals.Registrar.Registered.Register(typeof(TControlType), typeof(TRenderer));
 
 #if PLATFORM
-#pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0612, RS0030 // Type or member is obsolete
 			handlersCollection.AddHandler<TMauiType, RendererToHandlerShim>();
-#pragma warning restore CS0612 // Type or member is obsolete
+#pragma warning restore CS0612, RS0030 // Type or member is obsolete
 #endif
 			return handlersCollection;
 		}
@@ -76,9 +76,9 @@ public static IMauiHandlersCollection AddCompatibilityRenderers(this IMauiHandle
 				}, default(InitializationFlags),
 				(result) =>
 				{
-#pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0612, RS0030 // Type or member is obsolete
 					handlersCollection?.TryAddHandler(result.target, typeof(RendererToHandlerShim));
-#pragma warning restore CS0612 // Type or member is obsolete
+#pragma warning restore CS0612, RS0030 // Type or member is obsolete
 				});
 #endif
 
diff --git a/src/Controls/Maps/src/AppHostBuilderExtensions.cs b/src/Controls/Maps/src/AppHostBuilderExtensions.cs
index 49c832891829..c4d374be84bf 100644
--- a/src/Controls/Maps/src/AppHostBuilderExtensions.cs
+++ b/src/Controls/Maps/src/AppHostBuilderExtensions.cs
@@ -59,9 +59,9 @@ public static MauiAppBuilder UseMauiMaps(this MauiAppBuilder builder)
 		public static IMauiHandlersCollection AddMauiMaps(this IMauiHandlersCollection handlersCollection)
 		{
 #if __ANDROID__ || __IOS__
-			handlersCollection.AddHandler<Map, MapHandler>();
-			handlersCollection.AddHandler<Pin, MapPinHandler>();
-			handlersCollection.AddHandler<MapElement, MapElementHandler>();
+			handlersCollection.AddHandler<Map>(_ => new MapHandler());
+			handlersCollection.AddHandler<Pin>(_ => new MapPinHandler());
+			handlersCollection.AddHandler<MapElement>(_ => new MapElementHandler());
 #endif
 			return handlersCollection;
 		}
diff --git a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
index 2ffeafc4ab82..37ad6aa098d3 100644
--- a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
@@ -62,101 +62,112 @@ public static partial class AppHostBuilderExtensions
 
 		public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlersCollection handlersCollection)
 		{
-			handlersCollection.AddHandler<CollectionView, CollectionViewHandler>();
-			handlersCollection.AddHandler<CarouselView, CarouselViewHandler>();
-			handlersCollection.AddHandler<Application, ApplicationHandler>();
-			handlersCollection.AddHandler<ActivityIndicator, ActivityIndicatorHandler>();
-			handlersCollection.AddHandler<BoxView, BoxViewHandler>();
-			handlersCollection.AddHandler<Button, ButtonHandler>();
-			handlersCollection.AddHandler<CheckBox, CheckBoxHandler>();
-			handlersCollection.AddHandler<DatePicker, DatePickerHandler>();
-			handlersCollection.AddHandler<Editor, EditorHandler>();
-			handlersCollection.AddHandler<Entry, EntryHandler>();
-			handlersCollection.AddHandler<GraphicsView, GraphicsViewHandler>();
-			handlersCollection.AddHandler<Image, ImageHandler>();
-			handlersCollection.AddHandler<Label, LabelHandler>();
-			handlersCollection.AddHandler<Layout, LayoutHandler>();
-			handlersCollection.AddHandler<Picker, PickerHandler>();
-			handlersCollection.AddHandler<ProgressBar, ProgressBarHandler>();
-			handlersCollection.AddHandler<ScrollView, ScrollViewHandler>();
-			handlersCollection.AddHandler<SearchBar, SearchBarHandler>();
-			handlersCollection.AddHandler<Slider, SliderHandler>();
-			handlersCollection.AddHandler<Stepper, StepperHandler>();
-			handlersCollection.AddHandler<Switch, SwitchHandler>();
-			handlersCollection.AddHandler<TimePicker, TimePickerHandler>();
-			handlersCollection.AddHandler<Page, PageHandler>();
-			handlersCollection.AddHandler<WebView, WebViewHandler>();
-			handlersCollection.AddHandler<Border, BorderHandler>();
-			handlersCollection.AddHandler<IContentView, ContentViewHandler>();
-			handlersCollection.AddHandler<Shapes.Ellipse, ShapeViewHandler>();
-			handlersCollection.AddHandler<Shapes.Line, LineHandler>();
-			handlersCollection.AddHandler<Shapes.Path, PathHandler>();
-			handlersCollection.AddHandler<Shapes.Polygon, PolygonHandler>();
-			handlersCollection.AddHandler<Shapes.Polyline, PolylineHandler>();
-			handlersCollection.AddHandler<Shapes.Rectangle, RectangleHandler>();
-			handlersCollection.AddHandler<Shapes.RoundRectangle, RoundRectangleHandler>();
-			handlersCollection.AddHandler<Window, WindowHandler>();
-			handlersCollection.AddHandler<ImageButton, ImageButtonHandler>();
-			handlersCollection.AddHandler<IndicatorView, IndicatorViewHandler>();
-			handlersCollection.AddHandler<RadioButton, RadioButtonHandler>();
-			handlersCollection.AddHandler<RefreshView, RefreshViewHandler>();
-			handlersCollection.AddHandler<SwipeItem, SwipeItemMenuItemHandler>();
-			handlersCollection.AddHandler<SwipeView, SwipeViewHandler>();
+			handlersCollection.AddHandler<CollectionView>(_ => new CollectionViewHandler());
+			handlersCollection.AddHandler<CarouselView>(_ => new CarouselViewHandler());
+			handlersCollection.AddHandler<Application>(_ => new ApplicationHandler());
+			handlersCollection.AddHandler<ActivityIndicator>(_ => new ActivityIndicatorHandler());
+			handlersCollection.AddHandler<BoxView>(_ => new BoxViewHandler());
+			handlersCollection.AddHandler<Button>(_ => new ButtonHandler());
+			handlersCollection.AddHandler<CheckBox>(_ => new CheckBoxHandler());
+			handlersCollection.AddHandler<DatePicker>(_ => new DatePickerHandler());
+			handlersCollection.AddHandler<Editor>(_ => new EditorHandler());
+			handlersCollection.AddHandler<Entry>(_ => new EntryHandler());
+			handlersCollection.AddHandler<GraphicsView>(_ => new GraphicsViewHandler());
+			handlersCollection.AddHandler<Image>(_ => new ImageHandler());
+			handlersCollection.AddHandler<Label>(_ => new LabelHandler());
+			handlersCollection.AddHandler<Layout>(_ => new LayoutHandler());
+			handlersCollection.AddHandler<Picker>(_ => new PickerHandler());
+			handlersCollection.AddHandler<ProgressBar>(_ => new ProgressBarHandler());
+			handlersCollection.AddHandler<ScrollView>(_ => new ScrollViewHandler());
+			handlersCollection.AddHandler<SearchBar>(_ => new SearchBarHandler());
+			handlersCollection.AddHandler<Slider>(_ => new SliderHandler());
+			handlersCollection.AddHandler<Stepper>(_ => new StepperHandler());
+			handlersCollection.AddHandler<Switch>(_ => new SwitchHandler());
+			handlersCollection.AddHandler<TimePicker>(_ => new TimePickerHandler());
+			handlersCollection.AddHandler<Page>(_ => new PageHandler());
+			handlersCollection.AddHandler<WebView>(_ => new WebViewHandler());
+			handlersCollection.AddHandler<Border>(_ => new BorderHandler());
+			handlersCollection.AddHandler<IContentView>(_ => new ContentViewHandler());
+			handlersCollection.AddHandler<Shapes.Ellipse>(_ => new ShapeViewHandler());
+			handlersCollection.AddHandler<Shapes.Line>(_ => new LineHandler());
+			handlersCollection.AddHandler<Shapes.Path>(_ => new PathHandler());
+			handlersCollection.AddHandler<Shapes.Polygon>(_ => new PolygonHandler());
+			handlersCollection.AddHandler<Shapes.Polyline>(_ => new PolylineHandler());
+			handlersCollection.AddHandler<Shapes.Rectangle>(_ => new RectangleHandler());
+			handlersCollection.AddHandler<Shapes.RoundRectangle>(_ => new RoundRectangleHandler());
+			handlersCollection.AddHandler<Window>(_ => new WindowHandler());
+			handlersCollection.AddHandler<ImageButton>(_ => new ImageButtonHandler());
+			handlersCollection.AddHandler<IndicatorView>(_ => new IndicatorViewHandler());
+			handlersCollection.AddHandler<RadioButton>(_ => new RadioButtonHandler());
+			handlersCollection.AddHandler<RefreshView>(_ => new RefreshViewHandler());
+			handlersCollection.AddHandler<SwipeItem>(_ => new SwipeItemMenuItemHandler());
+			handlersCollection.AddHandler<SwipeView>(_ => new SwipeViewHandler());
 
 #pragma warning disable CA1416 //  'MenuBarHandler', MenuFlyoutSubItemHandler, MenuFlyoutSubItemHandler, MenuBarItemHandler is only supported on: 'ios' 13.0 and later
-			handlersCollection.AddHandler<MenuBar, MenuBarHandler>();
-			handlersCollection.AddHandler<MenuFlyoutSubItem, MenuFlyoutSubItemHandler>();
-			handlersCollection.AddHandler<MenuFlyoutSeparator, MenuFlyoutSeparatorHandler>();
-			handlersCollection.AddHandler<MenuFlyoutItem, MenuFlyoutItemHandler>();
-			handlersCollection.AddHandler<MenuBarItem, MenuBarItemHandler>();
+			handlersCollection.AddHandler<MenuBar>(_ => new MenuBarHandler());
+			handlersCollection.AddHandler<MenuFlyoutSubItem>(_ => new MenuFlyoutSubItemHandler());
+			handlersCollection.AddHandler<MenuFlyoutSeparator>(_ => new MenuFlyoutSeparatorHandler());
+			handlersCollection.AddHandler<MenuFlyoutItem>(_ => new MenuFlyoutItemHandler());
+			handlersCollection.AddHandler<MenuBarItem>(_ => new MenuBarItemHandler());
 #pragma warning restore CA1416
 
 #if WINDOWS || ANDROID || IOS || MACCATALYST || TIZEN
-			handlersCollection.AddHandler(typeof(ListView), typeof(Handlers.Compatibility.ListViewRenderer));
+			handlersCollection.AddHandler<ListView>(svc => new Handlers.Compatibility.ListViewRenderer(
+	#if ANDROID
+				svc.GetRequiredService<Android.Content.Context>()
+	#endif
+			));
 #if !TIZEN
-			handlersCollection.AddHandler(typeof(Cell), typeof(Handlers.Compatibility.CellRenderer));
-			handlersCollection.AddHandler(typeof(ImageCell), typeof(Handlers.Compatibility.ImageCellRenderer));
-			handlersCollection.AddHandler(typeof(EntryCell), typeof(Handlers.Compatibility.EntryCellRenderer));
-			handlersCollection.AddHandler(typeof(TextCell), typeof(Handlers.Compatibility.TextCellRenderer));
-			handlersCollection.AddHandler(typeof(ViewCell), typeof(Handlers.Compatibility.ViewCellRenderer));
-			handlersCollection.AddHandler(typeof(SwitchCell), typeof(Handlers.Compatibility.SwitchCellRenderer));
+			handlersCollection.AddHandler<ImageCell>(_ => new Handlers.Compatibility.ImageCellRenderer());
+			handlersCollection.AddHandler<EntryCell>(_ => new Handlers.Compatibility.EntryCellRenderer());
+			handlersCollection.AddHandler<TextCell>(_ => new Handlers.Compatibility.TextCellRenderer());
+			handlersCollection.AddHandler<ViewCell>(_ => new Handlers.Compatibility.ViewCellRenderer());
+			handlersCollection.AddHandler<SwitchCell>(_ => new Handlers.Compatibility.SwitchCellRenderer());
 #endif
-			handlersCollection.AddHandler(typeof(TableView), typeof(Handlers.Compatibility.TableViewRenderer));
-			handlersCollection.AddHandler(typeof(Frame), typeof(Handlers.Compatibility.FrameRenderer));
+			handlersCollection.AddHandler<TableView>(svc => new Handlers.Compatibility.TableViewRenderer(
+	#if ANDROID
+				svc.GetRequiredService<Android.Content.Context>()
+	#endif
+			));
+			handlersCollection.AddHandler<Frame>(svc => new Handlers.Compatibility.FrameRenderer(
+	#if ANDROID
+				svc.GetRequiredService<Android.Content.Context>()
+	#endif
+			));
 #endif
 
 #if WINDOWS || MACCATALYST
-			handlersCollection.AddHandler(typeof(MenuFlyout), typeof(MenuFlyoutHandler));
+			handlersCollection.AddHandler<MenuFlyout>(_ => new MenuFlyoutHandler());
 #endif
 
 #if IOS || MACCATALYST
-			handlersCollection.AddHandler(typeof(NavigationPage), typeof(Handlers.Compatibility.NavigationRenderer));
-			handlersCollection.AddHandler(typeof(TabbedPage), typeof(Handlers.Compatibility.TabbedRenderer));
-			handlersCollection.AddHandler(typeof(FlyoutPage), typeof(Handlers.Compatibility.PhoneFlyoutPageRenderer));
+			handlersCollection.AddHandler<NavigationPage>(_ => new Handlers.Compatibility.NavigationRenderer());
+			handlersCollection.AddHandler<TabbedPage>(_ => new Handlers.Compatibility.TabbedRenderer());
+			handlersCollection.AddHandler<FlyoutPage>(_ => new Handlers.Compatibility.PhoneFlyoutPageRenderer());
 #endif
 
 #if ANDROID || IOS || MACCATALYST || TIZEN
-			handlersCollection.AddHandler<SwipeItemView, SwipeItemViewHandler>();
+			handlersCollection.AddHandler<SwipeItemView>(_ => new SwipeItemViewHandler());
 #if ANDROID || IOS || MACCATALYST
-			handlersCollection.AddHandler<Shell, ShellRenderer>();
+			handlersCollection.AddHandler<Shell>(_ => new ShellRenderer());
 #else
-			handlersCollection.AddHandler<Shell, ShellHandler>();
-			handlersCollection.AddHandler<ShellItem, ShellItemHandler>();
-			handlersCollection.AddHandler<ShellSection, ShellSectionHandler>();
+			handlersCollection.AddHandler<Shell>(_ => new ShellHandler());
+			handlersCollection.AddHandler<ShellItem>(_ => new ShellItemHandler());
+			handlersCollection.AddHandler<ShellSection>(_ => new ShellSectionHandler());
 #endif
 #endif
 #if WINDOWS || ANDROID || TIZEN
-			handlersCollection.AddHandler<NavigationPage, NavigationViewHandler>();
-			handlersCollection.AddHandler<Toolbar, ToolbarHandler>();
-			handlersCollection.AddHandler<FlyoutPage, FlyoutViewHandler>();
-			handlersCollection.AddHandler<TabbedPage, TabbedViewHandler>();
+			handlersCollection.AddHandler<NavigationPage>(_ => new NavigationViewHandler());
+			handlersCollection.AddHandler<Toolbar>(_ => new ToolbarHandler());
+			handlersCollection.AddHandler<FlyoutPage>(_ => new FlyoutViewHandler());
+			handlersCollection.AddHandler<TabbedPage>(_ => new TabbedViewHandler());
 #endif
 
 #if WINDOWS
-			handlersCollection.AddHandler<ShellItem, ShellItemHandler>();
-			handlersCollection.AddHandler<ShellSection, ShellSectionHandler>();
-			handlersCollection.AddHandler<ShellContent, ShellContentHandler>();
-			handlersCollection.AddHandler<Shell, ShellHandler>();
+			handlersCollection.AddHandler<ShellItem>(_ => new ShellItemHandler());
+			handlersCollection.AddHandler<ShellSection>(_ => new ShellSectionHandler());
+			handlersCollection.AddHandler<ShellContent>(_ => new ShellContentHandler());
+			handlersCollection.AddHandler<Shell>(_ => new ShellHandler());
 #endif
 			return handlersCollection;
 		}
diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
index c482f6bce3fe..218a0fdc7040 100644
--- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
+++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.Controls.DeviceTests</AssemblyName>
     <NoWarn>$(NoWarn),CA1416</NoWarn>
+    <IsTestProject>true</IsTestProject>
     <!-- Disable multi-RID builds to workaround a parallel build issue -->
     <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
diff --git a/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs b/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs
index 5f7dec1aac41..9eb50d80b839 100644
--- a/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs
+++ b/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs
@@ -44,12 +44,12 @@ public static MauiAppBuilder ConfigureTestBuilder(this MauiAppBuilder mauiAppBui
 					})
 					.ConfigureMauiHandlers(handlers =>
 					{
-						handlers.AddHandler(typeof(Editor), typeof(EditorHandler));
-						handlers.AddHandler(typeof(VerticalStackLayout), typeof(LayoutHandler));
-						handlers.AddHandler(typeof(Controls.Window), typeof(WindowHandlerStub));
-						handlers.AddHandler(typeof(Controls.ContentPage), typeof(PageHandler));
+						handlers.AddHandler<Editor>(_ => new EditorHandler());
+						handlers.AddHandler<VerticalStackLayout>(_ => new LayoutHandler());
+						handlers.AddHandler<Controls.Window>(_ => new WindowHandlerStub());
+						handlers.AddHandler<Controls.ContentPage>(_ => new PageHandler());
 #if WINDOWS
-						handlers.AddHandler(typeof(MauiAppNewWindowStub), typeof(ApplicationHandler));
+						handlers.AddHandler<MauiAppNewWindowStub>(_ => new ApplicationHandler());
 #endif
 					});
 		}
diff --git a/src/Core/src/Hosting/ImageSources/ImageSourceServiceCollectionExtensions.cs b/src/Core/src/Hosting/ImageSources/ImageSourceServiceCollectionExtensions.cs
index 543acaf13088..c967e59b3d58 100644
--- a/src/Core/src/Hosting/ImageSources/ImageSourceServiceCollectionExtensions.cs
+++ b/src/Core/src/Hosting/ImageSources/ImageSourceServiceCollectionExtensions.cs
@@ -6,15 +6,31 @@ namespace Microsoft.Maui.Hosting
 {
 	public static class ImageSourceServiceCollectionExtensions
 	{
+		/// <summary>
+		/// Registers an image service with the underlying service container via AddSingleton.
+		/// </summary>
+		/// <typeparam name="TImageSource">The image type to register for</typeparam>
+		/// <typeparam name="TImageSourceService">The service type to register</typeparam>
+		/// <param name="services">The service collection</param>
+		/// <returns>The service collection</returns>
 		public static IImageSourceServiceCollection AddService<TImageSource, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TImageSourceService>(this IImageSourceServiceCollection services)
 			where TImageSource : IImageSource
 			where TImageSourceService : class, IImageSourceService<TImageSource>
 		{
+#pragma warning disable RS0030 // Do not use banned APIs, the current method is also banned
 			services.AddSingleton<IImageSourceService<TImageSource>, TImageSourceService>();
+#pragma warning restore RS0030 // Do not use banned APIs
 
 			return services;
 		}
 
+		/// <summary>
+		/// Registers an image service with the underlying service container via AddSingleton.
+		/// </summary>
+		/// <typeparam name="TImageSource">The image type to register for</typeparam>
+		/// <param name="services">The service collection</param>
+		/// <param name="implementationFactory">A factory method to create the service</param>
+		/// <returns>The service collection</returns>
 		public static IImageSourceServiceCollection AddService<TImageSource>(this IImageSourceServiceCollection services, Func<IServiceProvider, IImageSourceService<TImageSource>> implementationFactory)
 			where TImageSource : IImageSource
 		{
diff --git a/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs b/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs
index d3c33b1ac101..a8460e084654 100644
--- a/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs
+++ b/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs
@@ -7,39 +7,107 @@ namespace Microsoft.Maui.Hosting
 {
 	public static partial class MauiHandlersCollectionExtensions
 	{
+		/// <summary>
+		/// Registers a handler with the underlying service container via AddTransient.
+		/// </summary>
+		/// <param name="handlersCollection">The element collection</param>
+		/// <param name="viewType">The type of view to register</param>
+		/// <param name="handlerType">The handler type that represents the element</param>
+		/// <returns>The handler collection</returns>
 		public static IMauiHandlersCollection AddHandler(
 			this IMauiHandlersCollection handlersCollection,
 			Type viewType,
 			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type handlerType)
 		{
+#pragma warning disable RS0030 // Do not use banned APIs, the current method is also banned
 			handlersCollection.AddTransient(viewType, handlerType);
+#pragma warning restore RS0030 // Do not use banned APIs
 			return handlersCollection;
 		}
 
+		/// <summary>
+		/// Registers a handler with the underlying service container via AddTransient.
+		/// </summary>
+		/// <typeparam name="TType">The type of element to register</typeparam>
+		/// <typeparam name="TTypeRender">The handler type that represents the element</typeparam>
+		/// <param name="handlersCollection">The handler collection</param>
+		/// <returns>The handler collection</returns>
 		public static IMauiHandlersCollection AddHandler<TType, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TTypeRender>(
 			this IMauiHandlersCollection handlersCollection)
 			where TType : IElement
 			where TTypeRender : IElementHandler
 		{
+#pragma warning disable RS0030 // Do not use banned APIs, the current method is also banned
 			handlersCollection.AddTransient(typeof(TType), typeof(TTypeRender));
+#pragma warning restore RS0030 // Do not use banned APIs
 			return handlersCollection;
 		}
 
+		/// <summary>
+		/// Registers a handler with the underlying service container via AddTransient.
+		/// </summary>
+		/// <typeparam name="TType">The type of element to register</typeparam>
+		/// <param name="handlersCollection">The handler collection</param>
+		/// <param name="handlerImplementationFactory">A factory method to create the handler</param>
+		/// <returns>The handler collection</returns>
+		public static IMauiHandlersCollection AddHandler<TType>(
+			this IMauiHandlersCollection handlersCollection,
+			Func<IServiceProvider, IElementHandler> handlerImplementationFactory)
+			where TType : IElement
+		{
+			handlersCollection.AddTransient(typeof(TType), handlerImplementationFactory);
+			return handlersCollection;
+		}
+
+		/// <summary>
+		/// Registers a handler with the underlying service container via AddTransient.
+		/// </summary>
+		/// <param name="handlersCollection">The handler collection</param>
+		/// <param name="viewType">The type of element to register</param>
+		/// <param name="handlerType">The handler type that represents the element</param>
+		/// <returns>The handler collection</returns>
 		public static IMauiHandlersCollection TryAddHandler(
 			this IMauiHandlersCollection handlersCollection,
 			Type viewType,
 			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type handlerType)
 		{
+#pragma warning disable RS0030 // Do not use banned APIs, the current method is also banned
 			handlersCollection.TryAddTransient(viewType, handlerType);
+#pragma warning restore RS0030 // Do not use banned APIs
 			return handlersCollection;
 		}
 
+		/// <summary>
+		/// Registers a handler with the underlying service container via AddTransient.
+		/// </summary>
+		/// <typeparam name="TType">The type of element to register</typeparam>
+		/// <typeparam name="TTypeRender">The handler type that represents the element</typeparam>
+		/// <param name="handlersCollection">The handler collection</param>
+		/// <returns>The handler collection</returns>
 		public static IMauiHandlersCollection TryAddHandler<TType, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TTypeRender>(
 			this IMauiHandlersCollection handlersCollection)
 			where TType : IView
 			where TTypeRender : IViewHandler
 		{
+#pragma warning disable RS0030 // Do not use banned APIs, the current method is also banned
 			handlersCollection.TryAddTransient(typeof(TType), typeof(TTypeRender));
+#pragma warning restore RS0030 // Do not use banned APIs
+			return handlersCollection;
+		}
+
+		/// <summary>
+		/// Registers a handler with the underlying service container via AddTransient.
+		/// </summary>
+		/// <typeparam name="TType">The type of element to register</typeparam>
+		/// <param name="handlersCollection">The handler collection</param>
+		/// <param name="handlerImplementationFactory">A factory method to create the handler</param>
+		/// <returns>The handler collection</returns>
+		public static IMauiHandlersCollection TryAddHandler<TType>(
+			this IMauiHandlersCollection handlersCollection,
+			Func<IServiceProvider, IElementHandler> handlerImplementationFactory)
+			where TType : IElement
+		{
+			handlersCollection.TryAddTransient(typeof(TType), handlerImplementationFactory);
 			return handlersCollection;
 		}
 	}
diff --git a/src/Core/src/HotReload/HotReloadHelper.cs b/src/Core/src/HotReload/HotReloadHelper.cs
index 41d2f622aa1a..3f1ad37e185e 100644
--- a/src/Core/src/HotReload/HotReloadHelper.cs
+++ b/src/Core/src/HotReload/HotReloadHelper.cs
@@ -149,7 +149,9 @@ static void RegisterHandler(KeyValuePair<Type, Type> pair, Type newHandler)
 			var newType = newHandler;
 			if (pair.Value.IsGenericType)
 				newType = pair.Value.GetGenericTypeDefinition().MakeGenericType(newHandler);
+#pragma warning disable RS0030 // Do not use banned APIs
 			HandlerService.AddHandler(view, newType);
+#pragma warning restore RS0030 // Do not use banned APIs
 		}
 
 		public static void TriggerReload()
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index e80270786bf9..06c21000bb41 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -81,6 +81,8 @@ static Microsoft.Maui.Handlers.ImageButtonHandler.MapBackground(Microsoft.Maui.H
 static Microsoft.Maui.Handlers.SearchBarHandler.MapFocus(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar, object? args) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Handlers.StepperHandler.MapIsEnabled(Microsoft.Maui.Handlers.IStepperHandler! handler, Microsoft.Maui.IStepper! stepper) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 3bafe708cfa2..17084a39d0d2 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -72,6 +72,8 @@ static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Ma
 static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapBackground(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 5c200b2f746b..08dc32dce4d3 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -74,6 +74,8 @@ static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Ma
 static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapBackground(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 01e1872d2ead..54d5c4d6cfd4 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -38,6 +38,8 @@ static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Mic
 static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
 static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 Microsoft.Maui.IWebView.UserAgent.get -> string?
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index fa3394981300..5a6eee1ab77d 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -53,6 +53,8 @@ static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Mic
 static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
 static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 64a17cdfd7d7..1b9d634bacc9 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -42,6 +42,8 @@ static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Mic
 static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
 static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index dc2070d44eb6..a0d1a7f39ac4 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -39,6 +39,8 @@ static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Mic
 static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
 static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 64a17cdfd7d7..1b9d634bacc9 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -42,6 +42,8 @@ static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Mic
 static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
 static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
 static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
+static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler<TType>(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func<System.IServiceProvider!, Microsoft.Maui.IElementHandler!>! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
 static Microsoft.Maui.Layouts.FlexBasis.operator !=(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.FlexBasis.operator ==(Microsoft.Maui.Layouts.FlexBasis left, Microsoft.Maui.Layouts.FlexBasis right) -> bool
 static Microsoft.Maui.Layouts.LayoutExtensions.ArrangeContentUnbounded(this Microsoft.Maui.IContentView! contentView, Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/tests/Benchmarks/Core.Benchmarks.csproj b/src/Core/tests/Benchmarks/Core.Benchmarks.csproj
index 75eeceb1e727..2dd905ce4a03 100644
--- a/src/Core/tests/Benchmarks/Core.Benchmarks.csproj
+++ b/src/Core/tests/Benchmarks/Core.Benchmarks.csproj
@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(_MauiDotNetTfm)</TargetFramework>
     <LangVersion>9.0</LangVersion>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
index 44dfa9df3180..a56b684ea6f8 100644
--- a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
+++ b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.Core.DeviceTests</AssemblyName>
     <NoWarn>$(NoWarn),CA1416</NoWarn>
+    <IsTestProject>true</IsTestProject>
     <!-- Disable multi-RID builds to workaround a parallel build issue -->
     <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>