Skip to content

Commit b75fc72

Browse files
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#50683)
2 parents 04a5547 + a7a70a5 commit b75fc72

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

.vsts-ci.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,20 @@ extends:
6767
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
6868
parameters:
6969
containers:
70-
alpine319WithNode:
71-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
72-
cblMariner20Fpm:
73-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
70+
alpine322:
71+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
72+
azureLinux30:
73+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
74+
azureLinux30fpm:
75+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-fpm-amd64
7476
centosStream9:
7577
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
7678
debian12Amd64:
7779
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
78-
fedora39:
79-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
80-
mariner20CrossArm:
81-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
80+
fedora41:
81+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
82+
azureLinux30CrossArm:
83+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine
8284
ubuntu2204DebPkg:
8385
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
8486
sdl:
@@ -211,14 +213,14 @@ extends:
211213
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
212214
runTests: false
213215
- categoryName: Portable
214-
container: cblMariner20Fpm
216+
container: azureLinux30fpm
215217
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
216218
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
217219
officialBuildProperties: $(_officialBuildProperties)
218220
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
219221
runTests: false
220222
- categoryName: Portable
221-
container: cblMariner20Fpm
223+
container: azureLinux30fpm
222224
buildArchitecture: arm64
223225
runtimeIdentifier: linux-arm64
224226
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
@@ -228,7 +230,7 @@ extends:
228230
runTests: false
229231
### MUSL ###
230232
- categoryName: Musl
231-
container: alpine319WithNode
233+
container: alpine322
232234
runtimeIdentifier: linux-musl-x64
233235
publishArgument: $(_publishArgument)
234236
officialBuildProperties: $(_officialBuildProperties)
@@ -238,7 +240,7 @@ extends:
238240
enableSbom: false
239241
runTests: false
240242
- categoryName: Musl
241-
container: mariner20CrossArm
243+
container: azureLinux30CrossArm
242244
buildArchitecture: arm
243245
runtimeIdentifier: linux-musl-arm
244246
publishArgument: $(_publishArgument)

.vsts-pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ variables:
2222

2323
resources:
2424
containers:
25-
- container: alpine319WithNode
26-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
25+
- container: alpine322
26+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
2727
- container: centosStream9
2828
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
2929
- container: debian12Amd64
3030
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
31-
- container: fedora39
32-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
31+
- container: fedora41
32+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
3333
- container: ubuntu2204DebPkg
3434
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
3535

eng/pipelines/templates/jobs/sdk-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ jobs:
108108
displayName: Build
109109
env:
110110
BuildConfig: $(buildConfiguration)
111+
OPENSSL_ENABLE_SHA1_SIGNATURES: 1
111112
112113
############### TESTING ###############
113114
- ${{ if eq(parameters.runTests, true) }}:

eng/pipelines/templates/jobs/sdk-job-matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ parameters:
3636
# See: https://github.com/dotnet/sdk/issues/40935
3737
runTests: false
3838
- categoryName: ContainerBased
39-
container: fedora39
39+
container: fedora41
4040
# No fedora Helix container is available, so use the ubuntu one instead.
4141
helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64
4242
osProperties: $(linuxOsPortableProperties)
@@ -58,7 +58,7 @@ parameters:
5858
# See: https://github.com/dotnet/sdk/issues/40935
5959
runTests: false
6060
- categoryName: ContainerBased
61-
container: alpine319WithNode
61+
container: alpine322
6262
helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.18-helix-amd64
6363
runtimeIdentifier: linux-musl-x64
6464
# Use HostOSName when running on alpine.

src/Installer/redist-installer/targets/GenerateLayout.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<NetRuntimeRid Condition="'$(NetRuntimeRid)' == ''">$(HostRid)</NetRuntimeRid>
3636
<NetRuntimeRid Condition=" ('$(OSName)' == 'win' or '$(OSName)' == 'osx' or '$(OSName)' == 'freebsd') and '$(DotNetBuildSourceOnly)' != 'true' ">$(OSName)-$(Architecture)</NetRuntimeRid>
37-
<NetRuntimeRid Condition="'$(DotNetBuild)' != 'true' and $(NetRuntimeRid.StartsWith('mariner.2.0'))">$(HostRid.Replace('mariner.2.0', 'cm.2'))</NetRuntimeRid>
37+
<NetRuntimeRid Condition="'$(DotNetBuild)' != 'true' and $(NetRuntimeRid.StartsWith('azurelinux.3.0'))">$(HostRid.Replace('azurelinux.3.0', 'azl.3'))</NetRuntimeRid>
3838

3939
<!-- only the runtime OSX .pkgs have a `-internal` suffix -->
4040
<InstallerStartSuffix Condition="$([MSBuild]::IsOSPlatform('OSX'))">-internal</InstallerStartSuffix>

0 commit comments

Comments
 (0)