- cleanup

dotnet · Jun 2, 2021 · 5dabfc3 · 5dabfc3
1 parent 1cb2de4
commit 5dabfc3
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 45 deletions.
diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
@@ -105,7 +105,6 @@ public void Configure(HostBuilderContext context, IServiceProvider services)
 								return;
 						}
 
-						System.Diagnostics.Debug.WriteLine($"controlType: {controlType}");
 						_handlers?.TryAddHandler(controlType, typeof(RendererToHandlerShim));
 					});
 			}

diff --git a/src/Compatibility/Core/src/Compatibility-net6.csproj b/src/Compatibility/Core/src/Compatibility-net6.csproj
@@ -78,6 +78,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="AppHostBuilderExtensions.Controls.cs" />
     <Compile Include="RendererToHandlerShim.cs" />
     <Compile Include="AppHostBuilderExtensions.cs" />
     <Compile Include="MauiHandlersCollectionExtensions.cs" />

diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
@@ -60,10 +60,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="AppHostBuilderExtensions.Controls.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
+    <Compile Include="AppHostBuilderExtensions.Controls.cs" />
     <Compile Include="AppHostBuilderExtensions.cs" />
     <Compile Include="MauiHandlersCollectionExtensions.cs" />
     <Compile Include="Forms.cs" />

diff --git a/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs b/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs
@@ -18,25 +18,6 @@ public static IMauiHandlersCollection TryAddCompatibilityRenderer(this IMauiHand
 			return handlersCollection;
 		}
 
-		public static IMauiHandlersCollection TryAddCompatibilityRenderer<TControlType, TMauiType, TRenderer>(this IMauiHandlersCollection handlersCollection)
-			where TMauiType : IFrameworkElement
-		{
-			FormsCompatBuilder.AddRenderer(typeof(TControlType), typeof(TRenderer));
-
-#if __ANDROID__ || __IOS__ || WINDOWS || MACCATALYST
-			handlersCollection.TryAddHandler<TMauiType, RendererToHandlerShim>();
-#endif
-			return handlersCollection;
-		}
-
-		public static IMauiHandlersCollection TryAddCompatibilityRenderer<TControlType, TRenderer>(this IMauiHandlersCollection handlersCollection)
-			where TControlType : IFrameworkElement
-		{
-			handlersCollection.TryAddCompatibilityRenderer<TControlType, TControlType, TRenderer>();
-
-			return handlersCollection;
-		}
-
 		public static IMauiHandlersCollection AddCompatibilityRenderer(this IMauiHandlersCollection handlersCollection, Type controlType, Type rendererType)
 		{
 			FormsCompatBuilder.AddRenderer(controlType, rendererType);

diff --git a/src/Controls/samples/Controls.Sample/Startup.cs b/src/Controls/samples/Controls.Sample/Startup.cs
@@ -36,16 +36,6 @@ enum PageType { Xaml, Semantics, Main, Blazor, NavigationPage, Shell }
 
 		public readonly static bool UseXamlApp = true;
 		public readonly static bool UseFullDI = false;
-		public void Configurej(IAppHostBuilder appBuilder)
-		{
-			appBuilder
-				.UseMauiControlsApp<XamlApp>()
-				.ConfigureServices(services =>
-				{
-					services.AddSingleton<ITextService, TextService>();
-				})
-				.UseMauiServiceProviderFactory(constructorInjection: true);
-		}
 
 		public void Configure(IAppHostBuilder appBuilder)
 		{

diff --git a/src/Controls/src/Core/AppHostBuilderExtensions.cs b/src/Controls/src/Core/AppHostBuilderExtensions.cs
@@ -34,7 +34,7 @@ public static class AppHostBuilderExtensions
 			{ typeof(Page), typeof(PageHandler) }
 		};
 
-		public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlersCollection handlersCollection)
+		internal static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlersCollection handlersCollection)
 			=> handlersCollection.AddHandlers(DefaultMauiControlHandlers);
 	}
 }
diff --git a/src/Controls/src/Core/Registrar.cs b/src/Controls/src/Core/Registrar.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Microsoft.Maui.Controls.StyleSheets;
 
 namespace Microsoft.Maui.Controls
@@ -391,9 +390,6 @@ public static void RegisterAll(
 
 					var length = attributes.Length;
 
-					StringBuilder namespaces = new StringBuilder();
-					StringBuilder renderers = new StringBuilder();
-
 					for (var i = 0; i < length; i++)
 					{
 						var a = attributes[i];
@@ -406,17 +402,11 @@ public static void RegisterAll(
 						{
 							if (attribute.ShouldRegister())
 							{
-								namespaces.AppendLine($"using {attribute.TargetType.Name} = {attribute.TargetType.FullName};");
-								renderers.AppendLine($"handlers.TryAddCompatibilityRenderer(typeof({attribute.HandlerType.Name}), typeof({attribute.TargetType.Name}));");
-
 								Registered.Register(attribute.HandlerType, attribute.TargetType, attribute.SupportedVisuals, attribute.Priority);
 								viewRegistered?.Invoke(attribute.HandlerType);
 							}
 						}
 					}
-
-					System.Diagnostics.Debug.WriteLine(namespaces.ToString());
-					System.Diagnostics.Debug.WriteLine(renderers.ToString());
 				}
 
 				object[] effectAttributes = assembly.GetCustomAttributesSafe(typeof(ExportEffectAttribute));
-Original file line number
+Diff line change
@@ Expand Up @@
     								return;
     						}
-    						System.Diagnostics.Debug.WriteLine($"controlType: {controlType}");
     						_handlers?.TryAddHandler(controlType, typeof(RendererToHandlerShim));
     					});
     			}
@@ Expand Down @@