Skip to content

Fix mobile build and test failures in extra-platforms pipeline #124000

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 9 commits into from
Feb 9, 2026
+17 −8
Merged

Fix mobile build and test failures in extra-platforms pipeline #124000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96013ea
Temporarily disable ios_arm64 platform builds
kotlarmilos Feb 4, 2026
b80c38f
Fix target dependency for ZipMergedPayloadDirectory in helixpublishwi…
kotlarmilos Feb 4, 2026
b85b946
Revert changes
kotlarmilos Feb 4, 2026
cc72d44
Fix Native AOT relocation handling and add thread safety for CoreCLR …
kotlarmilos Feb 4, 2026
8951dee
Update merged wrapper name regex
kotlarmilos Feb 5, 2026
f74fd49
Fix Android merged test runners and disable failing tests
kotlarmilos Feb 6, 2026
09e45f3
Fix MergedWrapperName regex in helixpublishwitharcade.proj
kotlarmilos Feb 6, 2026
19e4681
Apply suggestion from @Copilot
kotlarmilos Feb 9, 2026
317809f
Revert changes
kotlarmilos Feb 9, 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 src/libraries/System.Net.NameResolution/tests/FunctionalTests/GetHostEntryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ public async Task DnsGetHostEntry_BadName_ThrowsArgumentOutOfRangeException_Obso
[InlineData(1)]
[InlineData(2)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/107339", TestPlatforms.Wasi)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/124079", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public async Task DnsGetHostEntry_LocalHost_ReturnsFqdnAndLoopbackIPs(int mode)
{
IPHostEntry entry = mode switch
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public async Task SendRecv_Stream_TCP_LargeMultiBufferSends(IPAddress listenAt)
Task<Socket> acceptTask = AcceptAsync(listener);
await client.ConnectAsync(listener.LocalEndPoint).WaitAsync(TestSettings.PassingTestTimeout);
using Socket server = await acceptTask.WaitAsync(TestSettings.PassingTestTimeout);

var sentChecksum = new Fletcher32();
var rand = new Random();
int bytesToSend = 0;
Expand Down Expand Up @@ -1030,6 +1030,7 @@ await Task.WhenAny(disposeTask, receiveTask)
[Theory]
[MemberData(nameof(TcpReceiveSendGetsCanceledByDispose_Data))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50568", TestPlatforms.Android | TestPlatforms.LinuxBionic)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/124079", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
[SkipOnPlatform(TestPlatforms.Wasi, "Wasi doesn't support PortBlocker")]
public async Task TcpReceiveSendGetsCanceledByDispose(bool receiveOrSend, bool ipv6Server, bool dualModeClient, bool owning)
{
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketAsyncEventArgsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,7 @@ public async Task SendTo_DifferentEP_Success(bool ipv4)
}

[ConditionalFact(typeof(DualModeBase), nameof(DualModeBase.LocalhostIsBothIPv4AndIPv6))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/124079", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void Connect_Parallel_Success()
{
using PortBlocker portBlocker = new PortBlocker(() =>
Expand Down Expand Up @@ -1123,6 +1124,7 @@ public void Connect_Parallel_Success()
}

[ConditionalFact(typeof(DualModeBase), nameof(DualModeBase.LocalhostIsBothIPv4AndIPv6))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/124079", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void Connect_Parallel_Fails()
{
using PortBlocker portBlocker = new PortBlocker(() =>
Expand Down Expand Up @@ -1157,6 +1159,7 @@ public void Connect_Parallel_Fails()
[ConditionalTheory(typeof(DualModeBase), nameof(DualModeBase.LocalhostIsBothIPv4AndIPv6))]
[InlineData(true)]
[InlineData(false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/124079", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void Connect_Parallel_FailsOver(bool preferIPv6)
{
using PortBlocker portBlocker = new PortBlocker(() =>
Expand Down
18 changes: 11 additions & 7 deletions src/tests/Common/helixpublishwitharcade.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
<!-- Exclude WASM support files. They can interfere with our discovery process and create extra work items that don't work. -->
<_MergedWrapperMarker Include="$(TestBinDir)**\*.MergedTestAssembly" Exclude="$(TestBinDir)**\supportFiles\*.MergedTestAssembly" />
<_MergedWrapperMarker Include="$(TestBinDir)**\*.MergedTestAssemblyForStress" Exclude="$(TestBinDir)**\supportFiles\*.MergedTestAssemblyForStress" />
<_MergedWrapperMarker Condition="'$(TargetsMobile)' == 'true'" Include="$(TestBinDir)**\*.StandaloneTestRunner" Exclude="$(TestBinDir)**\supportFiles\*.StandaloneTestRunner" />

<_MergedWrapperMarker>
<TestExecutionScriptPath Condition="'$(TargetsMobile)' != 'true'">$([System.IO.Path]::ChangeExtension('%(Identity)', '.$(TestScriptExtension)'))</TestExecutionScriptPath>
Expand Down Expand Up @@ -424,12 +425,14 @@
DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
<PropertyGroup>
<_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
<_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName>
<_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.(MergedTestAssembly(ForStress)?(\.\d+\.\d+)?|StandaloneTestRunner)$', ''))</_MergedWrapperName>
<!-- Android package names can't have hyphens, so we replace them with underscores -->
<_MergedApkName>$(_MergedWrapperName.Replace('-', '_'))</_MergedApkName>
<_ExpectedApkPath>$(_MergedWrapperDirectory)$(MobileAppBundleDirName)/bin/$(_MergedApkName).apk</_ExpectedApkPath>
</PropertyGroup>

<ItemGroup>
<!-- Skip markers that don't have a corresponding APK (SharedLibrary projects) -->
<ItemGroup Condition="Exists('$(_ExpectedApkPath)')">
<_MergedPayloadGroups Include="$(_MergedWrapperName)">
<ApkPackageName>$(_MergedApkName)</ApkPackageName>
</_MergedPayloadGroups>
Expand All @@ -438,10 +441,11 @@
<_MergedPayloadFiles Include="$(_MergedWrapperDirectory)ExpectedExitCode.txt" Condition="Exists('$(_MergedWrapperDirectory)ExpectedExitCode.txt')" />
</ItemGroup>

<Copy SourceFiles="@(_MergedPayloadFiles)" DestinationFiles="@(_MergedPayloadFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileName)%(Extension)')" />
<Copy SourceFiles="@(_MergedPayloadFiles)" DestinationFiles="@(_MergedPayloadFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileName)%(Extension)')" Condition="'@(_MergedPayloadFiles)' != ''" />
<PatchExclusionListInApks
ApkPaths="@(_MergedPayloadApkFiles->'$(MergedPayloadsRootDirectory)\$(_MergedWrapperName)\%(FileName)%(Extension)')"
ExcludedTests="@(FilteredTestExclusionList)" />
ExcludedTests="@(FilteredTestExclusionList)"
Condition="'@(_MergedPayloadApkFiles)' != ''" />
</Target>

<Target Name="PrepareMergedTestPayloadDirectoryForWasm"
Expand Down Expand Up @@ -496,7 +500,7 @@

<PropertyGroup>
<_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
<_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.MergedTestAssembly(ForStress)?\.\d+\.\d+$', ''))</_MergedWrapperName>
<_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.(MergedTestAssembly(ForStress)?(\.\d+\.\d+)?|StandaloneTestRunner)$', ''))</_MergedWrapperName>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -538,7 +542,7 @@

<PropertyGroup Condition="'@(_MergedWrapperMarker)' != ''" >
<_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
<_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.MergedTestAssembly(ForStress)?\.\d+\.\d+$', ''))</_MergedWrapperName>
<_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.(MergedTestAssembly(ForStress)?(\.\d+\.\d+)?|StandaloneTestRunner)$', ''))</_MergedWrapperName>
</PropertyGroup>

<ItemGroup Condition="'@(_MergedWrapperMarker)' != ''" >
Expand All @@ -564,7 +568,7 @@
</Target>

<Target Name="ZipMergedPayloadDirectory"
AfterTargets="PrepareMergedTestPayloadDirectories"
AfterTargets="PreparePayloadDirectories"
Condition="'$(TargetsBrowser)' == 'true' or ('$(TargetsAppleMobile)' == 'true' and '$(NeedsToBuildAppsOnHelix)' == 'true')">
<ItemGroup>
<MergedPayloads Include="$([System.IO.Directory]::GetDirectories($(MergedPayloadsRootDirectory)))" Condition="Exists('$(MergedPayloadsRootDirectory)')" />
Expand Down
Loading