[dotnet] Only do Mono AOT stuff when we're using Mono (#24204)

Author: rolfbjarne

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -1154,8 +1154,8 @@
 			<!-- Don't run the AOT compiler by default -->
 			<_RunAotCompiler>false</_RunAotCompiler>
 		</PropertyGroup>
-		<!-- We don't run Mono's AOT compiler if we're using NativeAOT -->
-		<PropertyGroup Condition="'$(_UseNativeAot)' != 'true'" >
+		<!-- We don't run Mono's AOT compiler if we're not using Mono (aka if we're using NativeAOT or CoreCLR) -->
+		<PropertyGroup Condition="'$(UseMonoRuntime)' == 'true'" >
 			<!-- We need it for device builds for mobile platforms -->
 			<_RunAotCompiler Condition="'$(_SdkIsSimulator)' != 'true' And '$(_PlatformName)' != 'macOS' And '$(_PlatformName)' != 'MacCatalyst'">true</_RunAotCompiler>
 			<!-- We need it if the interpreter is enabled, no matter where -->

tools/common/Application.cs

@@ -1354,18 +1354,13 @@ public bool IsInterpreted (string assembly)
 			return true;
 		}
 
-		// For mobile device builds: returns whether an assembly is AOT-compiled.
-		// For macOS: while AOT is supported for macOS, this particular method was not written for macOS, and would need
-		// revision/testing to be used so desired.
+		// Returns whether an assembly is Mono AOT-compiled.
 		public bool IsAOTCompiled (string assembly)
 		{
-#if NET && !LEGACY_TOOLS
-			if (Platform == ApplePlatform.MacOSX)
-				return false; // AOT on .NET for macOS hasn't been implemented yet.
-#else
-			if (Platform == ApplePlatform.MacOSX)
-				throw ErrorHelper.CreateError (99, Errors.MX0099, "IsAOTCompiled isn't a valid operation for macOS apps.");
-#endif
+			// We're never AOT compiled if we're using CoreCLR
+			if (XamarinRuntime == XamarinRuntime.CoreCLR)
+				return false;
+
 			if (!UseInterpreter) {
 				if (Platform == ApplePlatform.MacCatalyst)
 					return IsArchEnabled (Abi.ARM64);

tools/common/Target.cs

@@ -613,7 +613,7 @@ void GenerateIOSMain (StringWriter sw, Abi abi)
 			var assembly_location_count = 0;
 			var enable_llvm = (abi & Abi.LLVM) != 0;
 
-			if (app.XamarinRuntime != XamarinRuntime.NativeAOT) {
+			if (app.XamarinRuntime == XamarinRuntime.MonoVM) {
 				register_assemblies.AppendLine ("\tGCHandle exception_gchandle = INVALID_GCHANDLE;");
 				foreach (var s in assemblies) {
 					if (!s.IsAOTCompiled)
@@ -725,6 +725,8 @@ void GenerateIOSMain (StringWriter sw, Abi abi)
 				}
 			} else if (app.XamarinRuntime == XamarinRuntime.NativeAOT) {
 				// don't call mono_jit_set_aot_mode
+			} else if (app.XamarinRuntime == XamarinRuntime.CoreCLR) {
+				// don't call mono_jit_set_aot_mode
 			} else if (app.IsDeviceBuild) {
 				sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_FULL);");
 			} else if (app.Platform == ApplePlatform.MacCatalyst && ((abi & Abi.ARM64) == Abi.ARM64)) {