Remove SafeReflectionInvoker Part 2

ThomasGoulet73 · ThomasGoulet73 · commit c2174ceaada9 · 2024-04-30T22:06:36.000-04:00
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/SafeReflectionInvoker.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/SafeReflectionInvoker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/XamlMemberInvoker.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/XamlMemberInvoker.cs
@@ -147,20 +147,6 @@ public virtual ShouldSerializeResult ShouldSerializeValue(object instance)
             return ShouldSerializeResult.Default;
         }
 
-        // vvvvv---- Unused members.  Servicing policy is to retain these anyway.  -----vvvvv
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Retained per servicing policy.")]
-        private static bool IsSystemXamlNonPublic(
-            ref ThreeValuedBool methodIsSystemXamlNonPublic, MethodInfo method)
-        {
-            if (methodIsSystemXamlNonPublic == ThreeValuedBool.NotSet)
-            {
-                bool result = SafeReflectionInvoker.IsSystemXamlNonPublic(method);
-                methodIsSystemXamlNonPublic = result ? ThreeValuedBool.True : ThreeValuedBool.False;
-            }
-            return methodIsSystemXamlNonPublic == ThreeValuedBool.True;
-        }
-        // ^^^^^----- End of unused members.  -----^^^^^
-
         private bool IsUnknown
         {
             get { return _member == null || _member.UnderlyingMember == null; }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/XamlTypeInvoker.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/XamlTypeInvoker.cs
@@ -27,10 +27,6 @@ public class XamlTypeInvoker
 
         private ThreeValuedBool _isPublic;
 
-        // vvvvv---- Unused members.  Servicing policy is to retain these anyway.  -----vvvvv
-        private ThreeValuedBool _isInSystemXaml;
-        // ^^^^^----- End of unused members.  -----^^^^^
-
         protected XamlTypeInvoker()
         {
         }
@@ -226,23 +222,6 @@ public virtual IEnumerator GetItems(object instance)
             return (IEnumerator)getEnumMethod.Invoke(instance, s_emptyObjectArray);
         }
 
-        // vvvvv---- Unused members.  Servicing policy is to retain these anyway.  -----vvvvv
-        private bool IsInSystemXaml
-        {
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Retained per servicing policy.")]
-            get
-            {
-                if (_isInSystemXaml == ThreeValuedBool.NotSet)
-                {
-                    Type type = _xamlType.UnderlyingType.UnderlyingSystemType;
-                    bool result = SafeReflectionInvoker.IsInSystemXaml(type);
-                    _isInSystemXaml = result ? ThreeValuedBool.True : ThreeValuedBool.False;
-                }
-                return _isInSystemXaml == ThreeValuedBool.True;
-            }
-        }
-        // ^^^^^----- End of unused members.  -----^^^^^
-
         private bool IsPublic
         {
             get
