clean up bootstrap code so it's only in one place

Author: Jaykul

azure-pipelines.yml

@@ -10,8 +10,9 @@ steps:
 - task: gittools.gitversion.gitversion-task.GitVersion@3
   displayName: GitVersion
 
-- powershell: .\bootstrap.ps1
-  displayName: 'Restore pre-requisites'
+## As long as we're calling build.ps1, we don't need to bootstrap separately
+# - powershell: .\bootstrap.ps1
+#   displayName: 'Restore pre-requisites'
 
 - powershell: .\build.ps1 -OutputDirectory $(Build.ArtifactStagingDirectory)\$(Build.DefinitionName) -Version $(GitVersion.AssemblySemVer) -Verbose
   displayName: 'Run build script'

bootstrap.ps1

@@ -1,22 +1,43 @@
 [CmdletBinding()]
 param(
-    [ValidateSet("CurrentUser", "AllUsers")]
-    $Scope="CurrentUser"
+    #
+    [ValidateSet("CurrentUser", "AllUsers", "LocalTools")]
+    $Scope = "CurrentUser"
 )
 
-Push-Location $PSScriptRoot
+Push-Location $PSScriptRoot -StackName bootstrap-stack
 
-# # This really does work, but using PSDepends is a lot smoother when there's more modules, or nuget packages
+# # This would probably work, if the default gallery was trusted ...
 # Install-Module Pester        -RequiredVersion 4.4.0 -Scope CurrentUser -Repository PSGallery -SkipPublisherCheck
 # Install-Module Configuration -RequiredVersion 1.3.1 -Scope CurrentUser -Repository PSGallery -SkipPublisherCheck
+if (!(Get-Module PSDepends -ListAvailable)) {
+    $Policy = (Get-PSRepository PSGallery).InstallationPolicy
+    try {
+        Set-PSRepository PSGallery -InstallationPolicy Trusted
 
-# Here's one example of why PowerShellGet is so awkward: their default gallery is not be trusted by default!
-$Policy = (Get-PSRepository PSGallery).InstallationPolicy
-Set-PSRepository PSGallery -InstallationPolicy Trusted
-try {
-    Install-Module PSDepend -RequiredVersion 0.3.0 -Scope:$Scope -Repository PSGallery -ErrorAction Stop
-} finally {
-    # Make sure we didn't change anything permanently
-    Set-PSRepository PSGallery -InstallationPolicy:$Policy
+        if ($Scope -eq "LocalTools") {
+            $Target = Join-Path $PSScriptRoot "Tools"
+            New-Item -Path $Target -ItemType Directory -Force
+
+            $Env:PSModulePath += ';' + $Target
+            $PSDefaultParameterValues["Invoke-PSDepend:Target"] = $Target
+            Save-Module PSDepend -Repository PSGallery -ErrorAction Stop -Path $Target
+        } else {
+            $PSDefaultParameterValues["Invoke-PSDepend:Target"] = $Scope
+            Install-Module PSDepend -Repository PSGallery -ErrorAction Stop -Scope:$Scope
+        }
+    } finally {
+        # Make sure we didn't change anything permanently
+        Set-PSRepository PSGallery -InstallationPolicy:$Policy
+        Pop-Location -StackName bootstrap-stack
+    }
 }
-Import-Module  PSDepend -RequiredVersion 0.3.0
+
+try {
+    Write-Verbose "Updating dependencies"
+    Import-Module PSDepend -ErrorAction Stop
+    Invoke-PSDepend -Import -Force -ErrorAction Stop
+} catch {
+    Write-Warning "Unable to restore dependencies. Please review errors:"
+    throw
+}

build.ps1

@@ -8,8 +8,8 @@ param(
 
     $Repository = 'PSGallery',
 
-    [ValidateSet("User", "Machine", "Project")]
-    $InstallToolScope = "User",
+    [ValidateSet("CurrentUser", "AllUsers", "LocalTools")]
+    $InstallToolScope = "CurrentUser",
 
     [switch]$Test
 )
@@ -22,26 +22,7 @@ $null = $PSBoundParameters.Remove('InstallToolScope')
 $ErrorActionPreference = "Stop"
 Push-Location $PSScriptRoot -StackName BuildBuildModule
 try {
-
-    try {
-        Write-Verbose "Updating dependencies"
-        switch($InstallToolScope) {
-            "Project" {
-                $PSDefaultParameterValues["Invoke-PSDepend:Target"] = Join-Path $PSScriptRoot "Tools"
-            }
-            "Machine" {
-                $PSDefaultParameterValues["Invoke-PSDepend:Target"] = Join-Path $PSScriptRoot "AllUsers"
-            }
-            default {
-                $PSDefaultParameterValues["Invoke-PSDepend:Target"] = Join-Path $PSScriptRoot "CurrentUser"
-            }
-        }
-        Invoke-PSDepend -Force -ErrorAction Stop
-        Invoke-PSDepend -Import -Force -ErrorAction Stop
-    } catch {
-        Write-Warning "Unable to restore dependencies. Please review errors:"
-        throw
-    }
+    & "$PSScriptRoot\bootstrap.ps1" -Scope $InstallToolScope
 
     # Build ModuleBuilder with ModuleBuilder:
     Write-Verbose "Compiling ModuleBuilderBootstrap module"