[One .NET] add win-arm64 support to the workload (xamarin#7037)

Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1544836 Context: xamarin/LibZipSharp@33f5b01 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/
simonrozsival · May 31, 2022 · ffc5de9 · ffc5de9
1 parent 52afcf6
commit ffc5de9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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"
       }
     },