diff --git a/Configuration.props b/Configuration.props index c7c2df0e021..1a467652e80 100644 --- a/Configuration.props +++ b/Configuration.props @@ -145,6 +145,7 @@ $([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)')) $([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)')) $([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)')) + net8.0 $(AndroidSdkFullPath)\platform-tools\ 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+. - <_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" /> 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" />