Bump to xamarin/xamarin-android-tools/main@20f6112 (dotnet#7033)

Changes: dotnet/android-tools@fc3c2ac...20f6112

  * dotnet/android-tools@20f6112: Bump LibZipSharp to 2.0.4 (dotnet#166)
  * dotnet/android-tools@e4f0d59: Add support for writing android:roundIcon to Android manifest (dotnet#162)

Changes: dotnet/android-libzipsharp@2.0.3...2.0.4

  * dotnet/android-libzipsharp@8ac30f3: Bump Version to 2.0.4 for Release (#109)
  * dotnet/android-libzipsharp@8e22fe1: Use RuntimeInformation to determine the Processor architecture. (#108)
  * dotnet/android-libzipsharp@33f5b01: Bump vcpkg to latest version (#106)
  * dotnet/android-libzipsharp@6fd0a14: [ci] Use new EO compliant build pools (#107)
  * dotnet/android-libzipsharp@d339358: Add a new more complex unit test (#105)

Other changes:

  * 32-bit `libZipSharpNative.dll` is now in
    `x86\libZipSharpNative.dll`.

  * 64-bit `lib64\libZipSharpNative.dll` is now in
    `x64\libZipSharpNative.dll`.

Author: jonathanpeppers

Directory.Build.props

@@ -34,7 +34,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>

build-tools/installers/create-installers.targets

@@ -316,10 +316,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\aarch64-linux-android-as.exe" />