From b260c5490a51e44e0721215499fa2b1807356e87 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Mon, 27 Jan 2020 16:18:43 -0600
Subject: [PATCH 1/3] Bump Java.Interop: d16-5@fc18c54b.

---
 external/Java.Interop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/Java.Interop b/external/Java.Interop
index c0cc7700ca2..fc18c54b2cc 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit c0cc7700ca2e3d796f3a001a9188f2e535ae72a6
+Subproject commit fc18c54b2ccf14f444fadac0a1e7e81f837cc470

From c087a75f47cb3e36f9eaf5a327f3f85de8372a84 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Mon, 13 Jan 2020 14:47:24 -0600
Subject: [PATCH 2/3] [Mono.Android] Add unsigned NewArray overloads.

---
 src/Mono.Android/Android.Runtime/JNIEnv.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Mono.Android/Android.Runtime/JNIEnv.cs b/src/Mono.Android/Android.Runtime/JNIEnv.cs
index 59d0675b97c..6a45ae45993 100644
--- a/src/Mono.Android/Android.Runtime/JNIEnv.cs
+++ b/src/Mono.Android/Android.Runtime/JNIEnv.cs
@@ -1292,6 +1292,14 @@ public static IntPtr NewArray (string[] array)
 			return result;
 		}
 
+		// We do these translations here instead of in the binding to force a compile
+		// time error if using an older Java.Interop.dll instead of a runtime error
+		public static IntPtr NewArray (uint[] array) => NewArray ((int[])(object)array);
+
+		public static IntPtr NewArray (ushort[] array) => NewArray ((short[])(object)array);
+
+		public static IntPtr NewArray (ulong[] array) => NewArray ((long[])(object)array);
+
 		public static IntPtr NewObjectArray (int length, IntPtr elementClass)
 		{
 			return NewObjectArray (length, elementClass, IntPtr.Zero);

From 113696b2f5a7e4b72de2cdc8570da0ee1d81427e Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Mon, 27 Jan 2020 16:11:45 -0600
Subject: [PATCH 3/3] Consolidate all projects on Irony 1.1.0.

---
 .../Xamarin.Android.Build.Tasks.csproj                          | 2 +-
 src/Xamarin.Android.Build.Tasks/packages.config                 | 2 +-
 .../Xamarin.Android.Tools.Aidl.csproj                           | 2 +-
 src/Xamarin.Android.Tools.Aidl/packages.config                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index 406bcbcbb12..32c3fb88f2f 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -50,7 +50,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="Irony">
-      <HintPath>..\..\packages\Irony.0.9.1\lib\net40\Irony.dll</HintPath>
+      <HintPath>..\..\packages\Irony.1.1.0\lib\net40\Irony.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Compiler.CodeDom">
       <HintPath>..\..\packages\FSharp.Compiler.CodeDom.1.0.0.1\lib\net40\FSharp.Compiler.CodeDom.dll</HintPath>
diff --git a/src/Xamarin.Android.Build.Tasks/packages.config b/src/Xamarin.Android.Build.Tasks/packages.config
index 89d1fdac302..97508dde609 100644
--- a/src/Xamarin.Android.Build.Tasks/packages.config
+++ b/src/Xamarin.Android.Build.Tasks/packages.config
@@ -3,7 +3,7 @@
   <package id="FSharp.Compiler.CodeDom" version="1.0.0.1" targetFramework="net45" />
   <package id="FSharp.Core" version="3.1.2.5" targetFramework="net451" />
   <package id="ILRepack.Lib.MSBuild.Task" version="2.0.15.4" targetFramework="net462" />
-  <package id="Irony" version="0.9.1" targetFramework="net45" />
+  <package id="Irony" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.Build.Framework" version="14.3.0" targetFramework="net472" />
   <package id="Microsoft.Build.Tasks.Core" version="14.3.0" targetFramework="net472" />
   <package id="Microsoft.Build.Utilities.Core" version="14.3.0" targetFramework="net472" />
diff --git a/src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj b/src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj
index 71bf1256fd8..5b4a6e4335a 100644
--- a/src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj
+++ b/src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj
@@ -29,7 +29,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Irony">
-      <HintPath>..\..\packages\Irony.0.9.1\lib\net40\Irony.dll</HintPath>
+      <HintPath>..\..\packages\Irony.1.1.0\lib\net40\Irony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Xamarin.Android.Cecil">
diff --git a/src/Xamarin.Android.Tools.Aidl/packages.config b/src/Xamarin.Android.Tools.Aidl/packages.config
index e00e266fbcd..0a8db45bfa5 100644
--- a/src/Xamarin.Android.Tools.Aidl/packages.config
+++ b/src/Xamarin.Android.Tools.Aidl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Irony" version="0.9.1" targetFramework="net40" />
+  <package id="Irony" version="1.1.0" targetFramework="net40" />
 </packages>