Skip to content

[Mono.Android] Compile RuntimeFeature into a single assembly to avoid conflict warnings #11669

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 15 commits into from
Jul 7, 2026
Merged

[Mono.Android] Compile RuntimeFeature into a single assembly to avoid conflict warnings #11669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6e3bdb5
[Mono.Android] Compile RuntimeFeature into a single assembly
simonrozsival Jun 16, 2026
7824101
[Xamarin.Android.Build.Tests] Improve trimmer warning assertions and …
Copilot Jun 17, 2026
f54cbc8
[Xamarin.Android.Build.Tests] Refine warning summary parsing in Build…
Copilot Jun 17, 2026
83781e4
[Xamarin.Android.Build.Tests] Align trimmer warning totals with curre…
Copilot Jun 17, 2026
3b1621c
Merge branch 'main' into dev/simonrozsival/runtimefeature-single-asse…
simonrozsival Jun 23, 2026
0e96ae1
Merge branch 'main' into dev/simonrozsival/runtimefeature-single-asse…
simonrozsival Jun 27, 2026
b0366ae
Merge branch 'main' into dev/simonrozsival/runtimefeature-single-asse…
simonrozsival Jun 30, 2026
a104b62
Merge branch 'main' into dev/simonrozsival/runtimefeature-single-asse…
simonrozsival Jul 1, 2026
b6b4184
[Mono.Android] Fix NativeAOT link error for xamarin_app_init
simonrozsival Jul 2, 2026
4add77c
Merge remote-tracking branch 'origin/main' into dev/simonrozsival/run…
simonrozsival Jul 3, 2026
1f55671
[Mono.Android.Runtime] Mark assembly as trimmable
simonrozsival Jul 4, 2026
f9643c3
[tests] Fix trimmer warning expectations
simonrozsival Jul 4, 2026
7211c11
[NativeAOT] Remove xamarin_app_init stub
simonrozsival Jul 4, 2026
ee46f6f
[tests] Remove unrelated test changes
simonrozsival Jul 4, 2026
4d9ba82
Use SDK-generated AssemblyInfo for Mono.Android.Runtime
simonrozsival Jul 7, 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
31 changes: 28 additions & 3 deletions src/Mono.Android.Runtime/Mono.Android.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project>
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<Import Project="..\..\Configuration.props" />
<Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" />
Expand All @@ -11,12 +10,22 @@
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateRepositoryUrlAttribute>false</GenerateRepositoryUrlAttribute>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
<IsTrimmable>true</IsTrimmable>
<NoStdLib>true</NoStdLib>
<Nullable>enable</Nullable>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<SignAssembly>true</SignAssembly>
<AssemblyTitle>Mono.Android.Runtime.dll</AssemblyTitle>
<Product>.NET for Android</Product>
<Company>Microsoft Corporation</Company>
<_MonoAndroidRuntimeInternalsVisibleToPublicKey>0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db</_MonoAndroidRuntimeInternalsVisibleToPublicKey>

<!-- Ignore "unused member" warnings from code that originates from Mono.CodeGeneration -->
<NoWarn>$(NoWarn);CS0169;CS0414;CS0649</NoWarn>
Expand All @@ -43,8 +52,24 @@
</BuildDependsOn>
</PropertyGroup>

<Target Name="_SetGeneratedAssemblyInfoProperties"
DependsOnTargets="GetXAVersionInfo"
BeforeTargets="GetAssemblyAttributes">
<PropertyGroup>
<InformationalVersion>$(AndroidPackVersion).$(PackVersionCommitCount); git-rev-head:$(XAVersionHash); git-branch:$(XAVersionBranch)</InformationalVersion>
<TargetPlatformIdentifier>Android</TargetPlatformIdentifier>
<TargetPlatformVersion>$(AndroidApiLevel).0</TargetPlatformVersion>
<SupportedOSPlatformVersion>$(AndroidMinimumDotNetApiLevel).0</SupportedOSPlatformVersion>
</PropertyGroup>
</Target>

<ItemGroup>
<InternalsVisibleTo Include="Mono.Android" Key="$(_MonoAndroidRuntimeInternalsVisibleToPublicKey)" />
<InternalsVisibleTo Include="Microsoft.Android.Runtime.NativeAOT" Key="$(_MonoAndroidRuntimeInternalsVisibleToPublicKey)" />
<InternalsVisibleTo Include="Mono.Android.NET-Tests" Key="$(_MonoAndroidRuntimeInternalsVisibleToPublicKey)" />
</ItemGroup>

<ItemGroup>
<Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
<Compile Include="..\Mono.Android\Android.Runtime\AndroidRuntimeInternal.cs" />
<Compile Include="..\Mono.Android\Android.Runtime\LogCategories.cs" />
<Compile Include="..\Mono.Android\Android.Runtime\LogLevel.cs" />
Expand Down
18 changes: 0 additions & 18 deletions src/Mono.Android.Runtime/Mono.Android.Runtime.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Creates 'AssemblyInfo.cs' with appropriate version information -->
<Target Name="_BuildAssemblyInfo_cs"
DependsOnTargets="GetXAVersionInfo"
BeforeTargets="CoreCompile"
Condition="!Exists ('$(IntermediateOutputPath)AssemblyInfo.cs')"
Inputs="Properties\AssemblyInfo.cs.in"
Outputs="$(IntermediateOutputPath)AssemblyInfo.cs">
<PropertyGroup>
<_PackageVersion>$(AndroidPackVersion)</_PackageVersion>
<_PackageVersionBuild>$(PackVersionCommitCount)</_PackageVersionBuild>
</PropertyGroup>
<ReplaceFileContents
SourceFile="Properties\AssemblyInfo.cs.in"
DestinationFile="$(IntermediateOutputPath)AssemblyInfo.cs"
Replacements="@PACKAGE_VERSION@=$(_PackageVersion);@PACKAGE_VERSION_BUILD@=$(_PackageVersionBuild);@PACKAGE_HEAD_REV@=$(XAVersionHash);@PACKAGE_HEAD_BRANCH@=$(XAVersionBranch);@API_LEVEL@=$(AndroidApiLevel);@MIN_API_LEVEL@=$(AndroidMinimumDotNetApiLevel)">
</ReplaceFileContents>
</Target>

<Target Name="_CopyToPackDirs">
<Copy
SourceFiles="$(OutputPath)ref\Mono.Android.Runtime.dll"
Expand Down
21 changes: 0 additions & 21 deletions src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/Mono.Android/Android.Runtime/AndroidRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Java.Interop.Tools.TypeNameMappings;
using Microsoft.Android.Runtime;
using System.Diagnostics.CodeAnalysis;
using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;

#if JAVA_INTEROP
namespace Android.Runtime {
Expand Down
1 change: 1 addition & 0 deletions src/Mono.Android/Android.Runtime/JNIEnv.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Java.Interop;
using Java.Interop.Tools.TypeNameMappings;
using Microsoft.Android.Runtime;
using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;

namespace Android.Runtime {
public static partial class JNIEnv {
Expand Down
1 change: 1 addition & 0 deletions src/Mono.Android/Java.Interop/TypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using Android.Runtime;
using Microsoft.Android.Runtime;
using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;

namespace Java.Interop {

Expand Down
1 change: 0 additions & 1 deletion src/Mono.Android/Mono.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@
<Compile Include="Microsoft.Android.Runtime\JavaMarshalRegisteredPeers.cs" />
<Compile Include="Microsoft.Android.Runtime\JavaMarshalValueManager.cs" />
<Compile Include="Microsoft.Android.Runtime\PrimitiveArrayInfo.cs" />
<Compile Include="Microsoft.Android.Runtime\RuntimeFeature.cs" />
<Compile Include="Microsoft.Android.Runtime\SingleUniverseTypeMap.cs" />
<Compile Include="Microsoft.Android.Runtime\TrimmableTypeMap.cs" />
<Compile Include="Microsoft.Android.Runtime\TrimmableTypeMapTypeManager.cs" />
Expand Down