Fix merge issues

This commit is contained in:
Aditya Patwardhan
2024-06-12 15:32:40 -07:00
parent 59377effa1
commit 2350ae06d9
+7 -3
View File
@@ -893,7 +893,6 @@ function New-PSBuildZip
}
}
function Update-PSSignedBuildFolder
{
param(
@@ -904,6 +903,12 @@ function Update-PSSignedBuildFolder
[string[]] $RemoveFilter = ('*.pdb', '*.zip', '*.r2rmap')
)
$BuildPathNormalized = (Get-Item $BuildPath).FullName
$SignedFilesPathNormalized = (Get-Item $SignedFilesPath).FullName
Write-Verbose -Verbose "BuildPath = $BuildPathNormalized"
Write-Verbose -Verbose "SignedFilesPath = $signedFilesPath"
# Replace unsigned binaries with signed
$signedFilesFilter = Join-Path -Path $SignedFilesPathNormalized -ChildPath '*'
Write-Verbose -Verbose "signedFilesFilter = $signedFilesFilter"
@@ -965,12 +970,11 @@ function Update-PSSignedBuildFolder
}
foreach($filter in $RemoveFilter) {
$removePath = Join-Path -Path $BuildPath -ChildPath $filter
$removePath = Join-Path -Path $BuildPathNormalized -ChildPath $filter
Remove-Item -Path $removePath -Recurse -Force
}
}
function Expand-PSSignedBuild
{
param(