Skip to content

[Mono] Fix JLO lookup for packaged MAUI satellite assemblies #12496

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
jonathanpeppers wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[Mono] Fix JLO lookup for packaged MAUI satellite assemblies #12496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d461a9
[ci] Add Mono MAUI integration build
jonathanpeppers Aug 24, 2026
7b8ecf8
[Mono] Preserve JLO marker for satellite assemblies
jonathanpeppers Aug 24, 2026
2e8e89c
[Mono] Create scan marker directories
jonathanpeppers Aug 25, 2026
3bdc760
[Mono] Mark trimmed satellite assemblies unscanned
jonathanpeppers Aug 25, 2026
92951dc
[Mono] Align trimmed marker conditions
jonathanpeppers Aug 25, 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: 12 additions & 0 deletions build-tools/automation/azure-pipelines-internal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,18 @@ stages:
xaSourcePath: $(Build.SourcesDirectory)/android
displayName: Build MAUI template - Release

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
parameters:
project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj
arguments: >-
-f $(DotNetTargetFramework)-android -c Release
-p:UseMonoRuntime=true
-p:_DisableCheckForUnsupportedMonoMobileRuntime=true
--configfile $(Build.SourcesDirectory)/maui/NuGet.config
-bl:$(Build.StagingDirectory)/logs/MauiTestProj-Mono.binlog
xaSourcePath: $(Build.SourcesDirectory)/android
Comment thread
jonathanpeppers marked this conversation as resolved.
displayName: Build MAUI template - Mono

- task: CopyFiles@2
displayName: copy build logs
condition: always()
Expand Down
12 changes: 12 additions & 0 deletions build-tools/automation/azure-pipelines-public.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,18 @@ stages:
xaSourcePath: $(Build.SourcesDirectory)/android
displayName: Build MAUI template - Release

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
parameters:
project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj
arguments: >-
-f $(DotNetTargetFramework)-android -c Release
-p:UseMonoRuntime=true
-p:_DisableCheckForUnsupportedMonoMobileRuntime=true
--configfile $(Build.SourcesDirectory)/maui/NuGet.config
-bl:$(Build.StagingDirectory)/logs/MauiTestProj-Mono.binlog
xaSourcePath: $(Build.SourcesDirectory)/android
Comment thread
jonathanpeppers marked this conversation as resolved.
displayName: Build MAUI template - Mono

- template: /build-tools/automation/yaml-templates/run-maui-r2r-helix-matrix.yaml
parameters:
project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj
Expand Down
12 changes: 12 additions & 0 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,18 @@ extends:
xaSourcePath: $(Build.SourcesDirectory)/android
displayName: Build MAUI template - Release

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
parameters:
project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj
arguments: >-
-f $(DotNetTargetFramework)-android -c Release
-p:UseMonoRuntime=true
-p:_DisableCheckForUnsupportedMonoMobileRuntime=true
--configfile $(Build.SourcesDirectory)/maui/NuGet.config
-bl:$(Build.StagingDirectory)/logs/MauiTestProj-Mono.binlog
xaSourcePath: $(Build.SourcesDirectory)/android
Comment thread
jonathanpeppers marked this conversation as resolved.
displayName: Build MAUI template - Mono

- template: /build-tools/automation/yaml-templates/run-maui-r2r-helix-matrix.yaml@self
parameters:
project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj
Expand Down
10 changes: 7 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2300,8 +2300,9 @@ public void CheckLintResourceFileReferencesAreFixed ([Values (AndroidRuntime.Cor
}
}

[Test]
public void BuildDoesNotModifyNuGetPackageCache ()
[TestCase (AndroidRuntime.CoreCLR)]
[TestCase (AndroidRuntime.MonoVM)]
public void BuildDoesNotModifyNuGetPackageCache (AndroidRuntime runtime)
{
var proj = new XamarinAndroidApplicationProject {
IsRelease = true,
Expand All @@ -2328,7 +2329,10 @@ public void BuildDoesNotModifyNuGetPackageCache ()
new Package { Id = "Humanizer.Core.es", Version = "2.14.1" },
},
};
proj.SetRuntime (AndroidRuntime.CoreCLR);
proj.SetRuntime (runtime);
if (runtime == AndroidRuntime.MonoVM) {
proj.SetProperty ("_DisableCheckForUnsupportedMonoMobileRuntime", "true");
}
proj.SetProperty ("AndroidTypeMapImplementation", "llvm-ir");
proj.SetProperty (KnownProperties.PublishTrimmed, true.ToString ());
proj.MainActivity = proj.DefaultMainActivity
Expand Down
11 changes: 11 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,12 @@ because xbuild doesn't support framework reference assemblies.
<_AndroidLinkNoShrinkOutput
Condition=" '%(ResolvedAssemblies.AndroidSkipAssemblyModification)' != 'True' "
>$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)</_AndroidLinkNoShrinkOutput>
<JavaObjectsXmlFile
Condition=" '%(ResolvedAssemblies.AndroidSkipAssemblyModification)' == 'True' Or ('$(PublishTrimmed)' == 'true' And '$(AndroidTypeMapImplementation)' != 'trimmable' And $([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources'))) "
>$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubDirectory)%(Filename).scan.empty</JavaObjectsXmlFile>
<TypeMapObjectsXmlFile
Condition=" '%(ResolvedAssemblies.AndroidSkipAssemblyModification)' == 'True' Or ('$(PublishTrimmed)' == 'true' And '$(AndroidTypeMapImplementation)' != 'trimmable' And $([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources'))) "
>$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubDirectory)%(Filename).scan.empty</TypeMapObjectsXmlFile>
</ResolvedAssemblies>
<_AndroidAssembliesToLinkNoShrink
Include="@(ResolvedAssemblies)"
Expand Down Expand Up @@ -1509,6 +1515,7 @@ because xbuild doesn't support framework reference assemblies.
Condition=" '$(_AndroidUseMarshalMethods)' != 'True' or !$([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) " />
<_AfterILLinkDestFiles Condition=" '$(_AndroidUseMarshalMethods)' != 'True' " Include="@(_AfterILLinkSourceFiles->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
<_AfterILLinkDestFiles Condition=" '$(_AndroidUseMarshalMethods)' == 'True' " Include="@(_AfterILLinkSourceFiles)" />
<_AndroidScanMarkerFiles Include="@(ResolvedAssemblies->'%(JavaObjectsXmlFile)')" Condition=" '%(ResolvedAssemblies.JavaObjectsXmlFile)' != '' " />
</ItemGroup>
<AssemblyModifierPipeline
ApplicationJavaClass="$(AndroidApplicationJavaClass)"
Expand All @@ -1525,10 +1532,14 @@ because xbuild doesn't support framework reference assemblies.
SourceFiles="@(_AfterILLinkSourceFiles)"
TargetName="$(TargetName)">
</AssemblyModifierPipeline>
<MakeDir Directories="@(_AndroidScanMarkerFiles->'%(RootDir)%(Directory)')" />
<Touch Files="@(_AndroidScanMarkerFiles)" AlwaysCreate="true" />
<Touch Files="$(_AdditionalPostLinkerStepsFlag)" AlwaysCreate="true" />
<ItemGroup>
<FileWrites Include="@(_AndroidScanMarkerFiles)" />
<_AfterILLinkSourceFiles Remove="@(_AfterILLinkSourceFiles)" />
<_AfterILLinkDestFiles Remove="@(_AfterILLinkDestFiles)" />
<_AndroidScanMarkerFiles Remove="@(_AndroidScanMarkerFiles)" />
</ItemGroup>
<ItemGroup Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">
<FileWrites Include="$(_AfterILLinkOutputDir)**" />
Expand Down
Loading