Imported Upstream version 6.0.0.271

Former-commit-id: 2fde65daab17ed3bb08a7be86fb05423d63b0290
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-05-29 08:54:19 +00:00
parent 8f11a00d09
commit 2ba231cd0c
155 changed files with 1067 additions and 794 deletions

View File

@ -391,7 +391,7 @@ namespace System.Runtime.InteropServices
FreeHGlobal (s);
}
#if !FULL_AOT_RUNTIME
#if !FULL_AOT_RUNTIME && !MONOTOUCH
public static Guid GenerateGuidForType (Type type)
{
return type.GUID;
@ -438,7 +438,7 @@ namespace System.Runtime.InteropServices
return GetCCW (o, T);
}
#endif
#endif // !FULL_AOT_RUNTIME
#endif // !FULL_AOT_RUNTIME && !MONOTOUCH
public static IntPtr GetComInterfaceForObject (object o, Type T)
{
@ -463,7 +463,7 @@ namespace System.Runtime.InteropServices
return GetComInterfaceForObject ((object)o, typeof (T));
}
#if !FULL_AOT_RUNTIME && !NETCORE
#if !FULL_AOT_RUNTIME && !NETCORE && !MONOTOUCH
public static IntPtr GetComInterfaceForObjectInContext (object o, Type t)
{
@ -545,7 +545,7 @@ namespace System.Runtime.InteropServices
#endif
}
#if !FULL_AOT_RUNTIME
#if !FULL_AOT_RUNTIME && !MONOTOUCH
[MethodImplAttribute (MethodImplOptions.InternalCall)]
private extern static IntPtr GetIDispatchForObjectInternal (object o);
@ -595,7 +595,7 @@ namespace System.Runtime.InteropServices
public static IntPtr GetIUnknownForObject (object o)
{
#if FULL_AOT_RUNTIME
#if FULL_AOT_RUNTIME || MONOTOUCH
throw new PlatformNotSupportedException ();
#else
IntPtr pUnk = GetIUnknownForObjectInternal (o);
@ -700,7 +700,7 @@ namespace System.Runtime.InteropServices
#endif
}
#if !FULL_AOT_RUNTIME
#if !FULL_AOT_RUNTIME && !MONOTOUCH
#if !NETCORE
@ -1123,7 +1123,7 @@ namespace System.Runtime.InteropServices
#endif
}
#if !FULL_AOT_RUNTIME
#if !FULL_AOT_RUNTIME && !MONOTOUCH
[Obsolete]
public static void ReleaseThreadCache()