Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Move MemberInfo to shared partition #2979

Merged
1 commit merged into from Mar 15, 2017
Merged

Move MemberInfo to shared partition #2979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\ParamArrayAttribute.cs"/>
<Compile Include="$(MSBuildThisFileDirectory)System\PlatformNotSupportedException.cs"/>
<Compile Include="$(MSBuildThisFileDirectory)System\RankException.cs"/>
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\MemberInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ObfuscateAssemblyAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ObfuscationAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\TypeDelegator.cs" />
Expand Down
2 changes: 1 addition & 1 deletion ...reLib/src/System/Reflection/MemberInfo.cs → ...ib/shared/System/Reflection/MemberInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace System.Reflection
{
public abstract class MemberInfo : ICustomAttributeProvider
public abstract partial class MemberInfo : ICustomAttributeProvider
{
protected MemberInfo() { }

Expand Down
1 change: 0 additions & 1 deletion src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@
<Compile Include="System\Reflection\LocalVariableInfo.cs" />
<Compile Include="System\Reflection\ManifestResourceInfo.cs" />
<Compile Include="System\Reflection\MemberFilter.cs" />
<Compile Include="System\Reflection\MemberInfo.cs" />
<Compile Include="System\Reflection\MemberInfoSerializationHolder.cs" />
<Compile Include="System\Reflection\MemberSerializationStringGenerator.cs" />
<Compile Include="System\Reflection\MemberTypes.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/System.Private.CoreLib/src/System/Reflection/MemberInfoSerializationHolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion ...src/Internal/Reflection/Execution/PayForPlayExperience/MissingMetadataExceptionCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('<');
Expand Down
2 changes: 1 addition & 1 deletion ...ection.Execution/src/Internal/Reflection/Execution/ReflectionDomainSetupImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down