Skip to content

Commit 5f1e937

Browse files
authored
Update live test CI to fix the issue caused by PowerShell upgrade (#23497)
1 parent c458af5 commit 5f1e937

File tree

2 files changed

+45
-5
lines changed

2 files changed

+45
-5
lines changed

.azure-pipelines/live-test.yml

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ parameters:
2727
displayName: PowerShell 7.3.x Version
2828
type: string
2929
default: 7.3.*
30+
- name: ps_7_4_x
31+
displayName: PowerShell 7.4.x Version
32+
type: string
33+
default: 7.4.*
3034
- name: ps_latest
3135
displayName: PowerShell Latest Version
3236
type: string
@@ -39,6 +43,10 @@ parameters:
3943
displayName: .NET 7 SDK Version
4044
type: string
4145
default: 7.0.x
46+
- name: dotnet_sdk_8
47+
displayName: .NET 8 SDK Version
48+
type: string
49+
default: 8.0.x
4250

4351
variables:
4452
ArtifactsName: LiveTestArtifacts
@@ -92,13 +100,21 @@ stages:
92100
psVersion: ${{ parameters.ps_7_3_x }}
93101
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
94102

103+
- template: util/live-test-steps.yml
104+
parameters:
105+
name: 'ps_7_4_x_win_2019'
106+
vmImage: ${{ parameters.os_windows_2019 }}
107+
osType: 'Windows'
108+
psVersion: ${{ parameters.ps_7_4_x }}
109+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
110+
95111
- template: util/live-test-steps.yml
96112
parameters:
97113
name: 'ps_latest_win_2019'
98114
vmImage: ${{ parameters.os_windows_2019 }}
99115
osType: 'Windows'
100116
psVersion: ${{ parameters.ps_latest }}
101-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
117+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
102118

103119
- template: util/live-test-steps.yml
104120
parameters:
@@ -116,13 +132,21 @@ stages:
116132
psVersion: ${{ parameters.ps_7_3_x }}
117133
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
118134

135+
- template: util/live-test-steps.yml
136+
parameters:
137+
name: 'ps_7_4_x_win_2022'
138+
vmImage: ${{ parameters.os_windows_2022 }}
139+
osType: 'Windows'
140+
psVersion: ${{ parameters.ps_7_4_x }}
141+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
142+
119143
- template: util/live-test-steps.yml
120144
parameters:
121145
name: 'ps_latest_win_2022'
122146
vmImage: ${{ parameters.os_windows_2022 }}
123147
osType: 'Windows'
124148
psVersion: ${{ parameters.ps_latest }}
125-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
149+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
126150

127151
- template: util/live-test-steps.yml
128152
parameters:
@@ -140,13 +164,21 @@ stages:
140164
psVersion: ${{ parameters.ps_7_3_x }}
141165
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
142166

167+
- template: util/live-test-steps.yml
168+
parameters:
169+
name: 'ps_7_4_x_linux'
170+
vmImage: ${{ parameters.os_linux }}
171+
osType: 'Linux'
172+
psVersion: ${{ parameters.ps_7_4_x }}
173+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
174+
143175
- template: util/live-test-steps.yml
144176
parameters:
145177
name: 'ps_latest_linux'
146178
vmImage: ${{ parameters.os_linux }}
147179
osType: 'Linux'
148180
psVersion: ${{ parameters.ps_latest }}
149-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
181+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
150182

151183
- template: util/live-test-steps.yml
152184
parameters:
@@ -164,13 +196,21 @@ stages:
164196
psVersion: ${{ parameters.ps_7_3_x }}
165197
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
166198

199+
- template: util/live-test-steps.yml
200+
parameters:
201+
name: 'ps_7_4_x_macOS'
202+
vmImage: ${{ parameters.os_macos }}
203+
osType: 'MacOS'
204+
psVersion: ${{ parameters.ps_7_4_x }}
205+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
206+
167207
- template: util/live-test-steps.yml
168208
parameters:
169209
name: 'ps_latest_macOS'
170210
vmImage: ${{ parameters.os_macos }}
171211
osType: 'MacOS'
172212
psVersion: ${{ parameters.ps_latest }}
173-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
213+
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
174214

175215
- stage: Report
176216
displayName: Send Report

tools/TestFx/Live/InitializeLiveTestEnvironment.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if ($DesiredVersion -eq "latest") {
3939
$curSimpleVer = "$curMajorVer.$curMinorVer"
4040

4141
if ($curSimpleVer -eq ${env:POWERSHELLLATEST}) {
42-
Write-Host "##[section]Skipping live test for PowerShell $curSimpleVer as it has already been explicitly specified in the pipeline." -ForegroundColor Green
42+
Write-Host "##[warning]Skipping live test for PowerShell $curSimpleVer as it has already been explicitly specified in the pipeline."
4343
Write-Host "##vso[task.setvariable variable=skipLatest;isreadonly=true]true"
4444
}
4545
}

0 commit comments

Comments
 (0)