Simplify dotnet run

premun · premun · commit 7a0d41e06958 · 2026-07-23T17:05:50.000+02:00
diff --git a/run-tests.ps1 b/run-tests.ps1
@@ -23,14 +23,9 @@ function Exec {
     }
 }
 
-$EngDockerToolsDir = "$PSScriptRoot/eng/docker-tools"
-
-$DotnetInstallDir = "$PSScriptRoot/.dotnet"
-& $EngDockerToolsDir/Install-DotNetSdk.ps1 -InstallPath $DotnetInstallDir
-
 Push-Location "$PSScriptRoot\tests\Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests"
 try {
-    Exec "$DotnetInstallDir/dotnet run --project Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests.csproj --report-xunit-trx --results-directory $PSScriptRoot/artifacts/TestResults $OptionalArgs"
+    Exec "$PSScriptRoot/eng/common/dotnet.ps1 run --project Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests.csproj --report-xunit-trx --results-directory $PSScriptRoot/artifacts/TestResults $OptionalArgs"
 }
 finally {
     Pop-Location

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,9 @@ function Exec {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`-$EngDockerToolsDir = "$PSScriptRoot/eng/docker-tools"`
`27`		`-`
`28`		`-$DotnetInstallDir = "$PSScriptRoot/.dotnet"`
`29`		`-& $EngDockerToolsDir/Install-DotNetSdk.ps1 -InstallPath $DotnetInstallDir`
`30`		`-`
`31`	`26`	`Push-Location "$PSScriptRoot\tests\Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests"`
`32`	`27`	`try {`
`33`		`- Exec "$DotnetInstallDir/dotnet run --project Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests.csproj --report-xunit-trx --results-directory $PSScriptRoot/artifacts/TestResults $OptionalArgs"`
	`28`	`+ Exec "$PSScriptRoot/eng/common/dotnet.ps1 run --project Microsoft.DotNet.BuildTools.Prereqs.Docker.Tests.csproj --report-xunit-trx --results-directory $PSScriptRoot/artifacts/TestResults $OptionalArgs"`
`34`	`29`	`}`
`35`	`30`	`finally {`
`36`	`31`	`Pop-Location`