Merge pull request #1469 from Unity-Technologies/unity-master-fix-1346334-part2

joncham · web-flow · commit e62e1a02060d · 2021-07-27T15:14:51.000-04:00
Use IsComObject icall under UNITY_AOT.
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
@@ -856,7 +856,7 @@ public static object GetUniqueObjectForIUnknown (IntPtr unknown)
 			throw new PlatformNotSupportedException ();
 		}
 
-#if !MOBILE && !UNITY
+#if !MOBILE || UNITY_AOT
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
 		public extern static bool IsComObject (object o);
 #else

Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,7 @@ public static object GetUniqueObjectForIUnknown (IntPtr unknown)`
`856`	`856`	`throw new PlatformNotSupportedException ();`
`857`	`857`	`}`
`858`	`858`
`859`		`-#if !MOBILE && !UNITY`
	`859`	`+#if !MOBILE \|\| UNITY_AOT`
`860`	`860`	`[MethodImplAttribute (MethodImplOptions.InternalCall)]`
`861`	`861`	`public extern static bool IsComObject (object o);`
`862`	`862`	`#else`