Skip to content

Commit 6f939d3

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [5c12a14 from that repo](AArnott/Library.Template@5c12a14).
2 parents de7fd95 + 5c12a14 commit 6f939d3

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

tools/Convert-PDB.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ catch {
3535
return
3636
}
3737

38-
New-Item -ItemType Directory -Force -Path (Split-Path $OutputPath -Parent) | Out-Null
38+
$outputDirectory = Split-Path $OutputPath -Parent
39+
if ($outputDirectory) {
40+
New-Item -ItemType Directory -Force -Path $outputDirectory | Out-Null
41+
}
3942

4043
$toolpath = "$pdb2pdbpath/tools/Pdb2Pdb.exe"
4144
$arguments = $DllPath, '/out', $OutputPath, '/nowarn', '0021'

tools/Get-ExternalSymbolFiles.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Function Get-PackageVersions() {
9393
}
9494

9595
Function Get-PackageVersion($id) {
96-
$version = Get-PackageVersions | Select-Object -ExpandProperty $id -ErrorAction SilentlyContinue
96+
$version = (Get-PackageVersions)[$id]
9797
if (!$version) {
9898
Write-Error "No package version found in Directory.Packages.props for the package '$id'"
9999
}

tools/Install-NuGetPackage.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ $nugetArgs += '-Verbosity',$Verbosity
5757
if ($PSCmdlet.ShouldProcess($PackageId, 'nuget install')) {
5858
$p = Start-Process $nugetPath $nugetArgs -NoNewWindow -Wait -PassThru
5959
if ($null -ne $p.ExitCode -and $p.ExitCode -ne 0) {
60-
throw "NuGet install failed for package '$PackageId' (version '$requestedVersion') with exit code $exitCode."
60+
throw "NuGet install failed for package '$PackageId' (version '$Version') with exit code $($p.ExitCode)."
6161
}
6262
}
6363

0 commit comments

Comments
 (0)