Merge remote-tracking branch 'origin/main' into dev/pjc/1estemp

Author: pjcollins

build-tools/automation/azure-pipelines.yaml

@@ -329,7 +329,7 @@ extends:
     - stage: maui_tests
       displayName: MAUI Tests
       dependsOn: mac_build
-      condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(variables['System.PullRequest.TargetBranch'], 'main'))
+      condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(variables['RunMAUITestJob'], 'true'))
       jobs:
       # Check - "Xamarin.Android (MAUI Tests MAUI Integration)"
       - job: maui_tests_integration

build-tools/automation/yaml-templates/variables.yaml

@@ -56,3 +56,5 @@ variables:
   value: 34
 - name: ExcludedNightlyNUnitCategories
   value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
+- name: RunMAUITestJob
+  value: true

external/Java.Interop

@@ -0,0 +1,4 @@
+<Project>
+  <!-- Import $(LibZipSharpVersion) -->
+  <Import Project="..\Directory.Build.props" />
+</Project>

external/xamarin-android-tools.override.props

@@ -33,6 +33,8 @@ public class BuildApk : AndroidTask
 		[Required]
 		public string ApkOutputPath { get; set; }
 
+		public string AppSharedLibrariesDir { get; set; }
+
 		[Required]
 		public ITaskItem[] ResolvedUserAssemblies { get; set; }
 

src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs

@@ -20,6 +20,7 @@
 
 using Xamarin.Android.Tools;
 using Microsoft.Android.Build.Tasks;
+using Java.Interop.Tools.JavaCallableWrappers.Adapters;
 
 namespace Xamarin.Android.Tasks
 {
@@ -463,6 +464,16 @@ bool CreateJavaSources (IEnumerable<JavaType> newJavaTypes, TypeDefinitionCache
 			bool hasExportReference = ResolvedAssemblies.Any (assembly => Path.GetFileName (assembly.ItemSpec) == "Mono.Android.Export.dll");
 			bool generateOnCreateOverrides = int.Parse (AndroidSdkPlatform) <= 10;
 
+			var reader_options = new CallableWrapperReaderOptions {
+				DefaultApplicationJavaClass         = ApplicationJavaClass,
+				DefaultGenerateOnCreateOverrides    = generateOnCreateOverrides,
+				DefaultMonoRuntimeInitialization    = monoInit,
+				MethodClassifier                    = classifier,
+			};
+			var writer_options = new CallableWrapperWriterOptions {
+				CodeGenerationTarget    = JavaPeerStyle.XAJavaInterop1
+			};
+
 			bool ok = true;
 			foreach (JavaType jt in newJavaTypes) {
 				TypeDefinition t = jt.Type; // JCW generator doesn't care about ABI-specific types or token ids
@@ -473,23 +484,21 @@ bool CreateJavaSources (IEnumerable<JavaType> newJavaTypes, TypeDefinitionCache
 
 				using (var writer = MemoryStreamPool.Shared.CreateStreamWriter ()) {
 					try {
-						var jti = new JavaCallableWrapperGenerator (t, Log.LogWarning, cache, classifier) {
-							GenerateOnCreateOverrides = generateOnCreateOverrides,
-							ApplicationJavaClass = ApplicationJavaClass,
-							MonoRuntimeInitialization = monoInit,
-						};
+						var jcw_type = CecilImporter.CreateType (t, cache, reader_options);
+						
+						jcw_type.Generate (writer, writer_options);
 
-						jti.Generate (writer);
 						if (useMarshalMethods) {
 							if (classifier.FoundDynamicallyRegisteredMethods (t)) {
 								Log.LogWarning ($"Type '{t.GetAssemblyQualifiedName (cache)}' will register some of its Java override methods dynamically. This may adversely affect runtime performance. See preceding warnings for names of dynamically registered methods.");
 							}
 						}
+
 						writer.Flush ();
 
-						var path = jti.GetDestinationPath (outputPath);
+						var path = jcw_type.GetDestinationPath (outputPath);
 						Files.CopyIfStreamChanged (writer.BaseStream, path);
-						if (jti.HasExport && !hasExportReference)
+						if (jcw_type.HasExport && !hasExportReference)
 							Diagnostic.Error (4210, Properties.Resources.XA4210);
 					} catch (XamarinAndroidException xae) {
 						ok = false;