From fa3e0a2f06b5712da4611ff0e4a78a408e80af44 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 11 Apr 2024 14:55:21 -0700
Subject: [PATCH 01/14] Type registration experiment

---
 .../src/System/ComponentModel/TypeConverterHelper.cs      | 2 +-
 .../Windows/Forms/Controls/ListControl/ListControl.cs     | 2 +-
 .../Windows/Forms/Controls/ToolStrips/OpacityConverter.cs | 2 +-
 .../Forms/Controls/ToolStrips/ToolStripMenuItem.cs        | 2 +-
 .../src/System/Windows/Forms/Internal/Formatter.cs        | 6 ++----
 .../src/System/Windows/Forms/MDI/MDIWindowDialog.cs       | 8 ++++----
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
index 5ea877d26b..e2f473e412 100644
--- a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
@@ -28,7 +28,7 @@ internal static class TypeConverterHelper
             return false;
         }
 
-        TypeConverter converter = TypeDescriptor.GetConverter(typeof(T));
+        TypeConverter converter = TypeDescriptor.GetConverterFromKnownType(typeof(T));
         for (int i = 0; i < output.Length; i++)
         {
             // Note: ConvertFromString will raise exception if value cannot be converted.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index cbc24978dd..eae848dd37 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -527,7 +527,7 @@ public abstract class ListControl : Control
         }
 
         // Try Formatter.FormatObject
-        s_stringTypeConverter ??= TypeDescriptor.GetConverter(typeof(string));
+        s_stringTypeConverter ??= TypeDescriptor.GetConverterFromKnownType(typeof(string));
 
         try
         {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
index a8b00bf80d..84a7514b39 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
@@ -45,7 +45,7 @@ public class OpacityConverter : TypeConverter
             double percent;
             try
             {
-                percent = (double)TypeDescriptor.GetConverter(typeof(double)).ConvertFrom(context, culture, text)!;
+                percent = (double)TypeDescriptor.GetConverterFromKnownType(typeof(double)).ConvertFrom(context, culture, text)!;
 
                 // Assume they meant a percentage if it is > 1.0, else they actually
                 // typed the correct double.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
index ad48f03ebc..62c1fd7303 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
@@ -1108,7 +1108,7 @@ public partial class ToolStripMenuItem : ToolStripDropDownItem
             return string.Empty;
         }
 
-        return TypeDescriptor.GetConverter(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
+        return TypeDescriptor.GetConverterFromKnownType(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
     }
 
     internal override bool IsBeingTabbedTo()
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index 6174cbafaf..410758b3d9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -26,7 +26,6 @@ internal static class Formatter
     ///  If the caller is expecting a nullable value back, we must also re-wrap the final result
     ///  inside a nullable value before returning.
     /// </summary>
-    [RequiresUnreferencedCode(ComponentModelTrimIncompatibilityMessage)]
     public static object? FormatObject(
         object? value,
         Type targetType,
@@ -84,7 +83,6 @@ internal static class Formatter
     ///  - Uses TypeConverters or IConvertible where appropriate
     ///  - Throws a FormatException is no suitable conversion can be found
     /// </summary>
-    [RequiresUnreferencedCode(ComponentModelTrimIncompatibilityMessage)]
     private static object? FormatObjectInternal(
         object? value,
         Type targetType,
@@ -137,13 +135,13 @@ internal static class Formatter
         // The converters for properties should take precedence.  Unfortunately, we don't know whether we have one.  Check vs. the
         // type's TypeConverter.  We're punting the case where the property-provided converter is the same as the type's converter.
         Type sourceType = value.GetType();
-        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverter(sourceType);
+        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromKnownType(sourceType);
         if (sourceConverter is not null && sourceConverter != sourceTypeTypeConverter && sourceConverter.CanConvertTo(targetType))
         {
             return sourceConverter.ConvertTo(context: null, GetFormatterCulture(formatInfo), value, targetType);
         }
 
-        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverter(targetType);
+        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromKnownType(targetType);
         if (targetConverter is not null && targetConverter != targetTypeTypeConverter && targetConverter.CanConvertFrom(sourceType))
         {
             return targetConverter.ConvertFrom(context: null, GetFormatterCulture(formatInfo), value);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index 2904f9e405..e35a7a9789 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -86,20 +86,20 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // _itemList
         //
-        resources.ApplyResources(_itemList, "itemList");
+        resources.ApplyResources<ListBox>(_itemList, "itemList", null);
         _itemList.FormattingEnabled = true;
         _itemList.Name = "itemList";
         //
         // _okButton
         //
-        resources.ApplyResources(_okButton, "okButton");
+        resources.ApplyResources<Button>(_okButton, "okButton", null);
         _okButton.DialogResult = DialogResult.OK;
         _okButton.Margin = new Padding(0, 0, 3, 0);
         _okButton.Name = "okButton";
         //
         // _cancelButton
         //
-        resources.ApplyResources(_cancelButton, "cancelButton");
+        resources.ApplyResources<Button>(_cancelButton, "cancelButton", null);
         _cancelButton.DialogResult = DialogResult.Cancel;
         _cancelButton.Margin = new Padding(3, 0, 0, 0);
         _cancelButton.Name = "cancelButton";
@@ -118,7 +118,7 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // MdiWindowDialog
         //
-        resources.ApplyResources(this, "$this");
+        resources.ApplyResources<MdiWindowDialog>(this, "$this", null);
         AutoScaleMode = AutoScaleMode.Font;
         Controls.Add(_okCancelTableLayoutPanel);
         Controls.Add(_itemList);

From d491446fd9a769cd43065d6f27a37089b31d3be8 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 15 Apr 2024 09:11:12 -0700
Subject: [PATCH 02/14] Add AddKnownReflectedType

---
 .../ComponentModel/TypeConverterHelper.cs       |  1 +
 .../Forms/Controls/ListControl/ListControl.cs   |  1 +
 .../Controls/ToolStrips/OpacityConverter.cs     |  1 +
 .../Controls/ToolStrips/ToolStripMenuItem.cs    |  1 +
 .../System/Windows/Forms/Internal/Formatter.cs  |  3 +++
 .../System/Windows/Forms/MDI/MDIWindowDialog.cs | 17 ++++++++++++-----
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
index e2f473e412..976bdcd5a4 100644
--- a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
@@ -28,6 +28,7 @@ internal static class TypeConverterHelper
             return false;
         }
 
+        TypeDescriptor.AddKnownReflectedType<T>();
         TypeConverter converter = TypeDescriptor.GetConverterFromKnownType(typeof(T));
         for (int i = 0; i < output.Length; i++)
         {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index eae848dd37..deafd8dc5f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -527,6 +527,7 @@ public abstract class ListControl : Control
         }
 
         // Try Formatter.FormatObject
+        TypeDescriptor.AddKnownReflectedType<string>();
         s_stringTypeConverter ??= TypeDescriptor.GetConverterFromKnownType(typeof(string));
 
         try
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
index 84a7514b39..6265d1d277 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
@@ -45,6 +45,7 @@ public class OpacityConverter : TypeConverter
             double percent;
             try
             {
+                TypeDescriptor.AddKnownReflectedType<double>();
                 percent = (double)TypeDescriptor.GetConverterFromKnownType(typeof(double)).ConvertFrom(context, culture, text)!;
 
                 // Assume they meant a percentage if it is > 1.0, else they actually
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
index 62c1fd7303..51933183bb 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
@@ -1108,6 +1108,7 @@ public partial class ToolStripMenuItem : ToolStripDropDownItem
             return string.Empty;
         }
 
+        TypeDescriptor.AddKnownReflectedType<Keys>();
         return TypeDescriptor.GetConverterFromKnownType(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
     }
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index 410758b3d9..5ec38797ab 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -135,12 +135,15 @@ internal static class Formatter
         // The converters for properties should take precedence.  Unfortunately, we don't know whether we have one.  Check vs. the
         // type's TypeConverter.  We're punting the case where the property-provided converter is the same as the type's converter.
         Type sourceType = value.GetType();
+        // @TODO - needs a more derived type here
+        TypeDescriptor.AddKnownReflectedType<object>();
         TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromKnownType(sourceType);
         if (sourceConverter is not null && sourceConverter != sourceTypeTypeConverter && sourceConverter.CanConvertTo(targetType))
         {
             return sourceConverter.ConvertTo(context: null, GetFormatterCulture(formatInfo), value, targetType);
         }
 
+        TypeDescriptor.AddKnownReflectedType<Type>();
         TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromKnownType(targetType);
         if (targetConverter is not null && targetConverter != targetTypeTypeConverter && targetConverter.CanConvertFrom(sourceType))
         {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index e35a7a9789..a10bd5973c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.ComponentModel;
+
 namespace System.Windows.Forms;
 
 internal sealed partial class MdiWindowDialog : Form
@@ -86,27 +88,31 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // _itemList
         //
-        resources.ApplyResources<ListBox>(_itemList, "itemList", null);
+        TypeDescriptor.AddKnownReflectedType<ListBox>();
+        resources.ApplyResources(_itemList, "itemList", null);
         _itemList.FormattingEnabled = true;
         _itemList.Name = "itemList";
         //
         // _okButton
         //
-        resources.ApplyResources<Button>(_okButton, "okButton", null);
+        TypeDescriptor.AddKnownReflectedType<Button>();
+        resources.ApplyResources(_okButton, "okButton", null);
         _okButton.DialogResult = DialogResult.OK;
         _okButton.Margin = new Padding(0, 0, 3, 0);
         _okButton.Name = "okButton";
         //
         // _cancelButton
         //
-        resources.ApplyResources<Button>(_cancelButton, "cancelButton", null);
+        TypeDescriptor.AddKnownReflectedType<Button>();
+        resources.ApplyResources(_cancelButton, "cancelButton", null);
         _cancelButton.DialogResult = DialogResult.Cancel;
         _cancelButton.Margin = new Padding(3, 0, 0, 0);
         _cancelButton.Name = "cancelButton";
         //
         // _okCancelTableLayoutPanel
         //
-        resources.ApplyResources(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel");
+        TypeDescriptor.AddKnownReflectedType<TableLayoutPanel>();
+        resources.ApplyResources(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel", null);
         _okCancelTableLayoutPanel.ColumnCount = 2;
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
@@ -118,7 +124,8 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // MdiWindowDialog
         //
-        resources.ApplyResources<MdiWindowDialog>(this, "$this", null);
+        TypeDescriptor.AddKnownReflectedType<MdiWindowDialog>();
+        resources.ApplyResources(this, "$this", null);
         AutoScaleMode = AutoScaleMode.Font;
         Controls.Add(_okCancelTableLayoutPanel);
         Controls.Add(_itemList);

From 3350c1e01f60645c8370ba8b930b84f63f792257 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Sun, 21 Apr 2024 07:09:55 -0700
Subject: [PATCH 03/14] Partial fix for ComponentModel API that take object

---
 .../Forms/Controls/Buttons/ButtonBase.cs        |  3 ++-
 .../System/Windows/Forms/Internal/Formatter.cs  |  2 +-
 .../System/Windows/Forms/MDI/MDIWindowDialog.cs | 17 +++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index c5642fe1f7..cad8fc03d9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -155,7 +155,8 @@ public abstract partial class ButtonBase : Control, ICommandBindingTargetProvide
             {
                 if (value != Color.Empty)
                 {
-                    PropertyDescriptor? pd = TypeDescriptor.GetProperties(this)["UseVisualStyleBackColor"];
+                    TypeDescriptor.AddKnownReflectedType<ButtonBase>();
+                    PropertyDescriptor? pd = TypeDescriptor.GetPropertiesFromKnownType(this)["UseVisualStyleBackColor"];
                     pd?.SetValue(this, false);
                 }
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index 5ec38797ab..2774bcbb7b 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -143,7 +143,7 @@ internal static class Formatter
             return sourceConverter.ConvertTo(context: null, GetFormatterCulture(formatInfo), value, targetType);
         }
 
-        TypeDescriptor.AddKnownReflectedType<Type>();
+        // TypeDescriptor.AddKnownReflectedType<Type>();
         TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromKnownType(targetType);
         if (targetConverter is not null && targetConverter != targetTypeTypeConverter && targetConverter.CanConvertFrom(sourceType))
         {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index a10bd5973c..2904f9e405 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.ComponentModel;
-
 namespace System.Windows.Forms;
 
 internal sealed partial class MdiWindowDialog : Form
@@ -88,31 +86,27 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // _itemList
         //
-        TypeDescriptor.AddKnownReflectedType<ListBox>();
-        resources.ApplyResources(_itemList, "itemList", null);
+        resources.ApplyResources(_itemList, "itemList");
         _itemList.FormattingEnabled = true;
         _itemList.Name = "itemList";
         //
         // _okButton
         //
-        TypeDescriptor.AddKnownReflectedType<Button>();
-        resources.ApplyResources(_okButton, "okButton", null);
+        resources.ApplyResources(_okButton, "okButton");
         _okButton.DialogResult = DialogResult.OK;
         _okButton.Margin = new Padding(0, 0, 3, 0);
         _okButton.Name = "okButton";
         //
         // _cancelButton
         //
-        TypeDescriptor.AddKnownReflectedType<Button>();
-        resources.ApplyResources(_cancelButton, "cancelButton", null);
+        resources.ApplyResources(_cancelButton, "cancelButton");
         _cancelButton.DialogResult = DialogResult.Cancel;
         _cancelButton.Margin = new Padding(3, 0, 0, 0);
         _cancelButton.Name = "cancelButton";
         //
         // _okCancelTableLayoutPanel
         //
-        TypeDescriptor.AddKnownReflectedType<TableLayoutPanel>();
-        resources.ApplyResources(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel", null);
+        resources.ApplyResources(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel");
         _okCancelTableLayoutPanel.ColumnCount = 2;
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
@@ -124,8 +118,7 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // MdiWindowDialog
         //
-        TypeDescriptor.AddKnownReflectedType<MdiWindowDialog>();
-        resources.ApplyResources(this, "$this", null);
+        resources.ApplyResources(this, "$this");
         AutoScaleMode = AutoScaleMode.Font;
         Controls.Add(_okCancelTableLayoutPanel);
         Controls.Add(_itemList);

From 8ec211d5328629b688408b0fc46957ebb1508908 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 22 Apr 2024 11:51:30 -0700
Subject: [PATCH 04/14] CM that takes object

---
 src/System.Windows.Forms/src/System/Windows/Forms/Control.cs | 5 +++--
 .../System/Windows/Forms/Controls/ListControl/ListControl.cs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index e0192a6d6f..2e2294f412 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -13006,8 +13006,9 @@ public unsafe partial class Control :
 
         if (site is not null && site.DesignMode && site.TryGetService(out changeService))
         {
-            sizeProperty = TypeDescriptor.GetProperties(this)[PropertyNames.Size];
-            locationProperty = TypeDescriptor.GetProperties(this)[PropertyNames.Location];
+            TypeDescriptor.AddKnownReflectedType<Control>();
+            sizeProperty = TypeDescriptor.GetPropertiesFromKnownType(this)[PropertyNames.Size];
+            locationProperty = TypeDescriptor.GetPropertiesFromKnownType(this)[PropertyNames.Location];
             Debug.Assert(sizeProperty is not null && locationProperty is not null, "Error retrieving Size/Location properties on Control.");
 
             try
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index deafd8dc5f..5232b3f4c0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -143,7 +143,7 @@ public abstract class ListControl : Control
                     PropertyDescriptor? displayMemberProperty = props.Find(_displayMember.BindingField, true);
                     if (displayMemberProperty is not null)
                     {
-                        _displayMemberConverter = displayMemberProperty.Converter;
+                        _displayMemberConverter = displayMemberProperty.ConverterFromKnownType;
                     }
                 }
             }

From eeb3090b10fba1d14320eb80d7e1bee2e8cf8a59 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 25 Apr 2024 12:02:41 -0700
Subject: [PATCH 05/14] Partial move to new ComponentModel APIs

---
 .../src/System/ComponentModel/TypeConverterHelper.cs       | 4 ++--
 .../src/System/Windows/Forms/Control.cs                    | 6 +++---
 .../System/Windows/Forms/Controls/Buttons/ButtonBase.cs    | 4 ++--
 .../Windows/Forms/Controls/ListControl/ListControl.cs      | 6 +++---
 .../Windows/Forms/Controls/ToolStrips/OpacityConverter.cs  | 4 ++--
 .../Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs | 4 ++--
 .../src/System/Windows/Forms/Internal/Formatter.cs         | 7 ++++---
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
index 976bdcd5a4..fc4ba6386e 100644
--- a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
@@ -28,8 +28,8 @@ internal static class TypeConverterHelper
             return false;
         }
 
-        TypeDescriptor.AddKnownReflectedType<T>();
-        TypeConverter converter = TypeDescriptor.GetConverterFromKnownType(typeof(T));
+        TypeDescriptor.RegisterType<T>();
+        TypeConverter converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(T));
         for (int i = 0; i < output.Length; i++)
         {
             // Note: ConvertFromString will raise exception if value cannot be converted.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index 2e2294f412..66c6d8b9e0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -13006,9 +13006,9 @@ public unsafe partial class Control :
 
         if (site is not null && site.DesignMode && site.TryGetService(out changeService))
         {
-            TypeDescriptor.AddKnownReflectedType<Control>();
-            sizeProperty = TypeDescriptor.GetPropertiesFromKnownType(this)[PropertyNames.Size];
-            locationProperty = TypeDescriptor.GetPropertiesFromKnownType(this)[PropertyNames.Location];
+            TypeDescriptor.RegisterType<Control>();
+            sizeProperty = TypeDescriptor.GetPropertiesFromRegisteredType(this)[PropertyNames.Size];
+            locationProperty = TypeDescriptor.GetPropertiesFromRegisteredType(this)[PropertyNames.Location];
             Debug.Assert(sizeProperty is not null && locationProperty is not null, "Error retrieving Size/Location properties on Control.");
 
             try
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index cad8fc03d9..8f4cbb1c13 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -155,8 +155,8 @@ public abstract partial class ButtonBase : Control, ICommandBindingTargetProvide
             {
                 if (value != Color.Empty)
                 {
-                    TypeDescriptor.AddKnownReflectedType<ButtonBase>();
-                    PropertyDescriptor? pd = TypeDescriptor.GetPropertiesFromKnownType(this)["UseVisualStyleBackColor"];
+                    TypeDescriptor.RegisterType<ButtonBase>();
+                    PropertyDescriptor? pd = TypeDescriptor.GetPropertiesFromRegisteredType(this)["UseVisualStyleBackColor"];
                     pd?.SetValue(this, false);
                 }
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index 5232b3f4c0..a5c44066c3 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -143,7 +143,7 @@ public abstract class ListControl : Control
                     PropertyDescriptor? displayMemberProperty = props.Find(_displayMember.BindingField, true);
                     if (displayMemberProperty is not null)
                     {
-                        _displayMemberConverter = displayMemberProperty.ConverterFromKnownType;
+                        _displayMemberConverter = displayMemberProperty.ConverterFromRegisteredType;
                     }
                 }
             }
@@ -527,8 +527,8 @@ public abstract class ListControl : Control
         }
 
         // Try Formatter.FormatObject
-        TypeDescriptor.AddKnownReflectedType<string>();
-        s_stringTypeConverter ??= TypeDescriptor.GetConverterFromKnownType(typeof(string));
+        TypeDescriptor.RegisterType<string>();
+        s_stringTypeConverter ??= TypeDescriptor.GetConverterFromRegisteredType(typeof(string));
 
         try
         {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
index 6265d1d277..5fb7bcafeb 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
@@ -45,8 +45,8 @@ public class OpacityConverter : TypeConverter
             double percent;
             try
             {
-                TypeDescriptor.AddKnownReflectedType<double>();
-                percent = (double)TypeDescriptor.GetConverterFromKnownType(typeof(double)).ConvertFrom(context, culture, text)!;
+                TypeDescriptor.RegisterType<double>();
+                percent = (double)TypeDescriptor.GetConverterFromRegisteredType(typeof(double)).ConvertFrom(context, culture, text)!;
 
                 // Assume they meant a percentage if it is > 1.0, else they actually
                 // typed the correct double.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
index 51933183bb..39984f6168 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
@@ -1108,8 +1108,8 @@ public partial class ToolStripMenuItem : ToolStripDropDownItem
             return string.Empty;
         }
 
-        TypeDescriptor.AddKnownReflectedType<Keys>();
-        return TypeDescriptor.GetConverterFromKnownType(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
+        TypeDescriptor.RegisterType<Keys>();
+        return TypeDescriptor.GetConverterFromRegisteredType(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
     }
 
     internal override bool IsBeingTabbedTo()
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index 2774bcbb7b..dd3b3a74b7 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -136,15 +136,16 @@ internal static class Formatter
         // type's TypeConverter.  We're punting the case where the property-provided converter is the same as the type's converter.
         Type sourceType = value.GetType();
         // @TODO - needs a more derived type here
-        TypeDescriptor.AddKnownReflectedType<object>();
-        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromKnownType(sourceType);
+        TypeDescriptor.RegisterType<object>();
+        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(sourceType);
         if (sourceConverter is not null && sourceConverter != sourceTypeTypeConverter && sourceConverter.CanConvertTo(targetType))
         {
             return sourceConverter.ConvertTo(context: null, GetFormatterCulture(formatInfo), value, targetType);
         }
 
+        // @TODO - needs a more derived type here
         // TypeDescriptor.AddKnownReflectedType<Type>();
-        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromKnownType(targetType);
+        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(targetType);
         if (targetConverter is not null && targetConverter != targetTypeTypeConverter && targetConverter.CanConvertFrom(sourceType))
         {
             return targetConverter.ConvertFrom(context: null, GetFormatterCulture(formatInfo), value);

From 3792ff94627d40361afe17731769c86cc7f3f7d4 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 26 Apr 2024 08:40:49 -0700
Subject: [PATCH 06/14] ComponentModel object issues

---
 .../src/System/Windows/Forms/Control.cs           |  2 +-
 .../Windows/Forms/Controls/Buttons/ButtonBase.cs  |  2 +-
 .../System/Windows/Forms/MDI/MDIWindowDialog.cs   | 15 ++++++++++-----
 .../TableLayoutPanel/TableLayoutSettings.cs       |  3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index 66c6d8b9e0..f74221372e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -13006,7 +13006,7 @@ public unsafe partial class Control :
 
         if (site is not null && site.DesignMode && site.TryGetService(out changeService))
         {
-            TypeDescriptor.RegisterType<Control>();
+            // TypeDescriptor.RegisterType<Control>();
             sizeProperty = TypeDescriptor.GetPropertiesFromRegisteredType(this)[PropertyNames.Size];
             locationProperty = TypeDescriptor.GetPropertiesFromRegisteredType(this)[PropertyNames.Location];
             Debug.Assert(sizeProperty is not null && locationProperty is not null, "Error retrieving Size/Location properties on Control.");
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index 8f4cbb1c13..307c91c10a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -155,7 +155,7 @@ public abstract partial class ButtonBase : Control, ICommandBindingTargetProvide
             {
                 if (value != Color.Empty)
                 {
-                    TypeDescriptor.RegisterType<ButtonBase>();
+                    // TypeDescriptor.RegisterType<ButtonBase>();
                     PropertyDescriptor? pd = TypeDescriptor.GetPropertiesFromRegisteredType(this)["UseVisualStyleBackColor"];
                     pd?.SetValue(this, false);
                 }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index 2904f9e405..cbaa0be7fa 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -86,27 +86,31 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // _itemList
         //
-        resources.ApplyResources(_itemList, "itemList");
+        // TypeDescriptor.RegisterType<ListBox>();
+        resources.ApplyResourcesToRegisteredType(_itemList, "itemList", null);
         _itemList.FormattingEnabled = true;
         _itemList.Name = "itemList";
         //
         // _okButton
         //
-        resources.ApplyResources(_okButton, "okButton");
+        // TypeDescriptor.RegisterType<Button>();
+        resources.ApplyResourcesToRegisteredType(_okButton, "okButton", null);
         _okButton.DialogResult = DialogResult.OK;
         _okButton.Margin = new Padding(0, 0, 3, 0);
         _okButton.Name = "okButton";
         //
         // _cancelButton
         //
-        resources.ApplyResources(_cancelButton, "cancelButton");
+        // TypeDescriptor.RegisterType<Button>();
+        resources.ApplyResourcesToRegisteredType(_cancelButton, "cancelButton", null);
         _cancelButton.DialogResult = DialogResult.Cancel;
         _cancelButton.Margin = new Padding(3, 0, 0, 0);
         _cancelButton.Name = "cancelButton";
         //
         // _okCancelTableLayoutPanel
         //
-        resources.ApplyResources(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel");
+        // TypeDescriptor.RegisterType<TableLayoutPanel>();
+        resources.ApplyResourcesToRegisteredType(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel", null);
         _okCancelTableLayoutPanel.ColumnCount = 2;
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
@@ -118,7 +122,8 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // MdiWindowDialog
         //
-        resources.ApplyResources(this, "$this");
+        // TypeDescriptor.RegisterType<MdiWindowDialog>();
+        resources.ApplyResourcesToRegisteredType(this, "$this", null);
         AutoScaleMode = AutoScaleMode.Font;
         Controls.Add(_okCancelTableLayoutPanel);
         Controls.Add(_itemList);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
index c45c5d3ecd..08639042bc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
@@ -466,7 +466,8 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
 
     void ISerializable.GetObjectData(SerializationInfo si, StreamingContext context)
     {
-        TypeConverter converter = TypeDescriptor.GetConverter(this);
+        TypeDescriptor.RegisterType<TableLayoutSettings>();
+        TypeConverter converter = TypeDescriptor.GetConverterFromRegisteredType(this);
         string? stringVal = converter.ConvertToInvariantString(this);
 
         if (!string.IsNullOrEmpty(stringVal))

From 3ef09e423c1ba8547f679652a82418176279ac2e Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 26 Apr 2024 09:25:11 -0700
Subject: [PATCH 07/14] missed an annotation

---
 .../src/System/Windows/Forms/Controls/ListControl/ListControl.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index a5c44066c3..899d1f566a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -143,6 +143,7 @@ public abstract class ListControl : Control
                     PropertyDescriptor? displayMemberProperty = props.Find(_displayMember.BindingField, true);
                     if (displayMemberProperty is not null)
                     {
+                        // TypeDescriptor.RegisterType<displayMemberProperty.PropertyType>();
                         _displayMemberConverter = displayMemberProperty.ConverterFromRegisteredType;
                     }
                 }

From b2f9a0b1441afebeaa445899ec8861e5cd8606dd Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 29 Apr 2024 11:09:56 -0700
Subject: [PATCH 08/14] next round of changes to use the new ComponentModel
 APIs

---
 .../src/System/Drawing/Design/UITypeEditor.cs    |  6 ++++++
 .../Windows/Forms/ActiveX/Control.ActiveXImpl.cs | 15 +++++++++++++++
 .../src/System/Windows/Forms/Control.cs          | 16 +++++++++++++++-
 .../Forms/Controls/ToolStrips/ToolStrip.cs       |  1 -
 .../Forms/DataBinding/BindableComponent.cs       |  1 -
 .../Windows/Forms/DataBinding/BindingContext.cs  |  1 +
 .../Forms/DataBinding/IBindableComponent.cs      |  1 -
 .../Forms/Layout/Containers/ContainerControl.cs  |  1 -
 .../Forms/Layout/Containers/SplitContainer.cs    |  1 -
 .../System/Windows/Forms/MDI/MDIWindowDialog.cs  |  5 +++++
 ...taObject.NativeDataObjectToWinFormsAdapter.cs |  2 +-
 .../TableLayoutPanel/TableLayoutSettings.cs      |  4 +++-
 12 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
index fd19c73e1c..c47e34a110 100644
--- a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
+++ b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
@@ -6,6 +6,7 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Drawing.Imaging;
+using System.Windows.Forms;
 
 namespace System.Drawing.Design;
 
@@ -43,6 +44,11 @@ public class UITypeEditor
             [typeof(Metafile)] = $"System.Drawing.Design.MetafileEditor, {AssemblyRef.SystemDrawingDesign}",
         };
 
+        if (!Control.EnableFeaturesNotSupportedWithTrimming)
+        {
+            throw new NotSupportedException(SR.BindingNotSupported);
+        }
+
         // Add our intrinsic editors to TypeDescriptor.
         TypeDescriptor.AddEditorTable(typeof(UITypeEditor), intrinsicEditors);
     }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
index 81fc7d48bb..1b648c40aa 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
@@ -1134,6 +1134,11 @@ public partial class Control
 #pragma warning disable SYSLIB0011 // Type or member is obsolete
                     if (!success)
                     {
+                        if (!DataObject.ComposedDataObject.EnableUnsafeBinaryFormatterInNativeObjectSerialization)
+                        {
+                            throw new NotSupportedException(SR.BinaryFormatterNotSupported);
+                        }
+
                         stream.Position = 0;
                         deserialized = new BinaryFormatter().Deserialize(stream);
                     }
@@ -1420,6 +1425,11 @@ public partial class Control
             {
                 Type? eventInterface = null;
 
+                if (!Control.EnableFeaturesNotSupportedWithTrimming)
+                {
+                    throw new NotSupportedException(SR.BindingNotSupported);
+                }
+
                 // Get the first declared interface, if any.
                 if (controlType.GetCustomAttributes<ComSourceInterfacesAttribute>(inherit: false).FirstOrDefault()
                     is { } comSourceInterfaces)
@@ -1503,6 +1513,11 @@ public partial class Control
                     {
                         stream.SetLength(0);
 
+                        if (!DataObject.ComposedDataObject.EnableUnsafeBinaryFormatterInNativeObjectSerialization)
+                        {
+                            throw new NotSupportedException(SR.BinaryFormatterNotSupported);
+                        }
+
 #pragma warning disable SYSLIB0011 // Type or member is obsolete
                         new BinaryFormatter().Serialize(stream, sourceValue);
 #pragma warning restore
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index f74221372e..17318b3308 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -56,6 +56,11 @@ public unsafe partial class Control :
         "Makes double buffered controls non-double buffered");
 #endif
 
+    [FeatureSwitchDefinition("System.Windows.Forms.Control.FeatureNotSupportedWithTrimming")]
+#pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
+    internal static bool EnableFeaturesNotSupportedWithTrimming { get; } = AppContext.TryGetSwitch("System.Windows.Forms.Control.FeatureNotSupportedWithTrimming", out bool isEnabled) ? isEnabled : true;
+#pragma warning restore IDE0075
+
     private static readonly uint WM_GETCONTROLNAME = PInvoke.RegisterWindowMessage("WM_GETCONTROLNAME");
     private static readonly uint WM_GETCONTROLTYPE = PInvoke.RegisterWindowMessage("WM_GETCONTROLTYPE");
 
@@ -977,6 +982,11 @@ public unsafe partial class Control :
     [EditorBrowsable(EditorBrowsableState.Never)]
     public void ResetBindings()
     {
+        if (!Binding.IsSupported)
+        {
+            throw new NotSupportedException(SR.BindingNotSupported);
+        }
+
         ControlBindingsCollection? bindings = (ControlBindingsCollection?)Properties.GetObject(s_bindingsProperty);
         bindings?.Clear();
     }
@@ -1029,7 +1039,6 @@ public unsafe partial class Control :
     public virtual BindingContext? BindingContext
     {
         get => BindingContextInternal;
-        [RequiresUnreferencedCode(IBindableComponent.ComponentModelTrimIncompatibilityMessage)]
         set => BindingContextInternal = value;
     }
 
@@ -1670,6 +1679,11 @@ public unsafe partial class Control :
     {
         get
         {
+            if (!Binding.IsSupported)
+            {
+                throw new NotSupportedException(SR.BindingNotSupported);
+            }
+
             ControlBindingsCollection? bindings = (ControlBindingsCollection?)Properties.GetObject(s_bindingsProperty);
             if (bindings is null)
             {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
index a865ad63df..cb64774db4 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
@@ -387,7 +387,6 @@ public partial class ToolStrip : ScrollableControl, IArrangedElement, ISupportTo
             return null;
         }
 
-        [RequiresUnreferencedCode(IBindableComponent.ComponentModelTrimIncompatibilityMessage)]
         set
         {
             if (Properties.GetObject(s_propBindingContext) != value)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindableComponent.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindableComponent.cs
index 4c48f8718d..efc2f2c4a4 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindableComponent.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindableComponent.cs
@@ -28,7 +28,6 @@ public abstract class BindableComponent : Component, IBindableComponent
     {
         get => _bindingContext ??= [];
 
-        [RequiresUnreferencedCode(IBindableComponent.ComponentModelTrimIncompatibilityMessage)]
         set
         {
             if (!Equals(_bindingContext, value))
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindingContext.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindingContext.cs
index d5cfc8ae81..629a3786ce 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindingContext.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/BindingContext.cs
@@ -18,6 +18,7 @@ public partial class BindingContext : ICollection
     /// <summary>
     ///  Initializes a new instance of the System.Windows.Forms.BindingContext class.
     /// </summary>
+    [RequiresUnreferencedCode(IBindableComponent.ComponentModelTrimIncompatibilityMessage)]
     public BindingContext()
     {
         _listManagers = [];
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/IBindableComponent.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/IBindableComponent.cs
index 04d63a1559..2e3d3f65d5 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/IBindableComponent.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/IBindableComponent.cs
@@ -12,7 +12,6 @@ public interface IBindableComponent : IComponent
     BindingContext? BindingContext
     {
         get;
-        [RequiresUnreferencedCode(ComponentModelTrimIncompatibilityMessage)]
         set;
     }
 }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs
index 3f7be28dfd..1b96f5cca0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs
@@ -266,7 +266,6 @@ public class ContainerControl : ScrollableControl, IContainerControl
             return bm;
         }
 
-        [RequiresUnreferencedCode(IBindableComponent.ComponentModelTrimIncompatibilityMessage)]
         set => base.BindingContext = value;
     }
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/SplitContainer.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/SplitContainer.cs
index 16e3905f12..31041bfed8 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/SplitContainer.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/SplitContainer.cs
@@ -220,7 +220,6 @@ public partial class SplitContainer : ContainerControl, ISupportInitialize
             return BindingContextInternal;
         }
 
-        [RequiresUnreferencedCode(IBindableComponent.ComponentModelTrimIncompatibilityMessage)]
         set
         {
             BindingContextInternal = value;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index cbaa0be7fa..8cf6248e36 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -74,6 +74,11 @@ internal sealed partial class MdiWindowDialog : Form
     [MemberNotNull(nameof(_okCancelTableLayoutPanel))]
     private void InitializeComponent()
     {
+        if (!Control.EnableFeaturesNotSupportedWithTrimming)
+        {
+            throw new NotSupportedException(SR.BindingNotSupported);
+        }
+
         System.ComponentModel.ComponentResourceManager resources = new(typeof(MdiWindowDialog));
         _itemList = new ListBox();
         _okButton = new Button();
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs
index b968f43ac7..b9f87a64ba 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs
@@ -18,7 +18,7 @@ public unsafe partial class DataObject
     {
         [FeatureSwitchDefinition("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-        private static bool EnableUnsafeBinaryFormatterInNativeObjectSerialization { get; } = AppContext.TryGetSwitch("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization", out bool isEnabled) ? isEnabled : true;
+        internal static bool EnableUnsafeBinaryFormatterInNativeObjectSerialization { get; } = AppContext.TryGetSwitch("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization", out bool isEnabled) ? isEnabled : true;
 #pragma warning restore IDE0075
 
         /// <summary>
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
index 08639042bc..3fb96ce72e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
@@ -486,6 +486,8 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
         {
             List<ControlInformation> controlsInfo = new(Owner!.Children.Count);
 
+            TypeDescriptor.RegisterType<Control>();
+
             foreach (IArrangedElement element in Owner.Children)
             {
                 if (element is Control c)
@@ -494,7 +496,7 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
 
                     // We need to go through the PropertyDescriptor for the Name property
                     // since it is shadowed.
-                    PropertyDescriptor? prop = TypeDescriptor.GetProperties(c)["Name"];
+                    PropertyDescriptor? prop = TypeDescriptor.GetPropertiesFromRegisteredType(c)["Name"];
                     if (prop is not null && prop.PropertyType == typeof(string))
                     {
                         controlInfo.Name = prop.GetValue(c);

From a0c956c517d18e89d193e880985a6b33e4bab836 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 29 Apr 2024 12:57:27 -0700
Subject: [PATCH 09/14] Remaining warnings with TrimTest

---
 .../src/System/Windows/Forms/Control.cs           | 10 +++++++---
 .../Windows/Forms/Controls/Buttons/ButtonBase.cs  |  8 ++++++--
 .../Forms/Controls/ListControl/ListControl.cs     |  3 ++-
 .../System/Windows/Forms/Internal/Formatter.cs    |  8 +++++---
 .../System/Windows/Forms/MDI/MDIWindowDialog.cs   | 15 +++++----------
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index 17318b3308..8eed32d828 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -13020,9 +13020,13 @@ public unsafe partial class Control :
 
         if (site is not null && site.DesignMode && site.TryGetService(out changeService))
         {
-            // TypeDescriptor.RegisterType<Control>();
-            sizeProperty = TypeDescriptor.GetPropertiesFromRegisteredType(this)[PropertyNames.Size];
-            locationProperty = TypeDescriptor.GetPropertiesFromRegisteredType(this)[PropertyNames.Location];
+            if (!EnableFeaturesNotSupportedWithTrimming)
+            {
+                throw new NotSupportedException(SR.BindingNotSupported);
+            }
+
+            sizeProperty = TypeDescriptor.GetProperties(this)[PropertyNames.Size];
+            locationProperty = TypeDescriptor.GetProperties(this)[PropertyNames.Location];
             Debug.Assert(sizeProperty is not null && locationProperty is not null, "Error retrieving Size/Location properties on Control.");
 
             try
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index 307c91c10a..06810c50f2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -155,8 +155,12 @@ public abstract partial class ButtonBase : Control, ICommandBindingTargetProvide
             {
                 if (value != Color.Empty)
                 {
-                    // TypeDescriptor.RegisterType<ButtonBase>();
-                    PropertyDescriptor? pd = TypeDescriptor.GetPropertiesFromRegisteredType(this)["UseVisualStyleBackColor"];
+                    if (!EnableFeaturesNotSupportedWithTrimming)
+                    {
+                        throw new NotSupportedException(SR.BindingNotSupported);
+                    }
+
+                    PropertyDescriptor? pd = TypeDescriptor.GetProperties(this)["UseVisualStyleBackColor"];
                     pd?.SetValue(this, false);
                 }
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index 899d1f566a..474f5fa686 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -144,7 +144,8 @@ public abstract class ListControl : Control
                     if (displayMemberProperty is not null)
                     {
                         // TypeDescriptor.RegisterType<displayMemberProperty.PropertyType>();
-                        _displayMemberConverter = displayMemberProperty.ConverterFromRegisteredType;
+                        // _displayMemberConverter = displayMemberProperty.ConverterFromRegisteredType;
+                        _displayMemberConverter = displayMemberProperty.Converter;
                     }
                 }
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index dd3b3a74b7..46e2d1f85e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -136,8 +136,9 @@ internal static class Formatter
         // type's TypeConverter.  We're punting the case where the property-provided converter is the same as the type's converter.
         Type sourceType = value.GetType();
         // @TODO - needs a more derived type here
-        TypeDescriptor.RegisterType<object>();
-        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(sourceType);
+        // TypeDescriptor.RegisterType<object>();
+        // TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(sourceType);
+        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverter(sourceType);
         if (sourceConverter is not null && sourceConverter != sourceTypeTypeConverter && sourceConverter.CanConvertTo(targetType))
         {
             return sourceConverter.ConvertTo(context: null, GetFormatterCulture(formatInfo), value, targetType);
@@ -145,7 +146,8 @@ internal static class Formatter
 
         // @TODO - needs a more derived type here
         // TypeDescriptor.AddKnownReflectedType<Type>();
-        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(targetType);
+        // TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(targetType);
+        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverter(targetType);
         if (targetConverter is not null && targetConverter != targetTypeTypeConverter && targetConverter.CanConvertFrom(sourceType))
         {
             return targetConverter.ConvertFrom(context: null, GetFormatterCulture(formatInfo), value);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index 8cf6248e36..d28e13d51a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -91,31 +91,27 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // _itemList
         //
-        // TypeDescriptor.RegisterType<ListBox>();
-        resources.ApplyResourcesToRegisteredType(_itemList, "itemList", null);
+        resources.ApplyResources(_itemList, "itemList");
         _itemList.FormattingEnabled = true;
         _itemList.Name = "itemList";
         //
         // _okButton
         //
-        // TypeDescriptor.RegisterType<Button>();
-        resources.ApplyResourcesToRegisteredType(_okButton, "okButton", null);
+        resources.ApplyResources(_okButton, "okButton");
         _okButton.DialogResult = DialogResult.OK;
         _okButton.Margin = new Padding(0, 0, 3, 0);
         _okButton.Name = "okButton";
         //
         // _cancelButton
         //
-        // TypeDescriptor.RegisterType<Button>();
-        resources.ApplyResourcesToRegisteredType(_cancelButton, "cancelButton", null);
+        resources.ApplyResources(_cancelButton, "cancelButton");
         _cancelButton.DialogResult = DialogResult.Cancel;
         _cancelButton.Margin = new Padding(3, 0, 0, 0);
         _cancelButton.Name = "cancelButton";
         //
         // _okCancelTableLayoutPanel
         //
-        // TypeDescriptor.RegisterType<TableLayoutPanel>();
-        resources.ApplyResourcesToRegisteredType(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel", null);
+        resources.ApplyResources(_okCancelTableLayoutPanel, "okCancelTableLayoutPanel");
         _okCancelTableLayoutPanel.ColumnCount = 2;
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
         _okCancelTableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
@@ -127,8 +123,7 @@ internal sealed partial class MdiWindowDialog : Form
         //
         // MdiWindowDialog
         //
-        // TypeDescriptor.RegisterType<MdiWindowDialog>();
-        resources.ApplyResourcesToRegisteredType(this, "$this", null);
+        resources.ApplyResources(this, "$this");
         AutoScaleMode = AutoScaleMode.Font;
         Controls.Add(_okCancelTableLayoutPanel);
         Controls.Add(_itemList);

From 1aa2628a0b9ecbca528706d9d2333f575c7adad5 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 2 May 2024 15:30:28 -0700
Subject: [PATCH 10/14] Addressing the remaining warnings in TrimTest

---
 .../Windows/Forms/ActiveX/Control.ActiveXImpl.cs  | 10 ++++++++++
 .../src/System/Windows/Forms/Control.cs           |  3 ++-
 .../Forms/Controls/ListControl/ListControl.cs     | 12 ++++++++++--
 .../System/Windows/Forms/ImageIndexConverter.cs   |  5 +++++
 .../System/Windows/Forms/Internal/Formatter.cs    | 15 +++++++--------
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
index 1b648c40aa..7f247e76eb 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
@@ -1035,6 +1035,11 @@ public partial class Control
         /// <inheritdoc cref="IPersistPropertyBag.Load(IPropertyBag*, IErrorLog*)"/>
         internal unsafe void Load(IPropertyBag* propertyBag, IErrorLog* errorLog)
         {
+            if (!EnableFeaturesNotSupportedWithTrimming)
+            {
+                throw new NotSupportedException(SR.BindingNotSupported);
+            }
+
             PropertyDescriptorCollection props = TypeDescriptor.GetProperties(
                 _control,
                 [DesignerSerializationVisibilityAttribute.Visible]);
@@ -1479,6 +1484,11 @@ public partial class Control
         /// <inheritdoc cref="IPersistPropertyBag.Save(IPropertyBag*, BOOL, BOOL)"/>
         internal void Save(IPropertyBag* propertyBag, BOOL clearDirty, BOOL saveAllProperties)
         {
+            if (!EnableFeaturesNotSupportedWithTrimming)
+            {
+                throw new NotSupportedException(SR.BindingNotSupported);
+            }
+
             PropertyDescriptorCollection props = TypeDescriptor.GetProperties(
                 _control,
                 [DesignerSerializationVisibilityAttribute.Visible]);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index 8eed32d828..6801fa89ea 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -984,7 +984,8 @@ public unsafe partial class Control :
     {
         if (!Binding.IsSupported)
         {
-            throw new NotSupportedException(SR.BindingNotSupported);
+            // This gets called with Dispose that needs to be handled, a throwing is not appropriate in this case.
+            return;
         }
 
         ControlBindingsCollection? bindings = (ControlBindingsCollection?)Properties.GetObject(s_bindingsProperty);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index 474f5fa686..16d9667d9c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -135,6 +135,11 @@ public abstract class ListControl : Control
     {
         get
         {
+            if (!EnableFeaturesNotSupportedWithTrimming)
+            {
+                throw new NotSupportedException(SR.BindingNotSupported);
+            }
+
             if (_displayMemberConverter is null)
             {
                 PropertyDescriptorCollection? props = DataManager?.GetItemProperties();
@@ -143,8 +148,6 @@ public abstract class ListControl : Control
                     PropertyDescriptor? displayMemberProperty = props.Find(_displayMember.BindingField, true);
                     if (displayMemberProperty is not null)
                     {
-                        // TypeDescriptor.RegisterType<displayMemberProperty.PropertyType>();
-                        // _displayMemberConverter = displayMemberProperty.ConverterFromRegisteredType;
                         _displayMemberConverter = displayMemberProperty.Converter;
                     }
                 }
@@ -424,6 +427,11 @@ public abstract class ListControl : Control
     {
         if (item is not null && !string.IsNullOrEmpty(field))
         {
+            if (!EnableFeaturesNotSupportedWithTrimming)
+            {
+                throw new NotSupportedException(SR.BindingNotSupported);
+            }
+
             try
             {
                 // if we have a dataSource, then use that to display the string
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
index 1f70178af3..1f37e77320 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
@@ -83,6 +83,11 @@ public class ImageIndexConverter : Int32Converter
     /// </returns>
     public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext? context)
     {
+        if (!Control.EnableFeaturesNotSupportedWithTrimming)
+        {
+            throw new NotSupportedException(SR.BindingNotSupported);
+        }
+
         if (context is not null && context.Instance is not null)
         {
             object? instance = context.Instance;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index 46e2d1f85e..9d48f13032 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -135,19 +135,18 @@ internal static class Formatter
         // The converters for properties should take precedence.  Unfortunately, we don't know whether we have one.  Check vs. the
         // type's TypeConverter.  We're punting the case where the property-provided converter is the same as the type's converter.
         Type sourceType = value.GetType();
-        // @TODO - needs a more derived type here
-        // TypeDescriptor.RegisterType<object>();
-        // TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(sourceType);
-        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverter(sourceType);
+
+        // @TODO - We will register basic primitive types here but it would be optimal to move the registration to a start up path.
+        TypeDescriptor.RegisterType<string>();
+        TypeDescriptor.RegisterType<int>();
+        TypeDescriptor.RegisterType<bool>();
+        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(sourceType);
         if (sourceConverter is not null && sourceConverter != sourceTypeTypeConverter && sourceConverter.CanConvertTo(targetType))
         {
             return sourceConverter.ConvertTo(context: null, GetFormatterCulture(formatInfo), value, targetType);
         }
 
-        // @TODO - needs a more derived type here
-        // TypeDescriptor.AddKnownReflectedType<Type>();
-        // TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(targetType);
-        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverter(targetType);
+        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(targetType);
         if (targetConverter is not null && targetConverter != targetTypeTypeConverter && targetConverter.CanConvertFrom(sourceType))
         {
             return targetConverter.ConvertFrom(context: null, GetFormatterCulture(formatInfo), value);

From 1d43518ad071628bbc0b918e2fb48f8feabb03b9 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 20 May 2024 14:03:35 -0700
Subject: [PATCH 11/14] Use final ComponentModel API changes to get warnings to
 0

---
 .../ComponentModel/TypeConverterHelper.cs     | 19 +++++++-
 .../src/Resources/SR.resx                     | 15 ++++++
 .../src/Resources/xlf/SR.cs.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.de.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.es.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.fr.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.it.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.ja.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.ko.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.pl.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.pt-BR.xlf            | 25 ++++++++++
 .../src/Resources/xlf/SR.ru.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.tr.xlf               | 25 ++++++++++
 .../src/Resources/xlf/SR.zh-Hans.xlf          | 25 ++++++++++
 .../src/Resources/xlf/SR.zh-Hant.xlf          | 25 ++++++++++
 .../src/System/Drawing/Design/UITypeEditor.cs | 10 ++--
 .../Forms/ActiveX/Control.ActiveXImpl.cs      | 17 ++++---
 .../src/System/Windows/Forms/Control.cs       | 10 ++--
 .../Forms/Controls/Buttons/ButtonBase.cs      |  4 +-
 .../Forms/Controls/ListControl/ListControl.cs | 15 ++++--
 .../Controls/ToolStrips/OpacityConverter.cs   | 11 ++++-
 .../Controls/ToolStrips/ToolStripMenuItem.cs  | 12 ++++-
 .../Windows/Forms/DataBinding/Binding.cs      |  2 +-
 .../Windows/Forms/ImageIndexConverter.cs      |  9 +++-
 .../Windows/Forms/Internal/Formatter.cs       | 28 ++++++++---
 .../Windows/Forms/MDI/MDIWindowDialog.cs      |  9 +++-
 .../TableLayoutPanel/TableLayoutSettings.cs   | 31 +++++++++++--
 .../IntegrationTests/TrimTest/TrimTest.csproj | 46 +++++++++++++++++++
 28 files changed, 523 insertions(+), 40 deletions(-)

diff --git a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
index fc4ba6386e..f947152281 100644
--- a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
@@ -7,6 +7,11 @@ namespace System.ComponentModel;
 
 internal static class TypeConverterHelper
 {
+    [FeatureSwitchDefinition("System.ComponentModel.TypeConverterHelper.ComponentModelUseRegisterTypes")]
+#pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
+    internal static bool UseComponentModelRegisterTypes { get; } = AppContext.TryGetSwitch("System.ComponentModel.TypeConverterHelper.ComponentModelUseRegisterTypes", 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,8 +33,18 @@ internal static class TypeConverterHelper
             return false;
         }
 
-        TypeDescriptor.RegisterType<T>();
-        TypeConverter converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(T));
+        TypeConverter converter;
+        if (!UseComponentModelRegisterTypes)
+        {
+            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.
diff --git a/src/System.Windows.Forms/src/Resources/SR.resx b/src/System.Windows.Forms/src/Resources/SR.resx
index f5642df6a2..dcce2e5b05 100644
--- a/src/System.Windows.Forms/src/Resources/SR.resx
+++ b/src/System.Windows.Forms/src/Resources/SR.resx
@@ -6970,4 +6970,19 @@ Stack trace where the illegal operation occurred was:
   <data name="BinaryFormatterNotSupported" xml:space="preserve">
     <value>Using the BinaryFormatter is not supported.</value>
   </data>
+  <data name="UITypeEditorNotSupported" xml:space="preserve">
+    <value>Using the UITypeEditor is not supported.</value>
+  </data>
+  <data name="ActiveXNotSupported" xml:space="preserve">
+    <value>Using ActiveX is not supported.</value>
+  </data>
+  <data name="DesignTimeFeaturesNotSupported" xml:space="preserve">
+    <value>Design time features are not supported.</value>
+  </data>
+  <data name="ImageIndexConverterNotSupported" xml:space="preserve">
+    <value>ImageIndexConverter is not supported.</value>
+  </data>
+  <data name="MdiWindowDialogNotSupported" xml:space="preserve">
+    <value>MdiWindowDialog is not supported.</value>
+  </data>
 </root>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf
index 7439652146..3cfeefc0d1 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} nepodporuje vlastnost {1}. Musí to být přepsáno v odvozené třídě.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Ovládací prvky vytvořené v jednom vlákně nelze nadřadit ovládacím prvkům v jiném vlákně.</target>
@@ -4639,6 +4644,11 @@ Chcete-li nahradit toto výchozí dialogové okno, nastavte popisovač události
         <target state="translated">Umožňuje uživateli procházet webové stránky uvnitř formuláře.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">Operace {0} se součástí se nezdařila. Generovaný kód chyby je 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Vnitřní stav třídy {1} je neplatný.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Obrázek nelze přidat do seznamu ImageList.</target>
@@ -7054,6 +7069,11 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Určuje typ objektu, který se má použít k analýze vstupního textu v případě, že ovládací prvek ztratí fokus.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Klávesová zkratka přiřazená položce nabídky</target>
@@ -11004,6 +11024,11 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Ovládací prvky přidané do této kolekce musí být typu {0} nebo {1}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Součást nelze inicializovat.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf
index ac1d9cc723..21f986724e 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} unterstützt {1} Eigenschaft nicht. Sie muss in der abgeleiteten Klasse überschrieben werden.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Steuerelemente, die für einen Thread erstellt wurden, können nicht einem Steuerelement in einem anderen Thread übergeordnet werden.</target>
@@ -4639,6 +4644,11 @@ Behandeln Sie das DataError-Ereignis, um dieses Standarddialogfeld zu ersetzen.<
         <target state="translated">Ermöglicht dem Benutzer das Besuchen von Webseiten im Formular.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">Fehler beim {0}-Vorgang für die Komponente. Fehlercode: 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Der interne Zustand der {1}-Klasse ist ungültig.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Das Bild konnte nicht zur ImageList hinzugefügt werden.</target>
@@ -7054,6 +7069,11 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Gibt den Typ des für die Analyse des Eingabetexts zu verwendenden Objekts an, wenn das Steuerelement den Fokus verliert.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Die dem Menüelement zugeordnete Tastenkombination. </target>
@@ -11004,6 +11024,11 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Steuerelemente, die dieser Sammlung hinzugefügt werden, müssen den Typ {0} oder {1} haben.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Die Komponente kann nicht initialisiert werden.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf
index 211ae25d43..302fe832df 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} no admite {1} propiedad. Debe reemplazarse en la clase derivada.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Los controles creados en un subproceso no pueden tener controles primarios en un control en un subproceso diferente.</target>
@@ -4639,6 +4644,11 @@ Para reemplazar este cuadro de diálogo predeterminado controle el evento DataEr
         <target state="translated">Permite al usuario explorar páginas web dentro del formulario.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">Error de la operación {0} en el componente con el código de error 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">El estado interno de la clase {1} no es válido.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">No se puede agregar la imagen a ImageList.</target>
@@ -7054,6 +7069,11 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">Especifica el tipo del objeto que se va a utilizar para analizar el texto de entrada cuando el control pierde el foco.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Tecla de método abreviado asociada al elemento de menú. </target>
@@ -11004,6 +11024,11 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">Los controles que se agregan a esta colección deben ser de tipo '{0}' o '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">No se puede inicializar el componente.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf
index 8bb7b3d237..9e1d861318 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} ne prend pas en charge {1} la propriété. Il doit être remplacé dans la classe dérivée.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Les contrôles créés sur un thread ne peuvent pas être parents d'un contrôle d'un autre thread.</target>
@@ -4639,6 +4644,11 @@ Pour remplacer cette boîte de dialogue par défaut, traitez l'événement DataE
         <target state="translated">Permet à l'utilisateur de parcourir les pages web au sein de votre formulaire.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">L'opération {0} sur le composant a échoué avec le code d'erreur 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">L'état interne de la classe {1} n'est pas valide.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">L'image ne peut pas être ajoutée à l'ImageList.</target>
@@ -7054,6 +7069,11 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">Spécifie le Type de l'objet à utiliser pour l'analyse du texte d'entrée lorsque le contrôle perd le focus.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">La touche de raccourci associée à l'élément de menu. </target>
@@ -11004,6 +11024,11 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">Les contrôles ajoutés à cette collection doivent être de type '{0}' ou '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Impossible d'initialiser le composant.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf
index 58bbd065da..20b81beeac 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} non supporta la proprietà {1}. È necessario eseguire l'override sulla classe derivata.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">I controlli creati su un thread non possono avere come elemento padre un controllo su un thread diverso.</target>
@@ -4639,6 +4644,11 @@ Per sostituire questa finestra di dialogo predefinita, gestire l'evento DataErro
         <target state="translated">Consente all'utente di esplorare pagine Web all'interno del form.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">Operazione {0} sul componente non riuscita con codice di errore 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ Traccia dello stack da cui si è verificata l'operazione non valida:
         <target state="translated">Stato interno della classe {1} non valido.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Impossibile aggiungere l'immagine a ImageList.</target>
@@ -7054,6 +7069,11 @@ Traccia dello stack da cui si è verificata l'operazione non valida:
         <target state="translated">Specifica il tipo di oggetto da utilizzare per l'analisi del testo di input quando il controllo perde lo stato attivo.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Il tasto di scelta rapida associato alla voce di menu. </target>
@@ -11004,6 +11024,11 @@ Traccia dello stack da cui si è verificata l'operazione non valida:
         <target state="translated">I controlli aggiunti alla raccolta devono essere di tipo '{0}' o '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Impossibile inizializzare il componente.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf
index 229622b644..da9d186528 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} は {1} プロパティをサポートしていません。派生クラスでオーバーライドする必要があります。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">あるスレッドで作成されたコントロールに対して、別のスレッドのコントロールを親にすることはできません。</target>
@@ -4639,6 +4644,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">フォーム内の Web ページをユーザーが参照できるようにします。</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">コンポーネントの操作 {0} がエラー コード 0x{1:X} を生成して、成功しませんでした。</target>
@@ -5724,6 +5734,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} クラスの内部の状態は有効ではありません</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">イメージを ImageList に追加できませんでした。</target>
@@ -7054,6 +7069,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">コントロールがフォーカスを失ったときに、入力テキストを解析するために使用されるオブジェクトの型を指定します。</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">メニュー項目に関連付けられたショートカット キーです。</target>
@@ -11004,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">このコレクションに追加されたコントロールには型 '{0}' または '{1}' を指定しなければなりません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">コンポーネントを初期化できません。</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf
index 82c8c1736e..da6a78ff8d 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0}에서 {1} 속성을 지원하지 않습니다. 파생 클래스에서 재정의해야 합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">한 스레드에 만든 컨트롤은 다른 스레드에 있는 컨트롤의 부모가 될 수 없습니다.</target>
@@ -4639,6 +4644,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">사용자가 폼에서 웹 페이지를 찾을 수 있습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">구성 요소의 {0} 작업이 실패했습니다. 오류 코드 0x{1:X}를 생성합니다.</target>
@@ -5724,6 +5734,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} 클래스의 내부 상태가 잘못되었습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">이미지를 ImageList에 추가할 수 없습니다.</target>
@@ -7054,6 +7069,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">컨트롤이 포커스를 잃을 때 입력 텍스트를 구문 분석하는 데 사용할 개체의 형식을 지정합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">메뉴 항목에 연결된 바로 가기 키입니다.</target>
@@ -11004,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">이 컬렉션에 추가된 컨트롤은 '{0}' 또는 '{1}' 형식이어야 합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">구성 요소를 초기화할 수 없습니다.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf
index 639072eced..2eecedcfcb 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} nie obsługuje właściwości {1}. Musi zostać zastąpiona w klasie pochodnej.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Formanty utworzone w jednym wątku nie mogą być nadrzędne w stosunku do formantów w innym wątku.</target>
@@ -4639,6 +4644,11 @@ Aby zamienić to domyślne okno dialogowe, obsłuż zdarzenie DataError.</target
         <target state="translated">Umożliwia użytkownikowi przeglądanie stron sieci Web w formularzu.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">Niepowodzenie operacji {0} dla składnika, kod błędu 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Wewnętrzny stan klasy {1} jest nieprawidłowy.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Nie można dodać obrazu do elementu ImageList.</target>
@@ -7054,6 +7069,11 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Określa typ obiektu używanego do analizowania tekstu wejściowego, gdy formant utraci fokus.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Klawisz skrótu skojarzony z elementem menu. </target>
@@ -11004,6 +11024,11 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Formanty dodane do tej kolekcji muszą być typu „{0}” lub „{1}”.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Nie można zainicjować składnika.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf
index cbb3bf00de..39c2529b84 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} não dá suporte à propriedade {1}. Ele deve ser substituído na classe derivada.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Os controles criados em um thread não podem ser controles pai de um controle em um outro thread.</target>
@@ -4639,6 +4644,11 @@ Para substituir a caixa de diálogo padrão, manipule o evento DataError.</targe
         <target state="translated">Permite que o usuário navegue pelas páginas da Web dentro do formulário.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">A operação {0} no componente não teve êxito, gerando o código de erro 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ Rastreamento de pilha em que a operação ilegal ocorreu:
         <target state="translated">O estado interno da classe {1} é inválido.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">A imagem não pode ser adicionada a ImageList.</target>
@@ -7054,6 +7069,11 @@ Rastreamento de pilha em que a operação ilegal ocorreu:
         <target state="translated">Especifica o Tipo de objeto a ser usado para análise do texto de entrada quando o controle perde o foco.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">A tecla de atalho associada ao item de menu. </target>
@@ -11004,6 +11024,11 @@ Rastreamento de pilha em que a operação ilegal ocorreu:
         <target state="translated">Os controles adicionados à coleção devem ser do tipo '{0}' ou '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Não é possível inicializar componente.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf
index da78ce370a..e07d76e7b0 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} не поддерживает свойство {1}. Его необходимо переопределить в производном классе.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Элементы управления, созданные в одном потоке, не могут быть родительскими для элемента управления в другом потоке.</target>
@@ -4639,6 +4644,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">Позволяет пользователю просматривать веб-страницы внутри формы.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">Невозможно выполнить операцию {0} для компонента; генерируется код ошибки 0x{1:X}.</target>
@@ -5725,6 +5735,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Недопустимое внутреннее состояние класса {1}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Добавление изображения к ImageList невозможно.</target>
@@ -7055,6 +7070,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Указывает Type для объекта, который будет использоваться для разбора вводимого текста при потере фокуса элементом управления.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Указывает клавиши быстрого доступа к данному меню.</target>
@@ -11005,6 +11025,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Элементы управления, добавляемые к данной коллекции, должны иметь тип '{0}' или '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Не удалось инициализировать компонент.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf
index 32497d7763..556bc31cb8 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0}, {1} özelliğini desteklemez. Türetilmiş sınıfta geçersiz kılınmalıdır.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Bir iş parçacığında oluşturulan denetimler, farklı bir iş parçacığındaki denetimin üst öğesi yapılamaz.</target>
@@ -4639,6 +4644,11 @@ Bu varsayılan iletişim kutusunu değiştirmek için, lütfen DataError olayın
         <target state="translated">Kullanıcıların formunuzdaki Web sayfalarına gitmesine olanak tanır.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">Bileşen üzerindeki {0} işlemi başarılı olmadı, oluşturulan hata kodu 0x{1:X}.</target>
@@ -5724,6 +5734,11 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">{1} sınıfının iç durumu geçerli değil.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Resim ImageList'e eklenemiyor.</target>
@@ -7054,6 +7069,11 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">Denetim odağı kaybettiğinde giriş metnini ayrıştırmak için kullanılacak nesnenin türünü belirtir.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Menü öğesiyle ilişkili kısayol tuşu. </target>
@@ -11004,6 +11024,11 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">Bu koleksiyona eklenen denetimlerin '{0}' veya '{1}' türünde olması gerekir.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Bileşen başlatılamıyor.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf
index 6b7677a6fc..c7e8bec731 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} 不支持 {1} 属性。必须在派生类中重写它。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">在某个线程上创建的控件不能成为在另一个线程上创建的控件的父级。</target>
@@ -4639,6 +4644,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">允许用户在窗体内浏览网页。</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">该组件上的 {0} 操作失败，生成错误代码 0x{1:X}。</target>
@@ -5724,6 +5734,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} 类的内部状态无效。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">无法将图像添加到 ImageList。</target>
@@ -7054,6 +7069,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">指定当控件失去焦点时用于分析输入文本的对象的类型。</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">与菜单项关联的快捷键。</target>
@@ -11004,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">添加到此集合的控件必须为“{0}”或“{1}”类型。</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">无法初始化组件。</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf
index 243fe4bf28..05a2ef4617 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf
@@ -227,6 +227,11 @@
         <target state="translated">{0} 不支援 {1} 屬性。必須在衍生類別中加以覆寫。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ActiveXNotSupported">
+        <source>Using ActiveX is not supported.</source>
+        <target state="new">Using ActiveX is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">不可以在不同執行緒上建立控制項的父項。</target>
@@ -4639,6 +4644,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">讓使用者可以瀏覽表單內部的 Web 網頁。</target>
         <note />
       </trans-unit>
+      <trans-unit id="DesignTimeFeaturesNotSupported">
+        <source>Design time features are not supported.</source>
+        <target state="new">Design time features are not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DispInvokeFailed">
         <source>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</source>
         <target state="translated">元件的作業 {0} 失敗，產生錯誤碼 0x{1:X}。</target>
@@ -5724,6 +5734,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} 類別的內部狀態無效。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndexConverterNotSupported">
+        <source>ImageIndexConverter is not supported.</source>
+        <target state="new">ImageIndexConverter is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">無法將影像加入 ImageList。</target>
@@ -7054,6 +7069,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">指定當控制項遺失焦點時，用來剖析輸入文字的物件類型。</target>
         <note />
       </trans-unit>
+      <trans-unit id="MdiWindowDialogNotSupported">
+        <source>MdiWindowDialog is not supported.</source>
+        <target state="new">MdiWindowDialog is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">與功能表項目相關的快速鍵。</target>
@@ -11004,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">加入此集合的控制項必須屬於 '{0}' 或 '{1}' 類型。</target>
         <note />
       </trans-unit>
+      <trans-unit id="UITypeEditorNotSupported">
+        <source>Using the UITypeEditor is not supported.</source>
+        <target state="new">Using the UITypeEditor is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">無法初始化元件。</target>
diff --git a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
index c47e34a110..103b3ccf93 100644
--- a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
+++ b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
@@ -6,7 +6,6 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Drawing.Imaging;
-using System.Windows.Forms;
 
 namespace System.Drawing.Design;
 
@@ -15,6 +14,11 @@ namespace System.Drawing.Design;
 /// </summary>
 public class UITypeEditor
 {
+    [FeatureSwitchDefinition("System.Drawing.Design.UITypeEditor.IsSupported")]
+#pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
+    private static bool IsSupported => AppContext.TryGetSwitch("System.Drawing.Design.UITypeEditor.IsSupported", out bool isSupported) ? isSupported : true;
+#pragma warning restore IDE0075
+
     static UITypeEditor()
     {
         // Our set of intrinsic editors.
@@ -44,9 +48,9 @@ public class UITypeEditor
             [typeof(Metafile)] = $"System.Drawing.Design.MetafileEditor, {AssemblyRef.SystemDrawingDesign}",
         };
 
-        if (!Control.EnableFeaturesNotSupportedWithTrimming)
+        if (!IsSupported)
         {
-            throw new NotSupportedException(SR.BindingNotSupported);
+            throw new NotSupportedException(SR.UITypeEditorNotSupported);
         }
 
         // Add our intrinsic editors to TypeDescriptor.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
index 7f247e76eb..ae22530936 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
@@ -136,6 +136,11 @@ public partial class Control
         private short _accelCount = -1;
         private RECT* _adjustRect; // temporary rect used during OnPosRectChange && SetObjectRects
 
+        [FeatureSwitchDefinition("System.Windows.Forms.ActiveXImpl.IsSupported")]
+#pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
+        private static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.ActiveXImpl.IsSupported", out bool isSupported) ? isSupported : true;
+#pragma warning restore IDE0075
+
         /// <summary>
         ///  Creates a new ActiveXImpl.
         /// </summary>
@@ -1035,9 +1040,9 @@ public partial class Control
         /// <inheritdoc cref="IPersistPropertyBag.Load(IPropertyBag*, IErrorLog*)"/>
         internal unsafe void Load(IPropertyBag* propertyBag, IErrorLog* errorLog)
         {
-            if (!EnableFeaturesNotSupportedWithTrimming)
+            if (!IsSupported)
             {
-                throw new NotSupportedException(SR.BindingNotSupported);
+                throw new NotSupportedException(SR.ActiveXNotSupported);
             }
 
             PropertyDescriptorCollection props = TypeDescriptor.GetProperties(
@@ -1430,9 +1435,9 @@ public partial class Control
             {
                 Type? eventInterface = null;
 
-                if (!Control.EnableFeaturesNotSupportedWithTrimming)
+                if (!IsSupported)
                 {
-                    throw new NotSupportedException(SR.BindingNotSupported);
+                    throw new NotSupportedException(SR.ActiveXNotSupported);
                 }
 
                 // Get the first declared interface, if any.
@@ -1484,9 +1489,9 @@ public partial class Control
         /// <inheritdoc cref="IPersistPropertyBag.Save(IPropertyBag*, BOOL, BOOL)"/>
         internal void Save(IPropertyBag* propertyBag, BOOL clearDirty, BOOL saveAllProperties)
         {
-            if (!EnableFeaturesNotSupportedWithTrimming)
+            if (!IsSupported)
             {
-                throw new NotSupportedException(SR.BindingNotSupported);
+                throw new NotSupportedException(SR.ActiveXNotSupported);
             }
 
             PropertyDescriptorCollection props = TypeDescriptor.GetProperties(
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index 6801fa89ea..5c5b21b4ed 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -56,9 +56,11 @@ public unsafe partial class Control :
         "Makes double buffered controls non-double buffered");
 #endif
 
-    [FeatureSwitchDefinition("System.Windows.Forms.Control.FeatureNotSupportedWithTrimming")]
+    [FeatureSwitchDefinition("System.Windows.Forms.Control.DesignTimeFeatures")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-    internal static bool EnableFeaturesNotSupportedWithTrimming { get; } = AppContext.TryGetSwitch("System.Windows.Forms.Control.FeatureNotSupportedWithTrimming", out bool isEnabled) ? isEnabled : true;
+    internal static bool EnableDesignTimeFeatures { get; } = AppContext.TryGetSwitch("System.Windows.Forms.Control.FeatureNotSupportedWithTrimming", out bool isEnabled) ? isEnabled : true;
+    [FeatureSwitchDefinition("System.Windows.Forms.Control.ComponentModelUseRegisterTypes")]
+    internal static bool UseComponentModelRegisterTypes { get; } = AppContext.TryGetSwitch("System.Windows.Forms.Control.ComponentModelUseRegisterTypes", out bool isEnabled) ? isEnabled : false;
 #pragma warning restore IDE0075
 
     private static readonly uint WM_GETCONTROLNAME = PInvoke.RegisterWindowMessage("WM_GETCONTROLNAME");
@@ -13021,9 +13023,9 @@ public unsafe partial class Control :
 
         if (site is not null && site.DesignMode && site.TryGetService(out changeService))
         {
-            if (!EnableFeaturesNotSupportedWithTrimming)
+            if (!EnableDesignTimeFeatures)
             {
-                throw new NotSupportedException(SR.BindingNotSupported);
+                throw new NotSupportedException(SR.DesignTimeFeaturesNotSupported);
             }
 
             sizeProperty = TypeDescriptor.GetProperties(this)[PropertyNames.Size];
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index 06810c50f2..17b43301a6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -155,9 +155,9 @@ public abstract partial class ButtonBase : Control, ICommandBindingTargetProvide
             {
                 if (value != Color.Empty)
                 {
-                    if (!EnableFeaturesNotSupportedWithTrimming)
+                    if (!EnableDesignTimeFeatures)
                     {
-                        throw new NotSupportedException(SR.BindingNotSupported);
+                        throw new NotSupportedException(SR.DesignTimeFeaturesNotSupported);
                     }
 
                     PropertyDescriptor? pd = TypeDescriptor.GetProperties(this)["UseVisualStyleBackColor"];
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index 16d9667d9c..957bd67ed9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -135,7 +135,7 @@ public abstract class ListControl : Control
     {
         get
         {
-            if (!EnableFeaturesNotSupportedWithTrimming)
+            if (!Binding.IsSupported)
             {
                 throw new NotSupportedException(SR.BindingNotSupported);
             }
@@ -427,7 +427,7 @@ public abstract class ListControl : Control
     {
         if (item is not null && !string.IsNullOrEmpty(field))
         {
-            if (!EnableFeaturesNotSupportedWithTrimming)
+            if (!Binding.IsSupported)
             {
                 throw new NotSupportedException(SR.BindingNotSupported);
             }
@@ -537,8 +537,15 @@ public abstract class ListControl : Control
         }
 
         // Try Formatter.FormatObject
-        TypeDescriptor.RegisterType<string>();
-        s_stringTypeConverter ??= TypeDescriptor.GetConverterFromRegisteredType(typeof(string));
+        if (!UseComponentModelRegisterTypes)
+        {
+            s_stringTypeConverter ??= TypeDescriptor.GetConverter(typeof(string));
+        }
+        else
+        {
+            // Call the trim safe API
+            s_stringTypeConverter ??= TypeDescriptor.GetConverterFromRegisteredType(typeof(string));
+        }
 
         try
         {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
index 5fb7bcafeb..9641174925 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
@@ -45,8 +45,15 @@ public class OpacityConverter : TypeConverter
             double percent;
             try
             {
-                TypeDescriptor.RegisterType<double>();
-                percent = (double)TypeDescriptor.GetConverterFromRegisteredType(typeof(double)).ConvertFrom(context, culture, text)!;
+                if (!Control.UseComponentModelRegisterTypes)
+                {
+                    percent = (double)TypeDescriptor.GetConverter(typeof(double)).ConvertFrom(context, culture, text)!;
+                }
+                else
+                {
+                    // Call the trim safe API
+                    percent = (double)TypeDescriptor.GetConverterFromRegisteredType(typeof(double)).ConvertFrom(context, culture, text)!;
+                }
 
                 // Assume they meant a percentage if it is > 1.0, else they actually
                 // typed the correct double.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
index 39984f6168..22fc1da3ba 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
@@ -1108,8 +1108,16 @@ public partial class ToolStripMenuItem : ToolStripDropDownItem
             return string.Empty;
         }
 
-        TypeDescriptor.RegisterType<Keys>();
-        return TypeDescriptor.GetConverterFromRegisteredType(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
+        if (!Control.UseComponentModelRegisterTypes)
+        {
+            return TypeDescriptor.GetConverter(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
+        }
+        else
+        {
+            // Call the trim safe API
+            TypeDescriptor.RegisterType<Keys>();
+            return TypeDescriptor.GetConverterFromRegisteredType(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
+        }
     }
 
     internal override bool IsBeingTabbedTo()
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs
index 18be17725c..4bfddac89b 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs
@@ -15,7 +15,7 @@ public partial class Binding
     [FeatureSwitchDefinition("System.Windows.Forms.Binding.IsSupported")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
     internal static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.Binding.IsSupported", out bool isSupported) ? isSupported : true;
-#pragma warning restore IDE0075 //Simplify conditional expression
+#pragma warning restore IDE0075
 
     private BindingManagerBase? _bindingManagerBase;
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
index 1f37e77320..11517414bc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
@@ -12,6 +12,11 @@ namespace System.Windows.Forms;
 /// </summary>
 public class ImageIndexConverter : Int32Converter
 {
+    [FeatureSwitchDefinition("System.Windows.Forms.ImageIndexConverter.IsSupported")]
+#pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
+    private static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.ImageIndexConverter.IsSupported", out bool isSupported) ? isSupported : true;
+#pragma warning restore IDE0075
+
     /// <summary>
     ///  Gets a value that indicates whether a <see langword="null" /> value is valid in
     ///  the <see cref="TypeConverter.StandardValuesCollection" /> collection.
@@ -83,9 +88,9 @@ public class ImageIndexConverter : Int32Converter
     /// </returns>
     public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext? context)
     {
-        if (!Control.EnableFeaturesNotSupportedWithTrimming)
+        if (!IsSupported)
         {
-            throw new NotSupportedException(SR.BindingNotSupported);
+            throw new NotSupportedException(SR.ImageIndexConverterNotSupported);
         }
 
         if (context is not null && context.Instance is not null)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index 9d48f13032..40eded8566 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -136,17 +136,33 @@ internal static class Formatter
         // type's TypeConverter.  We're punting the case where the property-provided converter is the same as the type's converter.
         Type sourceType = value.GetType();
 
-        // @TODO - We will register basic primitive types here but it would be optimal to move the registration to a start up path.
-        TypeDescriptor.RegisterType<string>();
-        TypeDescriptor.RegisterType<int>();
-        TypeDescriptor.RegisterType<bool>();
-        TypeConverter sourceTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(sourceType);
+        TypeConverter sourceTypeTypeConverter;
+        if (!Control.UseComponentModelRegisterTypes)
+        {
+            sourceTypeTypeConverter = TypeDescriptor.GetConverter(sourceType);
+        }
+        else
+        {
+            // Call the trim safe API
+            sourceTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(sourceType);
+        }
+
         if (sourceConverter is not null && sourceConverter != sourceTypeTypeConverter && sourceConverter.CanConvertTo(targetType))
         {
             return sourceConverter.ConvertTo(context: null, GetFormatterCulture(formatInfo), value, targetType);
         }
 
-        TypeConverter targetTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(targetType);
+        TypeConverter targetTypeTypeConverter;
+        if (!Control.UseComponentModelRegisterTypes)
+        {
+            targetTypeTypeConverter = TypeDescriptor.GetConverter(targetType);
+        }
+        else
+        {
+            // Call the trim safe API
+            targetTypeTypeConverter = TypeDescriptor.GetConverterFromRegisteredType(targetType);
+        }
+
         if (targetConverter is not null && targetConverter != targetTypeTypeConverter && targetConverter.CanConvertFrom(sourceType))
         {
             return targetConverter.ConvertFrom(context: null, GetFormatterCulture(formatInfo), value);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index d28e13d51a..a19fae6c97 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -11,6 +11,11 @@ internal sealed partial class MdiWindowDialog : Form
     private TableLayoutPanel _okCancelTableLayoutPanel;
     private Form? _active;
 
+    [FeatureSwitchDefinition("System.Windows.Forms.MdiWindowDialog.IsSupported")]
+#pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
+    private static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.MdiWindowDialog.IsSupported", out bool isSupported) ? isSupported : true;
+#pragma warning restore IDE0075
+
     public MdiWindowDialog()
         : base()
     {
@@ -74,9 +79,9 @@ internal sealed partial class MdiWindowDialog : Form
     [MemberNotNull(nameof(_okCancelTableLayoutPanel))]
     private void InitializeComponent()
     {
-        if (!Control.EnableFeaturesNotSupportedWithTrimming)
+        if (!IsSupported)
         {
-            throw new NotSupportedException(SR.BindingNotSupported);
+            throw new NotSupportedException(SR.MdiWindowDialogNotSupported);
         }
 
         System.ComponentModel.ComponentResourceManager resources = new(typeof(MdiWindowDialog));
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
index 3fb96ce72e..2418aca7d2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
@@ -466,8 +466,18 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
 
     void ISerializable.GetObjectData(SerializationInfo si, StreamingContext context)
     {
-        TypeDescriptor.RegisterType<TableLayoutSettings>();
-        TypeConverter converter = TypeDescriptor.GetConverterFromRegisteredType(this);
+        TypeConverter converter;
+        if (!Control.UseComponentModelRegisterTypes)
+        {
+            converter = TypeDescriptor.GetConverter(this);
+        }
+        else
+        {
+            // Call the trim safe API
+            TypeDescriptor.RegisterType<TableLayoutSettings>();
+            converter = TypeDescriptor.GetConverterFromRegisteredType(this);
+        }
+
         string? stringVal = converter.ConvertToInvariantString(this);
 
         if (!string.IsNullOrEmpty(stringVal))
@@ -486,7 +496,10 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
         {
             List<ControlInformation> controlsInfo = new(Owner!.Children.Count);
 
-            TypeDescriptor.RegisterType<Control>();
+            if (Control.UseComponentModelRegisterTypes)
+            {
+                TypeDescriptor.RegisterType<Control>();
+            }
 
             foreach (IArrangedElement element in Owner.Children)
             {
@@ -496,7 +509,17 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
 
                     // We need to go through the PropertyDescriptor for the Name property
                     // since it is shadowed.
-                    PropertyDescriptor? prop = TypeDescriptor.GetPropertiesFromRegisteredType(c)["Name"];
+                    PropertyDescriptor? prop;
+                    if (!Control.UseComponentModelRegisterTypes)
+                    {
+                        prop = TypeDescriptor.GetProperties(c)["Name"];
+                    }
+                    else
+                    {
+                        // Call the trim safe API
+                        prop = TypeDescriptor.GetPropertiesFromRegisteredType(c)["Name"];
+                    }
+
                     if (prop is not null && prop.PropertyType == typeof(string))
                     {
                         controlInfo.Name = prop.GetValue(c);
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj b/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
index bbcb598a8b..7bd52e772d 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
+++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
@@ -22,4 +22,50 @@
     <ProjectReference Include="..\..\..\src\System.Windows.Forms.csproj" />
   </ItemGroup>
 
+  <!-- feature switches for trimming-->
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.ComponentModel.Design.IDesignerHost.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeDescriptor.SupportsInstanceBasedDescriptors"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.ComponentModel.NullableConverter.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Binding.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.ComponentModel.DefaultValueAttribute.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeDescriptor.IsComObjectDescriptorSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Drawing.Design.UITypeEditor.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.ActiveXImpl.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.DesignTimeFeatures"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.MdiWindowDialog.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.ImageIndexConverter.IsSupported"
+                                    Value="false"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeConverterHelper.ComponentModelUseRegisterTypes"
+                                    Value="true"
+                                    Trim="true" />
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.ComponentModelUseRegisterTypes"
+                                    Value="true"
+                                    Trim="true" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file

From 883846bb0ebda652e6cb3e80d7b4a61646332cfc Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 24 May 2024 13:42:00 -0700
Subject: [PATCH 12/14] FB

---
 .../ComponentModel/TypeConverterHelper.cs     | 10 +++++--
 .../src/Resources/SR.resx                     | 15 ++--------
 .../src/Resources/xlf/SR.cs.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.de.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.es.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.fr.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.it.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.ja.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.ko.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.pl.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.pt-BR.xlf            | 29 +++++--------------
 .../src/Resources/xlf/SR.ru.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.tr.xlf               | 29 +++++--------------
 .../src/Resources/xlf/SR.zh-Hans.xlf          | 29 +++++--------------
 .../src/Resources/xlf/SR.zh-Hant.xlf          | 29 +++++--------------
 .../src/System/Drawing/Design/UITypeEditor.cs | 16 ++++++++--
 .../Forms/ActiveX/Control.ActiveXImpl.cs      | 12 +++++---
 .../src/System/Windows/Forms/Control.cs       | 19 ++++++++----
 .../Forms/Controls/Buttons/ButtonBase.cs      |  2 +-
 .../Forms/Controls/ListControl/ListControl.cs |  2 +-
 .../Controls/ToolStrips/OpacityConverter.cs   |  2 +-
 .../Controls/ToolStrips/ToolStripMenuItem.cs  |  2 +-
 .../Windows/Forms/DataBinding/Binding.cs      |  6 +++-
 .../Windows/Forms/ImageIndexConverter.cs      |  8 +++--
 .../Windows/Forms/Internal/Formatter.cs       |  4 +--
 .../Windows/Forms/MDI/MDIWindowDialog.cs      |  8 +++--
 ...bject.NativeDataObjectToWinFormsAdapter.cs |  5 +++-
 .../TableLayoutPanel/TableLayoutSettings.cs   |  6 ++--
 .../IntegrationTests/TrimTest/TrimTest.csproj | 20 +++----------
 29 files changed, 171 insertions(+), 343 deletions(-)

diff --git a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
index f947152281..6c4498e657 100644
--- a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
@@ -7,9 +7,13 @@ namespace System.ComponentModel;
 
 internal static class TypeConverterHelper
 {
-    [FeatureSwitchDefinition("System.ComponentModel.TypeConverterHelper.ComponentModelUseRegisterTypes")]
+    // Feature switch, when set to true, used for trimming to access ComponentModel in a trim safe manner
+    [FeatureSwitchDefinition("System.ComponentModel.TypeConverterHelper.UseComponentModelRegisteredTypes")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-    internal static bool UseComponentModelRegisterTypes { get; } = AppContext.TryGetSwitch("System.ComponentModel.TypeConverterHelper.ComponentModelUseRegisterTypes", out bool isEnabled) ? isEnabled : false;
+    private static bool UseComponentModelRegisteredTypes { get; } =
+        AppContext.TryGetSwitch("System.ComponentModel.TypeConverterHelper.UseComponentModelRegisteredTypes", out bool isEnabled)
+            ? isEnabled
+            : false;
 #pragma warning restore IDE0075
 
     /// <summary>
@@ -34,7 +38,7 @@ internal static class TypeConverterHelper
         }
 
         TypeConverter converter;
-        if (!UseComponentModelRegisterTypes)
+        if (!UseComponentModelRegisteredTypes)
         {
             converter = TypeDescriptor.GetConverter(typeof(T));
         }
diff --git a/src/System.Windows.Forms/src/Resources/SR.resx b/src/System.Windows.Forms/src/Resources/SR.resx
index dcce2e5b05..30ef02209f 100644
--- a/src/System.Windows.Forms/src/Resources/SR.resx
+++ b/src/System.Windows.Forms/src/Resources/SR.resx
@@ -6968,21 +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="UITypeEditorNotSupported" xml:space="preserve">
-    <value>Using the UITypeEditor is not supported.</value>
-  </data>
-  <data name="ActiveXNotSupported" xml:space="preserve">
-    <value>Using ActiveX is not supported.</value>
+  <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>
-  <data name="ImageIndexConverterNotSupported" xml:space="preserve">
-    <value>ImageIndexConverter is not supported.</value>
-  </data>
-  <data name="MdiWindowDialogNotSupported" xml:space="preserve">
-    <value>MdiWindowDialog is not supported.</value>
-  </data>
 </root>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf
index 3cfeefc0d1..c7eff3368f 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} nepodporuje vlastnost {1}. Musí to být přepsáno v odvozené třídě.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Ovládací prvky vytvořené v jednom vlákně nelze nadřadit ovládacím prvkům v jiném vlákně.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">Použití BinaryFormatter není podporováno.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">Použití BinaryFormatter není podporováno.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">Objekt child není podřízeným ovládacím prvkem tohoto nadřazeného objektu.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Vyvolá se, když je změněna vlastnost AutoSize.</target>
@@ -5734,11 +5734,6 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Vnitřní stav třídy {1} je neplatný.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Obrázek nelze přidat do seznamu ImageList.</target>
@@ -7069,11 +7064,6 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Určuje typ objektu, který se má použít k analýze vstupního textu v případě, že ovládací prvek ztratí fokus.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Klávesová zkratka přiřazená položce nabídky</target>
@@ -11024,11 +11014,6 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Ovládací prvky přidané do této kolekce musí být typu {0} nebo {1}.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Součást nelze inicializovat.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf
index 21f986724e..51f4f0bd5e 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} unterstützt {1} Eigenschaft nicht. Sie muss in der abgeleiteten Klasse überschrieben werden.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Steuerelemente, die für einen Thread erstellt wurden, können nicht einem Steuerelement in einem anderen Thread übergeordnet werden.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">Die Verwendung von BinaryFormatter wird nicht unterstützt.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">Die Verwendung von BinaryFormatter wird nicht unterstützt.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">"child" ist kein untergeordnetes Steuerelement dieses übergeordneten Elements.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Tritt ein, wenn sich die AutoSize-Eigenschaft geändert hat.</target>
@@ -5734,11 +5734,6 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Der interne Zustand der {1}-Klasse ist ungültig.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Das Bild konnte nicht zur ImageList hinzugefügt werden.</target>
@@ -7069,11 +7064,6 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Gibt den Typ des für die Analyse des Eingabetexts zu verwendenden Objekts an, wenn das Steuerelement den Fokus verliert.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Die dem Menüelement zugeordnete Tastenkombination. </target>
@@ -11024,11 +11014,6 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Steuerelemente, die dieser Sammlung hinzugefügt werden, müssen den Typ {0} oder {1} haben.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Die Komponente kann nicht initialisiert werden.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf
index 302fe832df..596790609f 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} no admite {1} propiedad. Debe reemplazarse en la clase derivada.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Los controles creados en un subproceso no pueden tener controles primarios en un control en un subproceso diferente.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">No se admite el uso de BinaryFormatter.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">No se admite el uso de BinaryFormatter.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'child' no es un control secundario de este primario.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Tiene lugar cuando la propiedad AutoSize ha cambiado.</target>
@@ -5734,11 +5734,6 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">El estado interno de la clase {1} no es válido.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">No se puede agregar la imagen a ImageList.</target>
@@ -7069,11 +7064,6 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">Especifica el tipo del objeto que se va a utilizar para analizar el texto de entrada cuando el control pierde el foco.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Tecla de método abreviado asociada al elemento de menú. </target>
@@ -11024,11 +11014,6 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">Los controles que se agregan a esta colección deben ser de tipo '{0}' o '{1}'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">No se puede inicializar el componente.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf
index 9e1d861318..c48d441d8d 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} ne prend pas en charge {1} la propriété. Il doit être remplacé dans la classe dérivée.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Les contrôles créés sur un thread ne peuvent pas être parents d'un contrôle d'un autre thread.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">L’utilisation de BinaryFormatter n’est pas prise en charge.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">L’utilisation de BinaryFormatter n’est pas prise en charge.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'child' n'est pas un contrôle enfant de ce parent.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Se produit lorsque la propriété AutoSize est modifiée.</target>
@@ -5734,11 +5734,6 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">L'état interne de la classe {1} n'est pas valide.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">L'image ne peut pas être ajoutée à l'ImageList.</target>
@@ -7069,11 +7064,6 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">Spécifie le Type de l'objet à utiliser pour l'analyse du texte d'entrée lorsque le contrôle perd le focus.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">La touche de raccourci associée à l'élément de menu. </target>
@@ -11024,11 +11014,6 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">Les contrôles ajoutés à cette collection doivent être de type '{0}' ou '{1}'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Impossible d'initialiser le composant.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf
index 20b81beeac..1e3f4b2d39 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} non supporta la proprietà {1}. È necessario eseguire l'override sulla classe derivata.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">I controlli creati su un thread non possono avere come elemento padre un controllo su un thread diverso.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">L'uso di BinaryFormatter non è supportato.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">L'uso di BinaryFormatter non è supportato.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'child' non è un controllo figlio di questo elemento.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Generato alla modifica della proprietà AutoSize.</target>
@@ -5734,11 +5734,6 @@ Traccia dello stack da cui si è verificata l'operazione non valida:
         <target state="translated">Stato interno della classe {1} non valido.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Impossibile aggiungere l'immagine a ImageList.</target>
@@ -7069,11 +7064,6 @@ Traccia dello stack da cui si è verificata l'operazione non valida:
         <target state="translated">Specifica il tipo di oggetto da utilizzare per l'analisi del testo di input quando il controllo perde lo stato attivo.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Il tasto di scelta rapida associato alla voce di menu. </target>
@@ -11024,11 +11014,6 @@ Traccia dello stack da cui si è verificata l'operazione non valida:
         <target state="translated">I controlli aggiunti alla raccolta devono essere di tipo '{0}' o '{1}'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Impossibile inizializzare il componente.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf
index da9d186528..53ad806ede 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} は {1} プロパティをサポートしていません。派生クラスでオーバーライドする必要があります。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">あるスレッドで作成されたコントロールに対して、別のスレッドのコントロールを親にすることはできません。</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">BinaryFormatter の使用はサポートされていません。</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">BinaryFormatter の使用はサポートされていません。</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'子' はこの親の子コントロールではありません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">AutoSize プロパティが変更したときに発生します。</target>
@@ -5734,11 +5734,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} クラスの内部の状態は有効ではありません</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">イメージを ImageList に追加できませんでした。</target>
@@ -7069,11 +7064,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">コントロールがフォーカスを失ったときに、入力テキストを解析するために使用されるオブジェクトの型を指定します。</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">メニュー項目に関連付けられたショートカット キーです。</target>
@@ -11024,11 +11014,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">このコレクションに追加されたコントロールには型 '{0}' または '{1}' を指定しなければなりません。</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">コンポーネントを初期化できません。</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf
index da6a78ff8d..560ef573cf 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0}에서 {1} 속성을 지원하지 않습니다. 파생 클래스에서 재정의해야 합니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">한 스레드에 만든 컨트롤은 다른 스레드에 있는 컨트롤의 부모가 될 수 없습니다.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">BinaryFormatter 사용은 지원되지 않습니다.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">BinaryFormatter 사용은 지원되지 않습니다.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'child'는 이 부모의 자식 컨트롤이 아닙니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">AutoSize 속성이 변경되면 발생합니다.</target>
@@ -5734,11 +5734,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} 클래스의 내부 상태가 잘못되었습니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">이미지를 ImageList에 추가할 수 없습니다.</target>
@@ -7069,11 +7064,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">컨트롤이 포커스를 잃을 때 입력 텍스트를 구문 분석하는 데 사용할 개체의 형식을 지정합니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">메뉴 항목에 연결된 바로 가기 키입니다.</target>
@@ -11024,11 +11014,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">이 컬렉션에 추가된 컨트롤은 '{0}' 또는 '{1}' 형식이어야 합니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">구성 요소를 초기화할 수 없습니다.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf
index 2eecedcfcb..a23be18f17 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} nie obsługuje właściwości {1}. Musi zostać zastąpiona w klasie pochodnej.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Formanty utworzone w jednym wątku nie mogą być nadrzędne w stosunku do formantów w innym wątku.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">Używanie elementu BinaryFormatter nie jest obsługiwane.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">Używanie elementu BinaryFormatter nie jest obsługiwane.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">Element 'child' nie jest formantem podrzędnym dla tego formantu.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Występuje, gdy właściwość AutoSize zostanie zmieniona.</target>
@@ -5734,11 +5734,6 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Wewnętrzny stan klasy {1} jest nieprawidłowy.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Nie można dodać obrazu do elementu ImageList.</target>
@@ -7069,11 +7064,6 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Określa typ obiektu używanego do analizowania tekstu wejściowego, gdy formant utraci fokus.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Klawisz skrótu skojarzony z elementem menu. </target>
@@ -11024,11 +11014,6 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Formanty dodane do tej kolekcji muszą być typu „{0}” lub „{1}”.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Nie można zainicjować składnika.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf
index 39c2529b84..97771b571f 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} não dá suporte à propriedade {1}. Ele deve ser substituído na classe derivada.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Os controles criados em um thread não podem ser controles pai de um controle em um outro thread.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">Não há suporte para o uso do BinaryFormatter.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">Não há suporte para o uso do BinaryFormatter.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'child' não é um controle filho deste pai.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Ocorre quando a propriedade AutoSize é alterada.</target>
@@ -5734,11 +5734,6 @@ Rastreamento de pilha em que a operação ilegal ocorreu:
         <target state="translated">O estado interno da classe {1} é inválido.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">A imagem não pode ser adicionada a ImageList.</target>
@@ -7069,11 +7064,6 @@ Rastreamento de pilha em que a operação ilegal ocorreu:
         <target state="translated">Especifica o Tipo de objeto a ser usado para análise do texto de entrada quando o controle perde o foco.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">A tecla de atalho associada ao item de menu. </target>
@@ -11024,11 +11014,6 @@ Rastreamento de pilha em que a operação ilegal ocorreu:
         <target state="translated">Os controles adicionados à coleção devem ser do tipo '{0}' ou '{1}'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Não é possível inicializar componente.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf
index e07d76e7b0..a70b3b9cb8 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} не поддерживает свойство {1}. Его необходимо переопределить в производном классе.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Элементы управления, созданные в одном потоке, не могут быть родительскими для элемента управления в другом потоке.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">Использование BinaryFormatter не поддерживается.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">Использование BinaryFormatter не поддерживается.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'child' не является дочерним элементом управления этого родительского элемента.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">Возникает при изменении свойства AutoSize.</target>
@@ -5735,11 +5735,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Недопустимое внутреннее состояние класса {1}.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Добавление изображения к ImageList невозможно.</target>
@@ -7070,11 +7065,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Указывает Type для объекта, который будет использоваться для разбора вводимого текста при потере фокуса элементом управления.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Указывает клавиши быстрого доступа к данному меню.</target>
@@ -11025,11 +11015,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Элементы управления, добавляемые к данной коллекции, должны иметь тип '{0}' или '{1}'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Не удалось инициализировать компонент.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf
index 556bc31cb8..aaaa8f5ace 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0}, {1} özelliğini desteklemez. Türetilmiş sınıfta geçersiz kılınmalıdır.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">Bir iş parçacığında oluşturulan denetimler, farklı bir iş parçacığındaki denetimin üst öğesi yapılamaz.</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">BinaryFormatter kullanımı desteklenmiyor.</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">BinaryFormatter kullanımı desteklenmiyor.</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'alt' bu üstün alt denetimi değil.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">AutoSize özelliği değiştiğinde gerçekleşir.</target>
@@ -5734,11 +5734,6 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">{1} sınıfının iç durumu geçerli değil.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">Resim ImageList'e eklenemiyor.</target>
@@ -7069,11 +7064,6 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">Denetim odağı kaybettiğinde giriş metnini ayrıştırmak için kullanılacak nesnenin türünü belirtir.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">Menü öğesiyle ilişkili kısayol tuşu. </target>
@@ -11024,11 +11014,6 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">Bu koleksiyona eklenen denetimlerin '{0}' veya '{1}' türünde olması gerekir.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">Bileşen başlatılamıyor.</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf
index c7e8bec731..a576ececcf 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} 不支持 {1} 属性。必须在派生类中重写它。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">在某个线程上创建的控件不能成为在另一个线程上创建的控件的父级。</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">不支持使用 BinaryFormatter。</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">不支持使用 BinaryFormatter。</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">“child”不是此父级的子控件。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">在 AutoSize 属性更改时发生。</target>
@@ -5734,11 +5734,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} 类的内部状态无效。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">无法将图像添加到 ImageList。</target>
@@ -7069,11 +7064,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">指定当控件失去焦点时用于分析输入文本的对象的类型。</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">与菜单项关联的快捷键。</target>
@@ -11024,11 +11014,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">添加到此集合的控件必须为“{0}”或“{1}”类型。</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">无法初始化组件。</target>
diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf
index 05a2ef4617..279724c819 100644
--- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf
@@ -227,11 +227,6 @@
         <target state="translated">{0} 不支援 {1} 屬性。必須在衍生類別中加以覆寫。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ActiveXNotSupported">
-        <source>Using ActiveX is not supported.</source>
-        <target state="new">Using ActiveX is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="AddDifferentThreads">
         <source>Controls created on one thread cannot be parented to a control on a different thread.</source>
         <target state="translated">不可以在不同執行緒上建立控制項的父項。</target>
@@ -293,8 +288,8 @@
         <note />
       </trans-unit>
       <trans-unit id="BinaryFormatterNotSupported">
-        <source>Using the BinaryFormatter is not supported.</source>
-        <target state="translated">不支援使用 BinaryFormatter。</target>
+        <source>Using the BinaryFormatter is not supported in trimmed applications.</source>
+        <target state="needs-review-translation">不支援使用 BinaryFormatter。</target>
         <note />
       </trans-unit>
       <trans-unit id="BindableComponentBindingContextChangedDescr">
@@ -1667,6 +1662,11 @@
         <target state="translated">'child' 不是此父系的子控制項。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlNotSupportedInTrimming">
+        <source>'{0}' is not supported in trimmed applications.</source>
+        <target state="new">'{0}' is not supported in trimmed applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlOnAutoSizeChangedDescr">
         <source>Occurs when the AutoSize property has changed.</source>
         <target state="translated">當 AutoSize 屬性變更時發生。</target>
@@ -5734,11 +5734,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">{1} 類別的內部狀態無效。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ImageIndexConverterNotSupported">
-        <source>ImageIndexConverter is not supported.</source>
-        <target state="new">ImageIndexConverter is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ImageListAddFailed">
         <source>Image cannot be added to the ImageList.</source>
         <target state="translated">無法將影像加入 ImageList。</target>
@@ -7069,11 +7064,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">指定當控制項遺失焦點時，用來剖析輸入文字的物件類型。</target>
         <note />
       </trans-unit>
-      <trans-unit id="MdiWindowDialogNotSupported">
-        <source>MdiWindowDialog is not supported.</source>
-        <target state="new">MdiWindowDialog is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MenuItemShortCutDescr">
         <source>The shortcut key associated with the menu item. </source>
         <target state="translated">與功能表項目相關的快速鍵。</target>
@@ -11024,11 +11014,6 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">加入此集合的控制項必須屬於 '{0}' 或 '{1}' 類型。</target>
         <note />
       </trans-unit>
-      <trans-unit id="UITypeEditorNotSupported">
-        <source>Using the UITypeEditor is not supported.</source>
-        <target state="new">Using the UITypeEditor is not supported.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UnableToInitComponent">
         <source>Unable to initialize component.</source>
         <target state="translated">無法初始化元件。</target>
diff --git a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
index 103b3ccf93..32840c5858 100644
--- a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
+++ b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
@@ -14,9 +14,13 @@ namespace System.Drawing.Design;
 /// </summary>
 public class UITypeEditor
 {
+    // Feature switch, when set to false, UITypeEditor is not supported in trimmed applications.
     [FeatureSwitchDefinition("System.Drawing.Design.UITypeEditor.IsSupported")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-    private static bool IsSupported => AppContext.TryGetSwitch("System.Drawing.Design.UITypeEditor.IsSupported", out bool isSupported) ? isSupported : true;
+    private static bool IsSupported { get; } =
+        AppContext.TryGetSwitch("System.Drawing.Design.UITypeEditor.IsSupported", out bool isSupported)
+            ? isSupported
+            : true;
 #pragma warning restore IDE0075
 
     static UITypeEditor()
@@ -50,13 +54,21 @@ public class UITypeEditor
 
         if (!IsSupported)
         {
-            throw new NotSupportedException(SR.UITypeEditorNotSupported);
+            return;
         }
 
         // Add our intrinsic editors to TypeDescriptor.
         TypeDescriptor.AddEditorTable(typeof(UITypeEditor), intrinsicEditors);
     }
 
+    public UITypeEditor()
+    {
+        if (!IsSupported)
+        {
+            throw new NotSupportedException(string.Format(SR.ControlNotSupportedInTrimming, nameof(UITypeEditor)));
+        }
+    }
+
     /// <summary>
     ///  Determines if drop-down editors should be resizable by the user.
     /// </summary>
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
index ae22530936..0d13bf9afc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs
@@ -136,9 +136,13 @@ public partial class Control
         private short _accelCount = -1;
         private RECT* _adjustRect; // temporary rect used during OnPosRectChange && SetObjectRects
 
+        // Feature switch, when set to false, ActiveX is not supported in trimmed applications.
         [FeatureSwitchDefinition("System.Windows.Forms.ActiveXImpl.IsSupported")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-        private static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.ActiveXImpl.IsSupported", out bool isSupported) ? isSupported : true;
+        private static bool IsSupported { get; } =
+            AppContext.TryGetSwitch("System.Windows.Forms.ActiveXImpl.IsSupported", out bool isSupported)
+                ? isSupported
+                : true;
 #pragma warning restore IDE0075
 
         /// <summary>
@@ -1042,7 +1046,7 @@ public partial class Control
         {
             if (!IsSupported)
             {
-                throw new NotSupportedException(SR.ActiveXNotSupported);
+                throw new NotSupportedException(string.Format(SR.ControlNotSupportedInTrimming, nameof(ActiveXImpl)));
             }
 
             PropertyDescriptorCollection props = TypeDescriptor.GetProperties(
@@ -1437,7 +1441,7 @@ public partial class Control
 
                 if (!IsSupported)
                 {
-                    throw new NotSupportedException(SR.ActiveXNotSupported);
+                    throw new NotSupportedException(string.Format(SR.ControlNotSupportedInTrimming, nameof(ActiveXImpl)));
                 }
 
                 // Get the first declared interface, if any.
@@ -1491,7 +1495,7 @@ public partial class Control
         {
             if (!IsSupported)
             {
-                throw new NotSupportedException(SR.ActiveXNotSupported);
+                throw new NotSupportedException(string.Format(SR.ControlNotSupportedInTrimming, nameof(ActiveXImpl)));
             }
 
             PropertyDescriptorCollection props = TypeDescriptor.GetProperties(
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index 5c5b21b4ed..a2a345ccd0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -56,11 +56,20 @@ public unsafe partial class Control :
         "Makes double buffered controls non-double buffered");
 #endif
 
-    [FeatureSwitchDefinition("System.Windows.Forms.Control.DesignTimeFeatures")]
+    // Feature switch, when set to false, design time features of controls are not supported in trimmed applications.
+    [FeatureSwitchDefinition("System.Windows.Forms.Control.AreDesignTimeFeaturesSupported")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-    internal static bool EnableDesignTimeFeatures { get; } = AppContext.TryGetSwitch("System.Windows.Forms.Control.FeatureNotSupportedWithTrimming", out bool isEnabled) ? isEnabled : true;
-    [FeatureSwitchDefinition("System.Windows.Forms.Control.ComponentModelUseRegisterTypes")]
-    internal static bool UseComponentModelRegisterTypes { get; } = AppContext.TryGetSwitch("System.Windows.Forms.Control.ComponentModelUseRegisterTypes", out bool isEnabled) ? isEnabled : false;
+    internal static bool AreDesignTimeFeaturesSupported { get; } =
+        AppContext.TryGetSwitch("System.Windows.Forms.Control.AreDesignTimeFeaturesSupported", out bool isEnabled)
+            ? isEnabled
+            : true;
+
+    // Feature switch, when set to true, used for trimming to access ComponentModel in a trim safe manner
+    [FeatureSwitchDefinition("System.Windows.Forms.Control.UseComponentModelRegisteredTypes")]
+    internal static bool UseComponentModelRegisteredTypes { get; } =
+        AppContext.TryGetSwitch("System.Windows.Forms.Control.UseComponentModelRegisteredTypes", out bool isEnabled)
+            ? isEnabled
+            : false;
 #pragma warning restore IDE0075
 
     private static readonly uint WM_GETCONTROLNAME = PInvoke.RegisterWindowMessage("WM_GETCONTROLNAME");
@@ -13023,7 +13032,7 @@ public unsafe partial class Control :
 
         if (site is not null && site.DesignMode && site.TryGetService(out changeService))
         {
-            if (!EnableDesignTimeFeatures)
+            if (!AreDesignTimeFeaturesSupported)
             {
                 throw new NotSupportedException(SR.DesignTimeFeaturesNotSupported);
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index 17b43301a6..6ceb9b5a71 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -155,7 +155,7 @@ public abstract partial class ButtonBase : Control, ICommandBindingTargetProvide
             {
                 if (value != Color.Empty)
                 {
-                    if (!EnableDesignTimeFeatures)
+                    if (!AreDesignTimeFeaturesSupported)
                     {
                         throw new NotSupportedException(SR.DesignTimeFeaturesNotSupported);
                     }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
index 957bd67ed9..47a1bb7b32 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListControl/ListControl.cs
@@ -537,7 +537,7 @@ public abstract class ListControl : Control
         }
 
         // Try Formatter.FormatObject
-        if (!UseComponentModelRegisterTypes)
+        if (!UseComponentModelRegisteredTypes)
         {
             s_stringTypeConverter ??= TypeDescriptor.GetConverter(typeof(string));
         }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
index 9641174925..44873ec40e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/OpacityConverter.cs
@@ -45,7 +45,7 @@ public class OpacityConverter : TypeConverter
             double percent;
             try
             {
-                if (!Control.UseComponentModelRegisterTypes)
+                if (!Control.UseComponentModelRegisteredTypes)
                 {
                     percent = (double)TypeDescriptor.GetConverter(typeof(double)).ConvertFrom(context, culture, text)!;
                 }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
index 22fc1da3ba..9451cb15fe 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
@@ -1108,7 +1108,7 @@ public partial class ToolStripMenuItem : ToolStripDropDownItem
             return string.Empty;
         }
 
-        if (!Control.UseComponentModelRegisterTypes)
+        if (!Control.UseComponentModelRegisteredTypes)
         {
             return TypeDescriptor.GetConverter(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
         }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs
index 4bfddac89b..feb69b7671 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataBinding/Binding.cs
@@ -12,9 +12,13 @@ namespace System.Windows.Forms;
 [TypeConverter(typeof(ListBindingConverter))]
 public partial class Binding
 {
+    // Feature switch, when set to false, binding is not supported in trimmed applications.
     [FeatureSwitchDefinition("System.Windows.Forms.Binding.IsSupported")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-    internal static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.Binding.IsSupported", out bool isSupported) ? isSupported : true;
+    internal static bool IsSupported { get; } =
+        AppContext.TryGetSwitch("System.Windows.Forms.Binding.IsSupported", out bool isSupported)
+            ? isSupported
+            : true;
 #pragma warning restore IDE0075
 
     private BindingManagerBase? _bindingManagerBase;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
index 11517414bc..c215332af2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs
@@ -12,9 +12,13 @@ namespace System.Windows.Forms;
 /// </summary>
 public class ImageIndexConverter : Int32Converter
 {
+    // Feature switch, when set to false, ImageIndexConverter is not supported in trimmed applications.
     [FeatureSwitchDefinition("System.Windows.Forms.ImageIndexConverter.IsSupported")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-    private static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.ImageIndexConverter.IsSupported", out bool isSupported) ? isSupported : true;
+    private static bool IsSupported { get; } =
+        AppContext.TryGetSwitch("System.Windows.Forms.ImageIndexConverter.IsSupported", out bool isSupported)
+            ? isSupported
+            : true;
 #pragma warning restore IDE0075
 
     /// <summary>
@@ -90,7 +94,7 @@ public class ImageIndexConverter : Int32Converter
     {
         if (!IsSupported)
         {
-            throw new NotSupportedException(SR.ImageIndexConverterNotSupported);
+            throw new NotSupportedException(string.Format(SR.ControlNotSupportedInTrimming, nameof(ImageIndexConverter)));
         }
 
         if (context is not null && context.Instance is not null)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
index 40eded8566..bd2f770d1d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Formatter.cs
@@ -137,7 +137,7 @@ internal static class Formatter
         Type sourceType = value.GetType();
 
         TypeConverter sourceTypeTypeConverter;
-        if (!Control.UseComponentModelRegisterTypes)
+        if (!Control.UseComponentModelRegisteredTypes)
         {
             sourceTypeTypeConverter = TypeDescriptor.GetConverter(sourceType);
         }
@@ -153,7 +153,7 @@ internal static class Formatter
         }
 
         TypeConverter targetTypeTypeConverter;
-        if (!Control.UseComponentModelRegisterTypes)
+        if (!Control.UseComponentModelRegisteredTypes)
         {
             targetTypeTypeConverter = TypeDescriptor.GetConverter(targetType);
         }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
index a19fae6c97..ab15190cf4 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MDI/MDIWindowDialog.cs
@@ -11,9 +11,13 @@ internal sealed partial class MdiWindowDialog : Form
     private TableLayoutPanel _okCancelTableLayoutPanel;
     private Form? _active;
 
+    // Feature switch, when set to false, MdiWindowDialog is not supported in trimmed applications.
     [FeatureSwitchDefinition("System.Windows.Forms.MdiWindowDialog.IsSupported")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-    private static bool IsSupported => AppContext.TryGetSwitch("System.Windows.Forms.MdiWindowDialog.IsSupported", out bool isSupported) ? isSupported : true;
+    private static bool IsSupported { get; } =
+        AppContext.TryGetSwitch("System.Windows.Forms.MdiWindowDialog.IsSupported", out bool isSupported)
+            ? isSupported
+            : true;
 #pragma warning restore IDE0075
 
     public MdiWindowDialog()
@@ -81,7 +85,7 @@ internal sealed partial class MdiWindowDialog : Form
     {
         if (!IsSupported)
         {
-            throw new NotSupportedException(SR.MdiWindowDialogNotSupported);
+            throw new NotSupportedException(string.Format(SR.ControlNotSupportedInTrimming, nameof(MdiWindowDialog)));
         }
 
         System.ComponentModel.ComponentResourceManager resources = new(typeof(MdiWindowDialog));
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs
index 7cba3de8ad..eac17f197f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.ComposedDataObject.NativeDataObjectToWinFormsAdapter.cs
@@ -16,9 +16,12 @@ public unsafe partial class DataObject
 {
     internal unsafe partial class ComposedDataObject
     {
+        // Feature switch, when set to false, BinaryFormatter is not supported in trimmed applications.
+        // This field, using the default BinaryFormatter switch, is used to control trim warnings related to using BinaryFormatter in WinForms trimming.
+        // The trimmer will generate a warning when set to true and will not generate a warning when set to false.
         [FeatureSwitchDefinition("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization")]
 #pragma warning disable IDE0075 // Simplify conditional expression - the simpler expression is hard to read
-        private static bool EnableUnsafeBinaryFormatterInNativeObjectSerialization { get; } =
+        internal static bool EnableUnsafeBinaryFormatterInNativeObjectSerialization { get; } =
             AppContext.TryGetSwitch("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization", out bool isEnabled)
                 ? isEnabled
                 : true;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
index 2418aca7d2..03df7cf50e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.cs
@@ -467,7 +467,7 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
     void ISerializable.GetObjectData(SerializationInfo si, StreamingContext context)
     {
         TypeConverter converter;
-        if (!Control.UseComponentModelRegisterTypes)
+        if (!Control.UseComponentModelRegisteredTypes)
         {
             converter = TypeDescriptor.GetConverter(this);
         }
@@ -496,7 +496,7 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
         {
             List<ControlInformation> controlsInfo = new(Owner!.Children.Count);
 
-            if (Control.UseComponentModelRegisterTypes)
+            if (Control.UseComponentModelRegisteredTypes)
             {
                 TypeDescriptor.RegisterType<Control>();
             }
@@ -510,7 +510,7 @@ public sealed partial class TableLayoutSettings : LayoutSettings, ISerializable
                     // We need to go through the PropertyDescriptor for the Name property
                     // since it is shadowed.
                     PropertyDescriptor? prop;
-                    if (!Control.UseComponentModelRegisterTypes)
+                    if (!Control.UseComponentModelRegisteredTypes)
                     {
                         prop = TypeDescriptor.GetProperties(c)["Name"];
                     }
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj b/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
index 7bd52e772d..54fcf0a6d4 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
+++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
@@ -27,43 +27,31 @@
     <RuntimeHostConfigurationOption Include="System.ComponentModel.Design.IDesignerHost.IsSupported"
                                     Value="false"
                                     Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeDescriptor.SupportsInstanceBasedDescriptors"
-                                    Value="false"
-                                    Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.ComponentModel.NullableConverter.IsSupported"
-                                    Value="false"
-                                    Trim="true" />
     <RuntimeHostConfigurationOption Include="System.Windows.Forms.Binding.IsSupported"
                                     Value="false"
                                     Trim="true" />
     <RuntimeHostConfigurationOption Include="System.ComponentModel.DefaultValueAttribute.IsSupported"
                                     Value="false"
                                     Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeDescriptor.IsComObjectDescriptorSupported"
-                                    Value="false"
-                                    Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization"
-                                    Value="false"
-                                    Trim="true" />
     <RuntimeHostConfigurationOption Include="System.Drawing.Design.UITypeEditor.IsSupported"
                                     Value="false"
                                     Trim="true" />
     <RuntimeHostConfigurationOption Include="System.Windows.Forms.ActiveXImpl.IsSupported"
                                     Value="false"
                                     Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.DesignTimeFeatures"
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.AreDesignTimeFeaturesSupported"
                                     Value="false"
                                     Trim="true" />
     <RuntimeHostConfigurationOption Include="System.Windows.Forms.MdiWindowDialog.IsSupported"
                                     Value="false"
                                     Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.Windows.Forms.ImageIndexConverter.IsSupported"
+     <RuntimeHostConfigurationOption Include="System.Windows.Forms.ImageIndexConverter.IsSupported"
                                     Value="false"
                                     Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeConverterHelper.ComponentModelUseRegisterTypes"
+    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeConverterHelper.UseComponentModelRegisteredTypes"
                                     Value="true"
                                     Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.ComponentModelUseRegisterTypes"
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.UseComponentModelRegisteredTypes"
                                     Value="true"
                                     Trim="true" />
   </ItemGroup>

From 473bf8093b74e118989de107e5976866ae9ca25c Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Wed, 29 May 2024 11:02:36 -0700
Subject: [PATCH 13/14] Change namespace for a switch and move some tests to a
 different project

---
 .../ComponentModel/TypeConverterHelper.cs     |  4 +-
 .../src/System/Drawing/Design/UITypeEditor.cs | 11 ++--
 .../Control.ActiveXImplTests.cs               | 61 +++++++++++++++++++
 .../IntegrationTests/TrimTest/TrimTest.csproj |  2 +-
 .../Windows/Forms/Control.ActiveXImplTests.cs | 24 --------
 5 files changed, 70 insertions(+), 32 deletions(-)
 create mode 100644 src/System.Windows.Forms/tests/ComDisabledTests/Control.ActiveXImplTests.cs

diff --git a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
index 6c4498e657..ee06aa1fdf 100644
--- a/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/ComponentModel/TypeConverterHelper.cs
@@ -8,10 +8,10 @@ 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.ComponentModel.TypeConverterHelper.UseComponentModelRegisteredTypes")]
+    [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.ComponentModel.TypeConverterHelper.UseComponentModelRegisteredTypes", out bool isEnabled)
+        AppContext.TryGetSwitch("System.Windows.Forms.Primitives.TypeConverterHelper.UseComponentModelRegisteredTypes", out bool isEnabled)
             ? isEnabled
             : false;
 #pragma warning restore IDE0075
diff --git a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
index 32840c5858..98b8c0c073 100644
--- a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
+++ b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
@@ -25,6 +25,12 @@ public class UITypeEditor
 
     static UITypeEditor()
     {
+        // Trimming doesn't support UITypeEditor
+        if (!IsSupported)
+        {
+            return;
+        }
+
         // Our set of intrinsic editors.
         Hashtable intrinsicEditors = new Hashtable
         {
@@ -52,11 +58,6 @@ public class UITypeEditor
             [typeof(Metafile)] = $"System.Drawing.Design.MetafileEditor, {AssemblyRef.SystemDrawingDesign}",
         };
 
-        if (!IsSupported)
-        {
-            return;
-        }
-
         // Add our intrinsic editors to TypeDescriptor.
         TypeDescriptor.AddEditorTable(typeof(UITypeEditor), intrinsicEditors);
     }
diff --git a/src/System.Windows.Forms/tests/ComDisabledTests/Control.ActiveXImplTests.cs b/src/System.Windows.Forms/tests/ComDisabledTests/Control.ActiveXImplTests.cs
new file mode 100644
index 0000000000..86087a502b
--- /dev/null
+++ b/src/System.Windows.Forms/tests/ComDisabledTests/Control.ActiveXImplTests.cs
@@ -0,0 +1,61 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections;
+using System.Runtime.Serialization;
+using Windows.Win32.Foundation;
+using Windows.Win32.System.Com;
+
+namespace System.Windows.Forms.Tests;
+
+public unsafe partial class Control_ActiveXImplTests
+{
+    [WinFormsFact]
+    public void ActiveXImpl_SaveLoad_BinaryFormatterProperty_FormatterEnabled()
+    {
+        using MyControl control = new();
+
+        // We need to have a type that doesn't have a TypeConverter that implements ISerializable to hit the
+        // BinaryFormatter code path.
+        SerializableStruct myValue = new() { Value = "HelloThere" };
+        control.SerializableValue = myValue;
+        IPersistStreamInit.Interface persistStream = control;
+
+        using MemoryStream memoryStream = new();
+        using var istream = memoryStream.ToIStream();
+        HRESULT hr = persistStream.Save(istream.Value, fClearDirty: BOOL.FALSE);
+        Assert.True(hr.Succeeded);
+        control.SerializableValue = default;
+
+        istream.Value->Seek(0, SeekOrigin.Begin);
+        hr = persistStream.Load(istream.Value);
+        Assert.True(hr.Succeeded);
+        Assert.Equal(myValue, control.SerializableValue);
+    }
+
+    private class MyControl : Control
+    {
+        public SerializableStruct SerializableValue { get; set; }
+    }
+
+    private class BinaryFormatterPropertiesControl : Control
+    {
+        public Hashtable Table { get; set; }
+    }
+
+    [Serializable]
+    public struct SerializableStruct : ISerializable
+    {
+        public string Value { get; set; }
+
+        public readonly void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue(nameof(Value), Value, typeof(string));
+        }
+
+        private SerializableStruct(SerializationInfo serializationInfo, StreamingContext streamingContext)
+        {
+            Value = (string)serializationInfo.GetValue(nameof(Value), typeof(string));
+        }
+    }
+}
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj b/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
index 54fcf0a6d4..f71fe3efc2 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
+++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTest/TrimTest.csproj
@@ -48,7 +48,7 @@
      <RuntimeHostConfigurationOption Include="System.Windows.Forms.ImageIndexConverter.IsSupported"
                                     Value="false"
                                     Trim="true" />
-    <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeConverterHelper.UseComponentModelRegisteredTypes"
+    <RuntimeHostConfigurationOption Include="System.Windows.Forms.Primitives.TypeConverterHelper.UseComponentModelRegisteredTypes"
                                     Value="true"
                                     Trim="true" />
     <RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.UseComponentModelRegisteredTypes"
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ActiveXImplTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ActiveXImplTests.cs
index 820fdb84e1..d93546c542 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ActiveXImplTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ActiveXImplTests.cs
@@ -32,30 +32,6 @@ public unsafe class Control_ActiveXImplTests
         Assert.Equal(Color.Bisque, control.BackColor);
     }
 
-    [WinFormsFact]
-    public void ActiveXImpl_SaveLoad_BinaryFormatterProperty_FormatterEnabled()
-    {
-        using BinaryFormatterScope formatterScope = new(enable: true);
-        using MyControl control = new();
-
-        // We need to have a type that doesn't have a TypeConverter that implements ISerializable to hit the
-        // BinaryFormatter code path.
-        SerializableStruct myValue = new() { Value = "HelloThere" };
-        control.SerializableValue = myValue;
-        IPersistStreamInit.Interface persistStream = control;
-
-        using MemoryStream memoryStream = new();
-        using var istream = memoryStream.ToIStream();
-        HRESULT hr = persistStream.Save(istream.Value, fClearDirty: BOOL.FALSE);
-        Assert.True(hr.Succeeded);
-        control.SerializableValue = default;
-
-        istream.Value->Seek(0, SeekOrigin.Begin);
-        hr = persistStream.Load(istream.Value);
-        Assert.True(hr.Succeeded);
-        Assert.Equal(myValue, control.SerializableValue);
-    }
-
     [WinFormsFact]
     public void ActiveXImpl_SaveLoad_BinaryFormatterProperty_FormatterDisabled()
     {

From 4b073f2a28d76d428c2e6b38bbc9a487bd426834 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Tue, 4 Jun 2024 09:33:28 -0700
Subject: [PATCH 14/14] Moving CM type registration to Initialize()

---
 .../Forms/Controls/ToolStrips/ToolStripMenuItem.cs       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
index 9451cb15fe..d9c732a1ce 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
@@ -196,6 +196,12 @@ public partial class ToolStripMenuItem : ToolStripDropDownItem
 
     private void Initialize()
     {
+        if (Control.UseComponentModelRegisteredTypes)
+        {
+            // Register the type with the ComponentModel so as to be trim safe
+            TypeDescriptor.RegisterType<Keys>();
+        }
+
         Overflow = ToolStripItemOverflow.Never;
         MouseDownAndUpMustBeInSameItem = false;
         SupportsDisabledHotTracking = true;
@@ -1114,8 +1120,7 @@ public partial class ToolStripMenuItem : ToolStripDropDownItem
         }
         else
         {
-            // Call the trim safe API
-            TypeDescriptor.RegisterType<Keys>();
+            // Call the trim safe API, Keys type has been registered at Initialize()
             return TypeDescriptor.GetConverterFromRegisteredType(typeof(Keys)).ConvertToString(context: null, CultureInfo.CurrentUICulture, shortcutKeys);
         }
     }