Merged PR 6442: Moved the cleanup logic to Restore-PSModuleToBuild

Moved the cleanup logic to Restore-PSModuleToBuild
This commit is contained in:
Aditya Patwardhan
2019-01-10 00:12:40 +00:00
committed by Travis Plunk
parent 813a98e028
commit 661fa811fe
+3 -3
View File
@@ -680,9 +680,6 @@ Fix steps:
if ($CI) {
Restore-PSPester -Destination (Join-Path $publishPath "Modules")
}
# Remove .nupkg.metadata files
Get-ChildItem $publishPath -Filter '.nupkg.metadata' -Recurse | ForEach-Object { Remove-Item $_.FullName -ErrorAction SilentlyContinue -Force }
}
function Restore-PSPackage
@@ -758,6 +755,9 @@ function Restore-PSModuleToBuild
Write-Log "Restore PowerShell modules to $publishPath"
$modulesDir = Join-Path -Path $publishPath -ChildPath "Modules"
Copy-PSGalleryModules -Destination $modulesDir
# Remove .nupkg.metadata files
Get-ChildItem $PublishPath -Filter '.nupkg.metadata' -Recurse | ForEach-Object { Remove-Item $_.FullName -ErrorAction SilentlyContinue -Force }
}
function Restore-PSPester