Skip to content

Commit 850a320

Browse files
authored
update mariner Linux image to 2.0 (#81973)
* update mariner Linux image to 2.0 * product * test * force run * centos * update
1 parent de1a204 commit 850a320

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

eng/pipelines/libraries/helix-queues-setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- (Fedora.36.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-36-helix
7575
- Ubuntu.2204.Amd64.Open
7676
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
77-
- (Mariner.1.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix
77+
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
7878
- (openSUSE.15.2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
7979
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
8080
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public static partial class PlatformDetection
2424
public static bool IsDebian10 => IsDistroAndVersion("debian", 10);
2525
public static bool IsRaspbian10 => IsDistroAndVersion("raspbian", 10);
2626
public static bool IsMariner => IsDistroAndVersion("mariner");
27-
public static bool IsMariner1 => IsDistroAndVersion("mariner", 1);
2827
public static bool IsSLES => IsDistroAndVersion("sles");
2928
public static bool IsTizen => IsDistroAndVersion("tizen");
3029
public static bool IsFedora => IsDistroAndVersion("fedora");

src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue()
5353
}
5454
}
5555

56-
[ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsMariner1), nameof(PlatformDetection.IsInContainer))]
57-
[ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsCentos7), nameof(PlatformDetection.IsInContainer))]
5856
[ActiveIssue("https://github.com/dotnet/runtime/issues/82055", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu1804), nameof(PlatformDetection.IsArmProcess), nameof(PlatformDetection.IsInContainer))]
5957
[ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsRaspbian10), nameof(PlatformDetection.IsArmv6Process), nameof(PlatformDetection.IsInContainer))]
6058
[ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu2004), nameof(PlatformDetection.IsPpc64leProcess))]

0 commit comments

Comments
 (0)