More changes

Author: jonathanpeppers

Documentation/docs-mobile/messages/xa1040.md

@@ -8,24 +8,23 @@ ms.date: 02/24/2025
 ## Example messages
 
 ```
-warning XA1040: The CoreCLR runtime on Android is an experimental feature and not yet suitable for production use. File issues at: https://github.com/dotnet/android/issues
 warning XA1040: The NativeAOT runtime on Android is an experimental feature and not yet suitable for production use. File issues at: https://github.com/dotnet/android/issues
 ```
 
 ## Issue
 
-MonoVM is the default, supported runtime for .NET for Android.
+CoreCLR is the default, supported runtime for .NET for Android. Mono is also supported.
 
-Other runtimes are currently experimental, such as:
+You can opt into other runtimes via:
 
-* CoreCLR, used via `$(UseMonoRuntime)=false`
+* CoreCLR, default
+* MonoVM, used via `$(UseMonoRuntime)=true`
 * NativeAOT, used via `$(PublishAot)=true`
 
 ## Solution
 
 To silence this warning, you can either:
 
-* Use MonoVM by removing `$(UseMonoRuntime)=false` or
-  `$(PublishAot)=true` from your project file.
+* Use CoreCLR by removing `$(PublishAot)=true` from your project file.
 
 * Set `$(EnablePreviewFeatures)` to `true` in your project file.

build-tools/scripts/TestApks.targets

@@ -18,7 +18,7 @@
 
   <PropertyGroup>
     <!-- APK tests might run on 32-bit emulators -->
-    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)' == '' and '$(PublishAot)' != 'true' and '$(UseMonoRuntime)' != 'false' ">android-arm64;android-x86;android-x64;</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)' == '' and '$(PublishAot)' != 'true' and '$(UseMonoRuntime)' == 'true' ">android-arm64;android-x86;android-x64;</RuntimeIdentifiers>
     <TestAvdApiLevel Condition=" '$(TestAvdApiLevel)' == '' ">29</TestAvdApiLevel>
     <TestAvdAbi Condition=" '$(TestAvdAbi)' == '' and '$(HostOS)' == 'Darwin' and  '$(HostOSArchitecture)' == 'Arm64' ">arm64-v8a</TestAvdAbi>
     <TestAvdAbi Condition=" '$(TestAvdAbi)' == '' ">x86_64</TestAvdAbi>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/ProjectExtensions.cs

@@ -7,21 +7,20 @@ public static class ProjectExtensions
 {
 	/// <summary>
 	/// Sets the appropriate MSBuild property to use a specific .NET runtime.
-	/// NOTE: $(EnablePreviewFeatures) ignores warning XA1040: The CoreCLR/NativeAOT runtime on Android is an experimental feature and not yet suitable for production use.
+	/// NOTE: $(EnablePreviewFeatures) ignores warning XA1040: The NativeAOT runtime on Android is an experimental feature and not yet suitable for production use.
 	/// </summary>
 	public static void SetRuntime (this XamarinProject project, AndroidRuntime runtime)
 	{
 		switch (runtime) {
 			case AndroidRuntime.CoreCLR:
 				project.SetProperty ("UseMonoRuntime", "false");
-				project.SetProperty ("EnablePreviewFeatures", "true");
 				break;
 			case AndroidRuntime.NativeAOT:
 				project.SetProperty ("PublishAot", "true");
 				project.SetProperty ("EnablePreviewFeatures", "true");
 				break;
 			default:
-				// MonoVM or default can just use default settings
+				project.SetProperty ("UseMonoRuntime", "true");
 				break;
 		}
 	}

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -570,7 +570,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
   <AndroidWarning Code="XA1040"
       ResourceName="XA1040"
       FormatArguments="$(_AndroidRuntime)"
-      Condition=" '$(_AndroidRuntime)' != 'MonoVM' and '$(EnablePreviewFeatures)' != 'true' "
+      Condition=" '$(_AndroidRuntime)' == 'NativeAOT' and '$(EnablePreviewFeatures)' != 'true' "
   />
 </Target>
 

tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj

@@ -22,7 +22,7 @@
     <WarningsAsErrors>IL2037</WarningsAsErrors>
     <AndroidUseNegotiateAuthentication>true</AndroidUseNegotiateAuthentication>
     <AndroidNdkDirectory></AndroidNdkDirectory>
-    <DefineConstants Condition=" '$(UseMonoRuntime)' == 'false' ">$(DefineConstants);CORECLR</DefineConstants>
+    <DefineConstants Condition=" '$(UseMonoRuntime)' != 'true' ">$(DefineConstants);CORECLR</DefineConstants>
     <DefineConstants Condition=" '$(PublishAot)' == 'true' ">$(DefineConstants);NATIVEAOT</DefineConstants>
     <!--
       TODO: Fix excluded tests
@@ -31,7 +31,7 @@
         NetworkInterfaces excluded: https://github.com/dotnet/runtime/issues/75155
     -->
     <!-- TODO: https://github.com/dotnet/android/issues/10069 -->
-    <ExcludeCategories Condition=" '$(UseMonoRuntime)' == 'false' ">$(ExcludeCategories):CoreCLRIgnore:SSL:NTLM:RuntimeConfig</ExcludeCategories>
+    <ExcludeCategories Condition=" '$(UseMonoRuntime)' != 'true' ">$(ExcludeCategories):CoreCLRIgnore:SSL:NTLM:RuntimeConfig</ExcludeCategories>
     <!-- TODO: https://github.com/dotnet/android/issues/10079 -->
     <ExcludeCategories Condition=" '$(PublishAot)' == 'true' ">$(ExcludeCategories):NativeAOTIgnore:SSL:NTLM:AndroidClientHandler:Export:NativeTypeMap</ExcludeCategories>
     <!-- FIXME: LLVMIgnore https://github.com/dotnet/runtime/issues/89190 -->