diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 7e8cba1bd990..025d948af692 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -733,8 +733,8 @@ stages: sign: ${{ variables.signEnabled }} pool: ${{ parameters.pool_Linux }} container: - name: ${{ variables.azurelinuxX64AlpineCrossContainerName }} - image: ${{ variables.azurelinuxX64AlpineCrossContainerImage }} + name: ${{ variables.azurelinuxX64MuslCrossContainerName }} + image: ${{ variables.azurelinuxX64MuslCrossContainerImage }} crossRootFs: '/crossrootfs/x64' targetOS: linux-musl targetArchitecture: x64 @@ -748,8 +748,8 @@ stages: sign: ${{ variables.signEnabled }} pool: ${{ parameters.pool_Linux }} container: - name: ${{ variables.azurelinuxArmAlpineCrossContainerName }} - image: ${{ variables.azurelinuxArmAlpineCrossContainerImage }} + name: ${{ variables.azurelinuxArmMuslCrossContainerName }} + image: ${{ variables.azurelinuxArmMuslCrossContainerImage }} crossRootFs: '/crossrootfs/arm' targetOS: linux-musl targetArchitecture: arm @@ -763,8 +763,8 @@ stages: sign: ${{ variables.signEnabled }} pool: ${{ parameters.pool_Linux }} container: - name: ${{ variables.azurelinuxArm64AlpineCrossContainerName }} - image: ${{ variables.azurelinuxArm64AlpineCrossContainerImage }} + name: ${{ variables.azurelinuxArm64MuslCrossContainerName }} + image: ${{ variables.azurelinuxArm64MuslCrossContainerImage }} crossRootFs: '/crossrootfs/arm64' targetOS: linux-musl targetArchitecture: arm64 diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 18d07102e819..f49db6b7e54f 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -92,52 +92,52 @@ variables: - name: azurelinuxX64CrossContainerName value: azurelinuxX64CrossContainer - name: azurelinuxX64CrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64 - name: azurelinuxArmCrossContainerName value: azurelinuxArmCrossContainer - name: azurelinuxArmCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm - name: azurelinuxArm64CrossContainerName value: azurelinuxArm64CrossContainer - name: azurelinuxArm64CrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64 -- name: azurelinuxX64AlpineCrossContainerName - value: azurelinuxX64AlpineCrossContainer -- name: azurelinuxX64AlpineCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-alpine +- name: azurelinuxX64MuslCrossContainerName + value: azurelinuxX64MuslCrossContainer +- name: azurelinuxX64MuslCrossContainerImage + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64-musl -- name: azurelinuxArmAlpineCrossContainerName - value: azurelinuxArmAlpineCrossContainer -- name: azurelinuxArmAlpineCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine +- name: azurelinuxArmMuslCrossContainerName + value: azurelinuxArmMuslCrossContainer +- name: azurelinuxArmMuslCrossContainerImage + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm-musl -- name: azurelinuxArm64AlpineCrossContainerName - value: azurelinuxArm64AlpineCrossContainer -- name: azurelinuxArm64AlpineCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64-alpine +- name: azurelinuxArm64MuslCrossContainerName + value: azurelinuxArm64MuslCrossContainer +- name: azurelinuxArm64MuslCrossContainerImage + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64-musl - name: androidCrossContainerName value: androidCrossContainer - name: androidCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-android-amd64 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-android-amd64 - name: linuxBionicCrossContainerName value: linuxBionicCrossContainer - name: linuxBionicCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-openssl + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-android-openssl-amd64 - name: browserCrossContainerName value: browserCrossContainer - name: browserCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-webassembly-amd64 - name: wasiCrossContainerName value: wasiCrossContainer - name: wasiCrossContainerImage - value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-webassembly-amd64 - name: almaLinuxName value: AlmaLinux8