From e4ce863adf8fbc3457e05e2b93f738d00caf3e59 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 25 May 2022 14:47:20 -0500
Subject: [PATCH] Bump to xamarin/xamarin-android-tools/main@20f6112

Changes: https://github.com/xamarin/xamarin-android-tools/compare/fc3c2ac...20f6112
Changes: https://github.com/xamarin/LibZipSharp/compare/2.0.3...2.0.4

* Add support for writing `android:roundIcon` to Android manifest
* Bump LibZipSharp to 2.0.4

Other changes:

* The paths to `libZipSharpNative.dll` changed to `x86` and `x64`.
---
 Directory.Build.props                            | 2 +-
 build-tools/installers/create-installers.targets | 8 ++++----
 external/xamarin-android-tools                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a345c9af72c..1e0f0a8b838 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -36,7 +36,7 @@
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>2.0.3</LibZipSharpVersion>
+    <LibZipSharpVersion>2.0.4</LibZipSharpVersion>
     <MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.4</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
index 7073a899743..f780e9f70a7 100644
--- a/build-tools/installers/create-installers.targets
+++ b/build-tools/installers/create-installers.targets
@@ -318,10 +318,10 @@
     <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.DefaultOutputPaths.targets" />
   </ItemGroup>
   <ItemGroup>
-    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\libZipSharpNative.dll" />
-    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\libZipSharpNative.pdb" />
-    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\lib64\libZipSharpNative.dll" />
-    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\lib64\libZipSharpNative.pdb" />
+    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\x86\libZipSharpNative.dll" />
+    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\x86\libZipSharpNative.pdb" />
+    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\x64\libZipSharpNative.dll" />
+    <_MSBuildFilesWin Include="$(MSBuildSrcDir)\x64\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/external/xamarin-android-tools b/external/xamarin-android-tools
index fc3c2ac191a..20f611202be 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit fc3c2ac191a47715bc58e110ef28f38009158416
+Subproject commit 20f611202bef0fc7c1659366dd38865eb119dde5