Index: setup/Plugins/Wti2017Setup/Product.wxs
===================================================================
diff -u -r322d4b0df95dac67f7d5797dd9daf9ce9a19ea90 -rc451c62f5b26082aea318048b7c7add24bb5f904
--- setup/Plugins/Wti2017Setup/Product.wxs	(.../Product.wxs)	(revision 322d4b0df95dac67f7d5797dd9daf9ce9a19ea90)
+++ setup/Plugins/Wti2017Setup/Product.wxs	(.../Product.wxs)	(revision c451c62f5b26082aea318048b7c7add24bb5f904)
@@ -12,7 +12,10 @@
         <Directory Id="Deltares" Name="Deltares">
           <Directory Id="INSTALLDIR" Name="WTI 2017">
 
-            <!--Wti2017Payload.wxs defines all files going into this folder-->
+            <!--
+            Wti2017Payload.wxs defines all files going into this folder. 
+            Wti2017Payload.wxs will be generated on pre-build. Ensure you clean first before building the installer!
+            -->
             
           </Directory>
         </Directory>
Fisheye: Tag c451c62f5b26082aea318048b7c7add24bb5f904 refers to a dead (removed) revision in file `setup/Plugins/Wti2017Setup/Wti2017Payload.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: setup/Plugins/Wti2017Setup/Wti2017Setup.wixproj
===================================================================
diff -u -r322d4b0df95dac67f7d5797dd9daf9ce9a19ea90 -rc451c62f5b26082aea318048b7c7add24bb5f904
--- setup/Plugins/Wti2017Setup/Wti2017Setup.wixproj	(.../Wti2017Setup.wixproj)	(revision 322d4b0df95dac67f7d5797dd9daf9ce9a19ea90)
+++ setup/Plugins/Wti2017Setup/Wti2017Setup.wixproj	(.../Wti2017Setup.wixproj)	(revision c451c62f5b26082aea318048b7c7add24bb5f904)
@@ -14,15 +14,15 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>Debug;ApplicationBinFolderPath=..\..\..\src\DeltaShell\DeltaShell.Gui\bin</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <SuppressPdbOutput>True</SuppressPdbOutput>
     <WixVariables>
     </WixVariables>
-    <DefineConstants>ProductSourceDir=..\..\..\src\DeltaShell\DeltaShell.Gui\bin</DefineConstants>
+    <DefineConstants>ApplicationBinFolder=..\..\..\src\DeltaShell\DeltaShell.Gui\bin</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
@@ -43,6 +43,9 @@
     <Content Include="Wti2017.ico" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\src\DeltaShell\DeltaShell.Gui\bin -cg Wti2017ApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)Wti2017Payload.wxs"</PreBuildEvent>
+  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.