From d5e2d59fe9c2d98e3a1640c7e04afa47030c5554 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 14 Jul 2023 20:05:49 -0500
Subject: [PATCH] Fixes for WiX v4 migration

---
 scripts/build-arch.bat          | 4 +++-
 wix/Moonlight/Moonlight.wixproj | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/build-arch.bat b/scripts/build-arch.bat
index d04f452e..fc5da1e0 100644
--- a/scripts/build-arch.bat
+++ b/scripts/build-arch.bat
@@ -207,10 +207,12 @@ if "%ML_SYMBOL_STORE%" NEQ "" (
     echo Publishing binaries to symbol store: %ML_SYMBOL_STORE%
     symstore add /r /f %DEPLOY_FOLDER%\*.* /s %ML_SYMBOL_STORE% /t Moonlight
     if !ERRORLEVEL! NEQ 0 goto Error
+    symstore add /r /f %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe /s %ML_SYMBOL_STORE% /t Moonlight
+    if !ERRORLEVEL! NEQ 0 goto Error
 )
 
 echo Building MSI
-msbuild %SOURCE_ROOT%\wix\Moonlight\Moonlight.wixproj /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
+msbuild -Restore %SOURCE_ROOT%\wix\Moonlight\Moonlight.wixproj /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
 if !ERRORLEVEL! NEQ 0 goto Error
 
 if "%SIGN%"=="1" (
diff --git a/wix/Moonlight/Moonlight.wixproj b/wix/Moonlight/Moonlight.wixproj
index adc1a2d0..0fc48934 100644
--- a/wix/Moonlight/Moonlight.wixproj
+++ b/wix/Moonlight/Moonlight.wixproj
@@ -23,6 +23,6 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Firewall.wixext" Version="4.*" />
     <PackageReference Include="WixToolset.Util.wixext" Version="4.*" />
-    <PackageReference Include="WixToolset.Heat" />
+    <PackageReference Include="WixToolset.Heat" Version="4.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file