Clean up DynamicDependencyAttribute: review feedback + another test

Author: layomia

src/libraries/System.ComponentModel.TypeConverter/tests/TrimmingTests/InterfaceTypeTest.cs

@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel;
+
+/// <summary>
+/// Tests that the System.ComponentModel.TypeDescriptor.InterfaceType
+/// property works as expected when used in a trimmed application.
+/// </summary>
+class Program
+{
+    static int Main(string[] args)
+    {
+        Type type = TypeDescriptor.InterfaceType;
+
+        // Tests that the ctor for System.ComponentModel.TypeDescriptor+TypeDescriptorInterface is not trimmed out.
+        object obj = Activator.CreateInstance(type);
+        string expectedObjTypeNamePrefix = "System.ComponentModel.TypeDescriptor+TypeDescriptorInterface, System.ComponentModel.TypeConverter, Version=";
+
+        return obj != null && obj.GetType().AssemblyQualifiedName.StartsWith(expectedObjTypeNamePrefix)
+            ? 100
+            : -1;
+    }
+}

src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs

@@ -892,6 +892,9 @@ public PropertyFetch(Type? type)
                     /// <summary>
                     /// Create a property fetcher for a propertyName
                     /// </summary>
+                    [DynamicDependency("#ctor(System.Type)", typeof(EnumeratePropertyFetch<>))]
+                    [DynamicDependency("#ctor(System.Type,System.Reflection.PropertyInfo)", typeof(RefTypedFetchProperty<,>))]
+                    [DynamicDependency("#ctor(System.Type,System.Reflection.PropertyInfo)", typeof(ValueTypedFetchProperty<,>))]
                     public static PropertyFetch FetcherForProperty(Type? type, string propertyName)
                     {
                         if (propertyName == null)
@@ -946,12 +949,6 @@ public static PropertyFetch FetcherForProperty(Type? type, string propertyName)
                                 Logger.Message($"Property {propertyName} not found on {type}");
                                 return new PropertyFetch(type);
                             }
-                            // Delegate creation below is incompatible with static properties.
-                            else if (propertyInfo.GetMethod?.IsStatic == true || propertyInfo.SetMethod?.IsStatic == true)
-                            {
-                                Logger.Message($"Property {propertyName} is static.");
-                                return new PropertyFetch(type);
-                            }
                             Type typedPropertyFetcher = typeInfo.IsValueType ?
                                 typeof(ValueTypedFetchProperty<,>) : typeof(RefTypedFetchProperty<,>);
                             Type instantiatedTypedPropertyFetcher = typedPropertyFetcher.GetTypeInfo().MakeGenericType(
@@ -969,8 +966,6 @@ public static PropertyFetch FetcherForProperty(Type? type, string propertyName)
 
                     private sealed class RefTypedFetchProperty<TObject, TProperty> : PropertyFetch
                     {
-                        [DynamicDependency("get_TraceStateString", typeof(Activity))]
-                        [DynamicDependency("get_IsAllDataRequested", typeof(Activity))]
                         public RefTypedFetchProperty(Type type, PropertyInfo property) : base(type)
                         {
                             Debug.Assert(typeof(TObject).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()));

src/libraries/System.Diagnostics.DiagnosticSource/tests/TrimmingTests/EventSourcePropertyFetchTest.cs

@@ -1,4 +1,3 @@
-
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 

src/libraries/System.Diagnostics.DiagnosticSource/tests/TrimmingTests/System.Diagnostics.DiagnosticSource.TrimmingTests.proj

@@ -1,4 +1,3 @@
-
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />