Skip to content

[TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane plumbing #11091

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

Open
simonrozsival wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane plumbing #11091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4ee9be
Add trimmable typemap test plumbing and CI lane
simonrozsival Apr 13, 2026
ff2c15f
Keep CoreCLR test flavor naming in CI
simonrozsival Apr 13, 2026
e084238
Update extraBuildArgs for Mono.Android.NET tests
simonrozsival Apr 14, 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
12 changes: 11 additions & 1 deletion build-tools/automation/yaml-templates/stage-package-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,20 @@ stages:
testName: Mono.Android.NET_Tests-CoreCLR
project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)CoreCLR.xml
extraBuildArgs: -p:TestsFlavor=CoreCLR -p:UseMonoRuntime=false
extraBuildArgs: -p:TestsFlavor=CoreCLR -p:_AndroidTypeMapImplementation=llvm-ir -p:UseMonoRuntime=false
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-CoreCLR

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Mono.Android.NET_Tests-CoreCLRTrimmable
project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)CoreCLRTrimmable.xml
extraBuildArgs: -p:TestsFlavor=CoreCLRTrimmable -p:_AndroidTypeMapImplementation=trimmable -p:UseMonoRuntime=false
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-CoreCLRTrimmable

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
Expand Down
2 changes: 1 addition & 1 deletion tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JavaObjectExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Java.InteropTests {
[TestFixture]
public class JavaObjectExtensionsTests {

[Test]
[Test, Category ("TrimmableIgnore")]
public void JavaCast_BaseToGenericWrapper ()
{
using (var list = new JavaList (new[]{ 1, 2, 3 }))
Expand Down
4 changes: 2 additions & 2 deletions tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void InvokingNullInstanceDoesNotCrashDalvik ()
}
}

[Test]
[Test, Category ("TrimmableIgnore")]
public void NewOpenGenericTypeThrows ()
{
try {
Expand Down Expand Up @@ -301,7 +301,7 @@ public void ActivatedDirectObjectSubclassesShouldBeRegistered ()
}
}

[Test]
[Test, Category ("TrimmableIgnore")]
public void ActivatedDirectThrowableSubclassesShouldBeRegistered ()
{
if (Build.VERSION.SdkInt <= BuildVersionCodes.GingerbreadMr1)
Expand Down
6 changes: 6 additions & 0 deletions tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
<ExcludeCategories Condition=" '$(EnableLLVM)' == 'true' ">$(ExcludeCategories):InetAccess:NetworkInterfaces</ExcludeCategories>
</PropertyGroup>

<PropertyGroup>
<UseMonoRuntime Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' and '$(UseMonoRuntime)' == '' and '$(PublishAot)' != 'true' ">false</UseMonoRuntime>
<TestsFlavor Condition=" '$(TestsFlavor)' == '' and '$(_AndroidTypeMapImplementation)' == 'trimmable' ">CoreCLRTrimmable</TestsFlavor>
<ExcludeCategories Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' ">$(ExcludeCategories):NativeTypeMap:TrimmableIgnore:SSL</ExcludeCategories>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Mono.Linq.Expressions" Version="2.0.0" />
</ItemGroup>
Expand Down
14 changes: 14 additions & 0 deletions ...ono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@ protected override string LogTag
protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
: base(handle, transfer)
{
if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
// Java.Interop-Tests fixtures that use JavaObject types (not Java.Lang.Object)
// don't have JCW Java classes in the trimmable APK, and method remapping
// tests require Java-side support not present in the trimmable path.
// Exclude these entire fixtures to prevent ClassNotFoundException crashes.
ExcludedTestNames = new [] {
"Java.InteropTests.JavaObjectTest",
"Java.InteropTests.InvokeVirtualFromConstructorTests",
"Java.InteropTests.JniPeerMembersTests",
"Java.InteropTests.JniTypeManagerTests",
"Java.InteropTests.JniValueMarshaler_object_ContractTests",
"Java.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy",
};
}
}

protected override IList<TestAssemblyInfo> GetTestAssemblies()
Expand Down