Revert Framework.Extension project to be CLSCompliant (#1450)

microsoft · Dec 12, 2022 · 4d1d4a0 · 4d1d4a0
1 parent 48c4e5f
commit 4d1d4a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/TestFramework/TestFramework.Extensions/PrivateObject.cs b/src/TestFramework/TestFramework.Extensions/PrivateObject.cs
@@ -138,7 +138,9 @@ public PrivateObject(Type type, Type[]? parameterTypes, object?[]? args)
             o = Activator.CreateInstance(type, ConstructorFlags, null, args, null);
         }
 
-        ConstructFrom(o);
+        _ = o ?? throw new ArgumentNullException(nameof(o));
+        _target = o;
+        _originalType = o.GetType();
     }
 
     /// <summary>
@@ -150,7 +152,8 @@ public PrivateObject(Type type, Type[]? parameterTypes, object?[]? args)
     public PrivateObject(object obj)
     {
         _ = obj ?? throw new ArgumentNullException(nameof(obj));
-        ConstructFrom(obj);
+        _target = obj;
+        _originalType = obj.GetType();
     }
 
     /// <summary>
@@ -742,14 +745,6 @@ private static void ValidateAccessString(string access)
         }
     }
 
-    [MemberNotNull(nameof(_target), nameof(_originalType))]
-    private void ConstructFrom(object obj)
-    {
-        _ = obj ?? throw new ArgumentNullException(nameof(obj));
-        _target = obj;
-        _originalType = obj.GetType();
-    }
-
     private void BuildGenericMethodCacheForType(Type t)
     {
         DebugEx.Assert(t != null, "type should not be null.");

diff --git a/src/TestFramework/TestFramework.Extensions/Properties/AssemblyInfo.cs b/src/TestFramework/TestFramework.Extensions/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: NeutralResourcesLanguage("en")]
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(true)]
 
 // Version information for an assembly consists of the following four values:
 //