diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml
index 5db588cb7d74..e9e48ff35a22 100644
--- a/.azure/pipelines/ci-public.yml
+++ b/.azure/pipelines/ci-public.yml
@@ -444,7 +444,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
- container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
+ container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
buildArgs:
--arch arm
--os-name linux-musl
@@ -478,7 +478,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
- container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine
+ container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
buildArgs:
--arch arm64
--os-name linux-musl
@@ -607,7 +607,7 @@ stages:
parameters:
platform:
name: 'Managed'
- container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
+ container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
skipPublishValidation: true
jobProperties:
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 197e1a4984f2..daba25973421 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -138,12 +138,12 @@ extends:
image: 1es-windows-2022-pt
os: windows
containers:
- alpine314WithNode:
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode
- ubuntu1804CrossArmAlpine:
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine
- ubuntu1804CrossArm64Alpine:
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
+ alpine319WithNode:
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+ mariner20CrossArmAlpine:
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
+ mariner20CrossArm64Alpine:
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
stages:
- stage: build
displayName: Build
@@ -477,7 +477,7 @@ extends:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
- container: alpine314WithNode
+ container: alpine319WithNode
buildArgs:
--arch x64
--os-name linux-musl
@@ -512,7 +512,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
- container: ubuntu1804CrossArmAlpine
+ container: mariner20CrossArmAlpine
buildArgs:
--arch arm
--os-name linux-musl
@@ -546,7 +546,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
- container: ubuntu1804CrossArm64Alpine
+ container: mariner20CrossArm64Alpine
buildArgs:
--arch arm64
--os-name linux-musl
@@ -675,7 +675,7 @@ extends:
parameters:
platform:
name: 'Managed'
- container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
+ container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
skipPublishValidation: true
jobProperties:
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 82bd68a70a68..79197927189e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -189,9 +189,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
9f4b1f5d664afdfc80e1508ab7ed099dff210fbd
-
+
https://github.com/dotnet/source-build-externals
- 0fac378047750fa8bd850a98b159560f9f7627c3
+ 300e99190e6ae1983681694dbdd5f75f0c692081
diff --git a/eng/Versions.props b/eng/Versions.props
index 6777a35a635a..133f14943316 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,7 +165,7 @@
8.0.0-beta.24165.4
8.0.0-beta.24165.4
- 8.0.0-alpha.1.24168.2
+ 8.0.0-alpha.1.24175.3
8.0.0-alpha.1.24163.3
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index e586fa5efc16..f81f5cb55fb8 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -1,12 +1,12 @@
- (AlmaLinux.8.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64
- (Alpine.316.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.16-helix-amd64
- (Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- (Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix
- (Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix
- (Debian.12.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
+ (AlmaLinux.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64
+ (Alpine.317.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
+ (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
+ (Fedora.38.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
+ (Mariner)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix
+ (Debian.12.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
false
@@ -42,9 +42,9 @@
-
+
-
+
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 35c116026c62..f00c9c1cb421 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -17,9 +17,9 @@
$(HelixQueueAlmaLinux8);
- $(HelixQueueAlpine316);
+ $(HelixQueueAlpine317);
$(HelixQueueDebian11);
- $(HelixQueueFedora34);
+ $(HelixQueueFedora38);
$(HelixQueueMariner);
Ubuntu.2004.Amd64.Open;