Annotate required APIs with DynamicallyAccessedMemberTypes.Interfaces

src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs

@@ -411,15 +411,17 @@ private static AssemblyLoadContext GetALC(string assemblyPath)
         private sealed class BasicClassFactory : IClassFactory
         {
             private readonly Guid _classId;
+
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
             private readonly Type _classType;
 
-            public BasicClassFactory(Guid clsid, Type classType)
+            public BasicClassFactory(Guid clsid, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] Type classType)
             {
                 _classId = clsid;
                 _classType = classType;
             }
 
-            public static Type GetValidatedInterfaceType(Type classType, ref Guid riid, object? outer)
+            public static Type GetValidatedInterfaceType([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] Type classType, ref Guid riid, object? outer)
             {
                 Debug.Assert(classType != null);
                 if (riid == Marshal.IID_IUnknown)
@@ -519,9 +521,11 @@ private sealed class LicenseClassFactory : IClassFactory2
         {
             private readonly LicenseInteropProxy _licenseProxy = new LicenseInteropProxy();
             private readonly Guid _classId;
+
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
             private readonly Type _classType;
 
-            public LicenseClassFactory(Guid clsid, Type classType)
+            public LicenseClassFactory(Guid clsid, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] Type classType)
             {
                 _classId = clsid;
                 _classType = classType;

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/EnumBuilder.cs

@@ -137,11 +137,13 @@ public override FieldInfo[] GetFields(BindingFlags bindingAttr)
             return m_typeBuilder.GetFields(bindingAttr);
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type? GetInterface(string name, bool ignoreCase)
         {
             return m_typeBuilder.GetInterface(name, ignoreCase);
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type[] GetInterfaces()
         {
             return m_typeBuilder.GetInterfaces();

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/GenericTypeParameterBuilder.cs

@@ -115,8 +115,10 @@ public override Type MakeArrayType(int rank)
         [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.NonPublicFields)]
         public override FieldInfo[] GetFields(BindingFlags bindingAttr) { throw new NotSupportedException(); }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type GetInterface(string name, bool ignoreCase) { throw new NotSupportedException(); }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type[] GetInterfaces() { throw new NotSupportedException(); }
 
         [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicEvents | DynamicallyAccessedMemberTypes.NonPublicEvents)]

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/SymbolType.cs

@@ -397,11 +397,13 @@ public override FieldInfo[] GetFields(BindingFlags bindingAttr)
             throw new NotSupportedException(SR.NotSupported_NonReflectedType);
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type GetInterface(string name, bool ignoreCase)
         {
             throw new NotSupportedException(SR.NotSupported_NonReflectedType);
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type[] GetInterfaces()
         {
             throw new NotSupportedException(SR.NotSupported_NonReflectedType);

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/TypeBuilder.cs

@@ -837,6 +837,7 @@ public override FieldInfo[] GetFields(BindingFlags bindingAttr)
             return m_bakedRuntimeType.GetFields(bindingAttr);
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type? GetInterface(string name, bool ignoreCase)
         {
             if (!IsCreated())
@@ -845,6 +846,7 @@ public override FieldInfo[] GetFields(BindingFlags bindingAttr)
             return m_bakedRuntimeType.GetInterface(name, ignoreCase);
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type[] GetInterfaces()
         {
             if (m_bakedRuntimeType != null)
@@ -947,6 +949,9 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
             return m_bakedRuntimeType.GetMembers(bindingAttr);
         }
 
+        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",
+            Justification = "The GetInterfaces technically requires all interfaces to be preserved" +
+                "But in this case it acts only on TypeBuilder which is never trimmed (as it's runtime created).")]
         public override bool IsAssignableFrom([NotNullWhen(true)] Type? c)
         {
             if (IsTypeEqual(c, this))

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/TypeBuilderInstantiation.cs

@@ -178,7 +178,10 @@ public override Type? BaseType
         [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.NonPublicFields)]
         public override FieldInfo[] GetFields(BindingFlags bindingAttr) { throw new NotSupportedException(); }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type GetInterface(string name, bool ignoreCase) { throw new NotSupportedException(); }
+
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type[] GetInterfaces() { throw new NotSupportedException(); }
 
         [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicEvents | DynamicallyAccessedMemberTypes.NonPublicEvents)]

src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

@@ -803,6 +803,10 @@ private RuntimeConstructorInfo[] PopulateConstructors(Filter filter)
                     return list.ToArray();
                 }
 
+                [UnconditionalSuppressMessage ("ReflectionAnalysis", "IL2075:UnrecognizedReflectionPattern",
+                    Justification = "Calls to GetInterfaces technically require all interfaces on ReflectedType" +
+                        "But this is not a public API to enumerate reflection items, all the public APIs which do that" +
+                        "should be annotated accordingly.")]
                 private RuntimeFieldInfo[] PopulateFields(Filter filter)
                 {
                     ListBuilder<RuntimeFieldInfo> list = default;
@@ -983,7 +987,11 @@ private void PopulateLiteralFields(Filter filter, RuntimeType declaringType, ref
                     }
                 }
 
-                private void AddSpecialInterface(ref ListBuilder<RuntimeType> list, Filter filter, RuntimeType iList, bool addSubInterface)
+                private void AddSpecialInterface(
+                    ref ListBuilder<RuntimeType> list,
+                    Filter filter,
+                    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] RuntimeType iList,
+                    bool addSubInterface)
                 {
                     if (iList.IsAssignableFrom(ReflectedType))
                     {
@@ -1003,6 +1011,10 @@ private void AddSpecialInterface(ref ListBuilder<RuntimeType> list, Filter filte
                     }
                 }
 
+                [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2065:UnrecognizedReflectionPattern",
+                    Justification = "Calls to GetInterfaces technically require all interfaces on ReflectedType" +
+                        "But this is not a public API to enumerate reflection items, all the public APIs which do that" +
+                        "should be annotated accordingly.")]
                 private RuntimeType[] PopulateInterfaces(Filter filter)
                 {
                     ListBuilder<RuntimeType> list = default;
@@ -2611,6 +2623,7 @@ public override FieldInfo[] GetFields(BindingFlags bindingAttr)
             return GetFieldCandidates(null, bindingAttr, false).ToArray();
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type[] GetInterfaces()
         {
             RuntimeType[] candidates = Cache.GetInterfaceList(MemberListType.All, null);
@@ -2903,6 +2916,7 @@ public override InterfaceMapping GetInterfaceMap(Type ifaceType)
             return match;
         }
 
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
         public override Type? GetInterface(string fullname, bool ignoreCase)
         {
             if (fullname is null) throw new ArgumentNullException(nameof(fullname));

src/libraries/Microsoft.Extensions.Configuration.Binder/src/ILLink/ILLink.Suppressions.xml

@@ -43,5 +43,11 @@
       <property name="Scope">member</property>
       <property name="Target">M:Microsoft.Extensions.Configuration.ConfigurationBinder.GetAllProperties(System.Type)</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2070</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:Microsoft.Extensions.Configuration.ConfigurationBinder.FindOpenGenericInterface(System.Type,System.Type)</property>
+    </attribute>
   </assembly>
 </linker>

src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
+    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/libraries/Microsoft.Extensions.Options/src/OptionsServiceCollectionExtensions.cs

@@ -146,7 +146,7 @@ public static IServiceCollection PostConfigureAll<TOptions>(this IServiceCollect
 
         private static IEnumerable<Type> FindConfigurationServices(Type type)
         {
-            foreach (Type t in type.GetInterfaces())
+            foreach (Type t in GetInterfacesOnType(type))
             {
                 if (t.IsGenericType)
                 {
@@ -159,6 +159,16 @@ private static IEnumerable<Type> FindConfigurationServices(Type type)
                     }
                 }
             }
+
+            // Extracted the suppression to a local function as trimmer currently doesn't handle suppressions
+            // on iterator methods correctly.
+            [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",
+                Justification="This method only looks for interfaces referenced in its code. " +
+                    "The trimmer will keep the interface and thus all of its implementations in that case. " +
+                    "The call to GetInterfaces may return less results in trimmed apps, but it will " +
+                    "include the interfaces this method looks for if they should be there.")]
+            static Type[] GetInterfacesOnType (Type t)
+                => t.GetInterfaces();
         }
 
         private static void ThrowNoConfigServices(Type type) =>

src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/ConversionResolution.vb

@@ -176,7 +176,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Debug.Assert(TypeCode.String = 18, "wrong value!")
         End Sub
 
-        <RequiresUnreferencedCode("Calls ClassifyUserDefinedConversion")>
+        <RequiresUnreferencedCode("Calls ClassifyUserDefinedConversion and ClassifyPredefinedConversion")>
         Friend Shared Function ClassifyConversion(ByVal targetType As System.Type, ByVal sourceType As System.Type, ByRef operatorMethod As Method) As ConversionClass
             'This function classifies the nature of the conversion from the source type to the target
             'type. If such a conversion requires a user-defined conversion, it will be supplied as an
@@ -205,6 +205,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Return s_conversionTable(targetTypeCode)(sourceTypeCode)
         End Function
 
+        <RequiresUnreferencedCode("Calls GetInterfaceConstraints but does so recursively on various types")>
         Friend Shared Function ClassifyPredefinedCLRConversion(ByVal targetType As System.Type, ByVal sourceType As System.Type) As ConversionClass
             ' This function classifies all intrinsic CLR conversions, such as inheritance,
             ' implementation, and array covariance.
@@ -355,6 +356,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
 
         End Function
 
+        <RequiresUnreferencedCode("Calls ClassifyPredefinedCLRConversion")>
         Private Shared Function ClassifyCLRArrayToInterfaceConversion(ByVal targetInterface As System.Type, ByVal sourceArrayType As System.Type) As ConversionClass
 
             Debug.Assert(IsInterface(targetInterface), "Non-Interface type unexpected!!!")
@@ -424,6 +426,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
         End Function
 
 
+        <RequiresUnreferencedCode("Calls ClassifyPredefinedCLRConversion")>
         Private Shared Function ClassifyCLRConversionForArrayElementTypes(ByVal targetElementType As System.Type, ByVal sourceElementType As System.Type) As ConversionClass
 
             ' The element types must either be the same or
@@ -467,6 +470,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
         End Function
 
 
+        <RequiresUnreferencedCode("Calls ClassifyPredefinedCLRConversion")>
         Friend Shared Function ClassifyPredefinedConversion(ByVal targetType As System.Type, ByVal sourceType As System.Type) As ConversionClass
             ' This function classifies all intrinsic language conversions, such as inheritance,
             ' implementation, array covariance, and conversions between intrinsic types.
@@ -553,6 +557,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Return result
         End Function
 
+        <RequiresUnreferencedCode("Calls ClassifyPredefinedConversion")>
         Private Shared Function Encompasses(ByVal larger As System.Type, ByVal smaller As System.Type) As Boolean
             'Definition: LARGER is said to encompass SMALLER if SMALLER widens to or is LARGER.
 
@@ -564,6 +569,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Return result = ConversionClass.Widening OrElse result = ConversionClass.Identity
         End Function
 
+        <RequiresUnreferencedCode("Calls ClassifyPredefinedConversion")>
         Private Shared Function NotEncompasses(ByVal larger As System.Type, ByVal smaller As System.Type) As Boolean
             'Definition: LARGER is said to not encompass SMALLER if SMALLER narrows to or is LARGER.
 
@@ -575,7 +581,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Return result = ConversionClass.Narrowing OrElse result = ConversionClass.Identity
         End Function
 
-
+        <RequiresUnreferencedCode("Calls Encompasses")>
         Private Shared Function MostEncompassing(ByVal types As List(Of System.Type)) As System.Type
             'Given a set TYPES, determine the most encompassing type. An element
             'CANDIDATE of TYPES is said to be most encompassing if no other element of
@@ -601,7 +607,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Return maxEncompassing
         End Function
 
-
+        <RequiresUnreferencedCode("Calls Encompasses")>
         Private Shared Function MostEncompassed(ByVal types As List(Of System.Type)) As System.Type
             'Given a set TYPES, determine the most encompassed type. An element
             'CANDIDATE of TYPES is said to be most encompassed if CANDIDATE encompasses
@@ -687,6 +693,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             operatorList.Add(operatorToInsert)
         End Sub
 
+        <RequiresUnreferencedCode("Calls ClassifyPredefinedConversion")>
         Private Shared Function ResolveConversion(
             ByVal targetType As System.Type,
             ByVal sourceType As System.Type,

src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/OverloadResolution.vb

@@ -980,6 +980,7 @@ nextcandidate:
             Return False
         End Function
 
+        <RequiresUnreferencedCode("Calls GetInterfaces on argument type recursively")>
         Private Shared Function InferTypeArgumentsFromArgument(
             ByVal argumentType As Type,
             ByVal parameterType As Type,
@@ -1104,6 +1105,7 @@ RetryInference:
         End Function
 
 
+        <RequiresUnreferencedCode("Calls InferTypeArgumentsFromArgument")>
         Private Shared Function InferTypeArgumentsFromArgumentDirectly(
             ByVal argumentType As Type,
             ByVal parameterType As Type,
@@ -1296,6 +1298,7 @@ RetryInference:
 
         End Function
 
+        <RequiresUnreferencedCode("Calls InferTypArgumentsFromArgument")>
         Friend Shared Function InferTypeArgumentsFromArgument(
             ByVal targetProcedure As Method,
             ByVal argument As Object,
@@ -1839,6 +1842,7 @@ skipargument:
             Return
         End Sub
 
+        <RequiresUnreferencedCode("Calls InferTypeArgumentsFromArgument")>
         Private Shared Function InferTypeArguments(
             ByVal targetProcedure As Method,
             ByVal arguments As Object(),

src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/Symbols.vb

@@ -424,6 +424,8 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Return False
         End Function
 #End If
+        <UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",
+            Justification:="Calls GetInterfaces but only looks for existing interface type by reference equality. Trimmer guarantees that if the interface type is kept it is also kept on all the types which implement it.")>
         Friend Shared Function [Implements](ByVal implementor As System.Type, ByVal [interface] As System.Type) As Boolean
 
             Debug.Assert(Not IsInterface(implementor), "interfaces can't implement, so why call this?")
@@ -439,6 +441,8 @@ Namespace Microsoft.VisualBasic.CompilerServices
 
         End Function
 
+        <UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",
+            Justification:="Calls GetInterfaces but only looks for existing interface type by reference equality. Trimmer guarantees that if the interface type is kept it is also kept on all the types which implement it.")>
         Friend Shared Function IsOrInheritsFrom(ByVal derived As System.Type, ByVal base As System.Type) As Boolean
             Debug.Assert((Not derived.IsByRef) AndAlso (Not derived.IsPointer))
             Debug.Assert((Not base.IsByRef) AndAlso (Not base.IsPointer))
@@ -514,7 +518,7 @@ Namespace Microsoft.VisualBasic.CompilerServices
             Return type.GetGenericArguments
         End Function
 
-        Friend Shared Function GetInterfaceConstraints(ByVal genericParameter As Type) As Type()
+        Friend Shared Function GetInterfaceConstraints(<DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)> ByVal genericParameter As Type) As Type()
             'Returns the interface constraints for the type parameter.
             Debug.Assert(IsGenericParameter(genericParameter), "expected type parameter")
             Return System.Linq.Enumerable.ToArray(genericParameter.GetInterfaces)