windows/layout.ps1: clean up layout script

Clean up the Windows payload layout script to avoid errors when removing
files that don't exist. Also make the script parameters use normal
casing rules.

Signed-off-by: Matthew John Cheetham <[email protected]>

Author: mjcheetham

src/windows/Installer.Windows/layout.ps1

@@ -1,20 +1,22 @@
 # Inputs
-param ([Parameter(Mandatory)] $CONFIGURATION, [Parameter(Mandatory)] $OUTPUT, $SYMBOLOUTPUT)
+param ([Parameter(Mandatory)] $Configuration, [Parameter(Mandatory)] $Output, $SymbolOutput)
 
-Write-Output "Output: $OUTPUT"
+Write-Output "Output: $Output"
 
 # Directories
-$THISDIR = $pwd.path
-$ROOT = (Get-Item $THISDIR).parent.parent.parent.FullName
-$SRC = "$ROOT/src"
-$GCM_SRC = "$SRC/shared/Git-Credential-Manager"
+$THISDIR = $PSScriptRoot
+$ROOT = (Get-Item $THISDIR).Parent.Parent.Parent.FullName
+$SRC = "$ROOT\src"
+$GCM_SRC = "$SRC\shared\Git-Credential-Manager"
 
 # Perform pre-execution checks
-$PAYLOAD = "$OUTPUT"
-if ($SYMBOLOUTPUT)
+$PAYLOAD = "$Output"
+if ($SymbolOutput)
+{
+    $SYMBOLS = "$SymbolOutput"
+}
+else
 {
-    $SYMBOLS = "$SYMBOLOUTPUT"
-} else {
     $SYMBOLS = "$PAYLOAD.sym"
 }
 
@@ -32,37 +34,37 @@ if (Test-Path -Path $SYMBOLS)
 }
 
 # Ensure payload and symbol directories exist
-mkdir -p "$PAYLOAD","$SYMBOLS"
+mkdir -p "$PAYLOAD","$SYMBOLS" | Out-Null
 
 # Publish core application executables
 Write-Output "Publishing core application..."
 dotnet publish "$GCM_SRC" `
 	--framework net472 `
-	--configuration "$CONFIGURATION" `
+	--configuration "$Configuration" `
 	--runtime win-x86 `
 	--output "$PAYLOAD"
 
 # Delete libraries that are not needed for Windows but find their way
 # into the publish output.
-Remove-Item -Path "$PAYLOAD/*.dylib" -Force
+Remove-Item -Path "$PAYLOAD/*.dylib" -Force -ErrorAction Ignore
 
 # Delete extraneous files that get included for other architectures
 # We only care about x86 as the core GCM executable is only targeting x86
-Remove-Item -Path "$PAYLOAD/arm/" -Recurse -Force
-Remove-Item -Path "$PAYLOAD/arm64/" -Recurse -Force
-Remove-Item -Path "$PAYLOAD/x64/" -Recurse -Force
-Remove-Item -Path "$PAYLOAD/musl-x64/" -Recurse -Force
-Remove-Item -Path "$PAYLOAD/runtimes/win-arm64/" -Recurse -Force
-Remove-Item -Path "$PAYLOAD/runtimes/win-x64/" -Recurse -Force
+Remove-Item -Path "$PAYLOAD/arm/" -Recurse -Force -ErrorAction Ignore
+Remove-Item -Path "$PAYLOAD/arm64/" -Recurse -Force -ErrorAction Ignore
+Remove-Item -Path "$PAYLOAD/x64/" -Recurse -Force -ErrorAction Ignore
+Remove-Item -Path "$PAYLOAD/musl-x64/" -Recurse -Force -ErrorAction Ignore
+Remove-Item -Path "$PAYLOAD/runtimes/win-arm64/" -Recurse -Force -ErrorAction Ignore
+Remove-Item -Path "$PAYLOAD/runtimes/win-x64/" -Recurse -Force -ErrorAction Ignore
 
 # The Avalonia and MSAL binaries in these directories are already included in
 # the $PAYLOAD directory directly, so we can delete these extra copies.
-Remove-Item -Path "$PAYLOAD/x86/libSkiaSharp.dll" -Recurse -Force
-Remove-Item -Path "$PAYLOAD/x86/libHarfBuzzSharp.dll" -Recurse -Force
-Remove-Item -Path "$PAYLOAD/runtimes/win-x86/native/msalruntime_x86.dll" -Recurse -Force
+Remove-Item -Path "$PAYLOAD/x86/libSkiaSharp.dll" -Recurse -Force -ErrorAction Ignore
+Remove-Item -Path "$PAYLOAD/x86/libHarfBuzzSharp.dll" -Recurse -Force -ErrorAction Ignore
+Remove-Item -Path "$PAYLOAD/runtimes/win-x86/native/msalruntime_x86.dll" -Recurse -Force -ErrorAction Ignore
 
 # Delete localized resource assemblies - we don't localize the core GCM assembly anyway
-Get-ChildItem "$PAYLOAD" -Recurse -Include "*.resources.dll" | Remove-Item -Force
+Get-ChildItem "$PAYLOAD" -Recurse -Include "*.resources.dll" | Remove-Item -Force -ErrorAction Ignore
 
 # Delete any empty directories
 Get-ChildItem "$PAYLOAD" -Recurse -Directory `