Merge pull request #1457 from Unity-Technologies/fix-1346334

UnityAlex · web-flow · commit 5348e662034e · 2021-06-29T07:38:04.000-04:00
Disabling com in the jit class libs as they are also disabled in the …
diff --git a/mcs/build/profiles/unityjit.make b/mcs/build/profiles/unityjit.make
@@ -11,7 +11,7 @@ profile-check:
 	@:
 
 DEFAULT_REFERENCES = mscorlib
-PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:UNITY_JIT -d:UNITY -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
+PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:UNITY_JIT -d:UNITY -d:WIN_PLATFORM -d:DISABLE_COM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
 API_BIN_PROFILE = v4.7.1
 
 FRAMEWORK_VERSION = 4.5
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_AOT
+#if !MOBILE && !UNITY
 		[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_AOT`
	`859`	`+#if !MOBILE && !UNITY`
`860`	`860`	`[MethodImplAttribute (MethodImplOptions.InternalCall)]`
`861`	`861`	`public extern static bool IsComObject (object o);`
`862`	`862`	`#else`