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

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

[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
3 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
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
2 changes: 2 additions & 0 deletions src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ using System.Runtime.Versioning;
[assembly: SupportedOSPlatform("Android@MIN_API_LEVEL@.0")]

[assembly: InternalsVisibleTo("Mono.Android, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
[assembly: InternalsVisibleTo("Microsoft.Android.Runtime.NativeAOT, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
[assembly: InternalsVisibleTo("Mono.Android.NET-Tests, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
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 @@ -366,7 +366,6 @@
<Compile Include="Microsoft.Android.Runtime\ManagedTypeManager.cs" />
<Compile Include="Microsoft.Android.Runtime\ManagedTypeMapping.cs" />
<Compile Include="Microsoft.Android.Runtime\JavaMarshalValueManager.cs" />
<Compile Include="Microsoft.Android.Runtime\RuntimeFeature.cs" />
<Compile Include="Microsoft.Android.Runtime\SimpleValueManager.cs" />
<Compile Include="Microsoft.Android.Runtime\SingleUniverseTypeMap.cs" />
<Compile Include="Microsoft.Android.Runtime\TrimmableTypeMap.cs" />
Expand Down
38 changes: 34 additions & 4 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 @@ -501,9 +501,9 @@ static IEnumerable<object[]> Get_BuildHasTrimmerWarningsData ()
} else {
AddTestData (runtime, "", new string [0], true);
}
AddTestData (runtime, "SuppressTrimAnalysisWarnings=false", new string [] { "IL2055" }, true, 2);
AddTestData (runtime, "SuppressTrimAnalysisWarnings=false", new string [] { "IL2055" }, true, runtime == AndroidRuntime.NativeAOT ? 2 : 1);
AddTestData (runtime, "TrimMode=full", new string [] { "IL2055" }, false, 1);
AddTestData (runtime, "TrimMode=full", new string [] { "IL2055" }, true, 2);
AddTestData (runtime, "TrimMode=full", new string [] { "IL2055" }, true, runtime == AndroidRuntime.NativeAOT ? 2 : 1);
AddTestData (runtime, "IsAotCompatible=true", new string [] { "IL2055", "IL3050" }, false);

if (runtime == AndroidRuntime.NativeAOT) {
Expand Down Expand Up @@ -531,6 +531,8 @@ void AddTestData (AndroidRuntime runtime, string properties, string [] codes, bo
[TestCaseSource (nameof (Get_BuildHasTrimmerWarningsData))]
public void BuildHasTrimmerWarnings (AndroidRuntime runtime, string properties, string [] codes, bool isRelease, int? totalWarnings = null)
{
const int maxWarningLinesToShow = 25;

if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
return;
}
Expand Down Expand Up @@ -570,10 +572,38 @@ public void BuildHasTrimmerWarnings (AndroidRuntime runtime, string properties,
b.AssertHasNoWarnings ();
} else {
totalWarnings ??= codes.Length;
Assert.True (StringAssertEx.ContainsText (b.LastBuildOutput, $"{totalWarnings} Warning(s)"), $"Should receive {totalWarnings} warnings");

string warningSummaryLine = b.LastBuildOutput.LastOrDefault (line => line.Contains ("Warning(s)", StringComparison.Ordinal)) ?? "";
var actualWarnings = GetWarningCount (warningSummaryLine);

var allWarningLines = b.LastBuildOutput
.Where (line => line.Contains (": warning ", StringComparison.OrdinalIgnoreCase))
.Take (maxWarningLinesToShow)
.ToArray ();
Assert.AreEqual (
totalWarnings.Value,
actualWarnings,
$"{b.BuildLogFile} should have {totalWarnings} warnings. Summary line: '{warningSummaryLine}'. " +
$"Warnings found ({allWarningLines.Length} shown):{Environment.NewLine}{string.Join (Environment.NewLine, allWarningLines)}"
);
foreach (var code in codes) {
Assert.True (StringAssertEx.ContainsText (b.LastBuildOutput, code), $"Should receive {code} warning");
Assert.True (
StringAssertEx.ContainsText (b.LastBuildOutput, code),
$"{b.BuildLogFile} should contain warning {code}. Summary line: '{warningSummaryLine}'. " +
$"Warnings found ({allWarningLines.Length} shown):{Environment.NewLine}{string.Join (Environment.NewLine, allWarningLines)}"
);
}
}

static int GetWarningCount (string warningSummaryLine)
{
string [] tokens = warningSummaryLine.Split (new [] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
for (int i = 1; i < tokens.Length; i++) {
if (tokens [i] == "Warning(s)" && int.TryParse (tokens [i - 1], out var warningCount)) {
return warningCount;
}
}
return -1;
}
}

Expand Down