File tree Expand file tree Collapse file tree 3 files changed +12
-16
lines changed
src/Framework/App.Runtime/src Expand file tree Collapse file tree 3 files changed +12
-16
lines changed Original file line number Diff line number Diff line change @@ -414,7 +414,7 @@ stages:
414
414
jobName : Linux_musl_x64_build
415
415
jobDisplayName : " Build: Linux Musl x64"
416
416
agentOs : Linux
417
- container : mcr.microsoft.com/dotnet-buildtools/prereqs:alpine -3.19-WithNode
417
+ container : mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux -3.0-net8.0-build-amd64
418
418
buildArgs :
419
419
--arch x64
420
420
--os-name linux-musl
@@ -449,7 +449,7 @@ stages:
449
449
jobDisplayName : " Build: Linux Musl ARM"
450
450
agentOs : Linux
451
451
useHostedUbuntu : false
452
- container : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2 .0-cross-arm-alpine
452
+ container : mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8 .0-build-amd64
453
453
buildArgs :
454
454
--arch arm
455
455
--os-name linux-musl
@@ -483,7 +483,7 @@ stages:
483
483
jobDisplayName : " Build: Linux Musl ARM64"
484
484
agentOs : Linux
485
485
useHostedUbuntu : false
486
- container : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2 .0-cross-arm64-alpine
486
+ container : mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8 .0-build-amd64
487
487
buildArgs :
488
488
--arch arm64
489
489
--os-name linux-musl
@@ -612,7 +612,7 @@ stages:
612
612
parameters :
613
613
platform :
614
614
name : ' Managed'
615
- container : ' mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 '
615
+ container : ' mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 '
616
616
buildScript : ' ./eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
617
617
skipPublishValidation : true
618
618
jobProperties :
Original file line number Diff line number Diff line change @@ -143,12 +143,8 @@ extends:
143
143
tsa :
144
144
enabled : true
145
145
containers :
146
- alpine319WithNode :
147
- image : mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
148
- mariner20CrossArmAlpine :
149
- image : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
150
- mariner20CrossArm64Alpine :
151
- image : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
146
+ azureLinux30Net8BuildAmd64 :
147
+ image : mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
152
148
stages :
153
149
- stage : build
154
150
displayName : Build
@@ -483,7 +479,7 @@ extends:
483
479
jobName : Linux_musl_x64_build
484
480
jobDisplayName : " Build: Linux Musl x64"
485
481
agentOs : Linux
486
- container : alpine319WithNode
482
+ container : azureLinux30Net8BuildAmd64
487
483
buildArgs :
488
484
--arch x64
489
485
--os-name linux-musl
@@ -518,7 +514,7 @@ extends:
518
514
jobDisplayName : " Build: Linux Musl ARM"
519
515
agentOs : Linux
520
516
useHostedUbuntu : false
521
- container : mariner20CrossArmAlpine
517
+ container : azureLinux30Net8BuildAmd64
522
518
buildArgs :
523
519
--arch arm
524
520
--os-name linux-musl
@@ -552,7 +548,7 @@ extends:
552
548
jobDisplayName : " Build: Linux Musl ARM64"
553
549
agentOs : Linux
554
550
useHostedUbuntu : false
555
- container : mariner20CrossArm64Alpine
551
+ container : azureLinux30Net8BuildAmd64
556
552
buildArgs :
557
553
--arch arm64
558
554
--os-name linux-musl
Original file line number Diff line number Diff line change @@ -98,12 +98,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
98
98
<RuntimePackageRootVariableName >PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName >
99
99
100
100
<!--
101
- Determine the crossgen2 package path property name. Special case linux-musl-arm and linux-musl-arm64 because they
102
- are built on an Ubuntu container with cross compilation tools. linux-musl-x64 is built in an alpine container .
101
+ Determine the crossgen2 package path property name. Special case linux-musl because they are built on
102
+ an Ubuntu container with cross compilation tools.
103
103
Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
104
104
-->
105
105
<BuildOsName >$(TargetOsName)</BuildOsName >
106
- <BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' != 'x64' " >linux</BuildOsName >
106
+ <BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl'" >linux</BuildOsName >
107
107
<BuildOsName Condition =" '$(PortableBuild)' == 'false' " >$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName >
108
108
<Crossgen2BuildArchitecture Condition =" '$(BuildOsName)' == 'win' " >x64</Crossgen2BuildArchitecture >
109
109
<Crossgen2BuildArchitecture Condition =" '$(Crossgen2BuildArchitecture)' == '' " >$(BuildArchitecture)</Crossgen2BuildArchitecture >
You can’t perform that action at this time.
0 commit comments