Skip to content

Commit a8d1838

Browse files
committed
Fix unbalanced Push-Location in init.ps1 script
1 parent b4bf48a commit a8d1838

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

init.ps1

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,17 @@ try {
2525

2626
Write-Host "Restoring NPM packages..." -ForegroundColor Yellow
2727
Push-Location "$PSScriptRoot\src\nerdbank-gitversioning.npm"
28-
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "npm install")) {
29-
npm install --loglevel error
30-
}
28+
try {
29+
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "npm install")) {
30+
npm install --loglevel error
31+
}
3132

32-
Write-Host "Restoring Typings..." -ForegroundColor Yellow
33-
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "typings install")) {
34-
.\node_modules\.bin\typings install
33+
Write-Host "Restoring Typings..." -ForegroundColor Yellow
34+
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "typings install")) {
35+
.\node_modules\.bin\typings install
36+
}
37+
} finally {
38+
Pop-Location
3539
}
3640

3741
Write-Host "Successfully restored all dependencies" -ForegroundColor Yellow

src/Nerdbank.GitVersioning.sln

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25414.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "Nerdbank.GitVersioning.NuGet", "Nerdbank.GitVersioning.NuGet\Nerdbank.GitVersioning.NuGet.nuproj", "{B7DE4122-9E90-43DE-BE44-454315CFAE99}"
77
EndProject
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
ProjectSection(SolutionItems) = preProject
1212
..\.gitignore = ..\.gitignore
1313
..\appveyor.yml = ..\appveyor.yml
14+
..\init.ps1 = ..\init.ps1
1415
..\nuget.config = ..\nuget.config
1516
..\readme.md = ..\readme.md
1617
..\version.json = ..\version.json

0 commit comments

Comments
 (0)