[release/7.0.2xx] Fix WatchKit stub copy error when using native watc…

…hOS app (#17626)

Modified the FindWatchOS2AppBundleTaskBase and Xamarin.iOS.Common.targets so that it only tries to copy the WatchKit stub into the IPA file if the watch app bundle includes the folder.

This should fix the error that was found in #10070 by @ivanicin 


Backport of #17004

Co-authored-by: Jack Butler <[email protected]>
Co-authored-by: Jack Aardal <[email protected]>
Co-authored-by: Rolf Bjarne Kvinge <[email protected]>

msbuild/Xamarin.iOS.Tasks/Tasks/ValidateAppBundleTaskBase.cs

@@ -120,6 +120,7 @@ void ValidateWatchApp (string path, string mainBundleIdentifier, string mainShor
 		{
 			var name = Path.GetFileNameWithoutExtension (path);
 			var info = Path.Combine (path, "Info.plist");
+			var isSingleProject = false;
 			if (!File.Exists (info)) {
 				Log.LogError (7014, path, MSBStrings.E7014, name);
 				return;
@@ -162,26 +163,32 @@ void ValidateWatchApp (string path, string mainBundleIdentifier, string mainShor
 				Log.LogError (7019, info, MSBStrings.E7019, name, wkCompanionAppBundleIdentifier, mainBundleIdentifier);
 
 			PBoolean watchKitApp;
-			if (!plist.TryGetValue ("WKWatchKitApp", out watchKitApp) || !watchKitApp.Value)
-				Log.LogError (7020, info, MSBStrings.E7020, name);
+			if (plist.TryGetValue ("WKWatchKitApp", out watchKitApp)) {
+				if (!watchKitApp.Value)
+					Log.LogError (7020, info, MSBStrings.E7020, name);
+			} else {
+				isSingleProject = true;
+			}
 
 			if (plist.ContainsKey ("LSRequiresIPhoneOS"))
 				Log.LogError (7021, info, MSBStrings.E7021, name);
 
 			var pluginsDir = Path.Combine (path, "PlugIns");
-			if (!Directory.Exists (pluginsDir)) {
+			if (!Directory.Exists (pluginsDir) && !isSingleProject) {
 				Log.LogError (7022, path, MSBStrings.E7022, name);
 				return;
 			}
 
-			int count = 0;
-			foreach (var plugin in Directory.EnumerateDirectories (pluginsDir, "*.appex")) {
-				ValidateWatchExtension (plugin, bundleIdentifier, shortVersionString, version);
-				count++;
-			}
+			if (!isSingleProject) {
+				int count = 0;
+				foreach (var plugin in Directory.EnumerateDirectories (pluginsDir, "*.appex")) {
+					ValidateWatchExtension (plugin, bundleIdentifier, shortVersionString, version);
+					count++;
+				}
 
-			if (count == 0)
-				Log.LogError (7022, pluginsDir, MSBStrings.E7022_A, name);
+				if (count == 0)
+					Log.LogError (7022, pluginsDir, MSBStrings.E7022_A, name);
+			}
 		}
 
 		void ValidateWatchExtension (string path, string watchAppBundleIdentifier, string mainShortVersionString, string mainVersion)

msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Common.targets

@@ -408,7 +408,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 
 		<Copy
 			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true' And '$(_WatchOS2AppBundle)' != ''"
+			Condition="'$(IsMacEnabled)' == 'true' And '$(_WatchOS2AppBundle)' != '' And Exists('$(_WatchOS2AppBundle)\_WatchKitStub\WK')"
 			SourceFiles="$(_WatchOS2AppBundle)\_WatchKitStub\WK"
 			DestinationFolder="$(DeviceSpecificIntermediateOutputPath)ipa\WatchKitSupport2"
 		/>