[windows][msbuild] Copy entire directory when the native reference is a framework

msbuild/Xamarin.iOS.Tasks/Tasks/MTouch.cs

@@ -52,11 +52,18 @@ public IEnumerable<ITaskItem> GetAdditionalItemsToBeCopied ()
 			if (NativeReferences == null)
 				yield break;
 
-			foreach (var nativeRef in NativeReferences
-				.Where (x => Directory.Exists (x.ItemSpec))
-				.Select (x => x.ItemSpec))
-				foreach (var item in GetItemsFromNativeReference (nativeRef))
-					yield return item;
+			foreach (var nativeRef in NativeReferences) {
+				var path = nativeRef.ItemSpec;
+				// look for frameworks, if the library is part of one then bring all related files
+				var dir = Path.GetDirectoryName (path);
+				if ((Path.GetExtension (dir) == ".framework") && Directory.Exists (dir)) {
+					foreach (var item in GetItemsFromNativeReference (dir)) {
+						// don't return the native library itself (it's the original input, not something additional)
+						if (item.ItemSpec != path)
+							yield return item;
+					}
+				}
+			}
 		}
 
 		public override void Cancel ()

tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/MTouchTaskTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 using Microsoft.Build.Utilities;
 
@@ -9,7 +10,7 @@
 
 namespace Xamarin.iOS.Tasks
 {
-	class CustomMTouchTask : MTouchTaskBase
+	class CustomMTouchTask : MTouch
 	{
 		public CustomMTouchTask ()
 		{
@@ -298,6 +299,54 @@ public void ReferenceFrameworkFileResolution_WhenResolutionFails(string targetFr
 			}
 		}
 
+		[Test]
+		public void NativeReference_None ()
+		{
+			// non-framework native references do not have to copy anything else (back to Windows)
+
+			Task.NativeReferences = null;
+			var items = Task.GetAdditionalItemsToBeCopied ().ToArray ();
+			Assert.That (items.Count (), Is.EqualTo (0), "null");
+
+			Task.NativeReferences = new TaskItem [] { };
+			items = Task.GetAdditionalItemsToBeCopied ().ToArray ();
+			Assert.That (items.Count (), Is.EqualTo (0), "none");
+
+			var temp = Cache.CreateTemporaryDirectory ();
+			var native_lib = Path.Combine (temp, "libFoo");
+			File.WriteAllText (native_lib, "fake lib");
+			Task.NativeReferences = new [] { new TaskItem (native_lib) };
+			items = Task.GetAdditionalItemsToBeCopied ().ToArray ();
+			Assert.That (items.Count (), Is.EqualTo (0), "non-framework path");
+		}
+
+		[Test]
+		public void NativeReference_Framework ()
+		{
+			var temp = Cache.CreateTemporaryDirectory ();
+			var fx = Path.Combine (temp, "project", "Universal.xcframework", "macos-arm64_x86_64", "Universal.framework");
+			Directory.CreateDirectory (fx);
+
+			var native_lib = Path.Combine (fx, "Universal");
+			File.WriteAllText (native_lib, "fake lib");
+
+			// other files
+			File.WriteAllText (Path.Combine (fx, "Info.plist"), "fake info.plist");
+			var headers = Path.Combine (fx, "Headers");
+			Directory.CreateDirectory (headers);
+			File.WriteAllText (Path.Combine (headers, "Universal.h"), "fake headers");
+			var signature = Path.Combine (fx, "_CodeSignature");
+			Directory.CreateDirectory (signature);
+			File.WriteAllText (Path.Combine (signature, "CodeResources"), "fake resources");
+
+			// a native reference to a framework needs to bring (all of) the framework files (back to Windows)
+
+			Task.NativeReferences = new [] { new TaskItem (native_lib) };
+			var items = Task.GetAdditionalItemsToBeCopied ().ToArray ();
+			// 3 additional files (as we do not duplicate the TaskItem for the native library itself)
+			Assert.That (items.Count (), Is.EqualTo (3), "framework files");
+		}
+
 		class TempSdk : IDisposable
 		{
 			MonoTouchSdk sdk;