Merge pull request #2096 from github/fixes/script-nuget-2019

Use same msbuild.exe for NuGet and solution build

Author: StanleyGoldman

scripts/modules.ps1

@@ -115,7 +115,9 @@ New-Module -ScriptBlock {
     }
 
     function Build-Solution([string]$solution, [string]$target, [string]$configuration, [switch]$ForVSInstaller, [bool]$Deploy = $false) {
-        Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed }
+        $msbuild = Find-MSBuild
+
+        Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed -MSBuildPath (Split-Path -parent $msbuild) }
         $flag1 = ""
         $flag2 = ""
         if ($ForVSInstaller) {
@@ -127,8 +129,6 @@ New-Module -ScriptBlock {
             $flag1 = "/p:Package=Skip"
         }
 
-        $msbuild = Find-MSBuild
-
         Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2"
         Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2 }
     }