Skip to content

Workaround CoreCLR R2R integration test build failures on macCatalyst and Windows #34304

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

Draft
mattleibow wants to merge 1 commit into
base: net11.0
Choose a base branch
from
Draft

Workaround CoreCLR R2R integration test build failures on macCatalyst and Windows #34304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,24 @@ public void Build(string id, string framework, string config, bool shouldPack, s
"</Project>",
"<PropertyGroup><Version>1.0.0-preview.1</Version></PropertyGroup></Project>");

// Workaround for https://github.com/dotnet/maui/issues/34303
// CoreCLR R2R (ReadyToRun) compilation is broken for certain TFMs:
// - macCatalyst: R2R objects target version 15.2 but the linker expects 15.0 (fails on macOS)
// - iOS and macCatalyst: crossgen2 is missing for Apple cross-compilation (fails on Windows)
// Remove the broken TFMs per platform so the test still validates R2R for the working ones.
if (additionalDotNetBuildParams.Contains("UseMonoRuntime=false", StringComparison.OrdinalIgnoreCase))
{
var replacements = new Dictionary<string, string>()
{
{ ";net11.0-maccatalyst", "" },
};
if (OperatingSystem.IsWindows())
{
replacements[";net11.0-ios"] = "";
}
FileUtilities.ReplaceInFile(projectFile, replacements);
}

var buildProps = BuildProps;

if (additionalDotNetBuildParams is not "" and not null)
Expand Down
Loading