From c59ca37d1a79535cf83bd2112b6d1101208c3fb5 Mon Sep 17 00:00:00 2001
From: kayone <kay.one@gmail.com>
Date: Sat, 23 Nov 2013 18:05:42 -0800
Subject: [PATCH] removed conflicting files from wix.

---
 wix/nzbdrone.wxs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/wix/nzbdrone.wxs b/wix/nzbdrone.wxs
index 5ad4266a6..c21e8ab51 100644
--- a/wix/nzbdrone.wxs
+++ b/wix/nzbdrone.wxs
@@ -19,7 +19,6 @@
                 <Directory Id="ROOT_DIR" Name="NzbDrone">
                     <Directory Id="BIN_DIR" Name="bin">
                       <Component Id="BIN_COMP" DiskId="1" Guid="417fd784-e2f5-435d-92d1-220c140d0042">
-                          <File Id="CONSOLE_EXE_FILE" Name="NzbDrone.Console.exe" Source="..\_output\NzbDrone.Console.exe" KeyPath="yes"/>
                           <RemoveFolder Id="BIN_DIR" On="uninstall" />
                       </Component>
                     </Directory>
@@ -35,6 +34,11 @@
         <Property Id="INSTALL_WINDOWS_SERVICE" Value="1" />
         <Condition Message="This application requires .NET Framework 4.0 or later. Please install the .NET Framework then run this installer again.">NETFRAMEWORK40FULL</Condition>
         <Icon Id="APP_ICON" SourceFile="..\_output\NzbDrone.exe" />
-        <CustomAction Id="START_ACTION" FileKey="CONSOLE_EXE_FILE" ExeCommand="" Execute="deferred" Impersonate="no" Return="asyncNoWait" />
+         <InstallExecuteSequence>
+            <InstallInitialize />
+               <!-- <Custom Action="START_ACTION" After="InstallFiles" /> -->
+            <InstallFinalize />
+        </InstallExecuteSequence>
+        <CustomAction Id="START_ACTION" FileKey="NzbDrone.Console.exe" ExeCommand="" Execute="deferred" Impersonate="no" Return="asyncNoWait" />
     </Product>
 </Wix>
\ No newline at end of file