From dc0a815a9154aa5a438a82b32f8f28337ce6c580 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Fri, 9 Feb 2024 12:28:17 -0500
Subject: [PATCH] Bump to xamarin/Java.Interop/main@dfcbd670
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes: https://github.com/xamarin/Java.Interop/compare/7f08b77f3464f2b276ec5edd2e4836b1915f86dd...dfcbd670304bb3d4becc6c76a3c16f10a158efae

  * xamarin/Java.Interop@dfcbd670: Bump to xamarin/xamarin-android-tools/main@a698a33 (xamarin/Java.Interop#1189)
  * xamarin/Java.Interop@6182baff: [build] Target `net8.0` (xamarin/Java.Interop#1186)

xamarin/java.interop@6182baff updated Java.Interop to target .NET 8
instead of .NET 7.  This introduced a build break:

	…/xamarin-android/src/Mono.Android/Mono.Android.csproj(402,5):
	  error MSB3030: Could not copy the file
	  "…/xamarin-android/external/Java.Interop/bin/Debug-net7.0/ref/Java.Interop.dll"
	  because it was not found.

Introduce a new `$(JavaInteropTargetFrameworkVersion)` MSBuild
property within `Configuration.props` which contains the .NET version
that Java.Interop is targeting.

Update `Mono.Android.csproj` and `Microsoft.Android.Ref.proj` so that
they use `$(JavaInteropTargetFrameworkVersion)` to locate the
reference `Java.Interop.dll` assembly.
---
 Configuration.props                                 | 1 +
 build-tools/create-packs/Microsoft.Android.Ref.proj | 2 +-
 external/Java.Interop                               | 2 +-
 src/Mono.Android/Mono.Android.csproj                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Configuration.props b/Configuration.props
index c7c2df0e021..1a467652e80 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -145,6 +145,7 @@
     <MonoSourceFullPath>$([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)'))</MonoSourceFullPath>
     <SqliteSourceFullPath>$([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)'))</SqliteSourceFullPath>
     <OpenTKSourceFullPath>$([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)'))</OpenTKSourceFullPath>
+    <JavaInteropTargetFrameworkVersion>net8.0</JavaInteropTargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <AdbToolPath Condition=" '$(AdbToolPath)' == '' ">$(AndroidSdkFullPath)\platform-tools\</AdbToolPath>
diff --git a/build-tools/create-packs/Microsoft.Android.Ref.proj b/build-tools/create-packs/Microsoft.Android.Ref.proj
index dfbfc76d9b5..9a1bdd0dadf 100644
--- a/build-tools/create-packs/Microsoft.Android.Ref.proj
+++ b/build-tools/create-packs/Microsoft.Android.Ref.proj
@@ -31,7 +31,7 @@ by projects that use the Microsoft.Android framework in .NET 6+.
     </PropertyGroup>
 
     <ItemGroup>
-      <_AndroidRefPackAssemblies Include="$(JavaInteropSourceDirectory)\bin\$(Configuration)-net7.0\ref\Java.Interop.dll" />
+      <_AndroidRefPackAssemblies Include="$(JavaInteropSourceDirectory)\bin\$(Configuration)-$(JavaInteropTargetFrameworkVersion)\ref\Java.Interop.dll" />
       <_AndroidRefPackAssemblies Include="$(_MonoAndroidNETDefaultOutDir)ref\Mono.Android.dll" />
       <_AndroidRefPackAssemblies Include="$(_MonoAndroidNETDefaultOutDir)ref\Mono.Android.Runtime.dll" />
       <!-- Always include stable Mono.Android.Export.dll -->
diff --git a/external/Java.Interop b/external/Java.Interop
index 7f08b77f346..dfcbd670304 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 7f08b77f3464f2b276ec5edd2e4836b1915f86dd
+Subproject commit dfcbd670304bb3d4becc6c76a3c16f10a158efae
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index 7e7ad031604..006ebd5eb41 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -400,7 +400,7 @@
         SkipUnchangedFiles="true"
     />
     <Copy
-        SourceFiles="$(OutputPath)ref\Mono.Android.dll;$(JavaInteropSourceDirectory)\bin\$(Configuration)-net7.0\ref\Java.Interop.dll"
+        SourceFiles="$(OutputPath)ref\Mono.Android.dll;$(JavaInteropSourceDirectory)\bin\$(Configuration)-$(JavaInteropTargetFrameworkVersion)\ref\Java.Interop.dll"
         DestinationFolder="$(MicrosoftAndroidRefPackDir)"
         SkipUnchangedFiles="true"
     />