Testing…

Context: dotnet/java-interop#929

See if dotnet/java-interop#929 + type forwarders fixes the build
failure originally observed:

	error CS0433: The type 'JavaTypeParametersAttribute' exists in both
	'Java.Interop, Version=0.1.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065' and
	'Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065'
	[C:\a\_work\1\a\TestRelease\12-07_04.08.15\temp\LibraryProjectZipWithLint\BindingsProject\BindingsProject.csproj]

Author: jonpryor

.gitmodules

@@ -12,8 +12,8 @@
     branch = main
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
-    url = https://github.com/xamarin/java.interop.git
-    branch = main
+    url = https://github.com/jonpryor/java.interop.git
+    branch = jonp-JavaTypeParametersAttribute-only-in-net6
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs

@@ -61,10 +61,14 @@ public sealed class CheckApiCompatibility : Task
 		[Required]
 		public string ApiCompatibilityPath { get; set; }
 
+		// In case API diffs vary between e.g. Classic MonoAndroid & .NET 6+
+		public string TargetFramework { get; set; }
+
 		// This Build tasks validates that changes are not breaking Api
 		public override bool Execute ()
 		{
 			Log.LogMessage (MessageImportance.High, $"CheckApiCompatibility for ApiLevel: {ApiLevel}");
+			Log.LogWarning ($"# jonp: TargetFramework={TargetFramework}");
 
 			// Check to see if Api has a previous Api defined.
 			if (!api_versions.TryGetValue (ApiLevel, out string previousApiLevel)) {
@@ -173,8 +177,14 @@ void ValidateApiCompat (string contractPath, bool validateAgainstReference)
 
 
 					// Verify if there is a file with acceptable issues.
-					var acceptableIssuesFile = new FileInfo (Path.Combine (ApiCompatibilityPath, $"acceptable-breakages-{ (validateAgainstReference ? "vReference" : ApiLevel) }.txt"));
-					if (acceptableIssuesFile.Exists) {
+					var acceptableIssuesFiles = new[]{
+						Path.Combine (ApiCompatibilityPath, $"acceptable-breakages-{ (validateAgainstReference ? "vReference" : ApiLevel) }-{TargetFramework}.txt"),
+						Path.Combine (ApiCompatibilityPath, $"acceptable-breakages-{ (validateAgainstReference ? "vReference" : ApiLevel) }.txt"),
+					};
+					var acceptableIssuesFile = acceptableIssuesFiles.Select (p => new FileInfo (p))
+						.Where (v => v.Exists)
+						.FirstOrDefault ();
+					if (acceptableIssuesFile != null) {
 						genApiProcess.StartInfo.Arguments += $"--baseline \"{acceptableIssuesFile.FullName}\" --validate-baseline ";
 					}
 

src/Mono.Android/Java.Interop/JavaTypeParametersAttribute.cs

@@ -1,5 +1,12 @@
 using System;
 
+#if NET
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo (typeof (Java.Interop.JavaTypeParametersAttribute))]
+
+#else   // !NET
+
 namespace Java.Interop
 {
 	public class JavaTypeParametersAttribute : Attribute
@@ -13,3 +20,4 @@ public JavaTypeParametersAttribute (string [] typeParameters)
 	}
 }
 
+#endif  // !NET

src/Mono.Android/Mono.Android.targets

@@ -263,6 +263,7 @@
         LastStableApiLevel="$(AndroidLatestStableFrameworkVersion)"
         TargetImplementationPath="$(OutputPath)"
         ApiCompatibilityPath="$(ApiCompatibilityDir)"
+        TargetFramework="$(TargetFramework)"
     />
     <Touch
         Files="$(IntermediateOutputPath)CheckApiCompatibility.stamp"

tests/api-compatibility/acceptable-breakages-vReference-net6.0.txt

@@ -0,0 +1,9 @@
+Compat issues with assembly Mono.Android:
+CannotRemoveAttribute : Attribute 'Android.Runtime.RegisterAttribute' exists on 'Android.Bluetooth.BluetoothDevice.ConnectGatt(Android.Content.Context, System.Boolean, Android.Bluetooth.BluetoothGattCallback, Android.Bluetooth.BluetoothTransports, Android.Bluetooth.LE.ScanSettingsPhy)' in the contract but not the implementation.
+CannotRemoveAttribute : Attribute 'Android.Runtime.RegisterAttribute' exists on 'Android.Bluetooth.BluetoothDevice.ConnectGatt(Android.Content.Context, System.Boolean, Android.Bluetooth.BluetoothGattCallback, Android.Bluetooth.BluetoothTransports, Android.Bluetooth.LE.ScanSettingsPhy, Android.OS.Handler)' in the contract but not the implementation.
+CannotRemoveAttribute : Attribute 'Android.Runtime.RegisterAttribute' exists on 'Android.Bluetooth.LE.AdvertisingSetParameters.Builder.SetPrimaryPhy(Android.Bluetooth.LE.ScanSettingsPhy)' in the contract but not the implementation.
+CannotRemoveAttribute : Attribute 'Android.Runtime.RegisterAttribute' exists on 'Android.Bluetooth.LE.AdvertisingSetParameters.Builder.SetSecondaryPhy(Android.Bluetooth.LE.ScanSettingsPhy)' in the contract but not the implementation.
+CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'Android.Runtime.IntDefAttribute' changed from '[AttributeUsageAttribute(2272, AllowMultiple=true)]' in the contract to '[AttributeUsageAttribute(2528, AllowMultiple=true)]' in the implementation.
+CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'Android.Runtime.StringDefAttribute' changed from '[AttributeUsageAttribute(2272, AllowMultiple=true)]' in the contract to '[AttributeUsageAttribute(2528, AllowMultiple=true)]' in the implementation.
+CannotSealType : Type 'Java.Interop.JavaTypeParametersAttribute' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
+MembersMustExist : Member 'public void Java.Interop.JavaTypeParametersAttribute.TypeParameters.set(System.String[])' does not exist in the implementation but it does exist in the contract.