From c418fe9030c447e608a3af934507d6e360159868 Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Thu, 7 Nov 2024 21:24:47 +0300
Subject: [PATCH] Simples fixes to 'Compile.ps1' Script (#2971)

* Save WinUtil's json strings with DOS-Style Newline Character (CRLF) instead of Unix-Style Newline Character (LF)

Originated from PR #2816 by @ruxunderscore

* Exit Early when facing Syntax Errors, Solves a problem when passing '-Run' Argument with 'Compile.ps1' Script - Use 'Out-Null' to follow common project conventions
---
 Compile.ps1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Compile.ps1 b/Compile.ps1
index f427e3551c..e011b6b5e1 100644
--- a/Compile.ps1
+++ b/Compile.ps1
@@ -91,7 +91,7 @@ $($jsonAsObject | ConvertTo-Json -Depth 3)
 "@
 
     $sync.configs.$($psitem.BaseName) = $json | ConvertFrom-Json
-    $script_content.Add($(Write-Output "`$sync.configs.$($psitem.BaseName) = @'`n$json`n'@ `| ConvertFrom-Json" ))
+    $script_content.Add($(Write-Output "`$sync.configs.$($psitem.BaseName) = @'`r`n$json`r`n'@ `| ConvertFrom-Json" ))
 }
 
 # Read the entire XAML file as a single string, preserving line breaks
@@ -125,10 +125,12 @@ Write-Progress -Activity "Compiling" -Completed
 
 Update-Progress -Activity "Validating" -StatusMessage "Checking winutil.ps1 Syntax" -Percent 0
 try {
-    $null = Get-Command -Syntax .\winutil.ps1
+    Get-Command -Syntax .\winutil.ps1 | Out-Null
 } catch {
     Write-Warning "Syntax Validation for 'winutil.ps1' has failed"
     Write-Host "$($Error[0])" -ForegroundColor Red
+    Pop-Location # Restore previous location before exiting...
+    exit 1
 }
 Write-Progress -Activity "Validating" -Completed