diff --git a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems index 8e211d4ae35..5955180d431 100644 --- a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems @@ -153,6 +153,7 @@ + diff --git a/src/System.Private.CoreLib/src/System/Reflection/MemberInfo.cs b/src/System.Private.CoreLib/shared/System/Reflection/MemberInfo.cs similarity index 97% rename from src/System.Private.CoreLib/src/System/Reflection/MemberInfo.cs rename to src/System.Private.CoreLib/shared/System/Reflection/MemberInfo.cs index 4e722433795..1275cc15a05 100644 --- a/src/System.Private.CoreLib/src/System/Reflection/MemberInfo.cs +++ b/src/System.Private.CoreLib/shared/System/Reflection/MemberInfo.cs @@ -6,7 +6,7 @@ namespace System.Reflection { - public abstract class MemberInfo : ICustomAttributeProvider + public abstract partial class MemberInfo : ICustomAttributeProvider { protected MemberInfo() { } diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj index 8410cbe6b33..07baee8ec2d 100644 --- a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj @@ -187,7 +187,6 @@ - diff --git a/src/System.Private.CoreLib/src/System/Reflection/MemberInfoSerializationHolder.cs b/src/System.Private.CoreLib/src/System/Reflection/MemberInfoSerializationHolder.cs index 4400dac9c4f..7e4977a3f0f 100644 --- a/src/System.Private.CoreLib/src/System/Reflection/MemberInfoSerializationHolder.cs +++ b/src/System.Private.CoreLib/src/System/Reflection/MemberInfoSerializationHolder.cs @@ -34,7 +34,7 @@ public static void GetSerializationInfo(SerializationInfo info, ConstructorInfo public static void GetSerializationInfo(SerializationInfo info, MethodInfo m) { - Type[] genericArguments = (m.IsGenericMethod & !m.IsGenericMethodDefinition) ? m.GetGenericArguments() : null; + Type[] genericArguments = m.IsConstructedGenericMethod ? m.GetGenericArguments() : null; GetSerializationInfo(info, m.Name, m.ReflectedType, m.ToString(), m.SerializationToString(), MemberTypes.Method, genericArguments); } diff --git a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/PayForPlayExperience/MissingMetadataExceptionCreator.cs b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/PayForPlayExperience/MissingMetadataExceptionCreator.cs index 6201694ee3e..1e2f27ab3f6 100644 --- a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/PayForPlayExperience/MissingMetadataExceptionCreator.cs +++ b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/PayForPlayExperience/MissingMetadataExceptionCreator.cs @@ -116,7 +116,7 @@ public static String ComputeUsefulPertainantIfPossible(Object pertainant) bool first = true; // write out generic parameters - if (method.IsGenericMethod && !method.IsGenericMethodDefinition) + if (method.IsConstructedGenericMethod) { first = true; friendlyName.Append('<'); diff --git a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionDomainSetupImplementation.cs b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionDomainSetupImplementation.cs index 8ac4bde4afc..0dea9563ccb 100644 --- a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionDomainSetupImplementation.cs +++ b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionDomainSetupImplementation.cs @@ -55,7 +55,7 @@ public sealed override Exception CreateNonInvokabilityException(MemberInfo perta if (pertainant is MethodBase) { MethodBase methodBase = (MethodBase)pertainant; - resourceName = (methodBase.IsGenericMethod && !methodBase.IsGenericMethodDefinition) ? SR.MakeGenericMethod_NoMetadata : SR.Object_NotInvokable; + resourceName = methodBase.IsConstructedGenericMethod ? SR.MakeGenericMethod_NoMetadata : SR.Object_NotInvokable; if (methodBase is ConstructorInfo) { TypeInfo declaringTypeInfo = methodBase.DeclaringType.GetTypeInfo();