From a95c7bbea59fe88f06b4228dc721cf31f5ecf4f4 Mon Sep 17 00:00:00 2001
From: Eric Fontana <eric@fontanas.net>
Date: Tue, 12 Aug 2014 11:14:11 -0400
Subject: [PATCH] Changed back to .NET 4.0

---
 TimberWinR.ServiceHost/App.config                    | 6 +++---
 TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj | 3 ++-
 TimberWix/Product.wxs                                | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/TimberWinR.ServiceHost/App.config b/TimberWinR.ServiceHost/App.config
index 8e15646..74ade9d 100644
--- a/TimberWinR.ServiceHost/App.config
+++ b/TimberWinR.ServiceHost/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj b/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
index 1934ff8..d0d96a6 100644
--- a/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
+++ b/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TimberWinR.ServiceHost</RootNamespace>
     <AssemblyName>TimberWinR.ServiceHost</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/TimberWix/Product.wxs b/TimberWix/Product.wxs
index 248c691..df6c97a 100644
--- a/TimberWix/Product.wxs
+++ b/TimberWix/Product.wxs
@@ -48,7 +48,7 @@
       Impersonate="yes"
       Execute="deferred"
       ExeCommand='"[INSTALLFOLDER]TimberWinR.ServiceHost.exe" install --autostart -configFile "[CONFIGFILE]" -logDir "[LOGDIR]" -logLevel "[LOGLEVEL]"'
-      Return='check'>      
+      Return='ignore'>      
     </CustomAction>
 
     <CustomAction Id="ManagedInstall2"
@@ -56,7 +56,7 @@
       Impersonate="yes"
       Execute="deferred"
       ExeCommand='"[INSTALLFOLDER]TimberWinR.ServiceHost.exe" start'
-      Return='check'>      
+      Return='ignore'>      
     </CustomAction>
 
     <CustomAction Id="ManagedUnInstall"
@@ -64,7 +64,7 @@
      Impersonate="yes"
      Execute="deferred"
      ExeCommand='"[INSTALLFOLDER]TimberWinR.ServiceHost.exe" uninstall'
-     Return='check'>
+     Return='ignore'>
     </CustomAction>