Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@ -13,17 +13,19 @@ namespace System {
using System.Globalization;
using System.Diagnostics.Contracts;
using System.Security;
#if !MONO
using System.Security.Permissions;
#endif
[Serializable]
[AttributeUsageAttribute(AttributeTargets.All, Inherited = true, AllowMultiple=false)]
#if !MOBILE
#if !MOBILE && !NETCORE
[ClassInterface(ClassInterfaceType.None)]
[ComDefaultInterface(typeof(_Attribute))]
[System.Runtime.InteropServices.ComVisible(true)]
#endif
public abstract partial class Attribute
#if !MOBILE
#if !MOBILE && !NETCORE
: _Attribute
#endif
{
@ -68,7 +70,7 @@ namespace System {
custom_attributes.Add (param_attribute);
}
var base_method = method.GetBaseMethod ();
var base_method = ((RuntimeMethodInfo)method).GetBaseMethod ();
if (base_method == method)
break;
@ -103,7 +105,7 @@ namespace System {
if (member.MemberType != MemberTypes.Method)
return false;
var method = ((MethodInfo) member).GetBaseMethod ();
var method = ((RuntimeMethodInfo)(MethodInfo) member).GetBaseMethod ();
while (true) {
var parameters = method.GetParametersInternal ();
@ -113,7 +115,7 @@ namespace System {
if (param.IsDefined (attributeType, false))
return true;
var base_method = method.GetBaseMethod ();
var base_method = ((RuntimeMethodInfo)method).GetBaseMethod ();
if (base_method == method)
break;
@ -1048,7 +1050,7 @@ namespace System {
public virtual bool IsDefaultAttribute() { return false; }
#endregion
#if !FEATURE_CORECLR && !MOBILE
#if !FEATURE_CORECLR && !MOBILE && !NETCORE
void _Attribute.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();