Update MSI tests to use new output directory layout

(cherry picked from commit 2222290394)
This commit is contained in:
Daniel Plaisted 2017-08-14 17:42:07 -07:00 committed by Nick Guerrera
parent ca34332205
commit ca21dee79a
2 changed files with 5 additions and 3 deletions

View file

@ -199,7 +199,8 @@
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
-InputMsi '$(SdkInstallerFile)'
-DotnetDir '$(PreviousStageDirectory)'" />
-DotnetDir '$(PreviousStageDirectory)'
-TestDir '$(TestOutputDir)'" />
<WriteLinesToFile
File="$(SdkMsiTestedSentinel)"

View file

@ -3,7 +3,8 @@
param(
[string]$InputMsi,
[string]$DotnetDir
[string]$DotnetDir,
[string]$TestDir
)
. "$PSScriptRoot\..\..\scripts\common\_common.ps1"
@ -37,7 +38,7 @@ if(!(Test-Path $inputMsi))
$testName = "Microsoft.DotNet.Cli.Msi.Tests"
$testProj="$PSScriptRoot\$testName\$testName.csproj"
$testBin="$RepoRoot\artifacts\tests\$testName"
$testBin="$TestDir\$testName"
pushd "$DotnetDir"