Skip to content

Commit cbb2c65

Browse files
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#52364)
2 parents 4e6fb9d + a1b2cf9 commit cbb2c65

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ variables:
1515
- name: almaLinuxContainer
1616
value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
1717
- name: alpineContainer
18-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
18+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.23-amd64
1919
- name: centOSStreamContainer
2020
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
2121
- name: fedoraContainer
22-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
22+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-43-amd64
2323
- name: ubuntuContainer
2424
value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04
2525
- name: ubuntuArmContainer
@@ -48,11 +48,11 @@ variables:
4848
- name: almaLinuxName
4949
value: AlmaLinux8
5050
- name: alpineName
51-
value: Alpine321
51+
value: Alpine323
5252
- name: centOSStreamName
5353
value: CentOSStream9
5454
- name: fedoraName
55-
value: Fedora41
55+
value: Fedora43
5656
- name: ubuntuName
5757
value: Ubuntu2404
5858

@@ -65,11 +65,11 @@ variables:
6565
- name: linuxMuslArm64Rid
6666
value: linux-musl-arm64
6767
- name: alpineX64Rid
68-
value: alpine.3.21-x64
68+
value: alpine.3.23-x64
6969
- name: centOSStreamX64Rid
7070
value: centos.9-x64
7171
- name: fedoraX64Rid
72-
value: fedora.41-x64
72+
value: fedora.43-x64
7373
- name: ubuntux64Rid
7474
value: ubuntu.24.04-x64
7575
- name: ubuntuArm64Rid

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static (Process Process, string StdOut, string StdErr) ExecuteProcess(
100100
outputHelper.WriteLine(output);
101101
}
102102

103-
if (string.IsNullOrWhiteSpace(error))
103+
if (!string.IsNullOrWhiteSpace(error))
104104
{
105105
outputHelper.WriteLine(error);
106106
}

0 commit comments

Comments
 (0)