From 2222290394babb75cb92a72a14bbb5f4f11d7557 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 14 Aug 2017 17:42:07 -0700
Subject: [PATCH] Update MSI tests to use new output directory layout

---
 build/package/Installer.MSI.targets | 3 ++-
 test/Installer/testmsi.ps1          | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 8721c4673..ea98d309a 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -199,7 +199,8 @@
 
       <Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
                       -InputMsi '$(SdkInstallerFile)'
-                      -DotnetDir '$(PreviousStageDirectory)'" />
+                      -DotnetDir '$(PreviousStageDirectory)'
+                      -TestDir '$(TestOutputDir)'" />
 
       <WriteLinesToFile
           File="$(SdkMsiTestedSentinel)"
diff --git a/test/Installer/testmsi.ps1 b/test/Installer/testmsi.ps1
index 198999c78..47db57c58 100644
--- a/test/Installer/testmsi.ps1
+++ b/test/Installer/testmsi.ps1
@@ -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"