Merge pull request #11407 from LakshanF/TypeRegisterationTest

Get TrimTest to 0 trim warnings

src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs

@@ -7,6 +7,15 @@ namespace System.ComponentModel;
 
 internal static class TypeConverterHelper
 {
+    // Feature switch, when set to true, used for trimming to access ComponentModel in a trim safe manner
+    [FeatureSwitchDefinition("System.Windows.Forms.Primitives.TypeConverterHelper.UseComponentModelRegisteredTypes")]
+#pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
+    private static bool UseComponentModelRegisteredTypes { get; } =
+        AppContext.TryGetSwitch("System.Windows.Forms.Primitives.TypeConverterHelper.UseComponentModelRegisteredTypes", out bool isEnabled)
+            ? isEnabled
+            : false;
+#pragma warning restore IDE0075
+
     /// <summary>
     /// Converts the given text to list of objects, using the specified context and culture information.
     /// </summary>
@@ -28,7 +37,18 @@ internal static class TypeConverterHelper
             return false;
         }
 
-        TypeConverter converter = TypeDescriptor.GetConverter(typeof(T));
+        TypeConverter converter;
+        if (!UseComponentModelRegisteredTypes)
+        {
+            converter = TypeDescriptor.GetConverter(typeof(T));
+        }
+        else
+        {
+            // Call the trim safe API
+            TypeDescriptor.RegisterType<T>();
+            converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(T));
+        }
+
         for (int i = 0; i < output.Length; i++)
         {
             // Note: ConvertFromString will raise exception if value cannot be converted.

src/System.Windows.Forms/src/Resources/SR.resx

@@ -6968,6 +6968,12 @@ Stack trace where the illegal operation occurred was:
     <value>Binding operations are not supported when application trimming is enabled.</value>
   </data>
   <data name="BinaryFormatterNotSupported" xml:space="preserve">
-    <value>Using the BinaryFormatter is not supported.</value>
+    <value>Using the BinaryFormatter is not supported in trimmed applications.</value>
+  </data>
+  <data name="ControlNotSupportedInTrimming" xml:space="preserve">
+    <value>'{0}' is not supported in trimmed applications.</value>
+  </data>
+  <data name="DesignTimeFeaturesNotSupported" xml:space="preserve">
+    <value>Design time features are not supported.</value>
   </data>
 </root>