Skip to content

[msbuild] Refactor the logic to compute the target devices for IBTool/ACTool. #12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 1 commit into from
Aug 18, 2021
Merged

[msbuild] Refactor the logic to compute the target devices for IBTool/ACTool. #12461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions msbuild/Xamarin.MacDev.Tasks.Core/Tasks/XcodeCompilerToolTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ protected static bool IsWatchExtension (PDictionary plist)
PDictionary extension;
PString id;

if (plist == null)
return false;

if (!plist.TryGetValue ("NSExtension", out extension))
return false;

Expand All @@ -134,34 +137,31 @@ protected static bool IsWatchExtension (PDictionary plist)

protected IEnumerable<string> GetTargetDevices ()
{
return GetTargetDevices (GetAppManifest ());
var plist = GetAppManifest ();
var devices = plist?.GetUIDeviceFamily () ?? IPhoneDeviceType.NotSet;
var watch = plist?.GetWKWatchKitApp () == true;
var watchExtension = IsWatchExtension (plist);
return GetTargetDevices (devices, watch, watchExtension);
}

IEnumerable<string> GetTargetDevices (PDictionary plist)
IEnumerable<string> GetTargetDevices (IPhoneDeviceType devices, bool watch, bool watchExtension)
{
var devices = IPhoneDeviceType.NotSet;
bool watch = false;

if (Platform == ApplePlatform.MacOSX)
yield break;

if (plist != null) {
if (!(watch = plist.GetWKWatchKitApp ())) {
// the project is either a normal iOS project or an extension
if ((devices = plist.GetUIDeviceFamily ()) == IPhoneDeviceType.NotSet) {
// library projects and extension projects will not have this key, but
// we'll want them to work for both iPhones and iPads if the
// xib or storyboard supports them
devices = IPhoneDeviceType.IPhoneAndIPad;
}

// if the project is a watch extension, we'll also want to include watch support
watch = IsWatchExtension (plist);
} else {
// the project is a WatchApp, only include watch support
if (!watch) {
// the project is either a normal iOS project or an extension
if (devices == IPhoneDeviceType.NotSet) {
// library projects and extension projects will not have this key, but
// we'll want them to work for both iPhones and iPads if the
// xib or storyboard supports them
devices = IPhoneDeviceType.IPhoneAndIPad;
}

// if the project is a watch extension, we'll also want to include watch support
watch = watchExtension;
} else {
devices = IPhoneDeviceType.IPhoneAndIPad;
// the project is a WatchApp, only include watch support
}

if ((devices & IPhoneDeviceType.IPhone) != 0)
Expand Down