Skip to content

Commit fa20230

Browse files
authored
Fix cross-platform test launcher
1 parent 640554f commit fa20230

1 file changed

Lines changed: 19 additions & 1 deletion

File tree

run-tests.ps1

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,28 @@ param(
66

77
Set-StrictMode -Version Latest
88
$ErrorActionPreference = 'Stop'
9+
$env:DOTNET_ROLL_FORWARD = 'Major'
10+
11+
$DotNet = if ($IsWindows) {
12+
"$PSScriptRoot/eng/common/dotnet.ps1"
13+
} else {
14+
"$PSScriptRoot/eng/common/dotnet.sh"
15+
}
16+
$DotNetArgs = @(
17+
'run'
18+
'--project'
19+
'Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests.csproj'
20+
'--report-xunit-trx'
21+
'--results-directory'
22+
"$PSScriptRoot/artifacts/TestResults"
23+
)
24+
if ($OptionalArgs) {
25+
$DotNetArgs += $OptionalArgs
26+
}
927

1028
Push-Location "$PSScriptRoot/tests/Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests"
1129
try {
12-
& "$PSScriptRoot/eng/common/dotnet.ps1" run --project Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests.csproj --report-xunit-trx --results-directory $PSScriptRoot/artifacts/TestResults $OptionalArgs
30+
& $DotNet @DotNetArgs
1331

1432
if ($LASTEXITCODE -ne 0) {
1533
throw "Failed: dotnet run Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests"

0 commit comments

Comments
 (0)