Merge pull request #1252 from Microsoft/pedrolamas/msbuild2017

Ensured VS2017 build tools are used
CommunityToolkit · Jun 27, 2017 · 9e4804e · 9e4804e
2 parents 81497b0 + 0cca981
commit 9e4804e
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/build/default.ps1 b/build/default.ps1
@@ -21,8 +21,6 @@ properties {
   $signClientAppPath = "$tempDir\SignClient\Tools\SignClient.dll"
 }
 
-Framework "4.6x86"
-
 task default -depends ?
 
 task UpdateHeaders -description "Updates the headers in *.cs files" {
@@ -55,9 +53,26 @@ task Clean -description "Clean the output folder" {
 }
 
 task Setup -description "Setup environment" {
-  WriteColoredOutput -ForegroundColor Green "Restoring NuGet packages...`n"
+  New-Item -Path "$tempDir" -ItemType Directory | Out-Null
+
+  WriteColoredOutput -ForegroundColor Green "Installing VSWhere NuGet package...`n"
+
+  Exec { .$nuget install -excludeversion vswhere -outputdirectory $tempDir } "Error installing VSWhere NuGet package"
+
+  WriteColoredOutput -ForegroundColor Green "Executing VSWhere...`n"
+
+  [xml]$vsResult = Exec { .$tempDir\vswhere\tools\vswhere.exe -latest -requires Microsoft.Component.MSBuild -format xml } "Error executing VSWhere"
+
+  $vsPath = $vsResult.instances.instance.installationPath
+  $buildToolsPath = "$vsPath\MSBuild\15.0\Bin\"
+
+  WriteColoredOutput -ForegroundColor Green "Updating build tools path...`n"
+
+  if (-not (Test-Path -path "$buildToolsPath")) {
+    throw "Path not found: $buildToolsPath"
+  }
 
-  Exec { .$nuget restore $packagesConfig "$sourceDir\UWP Community Toolkit.sln" } "Error pre-installing NuGet packages"
+  $env:path = "$buildToolsPath;$env:path"
 }
 
 task Verify -description "Run pre-build verifications" {
@@ -110,7 +125,7 @@ task Version -description "Updates the version entries in AssemblyInfo.cs files"
 task Build -depends Clean, Setup, Verify, Version -description "Build all projects and get the assemblies" {
   New-Item -Path $binariesDir -ItemType Directory | Out-Null
 
-  Exec { msbuild "/t:Clean;Build" /p:Configuration=Release "/p:OutDir=$binariesDir" /p:GenerateProjectSpecificOutputFolder=true /p:TreatWarningsAsErrors=false /p:GenerateLibraryLayout=true /m "$sourceDir\UWP Community Toolkit.sln" } "Error building $solutionFile"
+  Exec { msbuild "/t:Clean;Restore;Build" /p:Configuration=Release "/p:OutDir=$binariesDir" /p:GenerateProjectSpecificOutputFolder=true /p:TreatWarningsAsErrors=false /p:GenerateLibraryLayout=true /m "$sourceDir\UWP Community Toolkit.sln" } "Error building $solutionFile"
 
   WriteColoredOutput -ForegroundColor Green "Restoring AssemblyInfo.cs files...`n"