[release/8.0.1xx] [msbuild] Detect any dylibs in NativeReferences. Fixes

 #19520. (#19571)

We add the dylib location as an rpath if the app has any location, so
make
sure to correctly detect dylibs in native references.

Fixes #19520.


Backport of #19560

---------

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

msbuild/Xamarin.MacDev.Tasks/Tasks/LinkNativeCodeTaskBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 using Microsoft.Build.Framework;
 
@@ -36,7 +37,7 @@ public abstract class LinkNativeCodeTaskBase : XamarinTask {
 		[Required]
 		public string MinimumOSVersion { get; set; }
 
-		public ITaskItem [] NativeReferences { get; set; }
+		public ITaskItem [] NativeReferences { get; set; } = Array.Empty<ITaskItem> ();
 
 		public ITaskItem [] Frameworks { get; set; }
 
@@ -78,7 +79,7 @@ bool ExecuteUnsafe ()
 
 			var hasEmbeddedFrameworks = false;
 
-			if (NativeReferences?.Length > 0) {
+			if (NativeReferences.Length > 0) {
 				var linkerArguments = new LinkerOptions ();
 				linkerArguments.BuildNativeReferenceFlags (Log, NativeReferences);
 				foreach (var framework in linkerArguments.Frameworks) {
@@ -162,6 +163,8 @@ bool ExecuteUnsafe ()
 				}
 			}
 
+			hasDylibs |= NativeReferences.Any (v => string.Equals (".dylib", Path.GetExtension (v.ItemSpec), StringComparison.OrdinalIgnoreCase));
+
 			if (hasDylibs) {
 				arguments.Add ("-rpath");
 				arguments.Add (DylibRPath ?? "@executable_path");

tests/dotnet/AppWithNativeDynamicLibrariesInPackageReference/MacCatalyst/Makefile

@@ -0,0 +1 @@
+include ../shared.mk

tests/dotnet/AppWithNativeDynamicLibrariesInPackageReference/macOS/Makefile

@@ -0,0 +1 @@
+include ../shared.mk

tests/dotnet/AppWithNativeDynamicLibrariesInPackageReference/shared.mk

@@ -0,0 +1,3 @@
+TOP=../../../..
+TESTNAME=MySimpleApp
+include $(TOP)/tests/common/shared-dotnet.mk

tests/dotnet/UnitTests/ProjectTest.cs

@@ -1376,15 +1376,20 @@ public void NoWarnCodesign (ApplePlatform platform, string runtimeIdentifiers, s
 		}
 
 		[Test]
-		[TestCase (ApplePlatform.MacOSX, "osx-x64")]
-		public void BuildAndExecuteAppWithNativeDynamicLibrariesInPackageReference (ApplePlatform platform, string runtimeIdentifier)
+		[TestCase (ApplePlatform.MacOSX, "osx-x64", false)]
+		[TestCase (ApplePlatform.MacOSX, "osx-x64", true)]
+		public void BuildAndExecuteAppWithNativeDynamicLibrariesInPackageReference (ApplePlatform platform, string runtimeIdentifier, bool isNativeAot)
 		{
 			var project = "AppWithNativeDynamicLibrariesInPackageReference";
 			Configuration.IgnoreIfIgnoredPlatform (platform);
 
 			var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifier, platform: platform, out var appPath);
 			Clean (project_path);
 			var properties = GetDefaultProperties (runtimeIdentifier);
+			if (isNativeAot) {
+				properties ["PublishAot"] = "true";
+				properties ["_IsPublishing"] = "true";
+			}
 			DotNet.AssertBuild (project_path, properties);
 
 			var appExecutable = Path.Combine (appPath, "Contents", "MacOS", Path.GetFileNameWithoutExtension (project_path));