Fix artifact names + some more test fixes

grendello · grendello · commit d3e28de2f10a · 2025-03-12T15:01:10.000+01:00
diff --git a/build-tools/automation/yaml-templates/run-msbuild-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-tests.yaml
@@ -62,7 +62,7 @@ jobs:
 
   - template: /build-tools/automation/yaml-templates/upload-results.yaml
     parameters:
-      artifactName: Test Results - MSBuild - ${{ parameters.testOS }}-${{ parameters.runtimeName }}
+      artifactName: Test Results - MSBuild - ${{ parameters.testOS }}-${{ parameters.runtimeName }}-$(System.JobPositionInPhase)
       xaSourcePath: ${{ parameters.xaSourcePath }}
       use1ESTemplate: ${{ parameters.use1ESTemplate }}
 
diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
@@ -68,3 +68,5 @@ variables:
   value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
 - name: RunMAUITestJob
   value: true
+- name: CoreCLRExcludedNunitCategories
+  value: 'cat != AOT'
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
@@ -342,6 +342,7 @@ void AddEnvironment ()
 					JniRemappingReplacementTypeCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementTypeCount,
 					JniRemappingReplacementMethodIndexEntryCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementMethodIndexEntryCount,
 					MarshalMethodsEnabled = EnableMarshalMethods,
+					ManagedMarshalMethodsLookupEnabled = EnableManagedMarshalMethodsLookup,
 					IgnoreSplitConfigs = ShouldIgnoreSplitConfigs (),
 				};
 			} else {
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -1406,21 +1406,21 @@ public void NUnitLiteNugetWorks ()
 				/* enableProguard */             null,
 				/* androidEnableProguard */      "true",
 				/* expectedBuildResult */        true,
-				/* expectedWarning */            "0 Warning(s)",
+				/* expectedWarning */            TargetRuntimeHelper.UseCoreCLR && TargetRuntimeHelper.CoreClrIsExperimental ? "1 Warning(s)" : "0 Warning(s)",
 			},
 			new object [] {
 				/* linkTool */                   "proguard",
 				/* enableProguard */             null,
 				/* androidEnableProguard */      "true",
 				/* expectedBuildResult */        false,
-				/* expectedWarning */            "0 Warning(s)",
+				/* expectedWarning */            TargetRuntimeHelper.UseCoreCLR && TargetRuntimeHelper.CoreClrIsExperimental ? "1 Warning(s)" : "0 Warning(s)",
 			},
 			new object [] {
 				/* linkTool */                   null,
 				/* enableProguard */             null,
 				/* androidEnableProguard */      null,
 				/* expectedBuildResult */        true,
-				/* expectedWarning */            "0 Warning(s)",
+				/* expectedWarning */            TargetRuntimeHelper.UseCoreCLR && TargetRuntimeHelper.CoreClrIsExperimental ? "1 Warning(s)" : "0 Warning(s)",
 			},
 			new object [] {
 				/* linkTool */                   null,
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -437,12 +437,14 @@ public void BuildHasTrimmerWarnings (string properties, string [] codes, bool is
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
 			};
-			if (totalWarnings != null && TargetRuntimeHelper.UseCoreCLR && TargetRuntimeHelper.CoreClrIsExperimental) {
+			if (TargetRuntimeHelper.UseCoreCLR && TargetRuntimeHelper.CoreClrIsExperimental) {
 				// Experimental runtimes will issue warning XA1040
-				totalWarnings++;
 				var newCodes = new List<string> (codes);
 				newCodes.Add ("XA1040");
 				codes = newCodes.ToArray ();
+				if (totalWarnings != null) {
+					totalWarnings++;
+				}
 			}
 			proj.SetRuntimeIdentifier ("arm64-v8a");
 			proj.MainActivity = proj.DefaultMainActivity
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs
@@ -456,7 +456,7 @@ public void BuildWithNativeLibraryUnknownAbi ()
 					},
 				}
 			};
-			proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");
+			proj.SetAndroidSupportedAbis ("arm64-v8a", "x64");
 
 			using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {
 				builder.ThrowOnBuildFailure = false;
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
@@ -1307,10 +1307,15 @@ public void MissingProjectReference ()
 				libBuilder.ThrowOnBuildFailure =
 					appBuilder.ThrowOnBuildFailure = false;
 
+				int expectedWarnings = 1;
+				if (TargetRuntimeHelper.UseCoreCLR && TargetRuntimeHelper.CoreClrIsExperimental) {
+					expectedWarnings++; // Warning XA1040 will be issued
+				}
+
 				// Build app before library is built
 				Assert.IsFalse (appBuilder.Build (app), "app build should have failed.");
 				Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "warning MSB9008"), "Should receive MSB9008");
-				Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Warning(s)"), "Should receive 1 Warning");
+				Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, $" {expectedWarnings} Warning(s)"), $"Should receive {expectedWarnings} Warning(s)");
 				Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "error CS0246"), "Should receive CS0246");
 				Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Error(s)"), "Should receive 1 Error");
 
@@ -1435,10 +1440,10 @@ public void AndroidAssetMissing ()
 		public void ChangeSupportedAbis ()
 		{
 			var proj = new XamarinFormsAndroidApplicationProject ();
-			proj.SetAndroidSupportedAbis ("armeabi-v7a");
+			proj.SetAndroidSupportedAbis ("arm64-v8a");
 			using (var b = CreateApkBuilder ()) {
 				b.Build (proj);
-				b.Build (proj, parameters: new [] { $"{KnownProperties.RuntimeIdentifier}=android-x86" }, doNotCleanupOnUpdate: true);
+				b.Build (proj, parameters: new [] { $"{KnownProperties.RuntimeIdentifier}=android-x64" }, doNotCleanupOnUpdate: true);
 			}
 		}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
@@ -415,8 +415,8 @@ public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true,
 
 				// Make sure the APKs have unique version codes
 				if (perAbiApk) {
-					int armManifestCode = GetVersionCodeFromIntermediateManifest (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "armeabi-v7a", "AndroidManifest.xml"));
-					int x86ManifestCode = GetVersionCodeFromIntermediateManifest (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "x86", "AndroidManifest.xml"));
+					int armManifestCode = thirtyTwoBitAbisSupported ? GetVersionCodeFromIntermediateManifest (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "armeabi-v7a", "AndroidManifest.xml")) : 0;
+					int x86ManifestCode = thirtyTwoBitAbisSupported ? GetVersionCodeFromIntermediateManifest (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "x86", "AndroidManifest.xml")) : 0;
 					int arm64ManifestCode = GetVersionCodeFromIntermediateManifest (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "arm64-v8a", "AndroidManifest.xml"));
 					int x86_64ManifestCode = GetVersionCodeFromIntermediateManifest (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "x86_64", "AndroidManifest.xml"));
 					List<int> versionList;
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/TargetRuntimeHelper.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/TargetRuntimeHelper.cs
@@ -32,6 +32,7 @@ static TargetRuntimeHelper ()
 	public static bool UseMonoRuntime => useMonoRuntime;
 	public static bool UseCoreCLR => !useMonoRuntime;
 	public static string[] CoreClrSupportedAbis => coreClrSupportedAbis;
+	public string RuntimeName => UseMonoRuntime ? "MonoVM" : "CoreCLR";
 
 	public static bool CoreClrSupportsAbi (string abiName) => coreClrAbis.Contains (abiName);
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs
@@ -3,7 +3,7 @@
 namespace Xamarin.Android.Tasks
 {
 	// Declaration order of fields and their types must correspond *exactly* to that in
-	// src/native/xamarin-app-stub/xamarin-app.hh ApplicationConfig structure
+	// src/native/mono/xamarin-app-stub/xamarin-app.hh ApplicationConfig structure
 	//
 	// Type mappings:
 	//
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigCLR.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigCLR.cs
@@ -3,7 +3,7 @@
 namespace Xamarin.Android.Tasks;
 
 // Declaration order of fields and their types must correspond *exactly* to that in
-// src/native/clr/xamarin-app-stub/xamarin-app.hh ApplicationConfig structure
+// src/native/clr/include/xamarin-app.hh ApplicationConfig structure
 //
 // Type mappings:
 //
@@ -49,4 +49,5 @@ sealed class ApplicationConfigCLR
 	public uint   jni_remapping_replacement_type_count;
 	public uint   jni_remapping_replacement_method_index_entry_count;
 	public string android_package_name = String.Empty;
+	public bool   managed_marshal_methods_lookup_enabled;
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGeneratorCLR.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGeneratorCLR.cs
@@ -207,6 +207,7 @@ sealed class XamarinAndroidBundledAssembly
 	public PackageNamingPolicy PackageNamingPolicy { get; set; }
 	public List<ITaskItem> NativeLibraries { get; set; }
 	public bool MarshalMethodsEnabled { get; set; }
+	public bool ManagedMarshalMethodsLookupEnabled { get; set; }
 	public bool IgnoreSplitConfigs { get; set; }
 
 	public ApplicationConfigNativeAssemblyGeneratorCLR (IDictionary<string, string> environmentVariables, IDictionary<string, string> systemProperties,
@@ -256,6 +257,7 @@ protected override void Construct (LlvmIrModule module)
 			uses_assembly_preload = UsesAssemblyPreload,
 			jni_add_native_method_registration_attribute_present = JniAddNativeMethodRegistrationAttributePresent,
 			marshal_methods_enabled = MarshalMethodsEnabled,
+			managed_marshal_methods_lookup_enabled = ManagedMarshalMethodsLookupEnabled,
 			ignore_split_configs = IgnoreSplitConfigs,
 			number_of_runtime_properties = (uint)(runtimeProperties == null ? 0 : runtimeProperties.Count),
 			package_naming_policy = (uint)PackageNamingPolicy,

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ public void BuildWithNativeLibraryUnknownAbi ()`
`456`	`456`	`},`
`457`	`457`	`}`
`458`	`458`	`};`
`459`		`- proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");`
	`459`	`+ proj.SetAndroidSupportedAbis ("arm64-v8a", "x64");`
`460`	`460`
`461`	`461`	`using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {`
`462`	`462`	`builder.ThrowOnBuildFailure = false;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Xamarin.Android.Tasks`
`4`	`4`	`{`
`5`	`5`	`// Declaration order of fields and their types must correspond exactly to that in`
`6`		`- // src/native/xamarin-app-stub/xamarin-app.hh ApplicationConfig structure`
	`6`	`+ // src/native/mono/xamarin-app-stub/xamarin-app.hh ApplicationConfig structure`
`7`	`7`	`//`
`8`	`8`	`// Type mappings:`
`9`	`9`	`//`