Skip to content

Attempt to update the rest of our container images to ones that are latest and in support. #20512

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.

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
merged 7 commits into from
Aug 4, 2025
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
39 changes: 19 additions & 20 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ extends:
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
parameters:
containers:
alpine319WithNode:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
cblMariner20Fpm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
alpine322:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
azureLinux30:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
centosStream9:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
debian11:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
fedora40:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
debian12:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc15-amd64
fedora41:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
ubuntu2204:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
mariner20CrossArm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
azureLinux30CrossArm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-arm-alpine
ubuntu2204DebPkg:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
sdl:
Expand Down Expand Up @@ -120,8 +120,8 @@ extends:
- template: eng/build.yml@self
parameters:
agentOs: Linux
jobName: Build_Fedora_40_Debug_x64
container: fedora40
jobName: Build_Fedora_41_Debug_x64
container: fedora41
buildConfiguration: Debug
buildArchitecture: x64
linuxPortable: true
Expand All @@ -135,12 +135,11 @@ extends:
buildArchitecture: x64
linuxPortable: false
runTests: true
additionalBuildParameters: '/p:OSName=centos.8'
- template: eng/build.yml@self
parameters:
agentOs: Linux
jobName: Build_Debian_11_Debug_x64
container: debian11
jobName: Build_Debian_12_Debug_x64
container: debian12
buildConfiguration: Debug
buildArchitecture: x64
additionalBuildParameters: '/p:BuildSdkDeb=true'
Expand All @@ -160,7 +159,7 @@ extends:
parameters:
agentOs: Linux
jobName: Build_Linux_musl_Debug_x64
container: alpine319WithNode
container: alpine322
buildConfiguration: Debug
buildArchitecture: x64
runtimeIdentifier: 'linux-musl-x64'
Expand Down Expand Up @@ -234,7 +233,7 @@ extends:
parameters:
agentOs: Linux
jobName: Build_Linux_musl_Release_arm
container: mariner20CrossArm
container: azureLinux30CrossArm
buildConfiguration: Release
buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm'
Expand All @@ -255,7 +254,7 @@ extends:
parameters:
agentOs: Linux
jobName: Build_Linux_musl_Release_x64
container: alpine319WithNode
container: alpine322
buildConfiguration: Release
buildArchitecture: x64
runtimeIdentifier: 'linux-musl-x64'
Expand All @@ -279,7 +278,7 @@ extends:
parameters:
agentOs: Linux
jobName: Build_Linux_Portable_Rpm_Release_x64
container: cblMariner20Fpm
container: azureLinux30
buildConfiguration: Release
buildArchitecture: x64
# Do not publish zips and tarballs. The linux-x64 binaries are
Expand All @@ -291,7 +290,7 @@ extends:
parameters:
agentOs: Linux
jobName: Build_Linux_Portable_Rpm_Release_Arm64
container: cblMariner20Fpm
container: azureLinux30
buildConfiguration: Release
buildArchitecture: arm64
runtimeIdentifier: 'linux-arm64'
Expand Down
14 changes: 7 additions & 7 deletions .vsts-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ stages:
- template: eng/build-pr.yml
parameters:
agentOs: Linux
jobName: Build_Fedora_36_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36'
jobName: Build_Fedora_41_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41'
buildConfiguration: Debug
buildArchitecture: x64
linuxPortable: true
Expand All @@ -96,8 +96,8 @@ stages:
- template: eng/build-pr.yml
parameters:
agentOs: Linux
jobName: Build_Debian_11_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64'
jobName: Build_Debian_12_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc15-amd64'
buildConfiguration: Debug
buildArchitecture: x64
additionalBuildParameters: '/p:BuildSdkDeb=true'
Expand Down Expand Up @@ -218,7 +218,7 @@ stages:
parameters:
agentOs: Linux
jobName: Build_Linux_musl_Release_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64'
buildConfiguration: Release
buildArchitecture: x64
runtimeIdentifier: 'linux-musl-x64'
Expand All @@ -242,7 +242,7 @@ stages:
parameters:
agentOs: Linux
jobName: Build_Linux_Portable_Rpm_Release_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64'
buildConfiguration: Release
buildArchitecture: x64
# Do not publish zips and tarballs. The linux-x64 binaries are
Expand All @@ -254,7 +254,7 @@ stages:
parameters:
agentOs: Linux
jobName: Build_Linux_Portable_Rpm_Release_Arm64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64'
buildConfiguration: Release
buildArchitecture: arm64
runtimeIdentifier: 'linux-arm64'
Expand Down
15 changes: 15 additions & 0 deletions test/SdkTests/TestsToSkipLinux.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,20 @@
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder"
Skip="true"
Reason="Fails on .NET 2.0 so suppressing for now"/>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_with_conflicts_from_the_output_folder"
Skip="true"
Reason="Fails on .NET 2.0 and 2.1 so suppressing"/>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
Skip="true"
Reason="Fails on .NET 2.0 and 2.1 so suppressing"/>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_from_the_output_folder"
Skip="true"
Reason="Fails on .NET 2.0 and 2.1 so suppressing"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
Skip="true"
Reason="Fails on .NET 2.0 and 2.1 so suppressing"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_should_publish_self_contained_for_2x"
Skip="true"
Reason="Fails on .NET 2.0 so suppressing"/>
</SkippedTests>
</Tests>