From f9a4498f9bd79c2be78e09d544ea81217e92a9fb Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 11 May 2024 15:08:10 -0500
Subject: [PATCH] Upgrade to WiX v5.0.0

---
 wix/Moonlight/Moonlight.wixproj           | 19 ++++---------------
 wix/Moonlight/Product.wxs                 |  4 ++++
 wix/MoonlightSetup/MoonlightSetup.wixproj |  6 +++---
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/wix/Moonlight/Moonlight.wixproj b/wix/Moonlight/Moonlight.wixproj
index db5a800a..43867b81 100644
--- a/wix/Moonlight/Moonlight.wixproj
+++ b/wix/Moonlight/Moonlight.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.4" ToolsVersion="4.0">
+<Project Sdk="WixToolset.Sdk/5.0.0" ToolsVersion="5.0">
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
@@ -9,17 +9,6 @@
   <PropertyGroup>
     <DefineConstants>DeployDir=$(DEPLOY_FOLDER);BuildDir=$(BUILD_FOLDER)</DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
-    <HarvestDirectory Include="$(DEPLOY_FOLDER)">
-      <ComponentGroupName>MoonlightDependencies</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <PreprocessorVariable>DeployDir</PreprocessorVariable>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-      <SuppressCom>true</SuppressCom>
-      <SuppressRegistry>true</SuppressRegistry>
-    </HarvestDirectory>
-    <BindPath Include="$(DEPLOY_FOLDER)" />
-  </ItemGroup>
   <PropertyGroup Condition="$(SIGN)!=''">
     <SignOutput>true</SignOutput>
   </PropertyGroup>
@@ -27,8 +16,8 @@
     <Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignMsi.FullPath)' />
   </Target>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Firewall.wixext" Version="4.0.4" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.4" />
-    <PackageReference Include="WixToolset.Heat" Version="4.0.4" />
+    <PackageReference Include="WixToolset.Firewall.wixext" Version="5.0.0" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.0" />
+    <PackageReference Include="WixToolset.Heat" Version="5.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/wix/Moonlight/Product.wxs b/wix/Moonlight/Product.wxs
index c17905f8..8f2ff2b9 100644
--- a/wix/Moonlight/Product.wxs
+++ b/wix/Moonlight/Product.wxs
@@ -106,6 +106,10 @@
       </Component>
     </DirectoryRef>
 
+    <ComponentGroup Id="MoonlightDependencies" Directory="INSTALLFOLDER">
+      <Files Include="$(var.DeployDir)\**" />
+    </ComponentGroup>
+
     <Feature Id="ProductFeature" Title="Moonlight" Level="1" ConfigurableDirectory="INSTALLFOLDER">
       <ComponentRef Id="Moonlight" />
       <ComponentRef Id="MoonlightShortcuts" />
diff --git a/wix/MoonlightSetup/MoonlightSetup.wixproj b/wix/MoonlightSetup/MoonlightSetup.wixproj
index d90eaa77..33fb7503 100644
--- a/wix/MoonlightSetup/MoonlightSetup.wixproj
+++ b/wix/MoonlightSetup/MoonlightSetup.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.4">
+<Project Sdk="WixToolset.Sdk/5.0.0">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
   </PropertyGroup>
@@ -19,7 +19,7 @@
     <Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignBundle.FullPath)' />
   </Target>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.4" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.4" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.0" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file