Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -64,7 +64,9 @@ namespace System.ComponentModel {
private static TraceSwitch PropDescCreateSwitch = new TraceSwitch("PropDescCreate", "ReflectPropertyDescriptor: Dump errors when creating property info");
private static TraceSwitch PropDescUsageSwitch = new TraceSwitch("PropDescUsage", "ReflectPropertyDescriptor: Debug propertydescriptor usage");
#if !MONO
private static TraceSwitch PropDescSwitch = new TraceSwitch("PropDesc", "ReflectPropertyDescriptor: Debug property descriptor");
#endif
private static readonly int BitDefaultValueQueried = BitVector32.CreateMask();
private static readonly int BitGetQueried = BitVector32.CreateMask(BitDefaultValueQueried);
@@ -417,12 +419,12 @@ namespace System.ComponentModel {
else {
args = new Type[] {receiverType};
}
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
IntSecurity.FullReflection.Assert();
try {
#endif
resetMethod = FindMethod(componentClass, "Reset" + Name, args, typeof(void), /* publicOnly= */ false);
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
}
finally {
CodeAccessPermission.RevertAssert();
@@ -524,13 +526,13 @@ namespace System.ComponentModel {
args = new Type[] {receiverType};
}
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
IntSecurity.FullReflection.Assert();
try {
#endif
shouldSerializeMethod = FindMethod(componentClass, "ShouldSerialize" + Name,
args, typeof(Boolean), /* publicOnly= */ false);
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
}
finally {
CodeAccessPermission.RevertAssert();