Skip to content

Enable cached ReadyToRun for CoreCLR Android Debug builds #12118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 6 commits into from
Closed

Enable cached ReadyToRun for CoreCLR Android Debug builds #12118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d927eb
Initial plan
Copilot Jul 15, 2026
bee0244
Enable cached framework ReadyToRun for CoreCLR Debug
Copilot Jul 15, 2026
cd4425b
Address ReadyToRun validation feedback
Copilot Jul 15, 2026
e42d29d
Clarify ReadyToRun selection and validation
Copilot Jul 15, 2026
8d66d1d
Update src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Te…
kotlarmilos Jul 15, 2026
a5e0b4e
Update src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Te…
kotlarmilos Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions ...n.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.CoreCLR.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,28 @@ This file contains the CoreCLR-specific MSBuild logic for .NET for Android.
</PropertyGroup>
<!-- Properties for $(OutputType)=Exe (Android Applications) -->
<PropertyGroup Condition=" '$(AndroidApplication)' == 'true' ">
<!-- Default to R2R Composite for CoreCLR Release mode -->
<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' and '$(Configuration)' == 'Release' ">true</PublishReadyToRun>
<PublishReadyToRunComposite Condition=" '$(PublishReadyToRunComposite)' == '' and '$(PublishReadyToRun)' == 'true' ">true</PublishReadyToRunComposite>
<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' ">true</PublishReadyToRun>
<PublishReadyToRunComposite Condition=" '$(PublishReadyToRunComposite)' == '' and '$(PublishReadyToRun)' == 'true' and '$(Configuration)' == 'Release' ">true</PublishReadyToRunComposite>
<PublishReadyToRunComposite Condition=" '$(PublishReadyToRunComposite)' == '' ">false</PublishReadyToRunComposite>
<_IsPublishing Condition=" '$(_IsPublishing)' == '' and '$(PublishReadyToRun)' == 'true' ">true</_IsPublishing>
<AllowReadyToRunWithoutRuntimeIdentifier Condition=" '$(PublishReadyToRun)' == 'true' and '$(RuntimeIdentifiers)' != '' ">true</AllowReadyToRunWithoutRuntimeIdentifier>
</PropertyGroup>

<Target Name="_ConfigureDebugReadyToRun"
Condition=" '$(AndroidApplication)' == 'true' and '$(Configuration)' == 'Debug' and '$(PublishReadyToRun)' == 'true' "
BeforeTargets="_PrepareForReadyToRunCompilation">
<ItemGroup>
<!-- Runtime-pack managed assemblies are the stable framework and Android SDK implementation set. -->
<_AndroidDebugReadyToRunFrameworkAssembly Include="@(RuntimePackAsset)"
Condition=" '%(RuntimePackAsset.AssetType)' == 'runtime' and '%(RuntimePackAsset.Extension)' == '.dll' " />
<_AndroidDebugReadyToRunExcludedAssembly Include="@(ResolvedFileToPublish->WithMetadataValue('PostprocessAssembly', 'true'))" />
<_AndroidDebugReadyToRunExcludedAssembly Remove="@(_AndroidDebugReadyToRunFrameworkAssembly)"
MatchOnMetadata="Filename;Extension"
MatchOnMetadataOptions="CaseInsensitive" />
<PublishReadyToRunExclude Include="@(_AndroidDebugReadyToRunExcludedAssembly->'%(Filename)%(Extension)')" />
</ItemGroup>
</Target>
Comment thread
kotlarmilos marked this conversation as resolved.

<!-- Default feature switches -->
<ItemGroup>
<RuntimeHostConfigurationOption Include="Microsoft.Android.Runtime.RuntimeFeature.IsMonoRuntime"
Expand Down
37 changes: 37 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,43 @@ public void BuildBasicApplication ([Values] bool isRelease, [Values ("", "en_US.
}
}

[Test]
public void DebugReadyToRunCompilesOnlyFrameworkAssemblies ([Values ("android-x64", "android-arm64")] string rid)
{
if (IgnoreUnsupportedConfiguration (AndroidRuntime.CoreCLR)) {
return;
}

var proj = new XamarinAndroidApplicationProject ();
proj.SetRuntime (AndroidRuntime.CoreCLR);
proj.SetProperty ("RuntimeIdentifier", rid);

using var b = CreateApkBuilder ();
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");

var abi = MonoAndroidHelper.RidToAbi (rid);
var assemblyDirectory = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "assets", abi);
var frameworkAssembly = Path.Combine (assemblyDirectory, "System.Private.CoreLib.dll");
var userAssembly = Path.Combine (assemblyDirectory, $"{proj.ProjectName}.dll");
AssertReadyToRun (frameworkAssembly, expected: true, "System.Private.CoreLib.dll should be a ReadyToRun image.");
AssertReadyToRun (userAssembly, expected: false, $"{proj.ProjectName}.dll should remain IL.");

proj.MainActivity += Environment.NewLine + "// Force an incremental C# rebuild.";
proj.Touch ("MainActivity.cs");
Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "Second build should have succeeded.");
Assert.IsTrue (b.Output.IsTargetSkipped ("_CreateR2RImages"),
"Changing a user assembly should not rerun crossgen2.");
AssertReadyToRun (frameworkAssembly, expected: true, "Cached System.Private.CoreLib.dll should remain a ReadyToRun image.");

static void AssertReadyToRun (string assembly, bool expected, string message)
{
FileAssert.Exists (assembly);
using var stream = File.OpenRead (assembly);
using var peReader = new System.Reflection.PortableExecutable.PEReader (stream);
Assert.AreEqual (expected, peReader.PEHeaders.CorHeader.ManagedNativeHeaderDirectory.Size > 0, message);
}
}

[Test]
public void BasicApplicationPublishReadyToRun ([Values] bool isComposite, [Values ("android-x64", "android-arm64")] string rid)
{
Expand Down
7 changes: 6 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,11 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
/>
</Target>

<PropertyGroup>
<_AndroidWarnAboutReadyToRunFastDeployment
Condition=" '$(EmbedAssembliesIntoApk)' != 'True' And '$(PublishReadyToRun)' == 'True' And ('$(_AndroidRuntime)' != 'CoreCLR' Or '$(Configuration)' != 'Debug') ">true</_AndroidWarnAboutReadyToRunFastDeployment>
</PropertyGroup>

<Target Name="_CheckNonIdealAppConfigurations"
Condition=" '$(AndroidApplication)' == 'true' ">
<AndroidWarning Code="XA0119"
Expand All @@ -537,7 +542,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
/>
<AndroidWarning Code="XA0119"
ResourceName="XA0119_ReadyToRun"
Condition=" '$(EmbedAssembliesIntoApk)' != 'True' And '$(PublishReadyToRun)' == 'True' "
Condition=" '$(_AndroidWarnAboutReadyToRunFastDeployment)' == 'true' "
/>
<AndroidWarning Code="XA1027"
ResourceName="XA1027"
Expand Down
Loading