Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -168,7 +168,7 @@ namespace System.Reflection
BaseType = 0x72000000,
Invalid = 0x7FFFFFFF,
}
#if !MONO
[Serializable]
internal struct ConstArray
{
@@ -756,6 +756,7 @@ namespace System.Reflection
return String.Format(CultureInfo.CurrentCulture, "MetadataException HResult = {0:x}.", m_hr);
}
}
#endif
}

View File

@@ -44,7 +44,7 @@ namespace System.Reflection {
// Implementation attributes.
Import = 0x00001000, // Class / interface is imported
Serializable = 0x00002000, // The class is Serializable.
#if FEATURE_COMINTEROP || MONO_COM
#if FEATURE_COMINTEROP || MONO
[ComVisible(false)]
WindowsRuntime = 0x00004000, // Type is a Windows Runtime type.
#endif // FEATURE_COMINTEROP