Skip to content

Commit 9e82981

Browse files
[release/6.0-maui][mono] Recognize new names for Xamarin.iOS etc assemblies (#64327)
* [mono] Remove support for Classic Xamarin for the Selector.GetHandle optimization, and add newer platforms. (#61989) We haven't supported Classic mode for Xamarin for quite a few years now (monotouch, MonoMac), so that code is not needed anymore. However, we've added support for more platforms (tvOS, Mac Catalyst), so add support for those. (cherry picked from commit b259f68) # Conflicts: # src/mono/mono/mini/intrinsics.c * [mono] Recognize new names for Xamarin.iOS etc assemblies (#64278) They are being renamed in dotnet/macios#13847 (cherry picked from commit 2b1cf1e) Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
1 parent 059caa2 commit 9e82981

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

src/mono/mono/mini/intrinsics.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,12 +1810,14 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
18101810
ins->type = STACK_I4;
18111811
MONO_ADD_INS (cfg->cbb, ins);
18121812
return ins;
1813-
} else if (((!strcmp (cmethod_klass_image->assembly->aname.name, "MonoMac") ||
1814-
!strcmp (cmethod_klass_image->assembly->aname.name, "monotouch")) &&
1815-
!strcmp (cmethod_klass_name_space, "XamCore.ObjCRuntime") &&
1816-
!strcmp (cmethod_klass_name, "Selector")) ||
1817-
((!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.iOS") ||
1818-
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.Mac")) &&
1813+
} else if (((!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.iOS") ||
1814+
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.TVOS") ||
1815+
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.MacCatalyst") ||
1816+
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.Mac") ||
1817+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.iOS") ||
1818+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.tvOS") ||
1819+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.MacCatalyst") ||
1820+
!strcmp (cmethod_klass_image->assembly->aname.name, "Microsoft.macOS")) &&
18191821
!strcmp (cmethod_klass_name_space, "ObjCRuntime") &&
18201822
!strcmp (cmethod_klass_name, "Selector"))
18211823
) {

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)