Skip to content

Fix Apple NativeAOT test harness crash from string P/Invoke marshalling #130341

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
kotlarmilos merged 3 commits into from
Jul 9, 2026
Merged

Fix Apple NativeAOT test harness crash from string P/Invoke marshalling #130341

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
33aa5f3
Fix Apple NativeAOT test harness crash from string P/Invoke marshalling
kotlarmilos Jul 8, 2026
d5db26c
Use `[LibraryImport]` for the Apple test harness P/Invokes
kotlarmilos Jul 8, 2026
8f653be
Drop redundant comment in tests.ioslike.targets
kotlarmilos Jul 8, 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
1 change: 1 addition & 0 deletions eng/testing/tests.ioslike.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<NativeLib>Static</NativeLib>
<CustomNativeMain>true</CustomNativeMain>
<_SuppressNativeLibEventSourceWarning>true</_SuppressNativeLibEventSourceWarning>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup Condition="'$(UseNativeAOTRuntime)' == 'true' and '$(IncludesTestRunner)' != 'false' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Common/tests/AppleTestRunner/AppleTestRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
using Microsoft.DotNet.XHarness.TestRunners.Common;
using Microsoft.DotNet.XHarness.TestRunners.Xunit;

public class SimpleTestRunner : iOSApplicationEntryPoint, IDevice
public partial class SimpleTestRunner : iOSApplicationEntryPoint, IDevice
{
// to be wired once https://github.com/dotnet/xharness/pull/46 is merged
[DllImport("__Internal")]
public extern static void mono_ios_append_output (string value);
[LibraryImport("__Internal", EntryPoint = "mono_ios_append_output", StringMarshalling = StringMarshalling.Utf8)]
private static partial void mono_ios_append_output (string value);

[DllImport("__Internal")]
public extern static void mono_ios_set_summary (string value);
[LibraryImport("__Internal", EntryPoint = "mono_ios_set_summary", StringMarshalling = StringMarshalling.Utf8)]
private static partial void mono_ios_set_summary (string value);
Comment thread
kotlarmilos marked this conversation as resolved.
Comment thread
kotlarmilos marked this conversation as resolved.

private static List<string> s_testLibs = new List<string>();
private static List<Assembly>? s_testAssemblies;
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Common/tests/AppleTestRunner/AppleTestRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
</PropertyGroup>
<ItemGroup>
Expand Down
Loading