Merge pull request #1312 from eerhardt/MoveMsiTests

Move Msi tests into the \test directory.

packaging/windows/generatemsi.ps1

@@ -243,7 +243,7 @@ if(!(Test-Path $DotnetBundleOutput))
 Write-Host -ForegroundColor Green "Successfully created dotnet MSI - $DotnetMSIOutput"
 Write-Host -ForegroundColor Green "Successfully created dotnet bundle - $DotnetBundleOutput"
 
-_ $PSScriptRoot\testmsi.ps1 @("$DotnetMSIOutput")
+_ $RepoRoot\test\Installer\testmsi.ps1 @("$DotnetMSIOutput")
 
 $PublishScript = Join-Path $PSScriptRoot "..\..\scripts\publish\publish.ps1"
 & $PublishScript -file $DotnetMSIOutput

scripts/test/restore-tests.ps1

@@ -8,4 +8,4 @@
 info "Restoring Test Projects"
 
 # Restore packages
-& dotnet restore "$RepoRoot\test" -f "$TestPackageDir\Debug"
+& dotnet restore "$RepoRoot\test" -f "$TestPackageDir"

test/Installer/testmsi.ps1

@@ -21,6 +21,7 @@ if(!(Test-Path $inputMsi))
 }
 
 $env:CLI_MSI=$inputMsi
+$testDir="$PSScriptRoot\Dotnet.Cli.Msi.Tests"
 $testBin="$RepoRoot\artifacts\tests\Dotnet.Cli.Msi.Tests"
 $xunitRunner="$env:USERPROFILE\.dnx\packages\xunit.runner.console\2.1.0\tools\xunit.console.exe"
 
@@ -29,7 +30,7 @@ pushd "$Stage2Dir\bin"
 try {
     .\dotnet restore `
         --runtime win-anycpu `
-        $RepoRoot\packaging\windows\Dotnet.Cli.Msi.Tests\project.json `
+        $testDir `
         -f https://www.myget.org/F/dotnet-buildtools/api/v3/index.json | Out-Host
 
     if($LastExitCode -ne 0)
@@ -41,7 +42,7 @@ try {
         --framework net46 `
         --runtime win-anycpu `
         --output $testBin `
-        $RepoRoot\packaging\windows\Dotnet.Cli.Msi.Tests\project.json | Out-Host
+        $testDir | Out-Host
 
     if($LastExitCode -ne 0)
     {