From 8a440339219c42e3af08405f50e620ed941a522b Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 7 Jul 2022 12:16:53 -0400
Subject: [PATCH 1/3] Try things

description TBD.  It'll be long.
---
 src/apksigner/apksigner.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apksigner/apksigner.csproj b/src/apksigner/apksigner.csproj
index 5860e929093..3f4158236e2 100644
--- a/src/apksigner/apksigner.csproj
+++ b/src/apksigner/apksigner.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <!-- There isn't an actual dependency here, but we can only build one 'gradlew' project
          at a time, and adding <ProjectReference> between them ensures they run sequentially. -->
-    <ProjectReference Include="..\..\external\Java.Interop\tools\java-source-utils\java-source-utils.csproj" ReferenceOutputAssembly="False" SkipGetTargetFrameworkProperties="True" AdditionalProperties="TargetFramework=$(DotNetTargetFramework)" />
+    <ProjectReference Include="..\..\external\Java.Interop\tools\java-source-utils\java-source-utils.csproj" ReferenceOutputAssembly="False" />
   </ItemGroup>
 
   <Import Project="apksigner.targets" />

From 52eacd04cb175729bae5470c9f580e06670974b8 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 7 Jul 2022 15:07:36 -0400
Subject: [PATCH 2/3] Try xamarin/java.interop#1007

---
 .gitmodules           | 4 ++--
 external/Java.Interop | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f8838a54d10..9544455cbae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,8 +12,8 @@
     branch = main
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
-    url = https://github.com/xamarin/java.interop.git
-    branch = main
+    url = https://github.com/jonpryor/java.interop.git
+    branch = jonp-jsu-single-tf
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
diff --git a/external/Java.Interop b/external/Java.Interop
index 7716ae53da7..bcc78c47cdd 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 7716ae53da79068e079b17dd4961d0c821bb2c34
+Subproject commit bcc78c47cdd608ebfc992dc7818ac0ba894896fc

From 9ca6b1b9dc063eec918554d25ee130d3d089326b Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Fri, 8 Jul 2022 12:21:42 -0400
Subject: [PATCH 3/3] Bump to xamarin/java.interop/main@c942ab68

---
 .gitmodules           | 4 ++--
 external/Java.Interop | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9544455cbae..f8838a54d10 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,8 +12,8 @@
     branch = main
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
-    url = https://github.com/jonpryor/java.interop.git
-    branch = jonp-jsu-single-tf
+    url = https://github.com/xamarin/java.interop.git
+    branch = main
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
diff --git a/external/Java.Interop b/external/Java.Interop
index bcc78c47cdd..c942ab683c1 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit bcc78c47cdd608ebfc992dc7818ac0ba894896fc
+Subproject commit c942ab683c12e88e0527ed584a13b411e005ea57