Skip to content

Commit 2b1cf1e

Browse files
authored
[mono] Recognize new names for Xamarin.iOS etc assemblies (#64278)
They are being renamed in dotnet/macios#13847
1 parent d34c0ff commit 2b1cf1e

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

src/mono/mono/mini/intrinsics.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,11 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
19241924
} else if (((!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.iOS") ||
19251925
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.TVOS") ||
19261926
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.MacCatalyst") ||
1927-
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.Mac")) &&
1927+
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.Mac") ||
1928+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.iOS") ||
1929+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.tvOS") ||
1930+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.MacCatalyst") ||
1931+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.macOS")) &&
19281932
!strcmp (cmethod_klass_name_space, "ObjCRuntime") &&
19291933
!strcmp (cmethod_klass_name, "Selector"))
19301934
) {

src/mono/mono/mini/mini-native-types.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,14 @@ mono_class_is_magic_assembly (MonoClass *klass)
374374
return TRUE;
375375
if (!strcmp ("Xamarin.MacCatalyst", aname))
376376
return TRUE;
377+
if (!strcmp ("Microsoft.iOS", aname))
378+
return TRUE;
379+
if (!strcmp ("Microsoft.macOS", aname))
380+
return TRUE;
381+
if (!strcmp ("Microsoft.watchOS", aname))
382+
return TRUE;
383+
if (!strcmp ("Microsoft.MacCatalyst", aname))
384+
return TRUE;
377385
/* regression test suite */
378386
if (!strcmp ("builtin-types", aname))
379387
return TRUE;

0 commit comments

Comments
 (0)