[net11.0] Use ElementHandlerAttribute instead of DI for built-in visual elements

src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ActivityIndicator.xml" path="Type[@FullName='Microsoft.Maui.Controls.ActivityIndicator']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<ActivityIndicatorHandler>]
+	[ElementHandler(typeof(ActivityIndicatorHandler))]
 	public partial class ActivityIndicator : View, IColorElement, IElementConfiguration<ActivityIndicator>, IActivityIndicator
 	{
 		/// <summary>Bindable property for <see cref="IsRunning"/>.</summary>

src/Controls/src/Core/Application/Application.cs

@@ -16,7 +16,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Application.xml" path="Type[@FullName='Microsoft.Maui.Controls.Application']/Docs/*" />
-	[ElementHandler<ApplicationHandler>]
+	[ElementHandler(typeof(ApplicationHandler))]
 	public partial class Application : Element, IResourcesProvider, IApplicationController, IElementConfiguration<Application>, IVisualTreeElement, IApplication
 	{
 		readonly WeakEventManager _weakEventManager = new WeakEventManager();

src/Controls/src/Core/Border/Border.cs

@@ -11,14 +11,8 @@
 namespace Microsoft.Maui.Controls
 {
 	[ContentProperty(nameof(Content))]
-<<<<<<< HEAD
-	[ElementHandler<BorderHandler>]
-	public class Border : View, IContentView, IBorderView, IPaddingElement
-||||||| 3f26a592b2
-	public class Border : View, IContentView, IBorderView, IPaddingElement
-=======
+	[ElementHandler(typeof(BorderHandler))]
 	public class Border : View, IContentView, IBorderView, IPaddingElement, ISafeAreaElement, ISafeAreaView2
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		float[]? _strokeDashPattern;
 

src/Controls/src/Core/BoxView/BoxView.cs

@@ -7,16 +7,10 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../docs/Microsoft.Maui.Controls/BoxView.xml" path="Type[@FullName='Microsoft.Maui.Controls.BoxView']/Docs/*" />
-	[ElementHandler<BoxViewHandler>]
-||||||| 3f26a592b2
-	/// <include file="../../docs/Microsoft.Maui.Controls/BoxView.xml" path="Type[@FullName='Microsoft.Maui.Controls.BoxView']/Docs/*" />
-=======
 	/// <summary>
 	/// A <see cref="View" /> used to draw a solid colored rectangle.
 	/// </summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
+	[ElementHandler(typeof(BoxViewHandler))]
 	public partial class BoxView : View, IColorElement, ICornerElement, IElementConfiguration<BoxView>, IShapeView, IShape
 	{
 		/// <summary>Bindable property for <see cref="Color"/>.</summary>

src/Controls/src/Core/Button/Button.cs

@@ -16,7 +16,7 @@ namespace Microsoft.Maui.Controls
 	/// A button <see cref="View" /> that reacts to touch events.
 	/// </summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<ButtonHandler>]
+	[ElementHandler(typeof(ButtonHandler))]
 	public partial class Button : View, IFontElement, ITextElement, IBorderElement, IButtonController, IElementConfiguration<Button>, IPaddingElement, IImageController, IViewController, IButtonElement, ICommandElement, IImageElement, IButton, ITextButton, IImageButton
 	{
 		const double DefaultSpacing = 10;

src/Controls/src/Core/Cells/Cell.cs

@@ -10,18 +10,12 @@
 namespace Microsoft.Maui.Controls
 {
 	// Don't add IElementConfiguration<Cell> because it kills performance on UWP structures that use Cells
-<<<<<<< HEAD
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Cell.xml" path="Type[@FullName='Microsoft.Maui.Controls.Cell']/Docs/*" />
+	/// <summary>Provides base class and capabilities for all Microsoft.Maui.Controls cells. Cells are elements meant to be added to <see cref="Microsoft.Maui.Controls.ListView"/> or <see cref="Microsoft.Maui.Controls.TableView"/>.</summary>
 #if WINDOWS || ANDROID || IOS || MACCATALYST
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.CellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.CellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
-||||||| 3f26a592b2
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Cell.xml" path="Type[@FullName='Microsoft.Maui.Controls.Cell']/Docs/*" />
-=======
-	/// <summary>Provides base class and capabilities for all Microsoft.Maui.Controls cells. Cells are elements meant to be added to <see cref="Microsoft.Maui.Controls.ListView"/> or <see cref="Microsoft.Maui.Controls.TableView"/>.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public abstract class Cell : Element, ICellController, IFlowDirectionController, IPropertyPropagationController, IVisualController, IWindowController, IVisualTreeElement
 	{
 		/// <summary>The default height of cells.</summary>

src/Controls/src/Core/Cells/EntryCell.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 	[Obsolete("The controls which use EntryCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
 #if WINDOWS || ANDROID || IOS || MACCATALYST
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.EntryCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.EntryCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
 	public class EntryCell : Cell, ITextAlignmentElement, IEntryCellController, ITextAlignment

src/Controls/src/Core/Cells/ImageCell.cs

@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Microsoft.Maui.Controls.TextCell"/> that has an image.</summary>
 	[Obsolete("The controls which use ImageCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
 #if WINDOWS || ANDROID || IOS || MACCATALYST
-	[ElementHandler<Handlers.Compatibility.ImageCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.ImageCellRenderer))]
 #endif
 	public class ImageCell : TextCell
 	{

src/Controls/src/Core/Cells/SwitchCell.cs

@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 	[Obsolete("The controls which use SwitchCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
 #if WINDOWS || ANDROID || IOS || MACCATALYST || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.SwitchCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.SwitchCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
 	public class SwitchCell : Cell

src/Controls/src/Core/Cells/TextCell.cs

@@ -8,18 +8,12 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.Cell"/> with primary <see cref="Microsoft.Maui.Controls.TextCell.Text"/>  and <see cref="Microsoft.Maui.Controls.TextCell.Detail"/> text.</summary>
 	[Obsolete("The controls which use TextCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
-<<<<<<< HEAD
 #if WINDOWS || ANDROID || IOS || MACCATALYST
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.TextCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.TextCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
-	public class TextCell : Cell
-||||||| 3f26a592b2
-	public class TextCell : Cell
-=======
 	public class TextCell : Cell, ICommandElement
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		/// <summary>Bindable property for <see cref="Command"/>.</summary>
 		public static readonly BindableProperty CommandProperty =

src/Controls/src/Core/Cells/ViewCell.cs

@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty("View")]
 #if WINDOWS || IOS || MACCATALYST || ANDROID || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.ViewCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.ViewCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
 	public class ViewCell : Cell

src/Controls/src/Core/CheckBox/CheckBox.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/CheckBox.xml" path="Type[@FullName='Microsoft.Maui.Controls.CheckBox']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<CheckBoxHandler>]
+	[ElementHandler(typeof(CheckBoxHandler))]
 	public partial class CheckBox : View, IElementConfiguration<CheckBox>, IBorderElement, IColorElement, ICheckBox, ICommandElement
 	{
 		readonly Lazy<PlatformConfigurationRegistry<CheckBox>> _platformConfigurationRegistry;

src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs

@@ -53,8 +53,8 @@ public static CommandMapper<Frame, FrameRenderer> CommandMapper
 
 		const double LegacyMinimumFrameSize = 20;
 
-		static FrameRenderer IElementHandlerWithAndroidContext<FrameRenderer>.CreateHandler(Context context)
-			=> new FrameRenderer(context);
+		static FrameRenderer IElementHandlerWithAndroidContext<FrameRenderer>.CreateHandler(Context? context)
+			=> new FrameRenderer(context!);
 
 		public FrameRenderer(Context context) : this(context, Mapper)
 		{

src/Controls/src/Core/ContentView/ContentView.cs

@@ -10,14 +10,8 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ContentView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentView']/Docs/*" />
 	[ContentProperty("Content")]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-<<<<<<< HEAD
-	[ElementHandler<ContentViewHandler>]
-	public partial class ContentView : TemplatedView, IContentView
-||||||| 3f26a592b2
-	public partial class ContentView : TemplatedView, IContentView
-=======
+	[ElementHandler(typeof(ContentViewHandler))]
 	public partial class ContentView : TemplatedView, IContentView, ISafeAreaView2, ISafeAreaElement
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		/// <summary>Bindable property for <see cref="Content"/>.</summary>
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentView), null, propertyChanged: TemplateUtilities.OnContentChanged);

src/Controls/src/Core/DatePicker/DatePicker.cs

@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.View"/> that allows date picking.</summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<DatePickerHandler>]
+	[ElementHandler(typeof(DatePickerHandler))]
 	public partial class DatePicker : View, IFontElement, ITextElement, IElementConfiguration<DatePicker>, IDatePicker
 	{
 		/// <summary>Bindable property for <see cref="Format"/>.</summary>

src/Controls/src/Core/Editor/Editor.cs

@@ -9,14 +9,8 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="Type[@FullName='Microsoft.Maui.Controls.Editor']/Docs/*" />
-	[ElementHandler<EditorHandler>]
-||||||| 3f26a592b2
-	/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="Type[@FullName='Microsoft.Maui.Controls.Editor']/Docs/*" />
-=======
 	/// <summary>A control that can edit multiple lines of text.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
+	[ElementHandler(typeof(EditorHandler))]
 	public partial class Editor : InputView, IEditorController, ITextAlignmentElement, IElementConfiguration<Editor>, IEditor
 	{
 		/// <summary>Identifies the Text bindable property.</summary>

src/Controls/src/Core/Entry/Entry.cs

@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>
 	/// Entry is a single line text entry. It is best used for collecting small discrete pieces of information, like usernames and passwords.
 	/// </summary>
-	[ElementHandler<EntryHandler>]
+	[ElementHandler(typeof(EntryHandler))]
 	public partial class Entry : InputView, ITextAlignmentElement, IEntryController, IElementConfiguration<Entry>, IEntry
 	{
 		/// <summary>

src/Controls/src/Core/FlyoutPage/FlyoutPage.cs

@@ -15,9 +15,9 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty(nameof(Detail))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Compatibility.PhoneFlyoutPageRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.PhoneFlyoutPageRenderer))]
 #elif WINDOWS || ANDROID || TIZEN
-	[ElementHandler<FlyoutViewHandler>]
+	[ElementHandler(typeof(FlyoutViewHandler))]
 #endif
 	public partial class FlyoutPage : Page, IFlyoutPageController, IElementConfiguration<FlyoutPage>, IFlyoutView
 	{

src/Controls/src/Core/Frame/Frame.cs

@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 #if WINDOWS || IOS || MACCATALYST || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.FrameRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.FrameRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #elif ANDROID
 #pragma warning disable CS0618 // Type or member is obsolete

src/Controls/src/Core/GraphicsView/GraphicsView.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	[ElementHandler<GraphicsViewHandler>]
+	[ElementHandler(typeof(GraphicsViewHandler))]
 	public class GraphicsView : View, IGraphicsView
 	{
 		public event EventHandler<TouchEventArgs> StartHoverInteraction;

src/Controls/src/Core/HybridWebView/HybridWebView.cs

@@ -10,7 +10,8 @@ namespace Microsoft.Maui.Controls
 	/// A <see cref="View"/> that presents local HTML content in a web view and allows JavaScript and C# code to
 	/// communicate by using messages and by invoking methods.
 	/// </summary>
-	[ElementHandler<HybridWebViewHandler>]
+	[UnconditionalSuppressMessage("Trimming", "IL2026")]
+	[ElementHandler(typeof(HybridWebViewHandler))]
 	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>

src/Controls/src/Core/Image/Image.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary><see cref="Microsoft.Maui.Controls.View"/> that holds an image.</summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<ImageHandler>]
+	[ElementHandler(typeof(ImageHandler))]
 	public partial class Image : View, IImageController, IElementConfiguration<Image>, IViewController, IImageElement, IImage
 	{
 		/// <summary>Bindable property for <see cref="Source"/>.</summary>

src/Controls/src/Core/ImageButton/ImageButton.cs

@@ -11,7 +11,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ImageButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.ImageButton']/Docs/*" />
-	[ElementHandler<ImageButtonHandler>]
+	[ElementHandler(typeof(ImageButtonHandler))]
 	public partial class ImageButton : View, IImageController, IElementConfiguration<ImageButton>, IBorderElement, IButtonController, IViewController, IPaddingElement, IButtonElement, ICommandElement, IImageElement, IImageButton
 	{
 		const int DefaultCornerRadius = -1;

src/Controls/src/Core/IndicatorView/IndicatorView.cs

@@ -14,7 +14,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/IndicatorView.xml" path="Type[@FullName='Microsoft.Maui.Controls.IndicatorView']/Docs/*" />
 	[ContentProperty(nameof(IndicatorLayout))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<IndicatorViewHandler>]
+	[ElementHandler(typeof(IndicatorViewHandler))]
 	public partial class IndicatorView : TemplatedView, ITemplatedIndicatorView
 	{
 		const int DefaultPadding = 4;

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

@@ -11,18 +11,12 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CarouselView']/Docs/*" />
+	/// <summary>A <see cref="Microsoft.Maui.Controls.ItemsView"/> whose scrollable child views 'snap' into place.</summary>
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Items2.CarouselViewHandler2>]
+	[ElementHandler(typeof(Handlers.Items2.CarouselViewHandler2))]
 #else
-	[ElementHandler<Handlers.Items.CarouselViewHandler>]
+	[ElementHandler(typeof(Handlers.Items.CarouselViewHandler))]
 #endif
-||||||| 3f26a592b2
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CarouselView']/Docs/*" />
-=======
-	/// <summary>A <see cref="Microsoft.Maui.Controls.ItemsView"/> whose scrollable child views 'snap' into place.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public class CarouselView : ItemsView
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselView.xml" path="//Member[@MemberName='CurrentItemVisualState']/Docs/*" />

src/Controls/src/Core/Items/CollectionView.cs

@@ -8,18 +8,12 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CollectionView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CollectionView']/Docs/*" />
+	/// <summary>A <see cref="Microsoft.Maui.Controls.SelectableItemsView"/> that presents a collection of items.</summary>
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Items2.CollectionViewHandler2>]
+	[ElementHandler(typeof(Handlers.Items2.CollectionViewHandler2))]
 #else
-	[ElementHandler<Handlers.Items.CollectionViewHandler>]
+	[ElementHandler(typeof(Handlers.Items.CollectionViewHandler))]
 #endif
-||||||| 3f26a592b2
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CollectionView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CollectionView']/Docs/*" />
-=======
-	/// <summary>A <see cref="Microsoft.Maui.Controls.SelectableItemsView"/> that presents a collection of items.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public class CollectionView : ReorderableItemsView
 	{
 	}

src/Controls/src/Core/Label/Label.cs

@@ -15,7 +15,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Microsoft.Maui.Controls.View"/> that displays text.</summary>
 	[ContentProperty(nameof(Text))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<LabelHandler>]
+	[ElementHandler(typeof(LabelHandler))]
 	public partial class Label : View, IFontElement, ITextElement, ITextAlignmentElement, ILineHeightElement, IElementConfiguration<Label>, IDecorableTextElement, IPaddingElement, ILabel
 	{
 		/// <summary>Bindable property for <see cref="HorizontalTextAlignment"/>.</summary>

src/Controls/src/Core/Layout/Layout.cs

@@ -18,14 +18,8 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Children))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-<<<<<<< HEAD
-	[ElementHandler<LayoutHandler>]
-	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement
-||||||| 3f26a592b2
-	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement
-=======
+	[ElementHandler(typeof(LayoutHandler))]
 	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement, ISafeAreaView2, ISafeAreaElement
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		protected ILayoutManager _layoutManager;
 

src/Controls/src/Core/ListView/ListView.cs

@@ -15,24 +15,18 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../docs/Microsoft.Maui.Controls/ListView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ListView']/Docs/*" />
-	[Obsolete("Please use CollectionView instead.")]
+	/// <summary>An <see cref="Microsoft.Maui.Controls.ItemsView{T}"/> that displays a collection of data as a vertical list.</summary>
+	[Obsolete("ListView is deprecated. Please use CollectionView instead.")]
 #if WINDOWS || IOS || MACCATALYST || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.ListViewRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.ListViewRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
+#endif
 #if ANDROID
+#pragma warning disable CS0618 // Type or member is obsolete
 	[ElementHandlerWithAndroidContext<Handlers.Compatibility.ListViewRenderer>]
+#pragma warning restore CS0618 // Type or member is obsolete
 #endif
-#endif
-||||||| 3f26a592b2
-	/// <include file="../../docs/Microsoft.Maui.Controls/ListView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ListView']/Docs/*" />
-	[Obsolete("Please use CollectionView instead.")]
-=======
-	/// <summary>An <see cref="Microsoft.Maui.Controls.ItemsView{T}"/> that displays a collection of data as a vertical list.</summary>
-	[Obsolete("ListView is deprecated. Please use CollectionView instead.")]
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public class ListView : ItemsView<Cell>, IListViewController, IElementConfiguration<ListView>, IVisualTreeElement
 	{
 		// The ListViewRenderer has some odd behavior with LogicalChildren

src/Controls/src/Core/Menu/MenuBar.cs

@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	[ElementHandler<MenuBarHandler>]
+	[ElementHandler(typeof(MenuBarHandler))]
 	public partial class MenuBar : Element, IMenuBar
 	{
 		/// <summary>Bindable property for <see cref="IsEnabled"/>.</summary>