Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
- OSX.14.Arm64.Open
- OSX.26.Arm64.Open

# iOS/tvOS Simulator x64 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
Expand All @@ -54,11 +54,11 @@ jobs:

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.13.Amd64.Iphone.Open
- OSX.15.Amd64.Iphone.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- OSX.13.Amd64.AppleTV.Open
- OSX.15.Amd64.AppleTV.Open

# Linux arm
- ${{ if eq(parameters.platform, 'linux_arm') }}:
Expand Down Expand Up @@ -105,19 +105,19 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
- OSX.13.Arm64.Open
- OSX.26.Arm64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
# superpmi is not about testing platform differences, so go with highest capacity queue
- OSX.14.Arm64.Open
- OSX.26.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.14.Arm64
- OSX.26.Arm64

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.13.Amd64.Open
- OSX.15.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.13.Amd64
- OSX.15.Amd64

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/installer/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- osx.13.Arm64.Open
- osx.26.Arm64.Open

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- OSX.13.Amd64.Open
- OSX.15.Amd64.Open

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
10 changes: 5 additions & 5 deletions eng/pipelines/libraries/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- osx.13.arm64.open
- osx.26.arm64.open

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- OSX.13.Amd64.Open
- OSX.15.Amd64.Open

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
Expand All @@ -92,19 +92,19 @@ jobs:

# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
- OSX.14.Arm64.Open
- OSX.26.Arm64.Open

# iOS/tvOS Simulator x64 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
- OSX.15.Amd64.Open

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.13.Amd64.Iphone.Open
- OSX.15.Amd64.Iphone.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- OSX.13.Amd64.AppleTV.Open
- OSX.15.Amd64.AppleTV.Open

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/scripts/superpmi_collect_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,9 @@ def main(main_args):
helix_queue = "azurelinux.3.amd64.open"
elif platform_name == "osx":
if arch == "arm64": # public osx_arm64
helix_queue = "osx.13.arm64.open"
helix_queue = "osx.26.arm64.open"
else: # public osx_x64
helix_queue = "OSX.13.Amd64.Open"
helix_queue = "OSX.15.Amd64.Open"
else:
if platform_name == "windows":
if arch == "arm64": # internal windows_arm64
Expand All @@ -488,9 +488,9 @@ def main(main_args):
helix_queue = "azurelinux.3.amd64"
elif platform_name == "osx":
if arch == "arm64": # internal osx_arm64
helix_queue = "OSX.13.ARM64"
helix_queue = "OSX.26.ARM64"
else: # internal osx_x64
helix_queue = "OSX.13.Amd64"
helix_queue = "OSX.15.Amd64"

# Copy the superpmi scripts

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void CanUnsignAndResign(string filePath, TestArtifact _)
Assert.True(IsSigned(managedSignedPath + ".resigned"), $"Failed to resign {filePath}");
}

[Theory]
[Theory(Skip = "Temporarily disabled due to macOS 26 codesign behavior change - only hashing __TEXT segment")]
[MemberData(nameof(GetTestFilePaths), nameof(MatchesCodesignOutput))]
[PlatformSpecific(TestPlatforms.OSX)]
void MatchesCodesignOutput(string filePath, TestArtifact _)
Expand Down
11 changes: 8 additions & 3 deletions src/libraries/System.Net.Ping/tests/FunctionalTests/PingTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -803,15 +803,20 @@ private async Task Ping_TimedOut_Core(Func<Ping, string, Task<PingReply>> sendPi
reply = await sendPing(sender, TestSettings.UnreachableAddress3);
}

if (reply.Status == IPStatus.DestinationNetworkUnreachable)
{
throw new SkipTestException("Unable to verify timeouts. Skipping test.");
}

Assert.Equal(IPStatus.TimedOut, reply.Status);
}

[Fact]
[ConditionalFact]
[OuterLoop]
public Task Ping_TimedOut_Sync_Success()
=> Ping_TimedOut_Core((sender, address) => Task.Run(() => sender.Send(address)));

[Fact]
[ConditionalFact]
[OuterLoop]
public Task Ping_TimedOut_EAP_Success()
=> Ping_TimedOut_Core(async (sender, address) =>
Expand Down Expand Up @@ -841,7 +846,7 @@ static void PingCompleted(object sender, PingCompletedEventArgs e)
return reply;
});

[Fact]
[ConditionalFact]
[OuterLoop]
public Task Ping_TimedOut_TAP_Success()
=> Ping_TimedOut_Core((sender, address) => sender.SendPingAsync(address));
Expand Down
12 changes: 9 additions & 3 deletions src/libraries/System.Net.Sockets/tests/FunctionalTests/SendTo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Xunit.Abstractions;

Expand Down Expand Up @@ -93,16 +94,21 @@ public async Task Datagram_UDP_ShouldImplicitlyBindLocalEndpoint()
Assert.NotNull(socket.LocalEndPoint);
}

[Fact]
[ConditionalFact]
[SkipOnPlatform(TestPlatforms.FreeBSD, "FreeBSD allows sendto() to broadcast")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/114450", typeof(PlatformDetection), nameof(PlatformDetection.IsMacCatalyst), nameof(PlatformDetection.IsX64Process))]
public async Task Datagram_UDP_AccessDenied_Throws_DoesNotBind()
{
IPEndPoint invalidEndpoint = new IPEndPoint(IPAddress.Broadcast, 1234);
using var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
byte[] buffer = new byte[32];

var e = await Assert.ThrowsAnyAsync<SocketException>(() => SendToAsync(socket, new ArraySegment<byte>(buffer), invalidEndpoint));
SocketException e = await Assert.ThrowsAnyAsync<SocketException>(() => SendToAsync(socket, new ArraySegment<byte>(buffer), invalidEndpoint));
if (e.SocketErrorCode == SocketError.HostUnreachable && PlatformDetection.IsApplePlatform)
{
// https://github.com/dotnet/runtime/issues/114450
throw new SkipTestException("HostUnreachable indicates missing local network permission; this test might pass or fail depending on the environment. Please verify manually.");
}

Assert.Equal(SocketError.AccessDenied, e.SocketErrorCode);
Assert.Null(socket.LocalEndPoint);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,15 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS
public async Task MulticastInterface_Set_AnyInterface_Succeeds()
{
// On all platforms, index 0 means "any interface"
await MulticastInterface_Set_Helper(0);
try
{
await MulticastInterface_Set_Helper(0);
}
catch (SocketException ex) when (ex.SocketErrorCode == SocketError.HostUnreachable && PlatformDetection.IsApplePlatform)
{
// https://github.com/dotnet/runtime/issues/114450
throw new SkipTestException("HostUnreachable indicates missing local network permission; this test might pass or fail depending on the environment. Please verify manually.");
}
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286
Expand Down
Loading