[mtouch] Make 'MonoTouch.Dialog-1' and 'MonoTouch.NUnitLite' SDK assemblies, not product assemblies. Fixes #12862. (#12919)

The "product assembly" is supposed to be Xamarin.iOS.dll, Xamarin.Mac.dll,
etc., not other assemblies, so fix the implementation to reflect this. The
original commit where MonoTouch.Dialog-1 and MonoTouch.NUnitLite were
introduced as platform assemblies is quite old [1], and doesn't explain much,
but I believe the intention was to make us treat these assemblies as *SDK*
assemblies and link them accordingly, so I made these assemblies SDK assemblies now.

Additionally remove "Xamarin.iOS" as a hardcoded platform assembly for Mac
Catalyst, because this particular code is exclusive to legacy Xamarin, and Mac
Catalyst support will only be included in our .NET release, which means this
code does not have any purpose here, and might even break something one day.

[1]: 0349f8d47f

Fixes https://github.com/xamarin/xamarin-macios/issues/12862.
This commit is contained in:
Rolf Bjarne Kvinge 2021-10-04 19:14:34 +02:00 коммит произвёл GitHub
Родитель 05ad66d908
Коммит b87db48344
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 3 добавлений и 8 удалений

Просмотреть файл

@ -44,6 +44,8 @@ namespace Xamarin.Linker {
"Mono.Security",
"OpenTK",
"OpenTK-1.0",
"MonoTouch.Dialog-1",
"MonoTouch.NUnitLite",
// Facades assemblies (PCL)
"Microsoft.Win32.Primitives",
"Microsoft.Win32.Registry.AccessControl",

Просмотреть файл

@ -8,14 +8,7 @@ namespace MonoTouch.Tuner {
protected override bool IsProduct (string assemblyName)
{
switch (assemblyName) {
case "MonoTouch.Dialog-1":
case "MonoTouch.NUnitLite":
case "Xamarin.iOS": // The Xamarin.iOS.dll implementation assembly for Mac Catalyst.
return true;
default:
return assemblyName == product_assembly;
}
return assemblyName == product_assembly;
}
public override string ProductAssembly {