Skip to content
24 changes: 12 additions & 12 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ 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-net9.0-build-amd64
centosStream9:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
debian12Amd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
fedora39:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
mariner20CrossArm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
fedora41:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
azureLinux30CrossArm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine
ubuntu2204DebPkg:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
sdl:
Expand Down Expand Up @@ -204,14 +204,14 @@ extends:
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
runTests: false
- categoryName: Portable
container: cblMariner20Fpm
container: azureLinux30
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
officialBuildProperties: $(_officialBuildProperties)
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
runTests: false
- categoryName: Portable
container: cblMariner20Fpm
container: azureLinux30
buildArchitecture: arm64
runtimeIdentifier: linux-arm64
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
Expand All @@ -221,7 +221,7 @@ extends:
runTests: false
### MUSL ###
- categoryName: Musl
container: alpine319WithNode
container: alpine322
runtimeIdentifier: linux-musl-x64
publishArgument: $(_publishArgument)
officialBuildProperties: $(_officialBuildProperties)
Expand All @@ -231,7 +231,7 @@ extends:
enableSbom: false
runTests: false
- categoryName: Musl
container: mariner20CrossArm
container: azureLinux30CrossArm
buildArchitecture: arm
runtimeIdentifier: linux-musl-arm
publishArgument: $(_publishArgument)
Expand Down
8 changes: 4 additions & 4 deletions .vsts-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ variables:

resources:
containers:
- container: alpine319WithNode
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
- container: alpine322
Comment thread
marcpopMSFT marked this conversation as resolved.
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
- container: centosStream9
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
- container: debian12Amd64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
- container: fedora39
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
- container: fedora41
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
- container: ubuntu2204DebPkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg

Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/templates/jobs/sdk-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ jobs:
displayName: Build
env:
BuildConfig: $(buildConfiguration)
OPENSSL_ENABLE_SHA1_SIGNATURES: 1
Comment thread
MiYanni marked this conversation as resolved.

############### TESTING ###############
- ${{ if eq(parameters.runTests, true) }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/sdk-job-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ parameters:
# See: https://github.com/dotnet/sdk/issues/40935
runTests: false
- categoryName: ContainerBased
container: fedora39
container: fedora41
# No fedora Helix container is available, so use the ubuntu one instead.
helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64
osProperties: $(linuxOsPortableProperties)
Expand All @@ -57,7 +57,7 @@ parameters:
# See: https://github.com/dotnet/sdk/issues/40935
runTests: false
- categoryName: ContainerBased
container: alpine319WithNode
container: alpine322
helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.18-helix-amd64
runtimeIdentifier: linux-musl-x64
# Use HostOSName when running on alpine.
Expand Down
Loading