From ea0b4de90a4d807a9e40e8480bbb92a476f67ab2 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Thu, 10 Jan 2019 00:12:40 +0000 Subject: [PATCH] Merged PR 6442: Moved the cleanup logic to Restore-PSModuleToBuild Moved the cleanup logic to Restore-PSModuleToBuild # Conflicts: # build.psm1 --- build.psm1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.psm1 b/build.psm1 index b1c8dd6794..613303e0df 100644 --- a/build.psm1 +++ b/build.psm1 @@ -478,9 +478,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 @@ -556,6 +553,9 @@ function Restore-PSModuleToBuild Write-Log "Restore PowerShell modules to $publishPath" $modulesDir = Join-Path -Path $publishPath -ChildPath "Modules" Copy-PSGalleryModules -Destination $modulesDir -CsProjPath "$PSScriptRoot\src\Modules\PSGalleryModules.csproj" + + # Remove .nupkg.metadata files + Get-ChildItem $PublishPath -Filter '.nupkg.metadata' -Recurse | ForEach-Object { Remove-Item $_.FullName -ErrorAction SilentlyContinue -Force } } function Restore-PSPester