Avoid error when ps1 is invoked from another ps1

AArnott · AArnott · commit b4bf48ad6ffe · 2017-01-21T13:19:19.000-08:00
diff --git a/src/Nerdbank.GitVersioning.NuGet/tools/Get-CommitId.ps1 b/src/Nerdbank.GitVersioning.NuGet/tools/Get-CommitId.ps1
@@ -22,7 +22,7 @@ Param(
     [string]$Version
 )
 
-if (!$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }
+if (-not (Test-Path variable:global:DependencyBasePath) -or !$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\Validation.dll"))
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\NerdBank.GitVersioning.dll"))
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\LibGit2Sharp.dll"))
diff --git a/src/Nerdbank.GitVersioning.NuGet/tools/Get-Version.ps1 b/src/Nerdbank.GitVersioning.NuGet/tools/Get-Version.ps1
@@ -10,7 +10,7 @@ Param(
     [string]$ProjectDirectory="."
 )
 
-if (!$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }
+if (-not (Test-Path variable:global:DependencyBasePath) -or !$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\Validation.dll"))
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\NerdBank.GitVersioning.dll"))
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\LibGit2Sharp.dll"))

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ Param(`
`22`	`22`	`[string]$Version`
`23`	`23`	`)`
`24`	`24`
`25`		`-if (!$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }`
	`25`	`+if (-not (Test-Path variable:global:DependencyBasePath) -or !$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }`
`26`	`26`	`$null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\Validation.dll"))`
`27`	`27`	`$null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\NerdBank.GitVersioning.dll"))`
`28`	`28`	`$null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\LibGit2Sharp.dll"))`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Param(`
`10`	`10`	`[string]$ProjectDirectory="."`
`11`	`11`	`)`
`12`	`12`
`13`		`-if (!$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }`
	`13`	`+if (-not (Test-Path variable:global:DependencyBasePath) -or !$DependencyBasePath) { $DependencyBasePath = "$PSScriptRoot\..\build" }`
`14`	`14`	`$null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\Validation.dll"))`
`15`	`15`	`$null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\NerdBank.GitVersioning.dll"))`
`16`	`16`	`$null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\LibGit2Sharp.dll"))`