From 9f21e20879a004983e917d30aaf7b23486062654 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 28 Oct 2021 16:11:34 -0500 Subject: [PATCH 1/2] [ClassParse.targets] Pass in temporary MSBuild flag `$(_AndroidUseJavaLegacyResolver)` --- .../Android/Xamarin.Android.Bindings.ClassParse.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets index 0c986cf825f..b9c9db19c03 100644 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets +++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets @@ -43,7 +43,8 @@ This file is only used by binding projects. ToolPath="$(MonoAndroidToolsDirectory)" ToolExe="$(BindingsGeneratorToolExe)" Nullable="$(Nullable)" - /> + UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)" + /> Date: Thu, 28 Oct 2021 16:16:22 -0500 Subject: [PATCH 2/2] Update Xamarin.Android.Bindings.ClassParse.targets --- .../Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets index b9c9db19c03..c90cd75332a 100644 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets +++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets @@ -44,7 +44,7 @@ This file is only used by binding projects. ToolExe="$(BindingsGeneratorToolExe)" Nullable="$(Nullable)" UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)" - /> + />