Skip to content

Commit d4bfd6a

Browse files
authored
[release/9.0] Centralize on one docker container (#60298)
* Centralize on one container * Centralize on one docker container * Fix name * Update ci-public.yml * Update Microsoft.AspNetCore.App.Runtime.csproj * Remove '--bl' option from pipeline script
1 parent ef00efd commit d4bfd6a

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ stages:
446446
jobName: Linux_musl_x64_build
447447
jobDisplayName: "Build: Linux Musl x64"
448448
agentOs: Linux
449-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
449+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
450450
buildArgs:
451451
--arch x64
452452
--os-name linux-musl
@@ -480,7 +480,7 @@ stages:
480480
jobDisplayName: "Build: Linux Musl ARM"
481481
agentOs: Linux
482482
useHostedUbuntu: false
483-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
483+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
484484
buildArgs:
485485
--arch arm
486486
--os-name linux-musl
@@ -513,7 +513,7 @@ stages:
513513
jobDisplayName: "Build: Linux Musl ARM64"
514514
agentOs: Linux
515515
useHostedUbuntu: false
516-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
516+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
517517
buildArgs:
518518
--arch arm64
519519
--os-name linux-musl
@@ -645,7 +645,7 @@ stages:
645645
parameters:
646646
platform:
647647
name: 'Managed'
648-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
648+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64'
649649
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
650650
skipPublishValidation: true
651651
jobProperties:

.azure/pipelines/ci.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,8 @@ extends:
149149
tsa:
150150
enabled: true
151151
containers:
152-
alpine319WithNode:
153-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
154-
mariner20CrossArmAlpine:
155-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
156-
mariner20CrossArm64Alpine:
157-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
152+
azureLinux30Net9BuildAmd64:
153+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
158154
stages:
159155
- stage: build
160156
displayName: Build
@@ -515,7 +511,7 @@ extends:
515511
jobName: Linux_musl_x64_build
516512
jobDisplayName: "Build: Linux Musl x64"
517513
agentOs: Linux
518-
container: alpine319WithNode
514+
container: azureLinux30Net9BuildAmd64
519515
buildArgs:
520516
--arch x64
521517
--os-name linux-musl
@@ -549,7 +545,7 @@ extends:
549545
jobDisplayName: "Build: Linux Musl ARM"
550546
agentOs: Linux
551547
useHostedUbuntu: false
552-
container: mariner20CrossArmAlpine
548+
container: azureLinux30Net9BuildAmd64
553549
buildArgs:
554550
--arch arm
555551
--os-name linux-musl
@@ -582,7 +578,7 @@ extends:
582578
jobDisplayName: "Build: Linux Musl ARM64"
583579
agentOs: Linux
584580
useHostedUbuntu: false
585-
container: mariner20CrossArm64Alpine
581+
container: azureLinux30Net9BuildAmd64
586582
buildArgs:
587583
--arch arm64
588584
--os-name linux-musl

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
100100
<RuntimePackageRootVariableName>PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName>
101101

102102
<!--
103-
Determine the crossgen2 package path property name. Special case linux-musl-arm and linux-musl-arm64 because they
104-
are built on an Ubuntu container with cross compilation tools. linux-musl-x64 is built in an alpine container.
103+
Determine the crossgen2 package path property name. Special case linux-musl because they are built
104+
on an Ubuntu container with cross compilation tools.
105105
Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
106106
-->
107107
<BuildOsName>$(TargetOsName)</BuildOsName>
108-
<BuildOsName Condition="'$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' != 'x64'">linux</BuildOsName>
108+
<BuildOsName Condition="'$(TargetOsName)' == 'linux-musl'">linux</BuildOsName>
109109
<BuildOsName Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName>
110110
<Crossgen2BuildArchitecture Condition=" '$(BuildOsName)' == 'win' ">x64</Crossgen2BuildArchitecture>
111111
<Crossgen2BuildArchitecture Condition=" '$(Crossgen2BuildArchitecture)' == '' ">$(BuildArchitecture)</Crossgen2BuildArchitecture>

0 commit comments

Comments
 (0)