Skip to content

Commit

Permalink
Update NuGet packaging code for the new markdown assembly (#7431)
Browse files Browse the repository at this point in the history
  • Loading branch information
adityapatwardhan authored and daxian-dbw committed Aug 3, 2018
1 parent 8131374 commit ac8ac4f
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion tools/packaging/packaging.psm1
Expand Up @@ -1426,7 +1426,8 @@ function New-UnifiedNugetPackage
"Microsoft.PowerShell.SDK.dll",
"Microsoft.WSMan.Management.dll",
"Microsoft.WSMan.Runtime.dll",
"System.Management.Automation.dll")
"System.Management.Automation.dll",
"Microsoft.PowerShell.MarkdownRender.dll")

$linuxExceptionList = @(
"Microsoft.PowerShell.Commands.Diagnostics.dll",
Expand Down Expand Up @@ -1495,6 +1496,8 @@ function New-UnifiedNugetPackage

'Microsoft.PowerShell.Commands.Utility' {
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.MarkdownRender'), [tuple]::Create('version', $PackageVersion))) > $null

foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
{
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
Expand Down Expand Up @@ -1526,6 +1529,8 @@ function New-UnifiedNugetPackage
{
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
}
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Management'), [tuple]::Create('version', $PackageVersion))) > $null
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Diagnostics'), [tuple]::Create('version', $PackageVersion))) > $null
}

'Microsoft.PowerShell.Security' {
Expand Down Expand Up @@ -1556,6 +1561,14 @@ function New-UnifiedNugetPackage
$deps.Add([tuple]::Create([tuple]::Create('id', 'PowerShell.Core.Instrumentation'), [tuple]::Create('version', '6.0.0-RC2'))) > $null
$deps.Add([tuple]::Create([tuple]::Create('id', 'libpsl'), [tuple]::Create('version', '6.0.0-rc'))) > $null
}

'Microsoft.PowerShell.MarkdownRender' {
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
{
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
}
}
}

New-NuSpec -PackageId $fileBaseName -PackageVersion $PackageVersion -Dependency $deps -FilePath (Join-Path $filePackageFolder.FullName "$fileBaseName.nuspec")
Expand Down

0 comments on commit ac8ac4f

Please sign in to comment.