diff --git a/.vsts-ci.yml b/.vsts-ci.yml index c661922cd..611df5379 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -62,17 +62,17 @@ resources: # image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm extends: - template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate parameters: - containers: - - container: MuslArm - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine - - container: MuslX64 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode - - container: PortableDeb - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg - - container: PortableRpm - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm + # containers: + # - container: MuslArm + # image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine + # - container: MuslX64 + # image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + # - container: PortableDeb + # image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg + # - container: PortableRpm + # image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm sdl: sourceAnalysisPool: name: $(DncEngInternalBuildPool) @@ -149,7 +149,8 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: MuslArm + # container: MuslArm + container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' @@ -170,7 +171,8 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: MuslX64 + # container: MuslX64 + container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -182,7 +184,8 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_Portable_Deb_Release_x64 - container: PortableDeb + # container: PortableDeb + container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg buildConfiguration: Release buildArchitecture: x64 # Do not publish zips and tarballs. The linux-x64 binaries are @@ -194,7 +197,8 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_x64 - container: PortableRpm + # container: PortableRpm + container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm buildConfiguration: Release buildArchitecture: x64 # Do not publish zips and tarballs. The linux-x64 binaries are @@ -206,7 +210,8 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_Arm64 - container: PortableRpm + # container: PortableRpm + container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm buildConfiguration: Release buildArchitecture: arm64 runtimeIdentifier: 'linux-arm64'