mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update MSI tests to use new output directory layout

Browse source
This commit is contained in:
Daniel Plaisted 2017-08-14 17:42:07 -07:00
parent c6e4c8f477
commit 2222290394
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/package/Installer.MSI.targets
View file

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

5
test/Installer/testmsi.ps1
View file

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