diff options
| author | Maxim Lipnin <v-maxlip@microsoft.com> | 2018-10-04 16:53:37 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-10-10 02:33:53 +0300 |
| commit | 88c68600e65e769a11cec465d8a82f37ea5ccfb8 (patch) | |
| tree | 1953b4c382cadf6576d39a10d38eac257506d566 | |
| parent | fdfd781b4a8bcf5a278614b30733d462ef79d707 (diff) | |
[Reflection] CoreFX import for TypeDelegator type
| -rw-r--r-- | mcs/class/corlib/ReferenceSources/Type.cs | 5 | ||||
| -rw-r--r-- | mcs/class/corlib/corlib.dll.sources | 2 | ||||
| -rw-r--r-- | mcs/class/corlib/corlib_xtest.dll.sources | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mcs/class/corlib/ReferenceSources/Type.cs b/mcs/class/corlib/ReferenceSources/Type.cs index 664782b1706..8514a0fe765 100644 --- a/mcs/class/corlib/ReferenceSources/Type.cs +++ b/mcs/class/corlib/ReferenceSources/Type.cs @@ -36,6 +36,11 @@ namespace System { internal RuntimeTypeHandle _impl; + public virtual bool IsTypeDefinition => throw NotImplemented.ByDesign; + public virtual bool IsGenericTypeParameter => IsGenericParameter && DeclaringMethod == null; + public virtual bool IsGenericMethodParameter => IsGenericParameter && DeclaringMethod != null; + public virtual bool IsByRefLike => throw new NotSupportedException(SR.NotSupported_SubclassOverride); + #region Requires stack backtracing fixes in unmanaged type_from_name [MethodImplAttribute(MethodImplOptions.InternalCall)] diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index 9ba4a30e39d..0e1ed12cdcc 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -1202,6 +1202,7 @@ ReferenceSources/AppContextDefaultValues.cs ../../../external/corefx/src/Common/src/CoreLib/System/Reflection/TargetParameterCountException.cs ../../../external/corefx/src/Common/src/CoreLib/System/Reflection/TypeAttributes.cs ../../../external/corefx/src/Common/src/CoreLib/System/Reflection/TypeFilter.cs +../../../external/corefx/src/Common/src/CoreLib/System/Reflection/TypeDelegator.cs ../../../external/corefx/src/Common/src/CoreLib/System/Reflection/TypeInfo.cs ../../../external/corefx/src/System.Reflection.TypeExtensions/src/System/Reflection/TypeExtensions.cs @@ -1212,7 +1213,6 @@ ReferenceSources/AppContextDefaultValues.cs ../referencesource/mscorlib/system/reflection/memberinfoserializationholder.cs ../referencesource/mscorlib/system/reflection/methodbase.cs ../referencesource/mscorlib/system/reflection/methodinfo.cs -../referencesource/mscorlib/system/reflection/typedelegator.cs ../referencesource/mscorlib/system/reflection/emit/methodbuilder.cs ../referencesource/mscorlib/system/reflection/emit/symboltype.cs diff --git a/mcs/class/corlib/corlib_xtest.dll.sources b/mcs/class/corlib/corlib_xtest.dll.sources index dbcd0cef2bd..5f87c9791f0 100644 --- a/mcs/class/corlib/corlib_xtest.dll.sources +++ b/mcs/class/corlib/corlib_xtest.dll.sources @@ -16,7 +16,7 @@ ../../../external/corefx/src/System.Reflection/tests/Common.cs -../../../external/corefx/src/System.Reflection/tests/*.cs:AssemblyTests.cs,AssemblyNameTests.cs,GetTypeTests.cs,MemberInfoTests.cs,MethodInfoTests.cs,ModuleTests.cs +../../../external/corefx/src/System.Reflection/tests/*.cs:AssemblyTests.cs,AssemblyNameTests.cs,MemberInfoTests.cs,MethodInfoTests.cs,ModuleTests.cs ../../../external/corefx/src/System.Reflection.Extensions/tests/Definitions/PropertyDefinitions.cs ../../../external/corefx/src/System.Reflection.Extensions/tests/*.cs |