From 5a0fdf93e3643e0421dd080bda50cecbf5aae597 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 24 Aug 2022 20:36:51 +0200
Subject: [PATCH 1/4] Bump XAT for new LibZipSharp

---
 external/xamarin-android-tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 9c641b3e08e..29f11f2a304 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 9c641b3e08e56db37467a64a2c5de2c7f7ddb3ef
+Subproject commit 29f11f2a304376bfa96de999a78083fe5a8174c6

From 6d7daf4225218695b76bfa6548bd0b61e18ebb9a Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 25 Aug 2022 17:42:17 -0400
Subject: [PATCH 2/4] $(LibZipSharpVersion)=2.0.7

Fixes NU1605 error:

         /Users/builder/azdo/_work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj : error NU1605: Detected package downgrade: Xamarin.LibZipSharp from 2.0.7 to 2.0.4. Reference the package directly from the project to select a different version.  [/Users/builder/azdo/_work/1/s/xamarin-android/Xamarin.Android.sln]
       /Users/builder/azdo/_work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj : error NU1605:  Xamarin.Android.Build.Tasks -> Microsoft.Android.Build.BaseTasks -> Xamarin.LibZipSharp (>= 2.0.7)  [/Users/builder/azdo/_work/1/s/xamarin-android/Xamarin.Android.sln]
       /Users/builder/azdo/_work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj : error NU1605:  Xamarin.Android.Build.Tasks -> Xamarin.LibZipSharp (>= 2.0.4) [/Users/builder/azdo/_work/1/s/xamarin-android/Xamarin.Android.sln]
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3c0f998eab8..cd1810a7ab4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -42,7 +42,7 @@
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>2.0.4</LibZipSharpVersion>
+    <LibZipSharpVersion>2.0.7</LibZipSharpVersion>
     <MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.4</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>

From 0498eb3801278e3b6a6c65ee83ea8b11026e3a87 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 25 Aug 2022 18:04:49 -0400
Subject: [PATCH 3/4] Bump mono.unix version

        /Users/builder/azdo/_work/1/s/xamarin-android/build-tools/xaprepare/xaprepare/xaprepare.csproj : error NU1605: Detected package downgrade: Mono.Unix from 7.1.0-final.1.21458.1 to 7.0.0-final.1.21369.2. Reference the package directly from the project to select a different version.
       /Users/builder/azdo/_work/1/s/xamarin-android/build-tools/xaprepare/xaprepare/xaprepare.csproj : error NU1605:  xaprepare -> Xamarin.LibZipSharp 2.0.7 -> Mono.Unix (>= 7.1.0-final.1.21458.1)
---
 build-tools/xaprepare/xaprepare/xaprepare.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj
index c8382018794..6a75be1ba23 100644
--- a/build-tools/xaprepare/xaprepare/xaprepare.csproj
+++ b/build-tools/xaprepare/xaprepare/xaprepare.csproj
@@ -52,7 +52,7 @@
     <PackageReference Include="7-Zip.CommandLine" Version="18.1.0" GeneratePathProperty="true" />
     <PackageReference Include="Kajabity.Tools.Java" Version="0.2.6862.30334" />
     <PackageReference Include="Mono.Options" Version="$(MonoOptionsVersion)" />
-    <PackageReference Include="Mono.Unix" Version="7.0.0-final.1.21369.2" />
+    <PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
     <PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" GeneratePathProperty="true" />

From 58ce08954c114d7ba563430df1e78c2916665b7f Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Fri, 26 Aug 2022 12:05:36 -0400
Subject: [PATCH 4/4] Bump to xamarin/monodroid/main@100ccf96

Changes: https://github.com/xamarin/monodroid/compare/210073e19b9aa339d2099260e724c1f60df6fd70...100ccf969e58a633ec85af7627110bab6e9fe13d

  * xamarin/monodroid@100ccf969: Bump to xamarin/androidtools@81486ab, xamarin/android-sdk-installer@8cac7ea (#1264)
---
 .external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.external b/.external
index db93df27e63..c1f0aa799f9 100644
--- a/.external
+++ b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@210073e19b9aa339d2099260e724c1f60df6fd70
+xamarin/monodroid:main@100ccf969e58a633ec85af7627110bab6e9fe13d
 mono/mono:2020-02@dffa5ab92245f2419238a35b7c2052e9a24036b4