Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -12,7 +12,6 @@ namespace System.Reflection
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Diagnostics.Tracing;
using System.Globalization;
using System.Runtime;
using System.Runtime.ConstrainedExecution;
@@ -68,7 +67,7 @@ namespace System.Reflection
return !(left == right);
}
#endif // !FEATURE_CORECLR
#if FEATURE_NETCORE || !FEATURE_CORECLR
public override bool Equals(object obj)
{
return base.Equals(obj);
@@ -78,7 +77,6 @@ namespace System.Reflection
{
return base.GetHashCode();
}
#endif //FEATURE_NETCORE || !FEATURE_CORECLR
#region Internal Members
internal virtual Type GetReturnType() { throw new NotImplementedException(); }
@@ -108,6 +106,7 @@ namespace System.Reflection
}
#endregion
#if !FEATURE_CORECLR
#region COM Interop Support
Type _ConstructorInfo.GetType()
{
@@ -156,6 +155,7 @@ namespace System.Reflection
throw new NotImplementedException();
}
#endregion
#endif
}
[Serializable]
@@ -321,9 +321,6 @@ namespace System.Reflection
}
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
#if !FEATURE_CORECLR
[TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
#endif
internal override bool CacheEquals(object o)
{
RuntimeConstructorInfo m = o as RuntimeConstructorInfo;
@@ -443,13 +440,6 @@ namespace System.Reflection
[System.Security.SecuritySafeCritical] // auto-generated
get { return RuntimeMethodHandle.GetName(this); }
}
[System.Security.SecuritySafeCritical]
internal override String GetFullNameForEtw()
{
return RuntimeMethodHandle.GetName(this);
}
[System.Runtime.InteropServices.ComVisible(true)]
public override MemberTypes MemberType { get { return MemberTypes.Constructor; } }
@@ -666,14 +656,6 @@ namespace System.Reflection
parameters[index] = arguments[index];
return retValue;
}
#if !FEATURE_CORECLR
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.ConstructorInfoInvoke(GetRuntimeType().GetFullNameForEtw(), GetFullNameForEtw());
}
#endif
return RuntimeMethodHandle.InvokeMethod(obj, null, sig, false);
}

View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.Tracing;
namespace System.Reflection
{
@@ -23,155 +22,46 @@ namespace System.Reflection
public static IEnumerable<PropertyInfo> GetRuntimeProperties(this Type type)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeProperties(type.GetFullNameForEtw());
}
#endif
IEnumerable<PropertyInfo> properties = type.GetProperties(everything);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeProperties(type.GetFullNameForEtw());
}
#endif
return properties;
return type.GetProperties(everything);
}
public static IEnumerable<EventInfo> GetRuntimeEvents(this Type type)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeEvents(type.GetFullNameForEtw());
}
#endif
IEnumerable<EventInfo> events = type.GetEvents(everything);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeEvents(type.GetFullNameForEtw());
}
#endif
return events;
return type.GetEvents(everything);
}
public static IEnumerable<MethodInfo> GetRuntimeMethods(this Type type)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeMethods(type.GetFullNameForEtw());
}
#endif
IEnumerable<MethodInfo> methods = type.GetMethods(everything);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeMethods(type.GetFullNameForEtw());
}
#endif
return methods;
return type.GetMethods(everything);
}
public static IEnumerable<FieldInfo> GetRuntimeFields(this Type type)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeFields(type.GetFullNameForEtw());
}
#endif
IEnumerable<FieldInfo> fields = type.GetFields(everything);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeFields(type.GetFullNameForEtw());
}
#endif
return fields;
return type.GetFields(everything);
}
public static PropertyInfo GetRuntimeProperty(this Type type, string name)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeProperty(type.GetFullNameForEtw(), name != null ? name : "");
}
#endif
PropertyInfo pi = type.GetProperty(name);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeProperty(type.GetFullNameForEtw(), pi != null ? pi.GetFullNameForEtw() : "");
}
#endif
return pi;
return type.GetProperty(name);
}
public static EventInfo GetRuntimeEvent(this Type type, string name)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeEvent(type.GetFullNameForEtw(), name != null ? name : "");
}
#endif
EventInfo ei = type.GetEvent(name);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeEvent(type.GetFullNameForEtw(), ei != null ? ei.GetFullNameForEtw() : "");
}
#endif
return ei;
return type.GetEvent(name);
}
public static MethodInfo GetRuntimeMethod(this Type type, string name, Type[] parameters)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeMethod(type.GetFullNameForEtw(), name != null ? name : "");
}
#endif
MethodInfo mi = type.GetMethod(name, parameters);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeMethod(type.GetFullNameForEtw(), mi != null ? mi.GetFullNameForEtw() : "");
}
#endif
return mi;
return type.GetMethod(name, parameters);
}
public static FieldInfo GetRuntimeField(this Type type, string name)
{
CheckAndThrow(type);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.BeginGetRuntimeField(type.GetFullNameForEtw(), name != null ? name : "");
}
#endif
FieldInfo fi = type.GetField(name);
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage))
{
FrameworkEventSource.Log.EndGetRuntimeField(type.GetFullNameForEtw(), fi != null ? fi.GetFullNameForEtw() : "");
}
#endif
return fi;
return type.GetField(name);
}
public static MethodInfo GetRuntimeBaseDefinition(this MethodInfo method){
CheckAndThrow(method);

View File

@@ -1 +1 @@
c6cd6858af471f75758f30ba87295e7fae83cd52
24bd73651248dc996e096016e27acb8cbb302ef1

View File

@@ -362,8 +362,7 @@ namespace System.Reflection {
}
}
// We don't support key migration on Silverlight, as libraries should all be distributed with the application.
#if FEATURE_STRONGNAME_MIGRATION || FEATURE_NETCORE
#if FEATURE_STRONGNAME_MIGRATION
[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple=false)]
public sealed class AssemblySignatureKeyAttribute : Attribute
{
@@ -388,7 +387,6 @@ namespace System.Reflection {
}
#endif
#if FEATURE_CORECLR || !FEATURE_PAL || MONO
[AttributeUsage (AttributeTargets.Assembly, Inherited=false)]
[System.Runtime.InteropServices.ComVisible(true)]
public sealed class AssemblyKeyNameAttribute : Attribute
@@ -405,7 +403,6 @@ namespace System.Reflection {
get { return m_keyName; }
}
}
#endif // FEATURE_CORECLR || !FEATURE_PAL
}

View File

@@ -46,7 +46,10 @@ namespace System.Reflection {
private Version _Version;
private StrongNameKeyPair _StrongNameKeyPair;
#if FEATURE_SERIALIZATION
private SerializationInfo m_siInfo; //A temporary variable which we need during deserialization.
#endif
private byte[] _HashForControl;
private AssemblyHashAlgorithm _HashAlgorithm;
@@ -94,10 +97,12 @@ namespace System.Reflection {
public String CultureName
{
get
{
get {
return (_CultureInfo == null) ? null : _CultureInfo.Name;
}
set {
_CultureInfo = (value == null) ? null : new CultureInfo(value);
}
}
public String CodeBase
@@ -309,6 +314,7 @@ namespace System.Reflection {
return s;
}
#if FEATURE_SERIALIZATION
[System.Security.SecurityCritical] // auto-generated_required
public void GetObjectData(SerializationInfo info, StreamingContext context)
{
@@ -367,6 +373,14 @@ namespace System.Reflection {
m_siInfo = null;
}
// Constructs a new AssemblyName during deserialization.
internal AssemblyName(SerializationInfo info, StreamingContext context)
{
//The graph is not valid until OnDeserialization() has been called.
m_siInfo = info;
}
#endif // FEATURE_SERIALIZATION
[System.Security.SecuritySafeCritical] // auto-generated
public AssemblyName(String assemblyName)
{
@@ -418,13 +432,6 @@ namespace System.Reflection {
nInit(out dummy, false, false);
}
// Constructs a new AssemblyName during deserialization.
internal AssemblyName(SerializationInfo info, StreamingContext context)
{
//The graph is not valid until OnDeserialization() has been called.
m_siInfo = info;
}
internal void SetProcArchIndex(PortableExecutableKinds pek, ImageFileMachine ifm)
{
ProcessorArchitecture = CalculateProcArchIndex(pek, ifm, _Flags);
@@ -503,6 +510,7 @@ namespace System.Reflection {
_StrongNameKeyPair = keyPair;
}
#if !FEATURE_CORECLR
void _AssemblyName.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -522,6 +530,7 @@ namespace System.Reflection {
{
throw new NotImplementedException();
}
#endif
#if FEATURE_APTCA
internal string GetNameWithPublicKey()

View File

@@ -7,8 +7,8 @@
**
** File: AssemblyNameFlags
**
** <OWNER>[....]</OWNER>
** <OWNER>[....]</OWNER>
** <OWNER>mray</OWNER>
** <OWNER>WESU</OWNER>
**
**
** Purpose: Flags controlling how an AssemblyName is used

View File

@@ -5,7 +5,7 @@
// ==--==
////////////////////////////////////////////////////////////////////////////////
//
// <OWNER>[....]</OWNER>
// <OWNER>WESU</OWNER>
//
// This interface defines a set of methods which interact with reflection
// during the binding process. This control allows systems to apply language

View File

@@ -8,7 +8,7 @@
//
// BindingFlags are a set of flags that control the binding and invocation process
//
// <OWNER>[....]</OWNER>
// <OWNER>WESU</OWNER>
// in Reflection. There are two processes. The first is selection of a Member which
// is the binding phase. The second, is invocation. These flags control how this
// process works.

View File

@@ -8,10 +8,10 @@
//
// CallingConventions is a set of Bits representing the calling conventions
//
// <OWNER>[....]</OWNER>
// <OWNER>WESU</OWNER>
// in the system.
//
// <EMAIL>Author: [....]</EMAIL>
// <EMAIL>Author: meichint</EMAIL>
// Date: Aug 99
//
namespace System.Reflection {

View File

@@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// ==--==
// <OWNER>[....]</OWNER>
// <OWNER>WESU</OWNER>
using System;
using System.Globalization;
using System.IO;
@@ -22,6 +22,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _Type
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -154,6 +155,7 @@ namespace System.Runtime.InteropServices
bool IsMarshalByRef { get; }
bool Equals(Type o);
#endregion
#endif
}
[GuidAttribute("17156360-2f1a-384a-bc52-fde93c215c5b")]
@@ -163,6 +165,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _Assembly
{
#if !FEATURE_CORECLR
#region Object Members
String ToString();
bool Equals(Object other);
@@ -239,6 +242,7 @@ get; }
AssemblyName[] GetReferencedAssemblies();
bool GlobalAssemblyCache { get; }
#endregion
#endif
}
@@ -249,6 +253,7 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _MemberInfo
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -272,6 +277,7 @@ get; }
Object[] GetCustomAttributes(bool inherit);
bool IsDefined(Type attributeType, bool inherit);
#endregion
#endif
}
@@ -282,6 +288,7 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _MethodBase
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -328,6 +335,7 @@ get; }
bool IsConstructor { get; }
Object Invoke(Object obj, Object[] parameters);
#endregion
#endif
}
@@ -338,6 +346,7 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _MethodInfo
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -390,6 +399,7 @@ get; }
ICustomAttributeProvider ReturnTypeCustomAttributes { get; }
MethodInfo GetBaseDefinition();
#endregion
#endif
}
@@ -400,6 +410,7 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _ConstructorInfo
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -451,6 +462,7 @@ get; }
Object Invoke_4(BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture);
Object Invoke_5(Object[] parameters);
#endregion
#endif
}
@@ -461,6 +473,7 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _FieldInfo
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -507,6 +520,7 @@ get; }
bool IsSpecialName { get; }
bool IsPinvokeImpl { get; }
#endregion
#endif
}
@@ -517,6 +531,7 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _PropertyInfo
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -559,6 +574,7 @@ get; }
MethodInfo GetSetMethod();
bool IsSpecialName { get; }
#endregion
#endif
}
@@ -569,6 +585,7 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _EventInfo
{
#if !FEATURE_CORECLR
#region IDispatch Members
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -607,6 +624,7 @@ get; }
bool IsSpecialName { get; }
bool IsMulticast { get; }
#endregion
#endif
}
[GuidAttribute("993634C4-E47A-32CC-BE08-85F567DC27D6")]
@@ -616,10 +634,12 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _ParameterInfo
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("D002E9BA-D9E3-3749-B1D3-D565A08B13E7")]
@@ -629,10 +649,12 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _Module
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("B42B6AAC-317E-34D5-9FA9-093BB4160C50")]
@@ -642,10 +664,12 @@ get; }
[System.Runtime.InteropServices.ComVisible(true)]
public interface _AssemblyName
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
}

View File

@@ -1 +1 @@
a5689babc0b607e4a222569a7ec1e81582c4db20
4dfeb2679fd95961ba9b42be3c6a068dda69bcfe

View File

@@ -1 +1 @@
371ef4aaa659cd8880046348782cbfe41a11b15c
22161806123ada0dd48dfd47d27ddbc42c2354eb

View File

@@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// ==--==
// <OWNER>[....]</OWNER>
// <OWNER>WESU</OWNER>
using System;
// This enumeration defines the access modes for a dynamic assembly.
@@ -24,8 +24,8 @@ namespace System.Reflection.Emit
#if FEATURE_REFLECTION_ONLY_LOAD
ReflectionOnly = 6, // 4 | Save,
#endif // FEATURE_REFLECTION_ONLY_LOAD
#if (FEATURE_COLLECTIBLE_TYPES && !FEATURE_CORECLR) || FEATURE_NETCORE
RunAndCollect = 8 | Run
#endif // FEATURE_COLLECTIBLE_TYPES && !FEATURE_CORECLR
#if FEATURE_COLLECTIBLE_TYPES
RunAndCollect = 8 | Run
#endif
}
}

View File

@@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// ==--==
// <OWNER>[....]</OWNER>
// <OWNER>WESU</OWNER>
using System;
using System.Globalization;
using System.IO;
@@ -22,6 +22,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _AssemblyBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -29,6 +30,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("ED3E4384-D7E2-3FA7-8FFD-8940D330519A")]
@@ -38,6 +40,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _ConstructorBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -45,6 +48,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("BE9ACCE8-AAFF-3B91-81AE-8211663F5CAD")]
@@ -54,6 +58,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _CustomAttributeBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -61,6 +66,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("C7BD73DE-9F85-3290-88EE-090B8BDFE2DF")]
@@ -70,6 +76,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _EnumBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -77,6 +84,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("AADABA99-895D-3D65-9760-B1F12621FAE8")]
@@ -86,6 +94,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _EventBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -93,6 +102,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("CE1A3BF5-975E-30CC-97C9-1EF70F8F3993")]
@@ -102,6 +112,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _FieldBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -109,6 +120,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("A4924B27-6E3B-37F7-9B83-A4501955E6A7")]
@@ -118,6 +130,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _ILGenerator
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -125,6 +138,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("4E6350D1-A08B-3DEC-9A3E-C465F9AEEC0C")]
@@ -134,6 +148,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _LocalBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -141,6 +156,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("007D8A14-FDF3-363E-9A0B-FEC0618260A2")]
@@ -150,6 +166,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _MethodBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -157,6 +174,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
#if FEATURE_METHOD_RENTAL
@@ -167,6 +185,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _MethodRental
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -174,6 +193,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
#endif
@@ -184,6 +204,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _ModuleBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -191,6 +212,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("36329EBA-F97A-3565-BC07-0ED5C6EF19FC")]
@@ -200,6 +222,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _ParameterBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -207,6 +230,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("15F9A479-9397-3A63-ACBD-F51977FB0F02")]
@@ -216,6 +240,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _PropertyBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -223,6 +248,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("7D13DD37-5A04-393C-BBCA-A5FEA802893D")]
@@ -232,6 +258,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _SignatureHelper
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -239,6 +266,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
[GuidAttribute("7E5678EE-48B3-3F83-B076-C58543498A58")]
@@ -248,6 +276,7 @@ namespace System.Runtime.InteropServices
[System.Runtime.InteropServices.ComVisible(true)]
public interface _TypeBuilder
{
#if !FEATURE_CORECLR
void GetTypeInfoCount(out uint pcTInfo);
void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
@@ -255,6 +284,7 @@ namespace System.Runtime.InteropServices
void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
#endif
}
}

View File

@@ -311,6 +311,7 @@ namespace System.Reflection.Emit
#endregion
#if !FEATURE_CORECLR
void _ConstructorBuilder.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -330,6 +331,7 @@ namespace System.Reflection.Emit
{
throw new NotImplementedException();
}
#endif
}
}

View File

@@ -555,6 +555,7 @@ namespace System.Reflection.Emit {
typeof(System.Diagnostics.DebuggableAttribute) == m_con.DeclaringType);
}
#if !FEATURE_CORECLR
void _CustomAttributeBuilder.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -574,6 +575,7 @@ namespace System.Reflection.Emit {
{
throw new NotImplementedException();
}
#endif
internal ConstructorInfo m_con;
internal Object[] m_constructorArgs;

View File

@@ -51,9 +51,7 @@ namespace System.Reflection.Emit
// Always false unless we are in an immersive (non dev mode) process.
#if FEATURE_APPX
private bool m_profileAPICheck;
#endif
#if !FEATURE_CORECLR
private RuntimeAssembly m_creatorAssembly;
#endif

View File

@@ -29,21 +29,13 @@ namespace System.Reflection.Emit {
[ClassInterface(ClassInterfaceType.None)]
[ComDefaultInterface(typeof(_EnumBuilder))]
[System.Runtime.InteropServices.ComVisible(true)]
sealed public class EnumBuilder :
#if FEATURE_CORECLR && !FEATURE_NETCORE
Type,
#else
TypeInfo,
#endif
_EnumBuilder
sealed public class EnumBuilder : TypeInfo, _EnumBuilder
{
#if !FEATURE_CORECLR || FEATURE_NETCORE
public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo){
if(typeInfo==null) return false;
return IsAssignableFrom(typeInfo.AsType());
}
#endif
// Define literal for enum
public FieldBuilder DefineLiteral(String literalName, Object literalValue)
@@ -59,13 +51,11 @@ namespace System.Reflection.Emit {
return fieldBuilder;
}
#if !FEATURE_CORECLR || FEATURE_NETCORE
public TypeInfo CreateTypeInfo()
{
BCLDebug.Log("DYNIL", "## DYNIL LOGGING: EnumBuilder.CreateType() ");
return m_typeBuilder.CreateTypeInfo();
}
#endif
// CreateType cause EnumBuilder to be baked.
public Type CreateType()
@@ -426,6 +416,7 @@ namespace System.Reflection.Emit {
m_underlyingField = m_typeBuilder.DefineField("value__", underlyingType, FieldAttributes.Public | FieldAttributes.SpecialName | FieldAttributes.RTSpecialName);
}
#if !FEATURE_CORECLR
void _EnumBuilder.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -445,6 +436,7 @@ namespace System.Reflection.Emit {
{
throw new NotImplementedException();
}
#endif
/*****************************************************

View File

@@ -139,6 +139,7 @@ namespace System.Reflection.Emit {
customBuilder.CreateCustomAttribute(m_module, m_evToken.Token);
}
#if !FEATURE_CORECLR
void _EventBuilder.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -158,6 +159,7 @@ namespace System.Reflection.Emit {
{
throw new NotImplementedException();
}
#endif
// These are package private so that TypeBuilder can access them.

View File

@@ -258,6 +258,7 @@ namespace System.Reflection.Emit
#endregion
#if !FEATURE_CORECLR
void _FieldBuilder.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -277,5 +278,6 @@ namespace System.Reflection.Emit
{
throw new NotImplementedException();
}
#endif
}
}

Some files were not shown because too many files have changed in this diff Show More