[msbuild] Add support for CopySceneKitAssetsPath to specify the location of the 'copySceneKitAssets' executable.

Also don't set the PATH or XCODE_DEVELOPER_USR_PATH variables anymore, it's
not needed.

Author: rolfbjarne

docs/building-apps/build-properties.md

@@ -290,6 +290,12 @@ This also applies to how native references are stored inside NuGets.
 > [!NOTE]
 > In some cases it can be beneficial to force a zip file on iOS as well, especially when there's a framework with files that have long names, because the zip file can sometimes work around MAX_PATH issues on Windows.
 
+## CopySceneKitAssetsPath
+
+The full path to the `copySceneKitAssets` tool.
+
+The default behavior is to use `xcrun copySceneKitAssets`.
+
 ## CoreMLCompilerPath
 
 The full path to the `coremlc` tool.

msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssets.cs

@@ -16,13 +16,13 @@
 
 namespace Xamarin.MacDev.Tasks {
 	public class CompileSceneKitAssets : XamarinTask, ICancelableTask, IHasProjectDir, IHasResourcePrefix {
-		string? toolExe;
-
 		#region Inputs
 
 		[Required]
 		public string AppBundleName { get; set; } = "";
 
+		public string CopySceneKitAssetsPath { get; set; } = "";
+
 		[Required]
 		public string IntermediateOutputPath { get; set; } = "";
 
@@ -49,13 +49,6 @@ public class CompileSceneKitAssets : XamarinTask, ICancelableTask, IHasProjectDi
 		[Required]
 		public string SdkVersion { get; set; } = "";
 
-		public string ToolExe {
-			get { return toolExe ?? ToolName; }
-			set { toolExe = value; }
-		}
-
-		public string ToolPath { get; set; } = "";
-
 		#endregion
 
 		#region Outputs
@@ -65,38 +58,19 @@ public string ToolExe {
 
 		#endregion
 
-		static string ToolName {
-			get { return "copySceneKitAssets"; }
-		}
+		const string ToolName = "copySceneKitAssets";
 
 		protected virtual string OperatingSystem {
 			get {
 				return PlatformFrameworkHelper.GetOperatingSystem (TargetFrameworkMoniker);
 			}
 		}
 
-		string DeveloperRootBinDir {
-			get { return Path.Combine (SdkDevPath, "usr", "bin"); }
-		}
-
-		string GetFullPathToTool ()
-		{
-			if (!string.IsNullOrEmpty (ToolPath))
-				return Path.Combine (ToolPath, ToolExe);
-
-			var path = Path.Combine (DeveloperRootBinDir, ToolExe);
-
-			return File.Exists (path) ? path : ToolExe;
-		}
-
 		Task CopySceneKitAssets (string scnassets, string output, string intermediate)
 		{
 			var environment = new Dictionary<string, string?> ();
 			var args = new List<string> ();
 
-			environment.Add ("PATH", DeveloperRootBinDir);
-			environment.Add ("XCODE_DEVELOPER_USR_PATH", DeveloperRootBinDir);
-
 			args.Add (Path.GetFullPath (scnassets));
 			args.Add ("-o");
 			args.Add (Path.GetFullPath (output));
@@ -111,7 +85,9 @@ Task CopySceneKitAssets (string scnassets, string output, string intermediate)
 			args.Add ($"--target-build-dir={Path.GetFullPath (intermediate)}");
 			args.Add ($"--resources-folder-path={AppBundleName}");
 
-			return ExecuteAsync (GetFullPathToTool (), args, sdkDevPath: SdkDevPath, environment: environment, showErrorIfFailure: true);
+			var executable = GetExecutable (args, ToolName, CopySceneKitAssetsPath);
+
+			return ExecuteAsync (executable, args, sdkDevPath: SdkDevPath, environment: environment, showErrorIfFailure: true);
 		}
 
 		static bool TryGetScnAssetsPath (string file, out string scnassets)

msbuild/Xamarin.Shared/Xamarin.Shared.targets

@@ -1153,8 +1153,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			SessionId="$(BuildSessionId)"
 			AppBundleName="$(_AppBundleName)$(AppBundleExtension)"
 			Condition="'$(IsMacEnabled)' == 'true'"
-			ToolExe="$(CopySceneKitAssetsExe)"
-			ToolPath="$(CopySceneKitAssetsPath)"
+			CopySceneKitAssetsPath="$(CopySceneKitAssetsPath)"
 			SceneKitAssets="@(SceneKitAsset)"
 			IntermediateOutputPath="$(DeviceSpecificIntermediateOutputPath)"
 			TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"