[msbuild] Fix watchOS submissions with Xcode 14. Fixes #16499. (#16526)

We have to remove any arm64e slices from the WK binary we copy from Apple's
SDK into the Watch app, as explained in Apple's forums.

Ref: https://developer.apple.com/forums/thread/714224
Fixes https://github.com/xamarin/xamarin-macios/issues/16120.
Fixes https://github.com/xamarin/xamarin-macios/issues/16499.
This commit is contained in:
Rolf Bjarne Kvinge 2022-11-02 18:59:04 +01:00 коммит произвёл GitHub
Родитель 060055af65
Коммит 0304f2bca1
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 8 добавлений и 0 удалений

Просмотреть файл

@ -71,9 +71,16 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<Target Name="_CompileToNative" DependsOnTargets="$(_CompileToNativeDependsOn)"
Inputs="$(_NativeWatchApp)"
Outputs="$(_NativeExecutable);$(_AppBundlePath)_WatchKitStub\WK">
<PropertyGroup Condition="'$(_SdkIsSimulator)' != 'true'">
<!-- Remove any arm64e slices when building for device -->
<WKDittoArchitectures Condition="'$(WKDittoArchitectures)' == ''">--arch arm64_32 --arch arm64 --arch armv7k</WKDittoArchitectures>
</PropertyGroup>
<Ditto
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)'"
AdditionalArguments="$(WKDittoArchitectures)"
ToolExe="$(DittoExe)"
ToolPath="$(DittoPath)"
Source="$(_NativeWatchApp)"
@ -85,6 +92,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<Ditto
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)'"
AdditionalArguments="$(WKDittoArchitectures)"
ToolExe="$(DittoExe)"
ToolPath="$(DittoPath)"
Source="$(_NativeWatchApp)"