Skip to content

[TrimmableTypeMap] Add CoreCLR 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 14 commits into
base: dev/simonrozsival/root-manifest-referenced-types
Choose a base branch
from
+38 −7
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8a8c3ae
Add trimmable typemap test plumbing and CI lane
simonrozsival Apr 8, 2026
42a0f4a
[TrimmableTypeMap] Fix CoreCLR test plumbing
simonrozsival Apr 11, 2026
87c531f
[TrimmableTypeMap] Keep #11091 to explicit skips
simonrozsival Apr 11, 2026
a7e0852
[TrimmableTypeMap] Drop incidental ObjectTest diff
simonrozsival Apr 12, 2026
204abf0
[TrimmableTypeMap] Keep explicit CoreCLR lane args
simonrozsival Apr 12, 2026
cc3620e
[TrimmableTypeMap] Revert unnecessary target ordering tweak
simonrozsival Apr 12, 2026
54da0e2
[TrimmableTypeMap] Prune trimmable test exclusions
simonrozsival Apr 12, 2026
c3b8431
[TrimmableTypeMap] Move disabled tests into categories
simonrozsival Apr 12, 2026
9e97139
[TrimmableTypeMap] Restore central Java.Interop exclusions
simonrozsival Apr 12, 2026
755215b
Fix indentation
simonrozsival Apr 12, 2026
a58a4f6
[TrimmableTypeMap] Revert JniTypeUtf8 test exclusion
simonrozsival Apr 12, 2026
343ae03
[TrimmableTypeMap] Drop redundant CoreCLRIgnore filter
simonrozsival Apr 12, 2026
e2cd79e
[TrimmableTypeMap] Simplify excluded categories assignment
simonrozsival Apr 12, 2026
da5b406
[TrimmableTypeMap] Keep exclusions in NUnitInstrumentation
simonrozsival Apr 12, 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:UseMonoRuntime=false -p:_AndroidTypeMapImplementation=llvm-ir
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:UseMonoRuntime=false -p:_AndroidTypeMapImplementation=trimmable
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
4 changes: 2 additions & 2 deletions 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
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;

Expand All @@ -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
5 changes: 5 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,11 @@
<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>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Mono.Linq.Expressions" Version="2.0.0" />
</ItemGroup>
Expand Down
20 changes: 18 additions & 2 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,7 +25,23 @@ protected override string LogTag
protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
: base(handle, transfer)
{
}
if (AppContext.TryGetSwitch ("Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap", out bool trimmableTypeMap) && trimmableTypeMap) {
ExcludedCategories = ["Export", "SSL", "TrimmableIgnore"];

// Keep the temporary Java.Interop exclusions centralized here so
// we don't need a PR against the Java.Interop submodule.
ExcludedTestNames = new [] {
"Java.InteropTests.JavaObjectTest",
"Java.InteropTests.JavaObjectExtensionsTests",
"Java.InteropTests.InvokeVirtualFromConstructorTests",
"Java.InteropTests.JniPeerMembersTests",
"Java.InteropTests.JniTypeManagerTests",
"Java.InteropTests.JniValueMarshaler_object_ContractTests",
"Java.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy",
"Java.InteropTests.JavaPeerableExtensionsTests",
};
}
}

protected override IList<TestAssemblyInfo> GetTestAssemblies()
{
Expand All @@ -39,4 +55,4 @@ protected override IList<TestAssemblyInfo> GetTestAssemblies()
};
}
}
}
}