Fix FilterStaticFrameworks to support custom framework binary names

Co-authored-by: rolfbjarne <[email protected]>

Author: Copilot

msbuild/Xamarin.MacDev.Tasks/Tasks/FilterStaticFrameworks.cs

@@ -20,6 +20,29 @@ public class FilterStaticFrameworks : XamarinTask, ITaskCallback {
 		[Output]
 		public ITaskItem []? FrameworkToPublish { get; set; }
 
+		static string GetFrameworkExecutablePath (string frameworkPath)
+		{
+			if (!frameworkPath.EndsWith (".framework", StringComparison.OrdinalIgnoreCase) || !Directory.Exists (frameworkPath))
+				return frameworkPath;
+
+			// Try to read the CFBundleExecutable from Info.plist
+			var infoPlistPath = Path.Combine (frameworkPath, "Info.plist");
+			if (File.Exists (infoPlistPath)) {
+				try {
+					var plist = PDictionary.FromFile (infoPlistPath);
+					var bundleExecutable = plist?.GetCFBundleExecutable ();
+					if (!string.IsNullOrEmpty (bundleExecutable)) {
+						return Path.Combine (frameworkPath, bundleExecutable);
+					}
+				} catch {
+					// If reading the plist fails, fall back to the default behavior
+				}
+			}
+
+			// Fall back to the default assumption: framework name without extension
+			return Path.Combine (frameworkPath, Path.GetFileNameWithoutExtension (frameworkPath));
+		}
+
 		public override bool Execute ()
 		{
 			if (ShouldExecuteRemotely ())
@@ -32,7 +55,7 @@ public override bool Execute ()
 					var frameworkExecutablePath = PathUtils.ConvertToMacPath (item.ItemSpec);
 					try {
 						if (frameworkExecutablePath.EndsWith (".framework", StringComparison.OrdinalIgnoreCase) && Directory.Exists (frameworkExecutablePath)) {
-							frameworkExecutablePath = Path.Combine (frameworkExecutablePath, Path.GetFileNameWithoutExtension (frameworkExecutablePath));
+							frameworkExecutablePath = GetFrameworkExecutablePath (frameworkExecutablePath);
 						}
 
 						if (OnlyFilterFrameworks && !Path.GetDirectoryName (frameworkExecutablePath).EndsWith (".framework", StringComparison.OrdinalIgnoreCase)) {

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

@@ -0,0 +1,97 @@
+using System;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using NUnit.Framework;
+using Xamarin.MacDev.Tasks;
+
+#nullable enable
+
+namespace Xamarin.MacDev.Tasks.Tests {
+
+	[TestFixture]
+	public class FilterStaticFrameworksTaskTest {
+
+		string tempDir = "";
+
+		[SetUp]
+		public void Setup ()
+		{
+			tempDir = Path.Combine (Path.GetTempPath (), Guid.NewGuid ().ToString ());
+			Directory.CreateDirectory (tempDir);
+		}
+
+		[TearDown]
+		public void TearDown ()
+		{
+			if (Directory.Exists (tempDir))
+				Directory.Delete (tempDir, true);
+		}
+
+		[Test]
+		public void TestCustomFrameworkExecutablePath ()
+		{
+			// Arrange: Create a mock framework with custom CFBundleExecutable
+			var frameworkDir = Path.Combine (tempDir, "libavcodec.framework");
+			Directory.CreateDirectory (frameworkDir);
+
+			// Create Info.plist with custom CFBundleExecutable
+			var infoPlistContent = @"<?xml version=""1.0"" encoding=""UTF-8""?>
+<!DOCTYPE plist PUBLIC ""-//Apple//DTD PLIST 1.0//EN"" ""http://www.apple.com/DTDs/PropertyList-1.0.dtd"">
+<plist version=""1.0"">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>libavcodec.dylib</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.ffmpeg.libavcodec</string>
+</dict>
+</plist>";
+			File.WriteAllText (Path.Combine (frameworkDir, "Info.plist"), infoPlistContent);
+
+			// Create the custom executable file 
+			var customExecutablePath = Path.Combine (frameworkDir, "libavcodec.dylib");
+			File.WriteAllText (customExecutablePath, "mock executable");
+
+			// Act: Use reflection to test the helper method
+			var method = typeof (FilterStaticFrameworks).GetMethod ("GetFrameworkExecutablePath", 
+				System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
+			var result = method?.Invoke (null, new object[] { frameworkDir }) as string;
+
+			// Assert: Should return the custom executable path from CFBundleExecutable
+			Assert.That (result, Is.EqualTo (customExecutablePath), "Should use CFBundleExecutable from Info.plist");
+		}
+
+		[Test]
+		public void TestDefaultFrameworkExecutablePath ()
+		{
+			// Arrange: Create a framework without Info.plist (or with default CFBundleExecutable)
+			var frameworkDir = Path.Combine (tempDir, "TestFramework.framework");
+			Directory.CreateDirectory (frameworkDir);
+
+			var expectedPath = Path.Combine (frameworkDir, "TestFramework");
+
+			// Act: Use reflection to test the helper method
+			var method = typeof (FilterStaticFrameworks).GetMethod ("GetFrameworkExecutablePath", 
+				System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
+			var result = method?.Invoke (null, new object[] { frameworkDir }) as string;
+
+			// Assert: Should return the default framework executable path
+			Assert.That (result, Is.EqualTo (expectedPath), "Should use default framework executable path");
+		}
+
+		[Test]
+		public void TestNonFrameworkPath ()
+		{
+			// Arrange: Use a non-framework path
+			var nonFrameworkPath = Path.Combine (tempDir, "regular_file.dylib");
+
+			// Act: Use reflection to test the helper method
+			var method = typeof (FilterStaticFrameworks).GetMethod ("GetFrameworkExecutablePath", 
+				System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
+			var result = method?.Invoke (null, new object[] { nonFrameworkPath }) as string;
+
+			// Assert: Should return the path unchanged
+			Assert.That (result, Is.EqualTo (nonFrameworkPath), "Should return non-framework paths unchanged");
+		}
+	}
+}