Merge branch 'master' into allow-major-precision

Author: asherber

CONTRIBUTING.md

@@ -31,7 +31,7 @@ and you are running Windows PowerShell, the command is:
     .\init.ps1
 
 Everything in the repo may be built via building the solution file
-either from Visual Studio 2015 or the command line:
+either from Visual Studio 2015 or the VS2015 Developer Command Prompt:
 
     .\build.ps1
 

appveyor.yml

@@ -15,8 +15,6 @@ environment:
     secure: Ql19CstT9GvFNeSIAjXvgHXZg+/pNaYJ2jVkzde4LT2vwSyjiQgQ+M332wVYtu+r
 install:
 - ps: >-
-    iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/install-nuget-3-3-0.ps1'))
-
     npm install npm -g
 before_build:
 - ps: >-

init.cmd

@@ -0,0 +1 @@
+powershell.exe -ExecutionPolicy bypass -Command "& '%~dpn0.ps1'" %*

init.ps1

@@ -6,20 +6,37 @@ Restores all NuGet, NPM and Typings packages necessary to build this repository.
 Param(
 )
 
-Write-Host "Restoring NuGet packages..." -ForegroundColor Yellow
-if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src", "nuget restore")) {
-    nuget restore "$PSScriptRoot\src" -Verbosity quiet
-}
+Push-Location $PSScriptRoot
+try {
+    $toolsPath = "$PSScriptRoot\tools"
 
-Write-Host "Restoring NPM packages..." -ForegroundColor Yellow
-Push-Location "$PSScriptRoot\src\nerdbank-gitversioning.npm"
-if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "npm install")) {
-    npm install --loglevel error
-}
+    # First restore NuProj packages since the solution restore depends on NuProj evaluation succeeding.
+    gci "$PSScriptRoot\src\project.json" -rec |? { $_.FullName -imatch 'nuget' } |% {
+        & "$toolsPath\Restore-NuGetPackages.ps1" -Path $_ -Verbosity Quiet
+    }
 
-Write-Host "Restoring Typings..." -ForegroundColor Yellow
-if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "typings install")) {
-    .\node_modules\.bin\typings install
-}
+    # Restore VS solution dependencies
+    gci "$PSScriptRoot\src" -rec |? { $_.FullName.EndsWith('.sln') } |% {
+        & "$toolsPath\Restore-NuGetPackages.ps1" -Path $_.FullName -Verbosity Quiet
+    }
+
+    Write-Host "Restoring NPM packages..." -ForegroundColor Yellow
+    Push-Location "$PSScriptRoot\src\nerdbank-gitversioning.npm"
+    if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "npm install")) {
+        npm install --loglevel error
+    }
 
-Pop-Location
+    Write-Host "Restoring Typings..." -ForegroundColor Yellow
+    if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "typings install")) {
+        .\node_modules\.bin\typings install
+    }
+
+    Write-Host "Successfully restored all dependencies" -ForegroundColor Yellow
+}
+catch {
+    Write-Error "Aborting script due to error"
+    exit $lastexitcode
+}
+finally {
+    Pop-Location
+}

tools/Get-NuGetTool.ps1

@@ -0,0 +1,24 @@
+<#
+.SYNOPSIS
+    Downloads the NuGet.exe tool and returns the path to it.
+#>
+
+function Expand-ZIPFile($file, $destination) {
+    if (!(Test-Path $destination)) { $null = mkdir $destination }
+    $shell = new-object -com shell.application
+    $zip = $shell.NameSpace((Resolve-Path $file).Path)
+    foreach ($item in $zip.items()) {
+        $shell.Namespace((Resolve-Path $destination).Path).copyhere($item)
+    }
+}
+
+$binaryToolsPath = "$PSScriptRoot\..\obj\tools"
+if (!(Test-Path $binaryToolsPath)) { $null = mkdir $binaryToolsPath }
+$nugetPath = "$binaryToolsPath\nuget.exe"
+if (!(Test-Path $nugetPath)) {
+    $NuGetVersion = "3.3.0"
+    Write-Host "Downloading nuget.exe $NuGetVersion..." -ForegroundColor Yellow
+    Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/v$NuGetVersion/NuGet.exe" -OutFile $nugetPath
+}
+
+$nugetPath

tools/Install-NuGetPackage.ps1

@@ -0,0 +1,41 @@
+<#
+.SYNOPSIS
+    Installs a NuGet package.
+.PARAMETER PackageID
+    The Package ID to install.
+.PARAMETER Version
+    The version of the package to install. If unspecified, the latest stable release is installed.
+.PARAMETER Source
+    The package source feed to find the package to install from.
+.PARAMETER PackagesDir
+    The directory to install the package to. By default, it uses the Packages folder at the root of the repo.
+#>
+Param(
+    [Parameter(Position=1,Mandatory=$true)]
+    [string]$PackageId,
+    [Parameter()]
+    [string]$Version,
+    [Parameter()]
+    [string]$Source,
+    [Parameter()]
+    [switch]$Prerelease,
+    [Parameter()]
+    [ValidateSet('Quiet','Normal','Detailed')]
+    [string]$Verbosity='normal'
+)
+
+$nugetPath = & "$PSScriptRoot\Get-NuGetTool.ps1"
+
+try {
+    Write-Verbose "Installing $PackageId..."
+    $args = "Install",$PackageId
+    if ($Version) { $args += "-Version",$Version }
+    if ($Source) { $args += "-Source",$Source }
+    if ($Prerelease) { $args += "-Prerelease" }
+    $args += '-Verbosity',$Verbosity
+
+    $p = Start-Process $nugetPath $args -NoNewWindow -Wait -PassThru
+    if ($p.ExitCode -ne 0) { throw }
+} finally {
+    Pop-Location
+}

tools/Restore-NuGetPackages.ps1

@@ -0,0 +1,21 @@
+<#
+.SYNOPSIS
+    Restores NuGet packages.
+.PARAMETER Path
+    The path of the solution, directory, packages.config or project.json file to restore packages from.
+    If not specified, the current directory is used.
+.PARAMETER Verbosity
+#>
+Param(
+    [Parameter(Position=1)]
+    [string]$Path=(Get-Location),
+    [Parameter()]
+    [ValidateSet('Quiet','Normal','Detailed')]
+    [string]$Verbosity='normal'
+)
+
+$nugetPath = & "$PSScriptRoot\Get-NuGetTool.ps1"
+
+Write-Verbose "Restoring NuGet packages for $Path"
+& $nugetPath restore $Path -Verbosity $Verbosity
+if ($lastexitcode -ne 0) { throw }