From 8ebc4f894fb61f95d524097b1ff0395c4da03de7 Mon Sep 17 00:00:00 2001
From: Eric Fontana <eric@fontanas.net>
Date: Tue, 12 Aug 2014 14:07:09 -0400
Subject: [PATCH] Don't warn about REINSTALLMODE

---
 TimberWix/Product.wxs            | 17 ++++++++++++++---
 TimberWix/TimberWinR.Wix.wixproj |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/TimberWix/Product.wxs b/TimberWix/Product.wxs
index 4f2b699..0e6ba8b 100644
--- a/TimberWix/Product.wxs
+++ b/TimberWix/Product.wxs
@@ -5,9 +5,20 @@
     <Property Id="CONFIGFILE">default.json</Property>
     <Property Id="LOGDIR">c:\logs</Property>
     <Property Id="LOGLEVEL">Info</Property>
+    
+    <!--
+				We need to be able to uninstall a newer version from an older version.
+				The default reinstallmode is "omus", of which the 'o' means "reinstall if missing or older"
+				The 'd' means "reinstall if different". This ensures that, at the individual component level, rollbacks work correctly.
+				See http://msdn.microsoft.com/en-us/library/windows/desktop/aa371182(v=vs.85).aspx
+			-->
+    <Property Id="REINSTALLMODE" Value="dmus" />
+
+    
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
 
+    
     <Feature Id="ProductFeature" Title="TimberWinR" Level="1">
       <ComponentGroupRef Id="ProductComponents" />
     </Feature>
@@ -48,7 +59,7 @@
       Impersonate="yes"
       Execute="deferred"
       ExeCommand='"[INSTALLFOLDER]TimberWinR.ServiceHost.exe" install --autostart -configFile "[CONFIGFILE]" -logDir "[LOGDIR]" -logLevel "[LOGLEVEL]"'
-      Return='ignore'>      
+      Return='check'>      
     </CustomAction>
 
     <CustomAction Id="ManagedInstall2"
@@ -56,7 +67,7 @@
       Impersonate="yes"
       Execute="deferred"
       ExeCommand='"[INSTALLFOLDER]TimberWinR.ServiceHost.exe" start'
-      Return='ignore'>      
+      Return='check'>      
     </CustomAction>
 
     <CustomAction Id="ManagedUnInstall"
@@ -64,7 +75,7 @@
      Impersonate="yes"
      Execute="deferred"
      ExeCommand='"[INSTALLFOLDER]TimberWinR.ServiceHost.exe" uninstall'
-     Return='ignore'>
+     Return='check'>
     </CustomAction>
 
 
diff --git a/TimberWix/TimberWinR.Wix.wixproj b/TimberWix/TimberWinR.Wix.wixproj
index 155b292..a5f87b3 100644
--- a/TimberWix/TimberWinR.Wix.wixproj
+++ b/TimberWix/TimberWinR.Wix.wixproj
@@ -28,6 +28,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressIces>ICE40</SuppressIces>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />