From b49dd3c1d5e2aff3513f4ac8d444e3f58e599e75 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 7 Feb 2025 11:15:12 -0800 Subject: [PATCH 1/3] down to 8 --- .azure/pipelines/ci-public.yml | 8 ++++---- .azure/pipelines/ci.yml | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index cb521dc97a9a..f7d33e8e4c09 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -414,7 +414,7 @@ stages: jobName: Linux_musl_x64_build jobDisplayName: "Build: Linux Musl x64" agentOs: Linux - container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 buildArgs: --arch x64 --os-name linux-musl @@ -449,7 +449,7 @@ stages: jobDisplayName: "Build: Linux Musl ARM" agentOs: Linux useHostedUbuntu: false - container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine + container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 buildArgs: --arch arm --os-name linux-musl @@ -483,7 +483,7 @@ stages: jobDisplayName: "Build: Linux Musl ARM64" agentOs: Linux useHostedUbuntu: false - container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine + container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 buildArgs: --arch arm64 --os-name linux-musl @@ -612,7 +612,7 @@ stages: parameters: platform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64' 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 61d5c7a3657a..9c7975095153 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -143,12 +143,8 @@ extends: tsa: enabled: true containers: - 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 + azureLinux30Net10BuildAmd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 stages: - stage: build displayName: Build @@ -483,7 +479,7 @@ extends: jobName: Linux_musl_x64_build jobDisplayName: "Build: Linux Musl x64" agentOs: Linux - container: alpine319WithNode + container: azureLinux30Net10BuildAmd64 buildArgs: --arch x64 --os-name linux-musl @@ -518,7 +514,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArmAlpine + container: azureLinux30Net10BuildAmd64 buildArgs: --arch arm --os-name linux-musl @@ -552,7 +548,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM64" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArm64Alpine + container: azureLinux30Net10BuildAmd64 buildArgs: --arch arm64 --os-name linux-musl From 836c1b8ba1d0da1a916af2bbe4b40a8fc95ff03a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 10 Feb 2025 08:46:05 -0800 Subject: [PATCH 2/3] Fix name --- .azure/pipelines/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 9c7975095153..107fcdef9ff3 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -143,7 +143,7 @@ extends: tsa: enabled: true containers: - azureLinux30Net10BuildAmd64: + azureLinux30Net8BuildAmd64: image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 stages: - stage: build @@ -479,7 +479,7 @@ extends: jobName: Linux_musl_x64_build jobDisplayName: "Build: Linux Musl x64" agentOs: Linux - container: azureLinux30Net10BuildAmd64 + container: azureLinux30Net8BuildAmd64 buildArgs: --arch x64 --os-name linux-musl @@ -514,7 +514,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM" agentOs: Linux useHostedUbuntu: false - container: azureLinux30Net10BuildAmd64 + container: azureLinux30Net8BuildAmd64 buildArgs: --arch arm --os-name linux-musl @@ -548,7 +548,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM64" agentOs: Linux useHostedUbuntu: false - container: azureLinux30Net10BuildAmd64 + container: azureLinux30Net8BuildAmd64 buildArgs: --arch arm64 --os-name linux-musl From ed6f1683b14e81a2e4a593ed70a518d2408ef672 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 10 Feb 2025 14:53:17 -0800 Subject: [PATCH 3/3] Update Microsoft.AspNetCore.App.Runtime.csproj --- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index b00505fabb53..fadf9de6547c 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -98,12 +98,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_')) $(TargetOsName) - linux + linux $(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-')))) x64 $(BuildArchitecture)