Fixed ReflectTypeDescriptionProvider keeping cached type in the dictionary after ReflectionCachesUpdateHandler caches cleanup

Author: alexey-zakharov

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectTypeDescriptionProvider.ReflectedTypeData.cs

@@ -547,22 +547,6 @@ internal PropertyDescriptorCollection GetProperties()
 
                 return t;
             }
-
-            /// <summary>
-            /// Refreshes the contents of this type descriptor. This does not
-            /// actually requery, but it will clear our state so the next
-            /// query re-populates.
-            /// </summary>
-            internal void Refresh()
-            {
-                _attributes = null;
-                _events = null;
-                _properties = null;
-                _converter = null;
-                _editors = null;
-                _editorTypes = null;
-                _editorCount = 0;
-            }
         }
     }
 }

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectTypeDescriptionProvider.cs

@@ -1413,16 +1413,11 @@ private static PropertyDescriptor[] ReflectGetPropertiesImpl(Type type)
         }
 
         /// <summary>
-        /// Refreshes the contents of this type descriptor. This does not
-        /// actually requery, but it will clear our state so the next
-        /// query re-populates.
+        /// Completely removed the reference to this type descriptor.
         /// </summary>
-        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2067:UnrecognizedReflectionPattern",
-            Justification = "ReflectedTypeData is not being created here, just checking if was already created.")]
-        internal void Refresh(Type type)
+        internal void Remove(Type type)
         {
-            ReflectedTypeData? td = GetTypeData(type, createIfNeeded: false);
-            td?.Refresh();
+            _typeData.TryRemove(type, out _);
         }
 
         /// <summary>

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectionCachesUpdateHandler.cs

@@ -23,14 +23,14 @@ public static void ClearCache(Type[]? types)
             {
                 foreach (Type type in types)
                 {
-                    TypeDescriptor.Refresh(type);
+                    TypeDescriptor.ClearCache(type);
                 }
             }
             else
             {
                 foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
                 {
-                    TypeDescriptor.Refresh(assembly);
+                    TypeDescriptor.ClearCache(assembly);
                 }
             }
         }

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs

@@ -2346,7 +2346,7 @@ private static void Refresh(object component, bool refreshReflectionProvider)
                                 if (provider.IsPopulated(type))
                                 {
                                     found = true;
-                                    provider.Refresh(type);
+                                    provider.Remove(type);
                                 }
                             }
                         }
@@ -2430,7 +2430,7 @@ public static void Refresh(Type type)
                             if (provider.IsPopulated(type))
                             {
                                 found = true;
-                                provider.Refresh(type);
+                                provider.Remove(type);
                             }
                         }
                     }
@@ -2493,7 +2493,7 @@ public static void Refresh(Module module)
 
                             foreach (Type populatedType in populatedTypes)
                             {
-                                provider.Refresh(populatedType);
+                                provider.Remove(populatedType);
                                 refreshedTypes ??= new Hashtable();
                                 refreshedTypes[populatedType] = populatedType;
                             }
@@ -2530,6 +2530,32 @@ public static void Refresh(Assembly assembly)
             }
         }
 
+        internal static void ClearCache(Type type)
+        {
+            Refresh(type);
+            s_defaultProviderInitialized.TryRemove(type, out _);
+        }
+
+        internal static void ClearCache(Assembly assembly)
+        {
+            foreach (Module module in assembly.GetModules())
+            {
+                // Invalidate the provider for the types in the module.
+                Refresh(module);
+
+                // And the default providers.
+                IEnumerator<KeyValuePair<Type, object?>> e = s_defaultProviderInitialized.GetEnumerator();
+                while (e.MoveNext())
+                {
+                    Type type = e.Current.Key;
+                    if (type.Module.Equals(module))
+                    {
+                        s_defaultProviderInitialized.TryRemove(type, out _);
+                    }
+                }
+            }
+        }
+
         [EditorBrowsable(EditorBrowsableState.Advanced)]
         public static Type ComObjectType
         {