From 718a5754787f95c57c9a8099695424714be06f46 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 25 Jul 2018 19:33:09 -0700
Subject: [PATCH] Reorganize WiX sources

---
 scripts/generate-installers.bat               |  2 +-
 wix/{Moonlight => }/Moonlight.sln             |  4 +--
 wix/Moonlight/Moonlight.wixproj               | 28 +++++++----------
 wix/{MoonlightMsi => Moonlight}/Product.wxs   |  0
 wix/{Moonlight => MoonlightSetup}/Bundle.wxs  |  4 +--
 .../MoonlightSetup.wixproj}                   | 30 +++++++++++--------
 wix/{Moonlight => MoonlightSetup}/license.rtf |  0
 7 files changed, 34 insertions(+), 34 deletions(-)
 rename wix/{Moonlight => }/Moonlight.sln (89%)
 rename wix/{MoonlightMsi => Moonlight}/Product.wxs (100%)
 rename wix/{Moonlight => MoonlightSetup}/Bundle.wxs (88%)
 rename wix/{MoonlightMsi/MoonlightMsi.wixproj => MoonlightSetup/MoonlightSetup.wixproj} (64%)
 rename wix/{Moonlight => MoonlightSetup}/license.rtf (100%)

diff --git a/scripts/generate-installers.bat b/scripts/generate-installers.bat
index 83249a27..20649355 100644
--- a/scripts/generate-installers.bat
+++ b/scripts/generate-installers.bat
@@ -67,7 +67,7 @@ copy %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe %DEPLOY_FOLDER%
 if !ERRORLEVEL! NEQ 0 goto Error
 
 echo Building installer
-msbuild %SOURCE_ROOT%\wix\Moonlight\Moonlight.sln /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
+msbuild %SOURCE_ROOT%\wix\Moonlight.sln /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
 if !ERRORLEVEL! NEQ 0 goto Error
 
 echo Build successful!
diff --git a/wix/Moonlight/Moonlight.sln b/wix/Moonlight.sln
similarity index 89%
rename from wix/Moonlight/Moonlight.sln
rename to wix/Moonlight.sln
index ebe8afdb..48aec995 100644
--- a/wix/Moonlight/Moonlight.sln
+++ b/wix/Moonlight.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Moonlight", "Moonlight.wixproj", "{466FA35D-4BE4-40EF-9CE5-AFADC3B63BC5}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MoonlightSetup", "MoonlightSetup\MoonlightSetup.wixproj", "{466FA35D-4BE4-40EF-9CE5-AFADC3B63BC5}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MoonlightMsi", "..\MoonlightMsi\MoonlightMsi.wixproj", "{8468EF94-3BB8-47A5-AF15-0E314AFE664D}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Moonlight", "Moonlight\Moonlight.wixproj", "{8468EF94-3BB8-47A5-AF15-0E314AFE664D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/wix/Moonlight/Moonlight.wixproj b/wix/Moonlight/Moonlight.wixproj
index 239268b9..1ed21498 100644
--- a/wix/Moonlight/Moonlight.wixproj
+++ b/wix/Moonlight/Moonlight.wixproj
@@ -2,37 +2,31 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>466fa35d-4be4-40ef-9ce5-afadc3b63bc5</ProjectGuid>
+    <ProjectGuid>8468ef94-3bb8-47a5-af15-0e314afe664d</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Moonlight</OutputName>
-    <OutputType>Bundle</OutputType>
+    <OutputType>Package</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <OutputPath>$(INSTALLER_FOLDER)\</OutputPath>
+    <OutputPath>$(BUILD_FOLDER)\</OutputPath>
     <IntermediateOutputPath>$(BUILD_FOLDER)\</IntermediateOutputPath>
   </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>SourceDir=$(DEPLOY_FOLDER)</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Bundle.wxs" />
+    <Compile Include="Product.wxs" />
+    <Compile Include="$(BUILD_FOLDER)\Dependencies.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <WixExtension Include="WixBalExtension">
-      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
-      <Name>WixBalExtension</Name>
+    <WixExtension Include="WixFirewallExtension">
+      <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
+      <Name>WixFirewallExtension</Name>
     </WixExtension>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MoonlightMsi\MoonlightMsi.wixproj">
-      <Name>MoonlightMsi</Name>
-      <Project>{8468ef94-3bb8-47a5-af15-0e314afe664d}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
diff --git a/wix/MoonlightMsi/Product.wxs b/wix/Moonlight/Product.wxs
similarity index 100%
rename from wix/MoonlightMsi/Product.wxs
rename to wix/Moonlight/Product.wxs
diff --git a/wix/Moonlight/Bundle.wxs b/wix/MoonlightSetup/Bundle.wxs
similarity index 88%
rename from wix/Moonlight/Bundle.wxs
rename to wix/MoonlightSetup/Bundle.wxs
index 6b62bee8..615bf2bc 100644
--- a/wix/Moonlight/Bundle.wxs
+++ b/wix/MoonlightSetup/Bundle.wxs
@@ -4,7 +4,7 @@
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
 
   <Bundle Name="Moonlight Game Streaming Client"
-          Version="!(bind.PackageVersion.MoonlightMsi)"
+          Version="!(bind.PackageVersion.Moonlight)"
           Manufacturer="Moonlight Game Streaming Team"
           UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5"
           HelpUrl="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide"
@@ -24,7 +24,7 @@
     </BootstrapperApplicationRef>
 
     <Chain>
-      <MsiPackage Id="MoonlightMsi" SourceFile="$(var.MoonlightMsi.TargetPath)" Vital="yes">
+      <MsiPackage Id="Moonlight" SourceFile="$(var.Moonlight.TargetPath)" Vital="yes">
         <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
       </MsiPackage>
     </Chain>
diff --git a/wix/MoonlightMsi/MoonlightMsi.wixproj b/wix/MoonlightSetup/MoonlightSetup.wixproj
similarity index 64%
rename from wix/MoonlightMsi/MoonlightMsi.wixproj
rename to wix/MoonlightSetup/MoonlightSetup.wixproj
index ea7eb965..e04f43fe 100644
--- a/wix/MoonlightMsi/MoonlightMsi.wixproj
+++ b/wix/MoonlightSetup/MoonlightSetup.wixproj
@@ -2,31 +2,37 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>8468ef94-3bb8-47a5-af15-0e314afe664d</ProjectGuid>
+    <ProjectGuid>466fa35d-4be4-40ef-9ce5-afadc3b63bc5</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>MoonlightMsi</OutputName>
-    <OutputType>Package</OutputType>
+    <OutputName>MoonlightSetup</OutputName>
+    <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <OutputPath>$(BUILD_FOLDER)\</OutputPath>
+    <OutputPath>$(INSTALLER_FOLDER)\</OutputPath>
     <IntermediateOutputPath>$(BUILD_FOLDER)\</IntermediateOutputPath>
   </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants>SourceDir=$(DEPLOY_FOLDER)</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Product.wxs" />
-    <Compile Include="$(BUILD_FOLDER)\Dependencies.wxs" />
+    <Compile Include="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <WixExtension Include="WixFirewallExtension">
-      <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
-      <Name>WixFirewallExtension</Name>
+    <WixExtension Include="WixBalExtension">
+      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
+      <Name>WixBalExtension</Name>
     </WixExtension>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Moonlight\Moonlight.wixproj">
+      <Name>Moonlight</Name>
+      <Project>{8468ef94-3bb8-47a5-af15-0e314afe664d}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
diff --git a/wix/Moonlight/license.rtf b/wix/MoonlightSetup/license.rtf
similarity index 100%
rename from wix/Moonlight/license.rtf
rename to wix/MoonlightSetup/license.rtf