From 2350ae06d9bfa40d7faa7b58d178823993cf65d3 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 12 Jun 2024 15:32:40 -0700
Subject: [PATCH] Fix merge issues

---
 tools/packaging/packaging.psm1 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 9c94cdac96..f14edaa364 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -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(