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:
414414 jobName : Linux_musl_x64_build
415415 jobDisplayName : " Build: Linux Musl x64"
416416 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
418418 buildArgs :
419419 --arch x64
420420 --os-name linux-musl
@@ -449,7 +449,7 @@ stages:
449449 jobDisplayName : " Build: Linux Musl ARM"
450450 agentOs : Linux
451451 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
453453 buildArgs :
454454 --arch arm
455455 --os-name linux-musl
@@ -483,7 +483,7 @@ stages:
483483 jobDisplayName : " Build: Linux Musl ARM64"
484484 agentOs : Linux
485485 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
487487 buildArgs :
488488 --arch arm64
489489 --os-name linux-musl
@@ -612,7 +612,7 @@ stages:
612612 parameters :
613613 platform :
614614 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 '
616616 buildScript : ' ./eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
617617 skipPublishValidation : true
618618 jobProperties :
Original file line number Diff line number Diff line change @@ -143,12 +143,8 @@ extends:
143143 tsa :
144144 enabled : true
145145 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
152148 stages :
153149 - stage : build
154150 displayName : Build
@@ -483,7 +479,7 @@ extends:
483479 jobName : Linux_musl_x64_build
484480 jobDisplayName : " Build: Linux Musl x64"
485481 agentOs : Linux
486- container : alpine319WithNode
482+ container : azureLinux30Net8BuildAmd64
487483 buildArgs :
488484 --arch x64
489485 --os-name linux-musl
@@ -518,7 +514,7 @@ extends:
518514 jobDisplayName : " Build: Linux Musl ARM"
519515 agentOs : Linux
520516 useHostedUbuntu : false
521- container : mariner20CrossArmAlpine
517+ container : azureLinux30Net8BuildAmd64
522518 buildArgs :
523519 --arch arm
524520 --os-name linux-musl
@@ -552,7 +548,7 @@ extends:
552548 jobDisplayName : " Build: Linux Musl ARM64"
553549 agentOs : Linux
554550 useHostedUbuntu : false
555- container : mariner20CrossArm64Alpine
551+ container : azureLinux30Net8BuildAmd64
556552 buildArgs :
557553 --arch arm64
558554 --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
9898 <RuntimePackageRootVariableName >PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName >
9999
100100 <!--
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.
103103 Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
104104 -->
105105 <BuildOsName >$(TargetOsName)</BuildOsName >
106- <BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' != 'x64' " >linux</BuildOsName >
106+ <BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl'" >linux</BuildOsName >
107107 <BuildOsName Condition =" '$(PortableBuild)' == 'false' " >$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName >
108108 <Crossgen2BuildArchitecture Condition =" '$(BuildOsName)' == 'win' " >x64</Crossgen2BuildArchitecture >
109109 <Crossgen2BuildArchitecture Condition =" '$(Crossgen2BuildArchitecture)' == '' " >$(BuildArchitecture)</Crossgen2BuildArchitecture >
You can’t perform that action at this time.
0 commit comments