From ffc5de9d44fb5eb17af2f81f23712faa31096c16 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 26 May 2022 18:42:02 -0500 Subject: [PATCH] [One .NET] add win-arm64 support to the workload (#7037) Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1544836 Context: https://github.com/xamarin/LibZipSharp/commit/33f5b0184fb007f9c02fecf82036ab469afa050b xamarin/LibZipSharp@33f5b018 added win-arm64 builds to the [Xamarin.LibZipSharp][0] NuGet package as `runtimes\win-arm64\native\libZipSharpNative.dll`. Copy `runtimes\win-arm64\native\libZipSharpNative.dll` into `$(MSBuildSrcDir)\arm64\libZipSharpNative.dll` so that it can be used by `Xamarin.Android.Build.Tasks.dll`. Update the `Microsoft.Android.Sdk` and `Microsoft.Android.Sdk.NET6` packs to list `win-arm64` as a supported platform. [0]: https://www.nuget.org/packages/Xamarin.LibZipSharp/ --- build-tools/installers/create-installers.targets | 2 ++ .../Microsoft.NET.Sdk.Android/WorkloadManifest.in.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index f780e9f70a7..9d69d56845e 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -322,6 +322,8 @@ <_MSBuildFilesWin Include="$(MSBuildSrcDir)\x86\libZipSharpNative.pdb" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\x64\libZipSharpNative.dll" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\x64\libZipSharpNative.pdb" /> + <_MSBuildFilesWin Include="$(MSBuildSrcDir)\arm64\libZipSharpNative.dll" /> + <_MSBuildFilesWin Include="$(MSBuildSrcDir)\arm64\libZipSharpNative.pdb" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\proguard\bin\proguard.bat" ExcludeFromAndroidNETSdk="true" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\aapt2.exe" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\binutils\bin\as.exe" /> diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json index 7384f3c8140..0ef103a448f 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json @@ -38,6 +38,7 @@ "osx-arm64": "Microsoft.Android.Sdk.Darwin", "win-x86": "Microsoft.Android.Sdk.Windows", "win-x64": "Microsoft.Android.Sdk.Windows", + "win-arm64": "Microsoft.Android.Sdk.Windows", "linux-x64": "Microsoft.Android.Sdk.Linux" } }, @@ -49,6 +50,7 @@ "osx-arm64": "Microsoft.Android.Sdk.Darwin", "win-x86": "Microsoft.Android.Sdk.Windows", "win-x64": "Microsoft.Android.Sdk.Windows", + "win-arm64": "Microsoft.Android.Sdk.Windows", "linux-x64": "Microsoft.Android.Sdk.Linux" } },