Mac: Fix building unified binary

[hazzik]

The following snippet does not make much sense

<UnifiedFiles TargetPath="$([System.String]::Copy('%(FullPath)').TrimStart('%(BasePath)'))" />

Because '%(BasePath)' is a relative path and so %(FullPath) does not start with it. Therefore %(TargetPath) becomes equal to '%(FullPath)' which is obviously unique (because these are the actual files).

Here is an example produced with a template project (2.6.1) created at~/Projects/Private/eto-test2 (~ is /Users/alex.z/):

  UnifiedFiles.BasePath = bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/
  UnifiedFiles.BasePath = bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/

  UnifiedFiles.Identity = bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Info.plist
  UnifiedFiles.Identity = bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/MacOS/eto-test2
  UnifiedFiles.Identity = bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Resources/MacIcon.icns
  UnifiedFiles.Identity = bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Info.plist
  UnifiedFiles.Identity = bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/MacOS/eto-test2
  UnifiedFiles.Identity = bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Resources/MacIcon.icns

  UnifiedFiles.FullPath = /Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Info.plist
  UnifiedFiles.FullPath = /Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/MacOS/eto-test2
  UnifiedFiles.FullPath = /Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Resources/MacIcon.icns
  UnifiedFiles.FullPath = /Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Info.plist
  UnifiedFiles.FullPath = /Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/MacOS/eto-test2
  UnifiedFiles.FullPath = /Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Resources/MacIcon.icns

Here is part of output of dotnet build if I uncomment this line:

Eto/src/Eto.Mac/build/BundleDotNetCore.targets

Line 35 in f5d7804

<!-- <Message Importance="high" Text="%(UnifiedFiles.RelativeDir)%(UnifiedFiles.FileName)%(UnifiedFiles.Extension) > %(UnifiedFiles.TargetPath)" /> -->

  bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Info.plist > Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Info.plist
  bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/MacOS/eto-test2 > Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/MacOS/eto-test2
  bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Resources/MacIcon.icns > Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Resources/MacIcon.icns
  bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Info.plist > Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Info.plist
  bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/MacOS/eto-test2 > Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/MacOS/eto-test2
  bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Resources/MacIcon.icns > Users/alex.z/Projects/Private/eto-test2/bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Resources/MacIcon.icns

And here's the output with a fixed version:

  bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Info.plist > Contents/Info.plist
  bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/MacOS/eto-test2 > Contents/MacOS/eto-test2
  bin/Mac64/Debug/net6.0/osx-x64/eto-test2.app/Contents/Resources/MacIcon.icns > Contents/Resources/MacIcon.icns
  bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Info.plist > Contents/Info.plist
  bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/MacOS/eto-test2 > Contents/MacOS/eto-test2
  bin/Mac64/Debug/net6.0/osx-arm64/eto-test2.app/Contents/Resources/MacIcon.icns > Contents/Resources/MacIcon.icns

[hazzik]

This is implied by this comment:

Eto/src/Eto.Mac/build/BundleDotNetCore.targets

Lines 148 to 150 in f5d7804

	Log.LogWarning($"{group.Key} is different between RuntimeIdentifiers. Creating universal binaries is only supported when PublishSingleFile is true.");

[cwensley]

Hey @hazzik, much appreciated for the fix creating unified binaries! I found the same issue recently and fixed it locally a little differently but either way works for me.

Unfortunately, the second fix I cannot merge in, as if PublishSingleFile is not set, it will still create single file .app bundles by default but will be skipped with that change.

On top of that, it's simply a warning. That might happen if you add different content files for each architecture, and you need the warning so you know they are different and can't be merged. I think the message should probably be updated to reflect that case.

[hazzik]

@cwensley ok, I've reverted the second commit.

[cwensley]

Awesome, thanks for doing that! Really appreciated.