Merge pull request #1419 from Microsoft/FixupEnvironmentScript

Fixed some minor issues in the PowerShell scripts

Author: billti

Build/VisualStudioHelpers.psm1

@@ -1,10 +1,14 @@
 function get_target_vs_versions($vstarget, $vsroot) {
     if ($vstarget -eq "15.0") {
-        return get_target_vs15_version $vsroot
+        if (-not $vsroot) {
+            Throw "The -vsroot argument must be specified for VS 2017"
+        } else {
+            return get_target_vs15_version $vsroot
+        }
     }
 
     $supported_vs_versions = (
-        @{number="15.0"; name="VS 15"; build_by_default=$true},    
+        @{number="15.0"; name="VS 2017"; build_by_default=$true},
         @{number="14.0"; name="VS 2015"; build_by_default=$true}
     )
 
@@ -15,6 +19,7 @@ function get_target_vs_versions($vstarget, $vsroot) {
     }
     foreach ($target_vs in $supported_vs_versions) {
         if ((-not $vstarget -and $target_vs.build_by_default) -or ($target_vs.number -in $vstarget)) {
+            # Note: These registry entries are not present for "15.0", thus it won't be built.
             $vspath = Get-ItemProperty -Path "HKLM:\Software\Wow6432Node\Microsoft\VisualStudio\$($target_vs.number)" -EA 0
             if (-not $vspath) {
                 $vspath = Get-ItemProperty -Path "HKLM:\Software\Microsoft\VisualStudio\$($target_vs.number)" -EA 0
@@ -43,10 +48,10 @@ function get_target_vs_versions($vstarget, $vsroot) {
 }
 
 function get_target_vs15_version($vsroot) {
-    $msbuildroot="${vsroot}\MSBuild\Microsoft\VisualStudio\v15.0\Node.js Tools\Microsoft.NodejsTools.targets"
+    $msbuildroot="${vsroot}\MSBuild\Microsoft\VisualStudio\v15.0"
     return @{
         number="15.0";
-        name="VS 15";
+        name="VS 2017";
         vsroot=$vsroot;
         msbuildroot=$msbuildroot
     }; 

EnvironmentSetup.ps1

@@ -92,17 +92,22 @@ if (-not $skipTestHost) {
         $currentVSTestHost = ls $gacDir -Recurse | ?{$_.Name -eq "Microsoft.VisualStudioTools.VSTestHost.$($version.number).dll"}
 
         $targetVSTestHostVersion = "$($version.number).1.0"
-        if ((-not $currentVSTestHost) -or ($currentVSTestHost.VersionInfo.FileVersion -ne $targetVSTestHostVersion)) {
-            Write-Warning "VSTestHost already installed. Overriding VSTestHost version $($currentVSTestHost.VersionInfo.FileVersion) with target VSTestHostVersion $targetVSTestHostVersion"
+        if (-not $currentVSTestHost) {
+            Write-Output "VSTestHost not installed. Installing version $targetVSTestHostVersion"
+            $shouldInstallVSTestHost = $true
+            break
+        }
+        if ($currentVSTestHost.VersionInfo.FileVersion -ne $targetVSTestHostVersion) {
+            Write-Warning "Incorrect VSTestHost version already installed. Overriding VSTestHost version $($currentVSTestHost.VersionInfo.FileVersion) with target VSTestHostVersion $targetVSTestHostVersion"
             $shouldInstallVSTestHost = $true
             break
         }
     }
 }
 
 if ($shouldInstallVSTestHost) {
-    Start-Process msiexec -ArgumentList "/i $vsTestHostLocation"
-    Wait-Process msiexec
+    # TODO: This doesn't appear to install correctly on some machines.
+    Start-Process msiexec -ArgumentList /i, $vsTestHostLocation, /lv, ${env:temp}\vstesthost.log, /quiet -Wait
     Write-Output "    Install completed"
 } else {
     Write-Output "    Skipping VSTestHost installation (compatible version of VSTestHost already installed.)"