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 @@ -446,7 +446,7 @@ stages:
446
446
jobName : Linux_musl_x64_build
447
447
jobDisplayName : " Build: Linux Musl x64"
448
448
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
450
450
buildArgs :
451
451
--arch x64
452
452
--os-name linux-musl
@@ -480,7 +480,7 @@ stages:
480
480
jobDisplayName : " Build: Linux Musl ARM"
481
481
agentOs : Linux
482
482
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
484
484
buildArgs :
485
485
--arch arm
486
486
--os-name linux-musl
@@ -513,7 +513,7 @@ stages:
513
513
jobDisplayName : " Build: Linux Musl ARM64"
514
514
agentOs : Linux
515
515
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
517
517
buildArgs :
518
518
--arch arm64
519
519
--os-name linux-musl
@@ -645,7 +645,7 @@ stages:
645
645
parameters :
646
646
platform :
647
647
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 '
649
649
buildScript : ' ./eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
650
650
skipPublishValidation : true
651
651
jobProperties :
Original file line number Diff line number Diff line change @@ -149,12 +149,8 @@ extends:
149
149
tsa :
150
150
enabled : true
151
151
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
158
154
stages :
159
155
- stage : build
160
156
displayName : Build
@@ -515,7 +511,7 @@ extends:
515
511
jobName : Linux_musl_x64_build
516
512
jobDisplayName : " Build: Linux Musl x64"
517
513
agentOs : Linux
518
- container : alpine319WithNode
514
+ container : azureLinux30Net9BuildAmd64
519
515
buildArgs :
520
516
--arch x64
521
517
--os-name linux-musl
@@ -549,7 +545,7 @@ extends:
549
545
jobDisplayName : " Build: Linux Musl ARM"
550
546
agentOs : Linux
551
547
useHostedUbuntu : false
552
- container : mariner20CrossArmAlpine
548
+ container : azureLinux30Net9BuildAmd64
553
549
buildArgs :
554
550
--arch arm
555
551
--os-name linux-musl
@@ -582,7 +578,7 @@ extends:
582
578
jobDisplayName : " Build: Linux Musl ARM64"
583
579
agentOs : Linux
584
580
useHostedUbuntu : false
585
- container : mariner20CrossArm64Alpine
581
+ container : azureLinux30Net9BuildAmd64
586
582
buildArgs :
587
583
--arch arm64
588
584
--os-name linux-musl
Original file line number Diff line number Diff line change @@ -100,12 +100,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
100
100
<RuntimePackageRootVariableName >PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName >
101
101
102
102
<!--
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.
105
105
Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
106
106
-->
107
107
<BuildOsName >$(TargetOsName)</BuildOsName >
108
- <BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' != 'x64' " >linux</BuildOsName >
108
+ <BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl'" >linux</BuildOsName >
109
109
<BuildOsName Condition =" '$(DotNetBuildSourceOnly)' == 'true' " >$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName >
110
110
<Crossgen2BuildArchitecture Condition =" '$(BuildOsName)' == 'win' " >x64</Crossgen2BuildArchitecture >
111
111
<Crossgen2BuildArchitecture Condition =" '$(Crossgen2BuildArchitecture)' == '' " >$(BuildArchitecture)</Crossgen2BuildArchitecture >
You can’t perform that action at this time.
0 commit comments