[release/6.0.3xx] [msbuild/tools] Fix path issues in the FilterStaticFrameworks task and ExtractBindingLibraries step. Fixes #15289. (#15442)

In the FilterStaticFrameworks task:

* Convert Windows-style paths to Mac-style paths.
* Give a better error if a framework can't be found.
* Don't try to copy frameworks that don't exist on Windows to the Mac.

In the ExtractBindingLibrariesStep:

* Return a relative path to frameworks we've extracted to make things easier for
  remote builds.

* In the _ComputeFrameworkFilesToPublish target, don't compute the source
  directory for frameworks using RootDir + Directory, because some frameworks
  may only exist on the mac, and RootDir + Directory will be a Windows path
  when building remotely. Instead use 'Identity', which is a relative path and
  will work on both Windows and Mac.

Fixes #15289.


Backport of #15321

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

Author: vs-mobiletools-engineering-service2

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -653,7 +653,7 @@
 			<!-- Set TargetDirectory and SourceDirectory for all frameworks we have to publish -->
 			<_FrameworkToPublish Update="@(_FrameworkToPublish)">
 				<TargetDirectory>$(_RelativePublishDir)$(_AppBundleFrameworksDir)\%(Filename).framework</TargetDirectory>
-				<SourceDirectory>%(RootDir)%(Directory)</SourceDirectory>
+				<SourceDirectory>%(RelativeDir)</SourceDirectory>
 			</_FrameworkToPublish>
 		</ItemGroup>
 

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

@@ -7,6 +7,7 @@
 using Microsoft.Build.Framework;
 
 using Xamarin.Localization.MSBuild;
+using Xamarin.Utils;
 
 namespace Xamarin.MacDev.Tasks {
 	// This task takes an itemgroup of frameworks, and filters out frameworks that aren't dynamic libraries.
@@ -20,12 +21,17 @@ public override bool Execute ()
 				var list = FrameworkToPublish.ToList ();
 				for (var i = list.Count - 1; i >= 0; i--) {
 					var item = list [i];
-					var frameworkExecutablePath = item.ItemSpec;
+					var frameworkExecutablePath = PathUtils.ConvertToMacPath (item.ItemSpec);
 					try {
 						if (frameworkExecutablePath.EndsWith (".framework", StringComparison.OrdinalIgnoreCase) && Directory.Exists (frameworkExecutablePath)) {
 							frameworkExecutablePath = Path.Combine (frameworkExecutablePath, Path.GetFileNameWithoutExtension (frameworkExecutablePath));
 						}
 
+						if (!File.Exists (frameworkExecutablePath)) {
+							Log.LogError (158, frameworkExecutablePath, MSBStrings.E0158 /* The file '{0}' does not exist. */, frameworkExecutablePath);
+							continue;
+						}
+
 						if (MachO.IsDynamicFramework (frameworkExecutablePath))
 							continue;
 					} catch (Exception e) {

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

@@ -32,6 +32,8 @@ public IEnumerable<ITaskItem> GetAdditionalItemsToBeCopied ()
 					// Copy all the files from the framework to the mac (copying only the executable won't work if it's just a symlink to elsewhere)
 					if (File.Exists (fw))
 						fw = Path.GetDirectoryName (fw);
+					if (!Directory.Exists (fw))
+						continue;
 					foreach (var file in Directory.EnumerateFiles (fw, "*.*", SearchOption.AllDirectories)) {
 						yield return new TaskItem (file);
 					}

tools/dotnet-linker/Steps/ExtractBindingLibrariesStep.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using Xamarin.Utils;
+
 namespace Xamarin.Linker {
 
 	public class ExtractBindingLibrariesStep : ConfigurationAwareStep {
@@ -70,7 +72,12 @@ protected override void TryEndProcess ()
 					if (!Configuration.Application.VerifyDynamicFramework (fwk))
 						continue;
 
-					var executable = Path.Combine (fwk, Path.GetFileNameWithoutExtension (fwk));
+					// Store a relative path if possible, it makes things easier with XVS.
+					var fwkDirectory = fwk;
+					if (Path.IsPathRooted (fwkDirectory))
+						fwkDirectory = Path.GetRelativePath (Environment.CurrentDirectory, PathUtils.ResolveSymbolicLinks (fwkDirectory));
+
+					var executable = Path.Combine (fwkDirectory, Path.GetFileNameWithoutExtension (fwkDirectory));
 
 					var item = new MSBuildItem {
 						Include = executable,