diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index ac6df46d4b..0cab4a7883 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -283,7 +283,7 @@ function Start-PSPackage { "fxdependent" { ## Remove PDBs from package to reduce size. if(-not $IncludeSymbols.IsPresent) { - Get-ChildItem $Source -Filter *.pdb | Remove-Item -Force + Get-ChildItem -Recurse $Source -Filter *.pdb | Remove-Item -Force } if ($Environment.IsWindows) { diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 index 1ed063ecb3..f4bbe70313 100644 --- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 +++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 @@ -94,7 +94,12 @@ try{ { Write-Verbose "Starting powershell build for RID: $Runtime and ReleaseTag: $ReleaseTag ..." -verbose $buildParams = @{'CrossGen'= $Runtime -notmatch "arm" -and $Runtime -ne "fxdependent"} - if(!$Symbols.IsPresent) + + if($Symbols.IsPresent) + { + $buildParams['NoPSModuleRestore'] = $true + } + else { $buildParams['PSModuleRestore'] = $true }