[msbuild] Unify the iOS and macOS version of ACToolTaskBase. (#10810)

* [msbuild] Unify the iOS and macOS version of ACToolTaskBase.

* The ACTool task now needs the target framework moniker.

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs

@@ -3,13 +3,10 @@
 using System.Text.Json;
 using System.Linq;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
-using Xamarin.MacDev.Tasks;
-using Xamarin.MacDev;
 using Xamarin.Localization.MSBuild;
 using Xamarin.Utils;
 
@@ -472,5 +469,42 @@ public override bool Execute ()
 
 			return !Log.HasLoggedErrors;
 		}
+
+		protected override IEnumerable<string> GetTargetDevices (PDictionary plist)
+		{
+			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 incldue watch support
+					watch = IsWatchExtension (plist);
+				} else {
+					// the project is a WatchApp, only include watch support
+				}
+			} else {
+				devices = IPhoneDeviceType.IPhoneAndIPad;
+			}
+
+			if ((devices & IPhoneDeviceType.IPhone) != 0)
+				yield return "iphone";
+
+			if ((devices & IPhoneDeviceType.IPad) != 0)
+				yield return "ipad";
+
+			if (watch)
+				yield return "watch";
+		}
 	}
 }

msbuild/Xamarin.Shared/Xamarin.Shared.targets

@@ -392,7 +392,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	<Target Name="_CoreCompileImageAssets"
 		Inputs="@(ImageAsset);$(_AppManifest)"
 		Outputs="$(_ACTool_PartialAppManifestCache);$(_ACTool_BundleResourceCache)"
-		DependsOnTargets="_DetectAppManifest;_GetMinimumOSVersion;_DetectSdkLocations;_BeforeCoreCompileImageAssets;_GetMinimumOSVersion;_DetectSigningIdentity">
+		DependsOnTargets="_DetectAppManifest;_GetMinimumOSVersion;_DetectSdkLocations;_BeforeCoreCompileImageAssets;_GetMinimumOSVersion;_DetectSigningIdentity;_ComputeTargetFrameworkMoniker">
 
 		<ACTool
 			SessionId="$(BuildSessionId)"
@@ -416,7 +416,9 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			SdkBinPath="$(_SdkBinPath)"
 			SdkUsrPath="$(_SdkUsrPath)"
 			SdkPlatform="$(_SdkPlatform)"
-			SdkVersion="$(_SdkVersion)">
+			SdkVersion="$(_SdkVersion)"
+			TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
+			>
 			<Output TaskParameter="PartialAppManifest" ItemName="_PartialAppManifest" />
 			<Output TaskParameter="BundleResources" ItemName="_BundleResourceWithLogicalName" />
 

msbuild/Xamarin.iOS.Tasks/Tasks/ACTool.cs

@@ -1,4 +1,5 @@
 using Microsoft.Build.Framework;
+using Xamarin.MacDev.Tasks;
 using Xamarin.Messaging.Build.Client;
 
 namespace Xamarin.iOS.Tasks {