Bump to xamarin/Java.Interop/main@79744f61 (#6436)

Changes: dotnet/java-interop@974ad32...79744f6

  * dotnet/java-interop@79744f61: [generator] Fix for fixing invalid annotation XML. (#897)
  * dotnet/java-interop@220b87fb: [tests] rework JavaObjectTest, use FinalizerHelper from mono/mono (#899)
  * dotnet/java-interop@f658ab26: [generator] Add Java.Interop.Tools.JavaTypeSystem (#849)

Add `Java.Interop.Tools.JavaTypeSystem.csproj` to
`Xamarin.Android.sln`, and add `Java.Interop.Tools.JavaTypeSystem.dll`
to the installers.

Add a temporary MSBuild property `$(_AndroidUseJavaLegacyResolver)`,
which when set to `true` will cause `generator` to use the legacy
Java type resolver (`ApiXmlAdjuster`) instead of the new
`JavaTypeSystem` one, in case there are unexpected issues.

Author: jpobst

Xamarin.Android.sln

@@ -150,6 +150,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tmt", "tools\tmt\tmt.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "assembly-store-reader", "tools\assembly-store-reader\assembly-store-reader.csproj", "{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaTypeSystem", "external\Java.Interop\src\Java.Interop.Tools.JavaTypeSystem\Java.Interop.Tools.JavaTypeSystem.csproj", "{4EFCED6E-9A6B-453A-94E4-CE4B736EC684}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems*{3f1f2f50-af1a-4a5a-bedb-193372f068d7}*SharedItemsImports = 5
@@ -414,6 +416,10 @@ Global
 		{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51}.Debug|AnyCPU.Build.0 = Debug|anycpu
 		{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51}.Release|AnyCPU.ActiveCfg = Release|anycpu
 		{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51}.Release|AnyCPU.Build.0 = Release|anycpu
+		{4EFCED6E-9A6B-453A-94E4-CE4B736EC684}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{4EFCED6E-9A6B-453A-94E4-CE4B736EC684}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{4EFCED6E-9A6B-453A-94E4-CE4B736EC684}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{4EFCED6E-9A6B-453A-94E4-CE4B736EC684}.Release|AnyCPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -482,6 +488,7 @@ Global
 		{1A273ED2-AE84-48E9-9C23-E978C2D0CB34} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{1FED3F23-1175-42AA-BE87-EF1E8DB52F8B} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
+		{4EFCED6E-9A6B-453A-94E4-CE4B736EC684} = {864062D3-A415-4A6F-9324-5820237BA058}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {53A1F287-EFB2-4D97-A4BB-4A5E145613F6}

build-tools/installers/create-installers.targets

@@ -148,6 +148,8 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaCallableWrappers.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaSource.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaSource.pdb" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaTypeSystem.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaTypeSystem.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll.config" Condition=" '$(HostOS)' != 'Windows' " />

external/Java.Interop

@@ -80,6 +80,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
         EnableBindingNestedInterfaceTypes="$(AndroidBoundInterfacesContainTypes)"
         EnableBindingInterfaceConstants="$(AndroidBoundInterfacesContainConstants)"
         Nullable="$(Nullable)"
+        UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)"
     />
 
     <!-- Write a flag so we won't redo this target if nothing changed -->

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets

@@ -59,6 +59,8 @@ public class BindingsGenerator : AndroidDotnetToolTask
 		public ITaskItem[] JavadocXml { get; set; }
 		public string JavadocVerbosity { get; set; }
 
+		public bool UseJavaLegacyResolver { get; set; }
+
 		private List<Tuple<string, string>> transform_files = new List<Tuple<string,string>> ();
 
 		public override bool RunTask ()
@@ -198,6 +200,9 @@ protected override string GenerateCommandLineCommands ()
 						WriteLine (sw, $"\"--with-javadoc-xml={Path.GetFullPath (xml.ItemSpec)}\"");
 					}
 				}
+
+				if (UseJavaLegacyResolver)
+					WriteLine (sw, "--use-legacy-java-resolver=true");
 			}
 
 			cmd.AppendSwitch (ApiXmlInput);