Skip to content

Enable CoreCLR Apple template tests #33044

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
kotlarmilos wants to merge 2 commits into
base: net11.0
Choose a base branch
from
Open

Enable CoreCLR Apple template tests #33044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e742c9a
Add CoreCLR support to AppleTemplateTests
kotlarmilos Dec 8, 2025
4a1fe97
Fix CoreCLR condition check
kotlarmilos Dec 8, 2025
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: 1 addition & 1 deletion eng/devices/catalyst.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void ExecuteBuild(string project, string binDir, string config, string rid, stri
.Append($"/p:RuntimeIdentifier={rid}")
.Append($"/bl:{binlog}");

if (isUsingCoreClr)
if (useCoreClr)
{
args.Append("/p:UseMonoRuntime=false");
}
Expand Down
2 changes: 1 addition & 1 deletion eng/devices/ios.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void ExecuteBuild(string project, string device, string binDir, string config, s
.Append("/bl:" + binlog)
.Append("/tl");

if (isUsingCoreClr)
if (useCoreClr)
{
args.Append("/p:UseMonoRuntime=false");
}
Expand Down
10 changes: 9 additions & 1 deletion src/TestUtils/src/Microsoft.Maui.IntegrationTests/AppleTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public void AppleTemplateFxtTearDown()
[TestCase("maui-blazor", "Release", DotNetCurrent, "iossimulator-x64", RuntimeVariant.Mono, null)]
[TestCase("maui-blazor", "Release", DotNetCurrent, "iossimulator-x64", RuntimeVariant.Mono, "full")]
[TestCase("maui", "Release", DotNetCurrent, "iossimulator-x64", RuntimeVariant.NativeAOT, null)]
[TestCase("maui", "Debug", DotNetCurrent, "iossimulator-x64", RuntimeVariant.CoreCLR, null)]
[TestCase("maui", "Release", DotNetCurrent, "iossimulator-x64", RuntimeVariant.CoreCLR, null)]
[TestCase("maui-blazor", "Debug", DotNetCurrent, "iossimulator-x64", RuntimeVariant.CoreCLR, null)]
[TestCase("maui-blazor", "Release", DotNetCurrent, "iossimulator-x64", RuntimeVariant.CoreCLR, null)]
public void RunOniOS(string id, string config, string framework, string runtimeIdentifier, RuntimeVariant runtimeVariant, string trimMode)
{
var projectDir = TestDirectory;
Expand All @@ -46,14 +50,18 @@ public void RunOniOS(string id, string config, string framework, string runtimeI
$"Unable to create template {id}. Check test output for errors.");

var buildProps = BuildProps;
buildProps.Add($"RuntimeIdentifier={runtimeIdentifier}");
if (runtimeVariant == RuntimeVariant.NativeAOT)
{
buildProps.Add("PublishAot=true");
buildProps.Add("PublishAotUsingRuntimePack=true"); // TODO: This parameter will become obsolete https://github.com/dotnet/runtime/issues/87060
buildProps.Add("_IsPublishing=true"); // using dotnet build with -p:_IsPublishing=true enables targeting simulators
buildProps.Add($"RuntimeIdentifier={runtimeIdentifier}");
buildProps.Add("IlcTreatWarningsAsErrors=false"); // TODO: Remove this once all warnings are fixed https://github.com/dotnet/maui/issues/19397
}
else if (runtimeVariant == RuntimeVariant.CoreCLR)
{
buildProps.Add("UseMonoRuntime=false");
}

if (!string.IsNullOrEmpty(trimMode))
{
Expand Down
3 changes: 2 additions & 1 deletion src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ namespace Microsoft.Maui.IntegrationTests
public enum RuntimeVariant
{
Mono,
NativeAOT
NativeAOT,
CoreCLR
}

public abstract class BaseBuildTest
Expand Down