From 973f72a52380e34216e60a6972214e7d75ee7094 Mon Sep 17 00:00:00 2001
From: Garritt McCune <glmccune@gmail.com>
Date: Tue, 11 Apr 2017 19:56:46 -0500
Subject: [PATCH] Updated installer to place all dependencies into the install
 directory.

---
 SetupProject/Product.wxs          | 28 +++++++++++++++++++++++-----
 SetupProject/SetupProject.wixproj |  6 ++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/SetupProject/Product.wxs b/SetupProject/Product.wxs
index 97d358f..cf7a72a 100644
--- a/SetupProject/Product.wxs
+++ b/SetupProject/Product.wxs
@@ -2,11 +2,13 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" Name="SetupProject" Language="1033" Version="1.0.0.0" Manufacturer="Garritt McCune" UpgradeCode="a416a558-d7c0-4f24-8b1e-2d01761ad15f">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <!--Not set by default, EmbedCab="yes" embeds the cabinet file into the installer-->
 		<MediaTemplate EmbedCab="yes"/>
-
+    <!--Displays the installer so the user can choose what directory they'd like to install the product.-->
+    <!--There are no select features options with this install dialog.-->
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+    <UIRef Id="WixUI_InstallDir" />
 		<Feature Id="ProductFeature" Title="AdvertisingProfitControl" Level="1">
 			<ComponentGroupRef Id="ProductComponents" />
       <ComponentRef Id="ApplicationShortcut" /> 
@@ -24,9 +26,9 @@
         <Directory Id="ApplicationProgramsFolder" Name="Advertising Profit Control"/>
       </Directory>
      <!--App data folder-->
-        <Directory Id="LocalAppDataFolder">
-            <Directory Id="AppDataFolder" Name="APC" />
-        </Directory>    
+      <Directory Id="LocalAppDataFolder">
+        <Directory Id="AppDataFolder" Name="APC" />    
+      </Directory>    
 		</Directory>
 	</Fragment>
  <!--Define the shortcut-->
@@ -50,6 +52,22 @@
 			<Component Id="AdvertisingProfitControl.exe">
       <File Source="$(var.AdvertsingProfitControl.TargetPath)" />
 		  </Component>
+      <!--Mark all needed DLLs and configuration files to be installed in the directory with the main binary.-->
+      <Component Id="AppConfig">
+        <File Name="AdvertsingProfitControl.exe.config" Source="$(var.SolutionDir)\AdvertsingProfitControl\App.config"/>
+      </Component>
+      <Component Id="HTMLRender">
+              <File Source="$(var.SolutionDir)\packages\HtmlRenderer.WinForms.1.5.0.6\lib\net45\HtmlRenderer.WinForms.dll"/>
+      </Component>
+            <Component Id="HTMLRenderCore">
+              <File Source="$(var.SolutionDir)\packages\HtmlRenderer.Core.1.5.0.6\lib\net45\HtmlRenderer.dll"/>
+      </Component>
+          <Component Id="EntityFrameworkDll">
+              <File Source="$(var.SolutionDir)\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll"/>
+      </Component>
+      <Component Id="EntityFrameworkSqlDll">
+              <File Source="$(var.SolutionDir)\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll"/>
+      </Component>
 		</ComponentGroup>
 	</Fragment>
 </Wix>
diff --git a/SetupProject/SetupProject.wixproj b/SetupProject/SetupProject.wixproj
index ca5a28a..67234ad 100644
--- a/SetupProject/SetupProject.wixproj
+++ b/SetupProject/SetupProject.wixproj
@@ -31,6 +31,12 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </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' ">