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

@@ -380,7 +380,7 @@ namespace System.ComponentModel {
else {
args = new Type[] {receiverType};
}
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
IntSecurity.FullReflection.Assert();
#endif
try {
@@ -456,7 +456,7 @@ namespace System.ComponentModel {
else {
args = new Type[] {receiverType};
}
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
IntSecurity.FullReflection.Assert();
#endif
try {

View File

@@ -1 +1 @@
ad04d77a51370aba0e61ef13802c5ec1bef78583
a795ad2d8fa52998de3ca0e81480c62c2a43e422

View File

@@ -11,13 +11,13 @@ namespace System.ComponentModel {
[HostProtection(SharedState = true)]
internal static class IntSecurity {
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
public static readonly CodeAccessPermission UnmanagedCode = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
public static readonly CodeAccessPermission FullReflection = new ReflectionPermission(PermissionState.Unrestricted);
#endif
public static string UnsafeGetFullPath(string fileName) {
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
string full = fileName;
FileIOPermission fiop = new FileIOPermission(PermissionState.None);

View File

@@ -98,11 +98,15 @@ namespace System.ComponentModel {
}
private class LicFileLicense : License {
#if !MONO
private LicFileLicenseProvider owner;
#endif
private string key;
public LicFileLicense(LicFileLicenseProvider owner, string key) {
#if !MONO
this.owner = owner;
#endif
this.key = key;
}
public override string LicenseKey {

View File

@@ -67,9 +67,10 @@ namespace System.ComponentModel {
/// </devdoc>
[HostProtection(SharedState = true)]
internal sealed class ReflectEventDescriptor : EventDescriptor {
#if !MONO
private static readonly Type[] argsNone = new Type[0];
private static readonly object noDefault = new object();
#endif
private Type type; // the delegate type for the event
private readonly Type componentClass; // the class of the component this info is for

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();

View File

@@ -1635,12 +1635,12 @@ namespace System.ComponentModel {
Type converterType = GetTypeFromName(instanceAttr.ConverterTypeName);
if (converterType != null && typeof(TypeConverter).IsAssignableFrom(converterType))
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
try {
IntSecurity.FullReflection.Assert();
#endif
return (TypeConverter)ReflectTypeDescriptionProvider.CreateInstance(converterType, _type);
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
} finally {
CodeAccessPermission.RevertAssert();
}
@@ -1665,12 +1665,12 @@ namespace System.ComponentModel {
Type converterType = GetTypeFromName(typeAttr.ConverterTypeName);
if (converterType != null && typeof(TypeConverter).IsAssignableFrom(converterType))
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
try {
IntSecurity.FullReflection.Assert();
#endif
_converter = (TypeConverter)ReflectTypeDescriptionProvider.CreateInstance(converterType, _type);
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
} finally {
CodeAccessPermission.RevertAssert();
}

View File

@@ -28,8 +28,10 @@ namespace System.ComponentModel {
private const string s_UseCompatibleTypeConverterBehavior = "UseCompatibleTypeConverterBehavior";
private static volatile bool useCompatibleTypeConversion = false;
#if !MONO
private static volatile bool firstLoadAppSetting = true;
private static object loadAppSettingLock = new Object();
#endif
private static bool UseCompatibleTypeConversion {
get {

View File

@@ -1 +1 @@
cf77c9972b2967219bba6e0992252ca86961ca7c
0783e121a8b8058a221c9497594d8d4597e24dda

View File

@@ -75,7 +75,7 @@ namespace System.ComponentModel {
}
protected Win32Exception(SerializationInfo info, StreamingContext context) : base (info, context) {
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
IntSecurity.UnmanagedCode.Demand();
#endif
nativeErrorCode = info.GetInt32("NativeErrorCode");

View File

@@ -93,7 +93,7 @@ namespace System.ComponentModel.Design {
Debug.WriteLineIf(RuntimeLicenseContextSwitch.TraceVerbose,"rawfile: " + rawFile);
string codeBase;
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
// FileIOPermission is required for ApplicationBase in URL-hosted domains
FileIOPermission perm = new FileIOPermission(PermissionState.Unrestricted);
perm.Assert();
@@ -133,7 +133,7 @@ namespace System.ComponentModel.Design {
// file://fullpath/foo.exe
//
string fileName;
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
FileIOPermission perm = new FileIOPermission(PermissionState.Unrestricted);
perm.Assert();
try
@@ -166,7 +166,7 @@ namespace System.ComponentModel.Design {
else if(!resourceAssembly.IsDynamic) { // EscapedCodeBase won't be supported by emitted assemblies anyway
Debug.WriteLineIf(RuntimeLicenseContextSwitch.TraceVerbose,"resourceAssembly is not null");
string fileName;
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
FileIOPermission perm = new FileIOPermission(PermissionState.Unrestricted);
perm.Assert();
#endif
@@ -176,7 +176,7 @@ namespace System.ComponentModel.Design {
}
finally
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
CodeAccessPermission.RevertAssert();
#endif
}
@@ -258,7 +258,7 @@ namespace System.ComponentModel.Design {
static Stream OpenRead(Uri resourceUri) {
Stream result = null;
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
PermissionSet perms = new PermissionSet(PermissionState.Unrestricted);
perms.Assert();
@@ -271,7 +271,7 @@ namespace System.ComponentModel.Design {
catch (Exception e) {
Debug.Fail(e.ToString());
}
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
finally {
CodeAccessPermission.RevertAssert();
}