Drop DAM on the GetHandlerType return value

Author: simonrozsival

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

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Maui.Controls;
 
@@ -11,10 +10,8 @@ partial class CheckBox
 		return new CheckBoxHandler();
 	}
 
-	[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 	protected override Type? GetHandlerType()
 	{
-		RemapForControlsIfNeeded();
 		return typeof(CheckBoxHandler);
 	}
 

src/Controls/src/Core/Element/Element.Handler.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Maui.Controls;
 
@@ -17,7 +16,6 @@ partial class Element
 	/// <summary>
 	/// Create the type of the Handler for the Element.
 	/// </summary>
-	[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 	protected virtual Type? GetHandlerType()
 	{
 		return null;
@@ -30,7 +28,6 @@ protected virtual void RemapForControlsIfNeeded()
 
 	IElementHandler? IElement.GetElementHandler(IMauiContext context) => GetHandler(context);
 
-	[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 	Type? IElement.GetElementHandlerType() => GetHandlerType();
 
 	private static readonly HashSet<Type> s_remappedTypes = new ();

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

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Maui.Controls;
 
@@ -11,10 +10,8 @@ partial class Label
 		return new LabelHandler();
 	}
 
-	[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 	protected override Type? GetHandlerType()
 	{
-		RemapForControlsIfNeeded();
 		return typeof(LabelHandler);
 	}
 

src/Controls/src/Core/Toolbar/Toolbar.Handler.cs

@@ -1,18 +1,9 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Maui.Controls;
 
 partial class Toolbar
 {
-	IElementHandler? IElement.GetElementHandler(IMauiContext context)
-	{
-		return null;
-	}
-
-	[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
-	Type? IElement.GetElementHandlerType()
-	{
-		return null;
-	}
+	IElementHandler? IElement.GetElementHandler(IMauiContext context) => null;
+	Type? IElement.GetElementHandlerType() => null;
 }

src/Core/src/Core/IElement.cs

@@ -23,7 +23,6 @@ public interface IElement
 		/// <summary>
 		/// Gets the Handler Type for the Element.
 		/// </summary>
-		[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 		Type? GetElementHandlerType();
 	}
 }

src/Core/src/Hosting/IMauiHandlersFactory.cs

@@ -11,7 +11,6 @@ public interface IMauiHandlersFactory : IMauiFactory
 		[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 		Type? GetHandlerType(Type iview);
 
-		[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 		Type? GetHandlerType(IElement element);
 
 		IElementHandler? GetHandler(IElement element, IMauiContext context);

src/Core/src/Hosting/Internal/MauiHandlersFactory.cs

@@ -31,7 +31,6 @@ public MauiHandlersFactory(IMauiHandlersCollection collection)
 			return view.GetElementHandler(context);
 		}
 
-		[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 		public Type? GetHandlerType(IElement view)
 		{
 			// Try to get the handler type from the service collection first.

src/Core/src/Platform/ElementExtensions.cs

@@ -34,9 +34,11 @@ public static partial class ElementExtensions
 	{
 		static HashSet<Type> handlersWithConstructors = new HashSet<Type>();
 
-		static IElementHandler? CreateTypeWithInjection(this IElement view, IMauiContext mauiContext)
+		static IElementHandler? CreateTypeWithInjection(this Type viewType, IMauiContext mauiContext)
 		{
-			var handlerType = mauiContext.Handlers.GetHandlerType(view);
+#pragma warning disable CS0618 // Type or member is obsolete
+			var handlerType = mauiContext.Handlers.GetHandlerType(viewType);
+#pragma warning restore CS0618
 
 			if (handlerType == null)
 				return null;
@@ -76,15 +78,15 @@ public static IElementHandler ToHandler(this IElement view, IMauiContext context
 				try
 				{
 					if (handlersWithConstructors.Contains(viewType))
-						handler = view.CreateTypeWithInjection(context);
-					else
+						handler = viewType.CreateTypeWithInjection(context);
+				else
 						handler = context.Handlers.GetHandler(view, context);
 				}
 				catch (MissingMethodException)
 				{
-					handler = view.CreateTypeWithInjection(context);
+					handler = viewType.CreateTypeWithInjection(context);
 					if (handler != null)
-						handlersWithConstructors.Add(view.GetType());
+						handlersWithConstructors.Add(viewType);
 				}
 			}