Bump to xamarin/java.interop/main@8f7ddcdd (#6232)

Fixes: #6271

Context: 2d81740
Context: #5749
Context: dotnet/java-interop@d16b1e5

Changes: dotnet/java-interop@f359e73...8f7ddcd

  * dotnet/java-interop@8f7ddcdd: [build] Fix 'BuildVersionInfo_g_cs' build target. (#881)
  * dotnet/java-interop@7068f4b2: [build] Enable string operations globalization code analyzers. (#879)
  * dotnet/java-interop@3e6a6232: [build] Use GitInfo to Generate Version information. (#875)

In order to better support building solutions which reference both
.NET 6 and legacy projects within Visual Studio, we have begun
strong-naming all the MSBuild-related assemblies; see also 2d81740.
This allows loading two different version of the "same" assembly, e.g.
`Java.Interop.Tools.Diagnostics.dll`, from two different filesystem
locations in the same AppDomain/AssemblyLoadContext.

However, strong-naming is only part of the solution.  The other part
is that, for sanity and reliability, the "two different versions of
the 'same' assembly" should *also* have different assembly *versions*.
If they have the same assembly version, are they truly different?

Multiple sub-modules have been updated to use the [`GitInfo`][0]
[NuGet Package][1] so that assembly versions are unique per-commit:

  * `external/xamarin-android-tools`: 25c5cb5
  * `.external` & `monodroid`: 2d81740

Update the `external/Java.Interop` submodule to follow suit.

This in turn requires updates to `xaprepare` and the CI YAML files to
ensure that `GitInfo` is configured correctly within Java.Interop.

[0]: https://github.com/devlooped/GitInfo
[1]: https://www.nuget.org/packages/GitInfo/2.1.2

Author: dellis1972

build-tools/automation/azure-pipelines-oss.yaml

@@ -174,6 +174,9 @@ stages:
 
     - template: yaml-templates/setup-ubuntu.yaml
 
+    - script: make prepare V=1 PREPARE_CI_PR=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
+      displayName: make prepare
+
     - script: make jenkins V=1 PREPARE_CI_PR=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
       displayName: make jenkins
 

build-tools/automation/azure-pipelines.yaml

@@ -437,6 +437,10 @@ stages:
       workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
       displayName: make prepare-external-git-dependencies
 
+    - script: make prepare PREPARE_CI=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
+      workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
+      displayName: make prepare
+
     - script: make jenkins V=1 PREPARE_CI=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
       workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
       displayName: make jenkins

build-tools/scripts/msbuild.mk

@@ -37,11 +37,15 @@ ifeq ($(MSBUILD),msbuild)
 export USE_MSBUILD  = 1
 endif   # $(MSBUILD) == msbuild
 
+ifneq ($(V),0)
+MSBUILD_FLAGS += /v:diag
+endif   # $(V) != 0
+
 ifeq ($(USE_MSBUILD),1)
 
 # $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD),outdir=Build)
 define MSBUILD_BINLOG
-	$(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS) /v:normal \
+	$(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS) \
 		/binaryLogger:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/$(if $(3),$(3),Build)$(CONFIGURATION)/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog"
 endef
 
@@ -59,10 +63,6 @@ else    # $(_CSC_EMITS_PDB) == ''
 MSBUILD_FLAGS += /p:_DebugFileExt=.mdb
 endif   # $(_CSC_EMITS_PDB) == Pdb
 
-ifneq ($(V),0)
-MSBUILD_FLAGS += /v:diag
-endif   # $(V) != 0
-
 # $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD))
 define MSBUILD_BINLOG
 	$(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS)

build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Windows.cs

@@ -9,6 +9,19 @@ partial class Step_PrepareExternalJavaInterop
 #pragma warning disable CS1998
 		async Task<bool> ExecuteOSSpecific (Context context)
 		{
+			string javaInteropDir = context.Properties.GetRequiredValue (KnownProperties.JavaInteropFullPath);
+			string projectPath = Path.Combine (javaInteropDir, "build-tools", "Java.Interop.BootstrapTasks", "Java.Interop.BootstrapTasks.csproj");
+			var msbuild = new MSBuildRunner (context);
+			bool result = await msbuild.Run (
+				projectPath: projectPath,
+				logTag: "java-interop-prepare",
+				binlogName: "build-java-interop-prepare"
+			);
+
+			if (!result) {
+				Log.ErrorLine ("Failed to build java-interop-prepare");
+				return false;
+			}
 			return true;
 		}
 #pragma warning restore CS1998