diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs index b08f16cd9ae349..874fa6e2e7d03e 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs @@ -8,6 +8,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; +using System.Runtime.InteropServices; using System.Threading; namespace System.ComponentModel @@ -1541,6 +1542,17 @@ private static TypeDescriptionNode NodeFor(object instance, bool createDelegator { type = ComObjectType; } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) + && ComWrappers.TryGetComInstance(instance, out nint unknown)) + { + // ComObjectType uses the Windows Forms provided ComNativeDescriptor. It currently has hard Win32 + // API dependencies. Even though ComWrappers work with other platforms, restricting to Windows until + // such time that the ComNativeDescriptor can handle basic COM types on other platforms. + // + // Tracked with https://github.com/dotnet/winforms/issues/9291 + Marshal.Release(unknown); + type = ComObjectType; + } if (createDelegator) {