Skip to content

[TrimmableTypeMap] Add trimmable DotNetRun cases #11486

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

Merged
jonathanpeppers merged 14 commits into from
Jun 15, 2026
+11 −5
Merged

[TrimmableTypeMap] Add trimmable DotNetRun cases #11486

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
86ee19c
[tests] Add trimmable DotNetRun cases
simonrozsival May 25, 2026
3438299
[tests] Cover NativeAOT trimmable DotNetRun
simonrozsival May 25, 2026
7760f70
tests: ignore failing Release CoreCLR trimmable DotNetRun case
Copilot May 26, 2026
cc33825
tests: document temporary ignore for Release CoreCLR trimmable DotNetRun
Copilot May 26, 2026
d551827
Merge branch 'main' into dev/simonrozsival/11019-trimmable-dotnetrun
simonrozsival Jun 3, 2026
5a27129
Renormalize banned-apis.targets line endings to LF
simonrozsival Jun 3, 2026
aab5a5d
tests: ignore Debug CoreCLR trimmable DotNetRun (same dotnet run --no…
simonrozsival Jun 3, 2026
6e4bb59
[TrimmableTypeMap] Fix dotnet run --no-build for trimmable CoreCLR
simonrozsival Jun 3, 2026
1169b3b
[TrimmableTypeMap] Retry post-trim Java source cleanup
simonrozsival Jun 4, 2026
de245ba
[TrimmableTypeMap] Avoid parallel post-trim Java source race
simonrozsival Jun 4, 2026
e400d73
[TrimmableTypeMap] Generate post-trim Java sources in outer build
simonrozsival Jun 4, 2026
a134907
Remove unnecessary commit
simonrozsival Jun 8, 2026
501564c
Merge branch 'main' of github.com:dotnet/android into dev/simonrozsiv…
simonrozsival Jun 8, 2026
8454229
Merge branch 'main' into dev/simonrozsival/11019-trimmable-dotnetrun
simonrozsival Jun 10, 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
8 changes: 4 additions & 4 deletions ...sks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
</Target>

<Target Name="_GeneratePostTrimTrimmableTypeMapJavaSources"
Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' and '$(PublishTrimmed)' == 'true' and Exists('$(IntermediateOutputPath)linked/Link.semaphore') "
AfterTargets="ILLink"
Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' and '$(PublishTrimmed)' == 'true' and '$(_ComputeFilesToPublishForRuntimeIdentifiers)' != 'true' "
AfterTargets="_ResolveAssemblies"
BeforeTargets="_GenerateJavaStubs;_CompileJava;_CompileToDalvik"
Inputs="$(IntermediateOutputPath)linked/Link.semaphore"
Inputs="@(ResolvedFileToPublish)"
Outputs="$(_PostTrimTrimmableTypeMapJavaStamp)">
<ItemGroup>
<_PostTrimTrimmableTypeMapInputAssemblies Include="@(ResolvedFileToPublish)"
Condition=" '%(Extension)' == '.dll' " />
Condition=" '%(Extension)' == '.dll' and ('%(RuntimeIdentifier)' == '' or '$(_PostTrimTypeMapFirstRuntimeIdentifier)' == '' or '%(RuntimeIdentifier)' == '$(_PostTrimTypeMapFirstRuntimeIdentifier)') " />
Comment thread
jonathanpeppers marked this conversation as resolved.
</ItemGroup>

<GenerateTrimmableTypeMap
Expand Down
4 changes: 3 additions & 1 deletion ...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
<_TypeMapJavaOutputDirectory>$(_TypeMapBaseOutputDir)typemap/java</_TypeMapJavaOutputDirectory>
<_TypeMapAssembliesListFile>$(_TypeMapOutputDirectory)typemap-assemblies.txt</_TypeMapAssembliesListFile>
<_PostTrimTypeMapJavaOutputDirectory>$(_TypeMapBaseOutputDir)typemap/linked-java</_PostTrimTypeMapJavaOutputDirectory>
<_PostTrimTypeMapFirstRuntimeIdentifier Condition=" '$(RuntimeIdentifiers)' != '' ">$([System.String]::Copy('$(RuntimeIdentifiers)').Split(';')[0])</_PostTrimTypeMapFirstRuntimeIdentifier>
<_PostTrimTypeMapFirstRuntimeIdentifier Condition=" '$(_PostTrimTypeMapFirstRuntimeIdentifier)' == '' ">$(RuntimeIdentifier)</_PostTrimTypeMapFirstRuntimeIdentifier>
<_TypeMapJavaStubsSourceDirectory Condition=" '$(_TypeMapJavaStubsSourceDirectory)' == '' and '$(_AndroidRuntime)' == 'CoreCLR' and '$(PublishTrimmed)' == 'true' ">$(_PostTrimTypeMapJavaOutputDirectory)</_TypeMapJavaStubsSourceDirectory>
<_TypeMapJavaStubsSourceDirectory Condition=" '$(_TypeMapJavaStubsSourceDirectory)' == '' ">$(_TypeMapJavaOutputDirectory)</_TypeMapJavaStubsSourceDirectory>
<_PostTrimTrimmableTypeMapJavaStamp>$(_TypeMapBaseOutputDir)stamp/_GeneratePostTrimTrimmableTypeMapJavaSources.stamp</_PostTrimTrimmableTypeMapJavaStamp>
Expand Down Expand Up @@ -252,7 +254,7 @@
(_GetGeneratePackageManagerJavaInputs) can still read @(_GenerateJavaStubsInputs).
-->
<Target Name="_GenerateJavaStubs"
DependsOnTargets="_SetLatestTargetFrameworkVersion;_CleanIntermediateIfNeeded;_PrepareAssemblies;_GetGenerateJavaStubsInputs;_DefineBuildTargetAbis;_PrepareNativeAssemblySources"
DependsOnTargets="_SetLatestTargetFrameworkVersion;_PrepareAssemblies;_GetGenerateJavaStubsInputs;_DefineBuildTargetAbis;_PrepareNativeAssemblySources"
Inputs="$(_TypeMapOutputDirectory)$(_TypeMapAssemblyName).dll;@(_EnvironmentFiles)"
Outputs="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp">

Expand Down
4 changes: 4 additions & 0 deletions tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ static IEnumerable<object[]> Get_DotNetRun_Data ()
//AddTestData (false, "managed", runtime);
}

AddTestData (true, "trimmable", AndroidRuntime.CoreCLR);
AddTestData (false, "trimmable", AndroidRuntime.CoreCLR);
AddTestData (true, "trimmable", AndroidRuntime.NativeAOT);
Comment thread
simonrozsival marked this conversation as resolved.
Comment thread
jonathanpeppers marked this conversation as resolved.

return ret;

void AddTestData (bool isRelease, string typemapImplementation, AndroidRuntime runtime)
Expand Down
Loading