Skip to content
This repository was archived by the owner on Jun 13, 2024. It is now read-only.

Commit 6801a23

Browse files
committed
return file paths from nuspec and nupkg functions.
1 parent ae0e4d1 commit 6801a23

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

src/PowerShellGet/private/functions/New-NugetPackage.ps1

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function New-NugetPackage {
1010
[Parameter()]
1111
[string]$OutputPath = $NugetPackageRoot,
1212

13-
[Parameter(ParameterSetName = "UseNuget")]
13+
[Parameter(Mandatory = $true, ParameterSetName = "UseNuget")]
1414
[string]$NugetExePath,
1515

1616
[Parameter(ParameterSetName = "UseDotnetCli")]
@@ -26,6 +26,7 @@ function New-NugetPackage {
2626
throw "NugetPackageRoot $NugetPackageRoot does not exist"
2727
}
2828

29+
2930
if ($PSCmdlet.ParameterSetName -eq "UseNuget") {
3031
if (-Not(Test-Path -Path $NuGetExePath)) {
3132
throw "Nuget.exe does not exist at $NugetExePath, provide a valid path to nuget.exe"
@@ -96,13 +97,19 @@ function New-NugetPackage {
9697
}
9798

9899
if (-Not ($process.ExitCode -eq 0 )) {
99-
$stdOut = $process.StandardOut.ReadToEnd()
100+
$stdOut = $process.StandardOutput.ReadToEnd()
100101
throw "dotnet cli failed to pack $stdOut"
101102
}
102103

103104
}
104105

105-
$stdOut = $process.StandardOutput.ReadLine()
106+
[xml]$nuspecXml = Get-Content -Path $NuspecPath
107+
$version = $nuspecXml.package.metadata.version
108+
$id = $nuspecXml.package.metadata.id
109+
$nupkgFullFile = Join-Path $OutputPath -ChildPath "$id.$version.nupkg"
110+
111+
$stdOut = $process.StandardOutput.ReadToEnd()
106112

107113
Write-Verbose -Message $stdOut
114+
Write-Output $nupkgFullFile
108115
}

src/PowerShellGet/private/functions/New-NuspecFile.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ function New-NuspecFile {
7777
tags = $Tags
7878
}
7979

80-
if ($LicenseUrl) { $metaDataElement.Add("licenseUrl", $LicenseUrl) }
81-
if ($ProjectUrl) { $metaDataElement.Add("projectUrl", $ProjectUrl) }
82-
if ($IconUrl) { $metaDataElement.Add("iconUrl", $IconUrl) }
80+
if ($LicenseUrl) { $metaDataElementsHash.Add("licenseUrl", $LicenseUrl) }
81+
if ($ProjectUrl) { $metaDataElementsHash.Add("projectUrl", $ProjectUrl) }
82+
if ($IconUrl) { $metaDataElementsHash.Add("iconUrl", $IconUrl) }
8383

8484
foreach ($key in $metaDataElementsHash.Keys) {
8585
$element = $xml.CreateElement($key, $nameSpaceUri)
@@ -89,6 +89,7 @@ function New-NuspecFile {
8989
$metaDataElement.AppendChild($element) | Out-Null
9090
}
9191

92+
9293
if ($Dependencies) {
9394
$dependenciesElement = $xml.CreateElement("dependencies", $nameSpaceUri)
9495

src/PowerShellGet/private/functions/Publish-PSArtifactUtility.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,12 @@ function Publish-PSArtifactUtility {
377377

378378
try {
379379
if ($DotnetCommandPath) {
380-
New-NugetPackage -NuspecPath $NuspecFullName -NugetPackageRoot $NugetPackageRoot -UseDotnetCli -Verbose:$VerbosePreference
380+
$NupkgFullName = New-NugetPackage -NuspecPath $NuspecFullName -NugetPackageRoot $NugetPackageRoot -UseDotnetCli -Verbose:$VerbosePreference
381381
}
382382
elseif ($NuGetExePath) {
383-
New-NugetPackage -NuspecPath $NuspecFullName -NugetPackageRoot $NugetPackageRoot -NugetExePath $NuGetExePath -Verbose:$VerbosePreference
383+
$NupkgFullName = New-NugetPackage -NuspecPath $NuspecFullName -NugetPackageRoot $NugetPackageRoot -NugetExePath $NuGetExePath -Verbose:$VerbosePreference
384384
}
385385

386-
$NupkgFullName = Join-Path -Path $NugetPackageRoot -ChildPath "$Name.$Version.nupkg"
387386
Write-Verbose -Message "Successfully created nuget package at $NupkgFullName"
388387
}
389388
catch {

0 commit comments

Comments
 (0)