diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 530f929b4..651fb727a 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -64,8 +64,8 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 - ubuntu2204CrossArmAlpine: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine + mariner20CrossArm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: @@ -233,7 +233,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: ubuntu2204CrossArmAlpine + container: mariner20CrossArm buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 2a762dd9a..012166861 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -203,7 +203,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' diff --git a/test/SdkTests/TestsToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml index 550025aa6..e0f5b37b7 100644 --- a/test/SdkTests/TestsToSkipStableSDK.xml +++ b/test/SdkTests/TestsToSkipStableSDK.xml @@ -187,10 +187,26 @@ + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + + + +