From dbaa52a12ebca960f34335ba49c8681dd4b702d4 Mon Sep 17 00:00:00 2001
From: Eric Fontana <efontana@vistaprint.com>
Date: Mon, 13 Apr 2015 07:31:06 -0400
Subject: [PATCH 1/5] Embed the MSI into chocolatey package

---
 chocolateyInstall.ps1.template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/chocolateyInstall.ps1.template b/chocolateyInstall.ps1.template
index 63002c1..f2c908b 100644
--- a/chocolateyInstall.ps1.template
+++ b/chocolateyInstall.ps1.template
@@ -1,8 +1,14 @@
 $packageName = 'TimberWinR-${version}' 
-$installerType = 'msi'
-$url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi'
+$fileType = 'msi'
 $silentArgs = '/quiet' 
-$validExitCodes = @(0)
-Install-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" "$url64"  -validExitCodes $validExitCodes
+$scriptPath =  $(Split-Path $MyInvocation.MyCommand.Path)
+$fileFullPath = Join-Path $scriptPath 'TimberWinR-${version}'
+try { 
+  Install-ChocolateyInstallPackage $packageName $fileType $silentArgs $fileFullPath
+} catch {
+  Write-ChocolateyFailure $packageName $($_.Exception.Message)
+  throw 
+}
+
 
 

From 3d0bfc248d46a7694d546e95f5fe628168b1a8d1 Mon Sep 17 00:00:00 2001
From: Eric Fontana <efontana@vistaprint.com>
Date: Mon, 13 Apr 2015 07:42:58 -0400
Subject: [PATCH 2/5] Stage the MSI for chocolatey

---
 TimberWix/TimberWinR.Wix.wixproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/TimberWix/TimberWinR.Wix.wixproj b/TimberWix/TimberWinR.Wix.wixproj
index 3c7c4d3..3db7cc8 100644
--- a/TimberWix/TimberWinR.Wix.wixproj
+++ b/TimberWix/TimberWinR.Wix.wixproj
@@ -98,10 +98,12 @@
     </CreateProperty>
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>$(SolutionDir)\TimberWinR.ExtractID\$(OutDir)\TimberWinR.ExtractID.exe $(TargetDir) $(SolutionDir)chocolateyUninstall.ps1.guid  $(SolutionDir)chocolateyUninstall.ps1.template</PostBuildEvent>
+    <PreBuildEvent>mkdir  $(SolutionDir)tools
+cmd.exe /c copy $(SolutionDir)chocolateyUninstall.ps1.template.orig  $(SolutionDir)chocolateyUninstall.ps1.template</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>cmd.exe /c copy $(SolutionDir)chocolateyUninstall.ps1.template.orig  $(SolutionDir)chocolateyUninstall.ps1.template</PreBuildEvent>
+    <PostBuildEvent>$(SolutionDir)\TimberWinR.ExtractID\$(OutDir)\TimberWinR.ExtractID.exe $(TargetDir) $(SolutionDir)chocolateyUninstall.ps1.guid  $(SolutionDir)chocolateyUninstall.ps1.template
+cmd.exe /c copy "$(TargetDir)%2a.msi" "$(SolutionDir)tools"</PostBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

From f5b2858c1ca9c5be3b1dc1bd91a4307c87db33e3 Mon Sep 17 00:00:00 2001
From: Eric Fontana <efontana@vistaprint.com>
Date: Mon, 13 Apr 2015 07:44:55 -0400
Subject: [PATCH 3/5] Don't check in MSI files.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f803bda..96aedda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -155,3 +155,4 @@ $RECYCLE.BIN/
 # Mac desktop service store files
 .DS_Store
 packages
+*.msi

From 6461369d396f32ab7c91f2453b803c2d0a812f6e Mon Sep 17 00:00:00 2001
From: Eric Fontana <efontana@vistaprint.com>
Date: Mon, 13 Apr 2015 08:05:30 -0400
Subject: [PATCH 4/5] Embed msi

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 569fd2e..a3ffa69 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,7 @@ following options:
 TimberWinR.ServiceHost.exe -configFile:myconfig.json -logLevel:Debug
 ```
 
-## Automatic Installation via Chocolatey
+## Automatic Installation via Chocolatey (embedded)
 
 [TimbeWinR Chocolatey](https://chocolatey.org/packages/TimberWinR)
 

From e98ef89fe22a5dd1b0e3aaf64552075439954c1e Mon Sep 17 00:00:00 2001
From: Eric Fontana <efontana@vistaprint.com>
Date: Mon, 13 Apr 2015 08:41:40 -0400
Subject: [PATCH 5/5] Updated uninstaller to match new installer.

---
 chocolateyUninstall.ps1.template      | 7 ++++---
 chocolateyUninstall.ps1.template.orig | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chocolateyUninstall.ps1.template b/chocolateyUninstall.ps1.template
index cd8af68..e9f850d 100644
--- a/chocolateyUninstall.ps1.template
+++ b/chocolateyUninstall.ps1.template
@@ -1,8 +1,9 @@
 $packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages
 $installerType = 'msi' #only one of these: exe, msi, msu
-$url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url
-$silentArgs = '{58758EE5-4CDF-4258-81B2-0314F1290C24} /quiet' 
+$scriptPath =  $(Split-Path $MyInvocation.MyCommand.Path)
+$fileFullPath = Join-Path $scriptPath 'TimberWinR-${version}'
+$silentArgs = '${PROJECTGUID} /quiet' 
 $validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx
-UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes
+UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "fileFullPath" -validExitCodes $validExitCodes
 
 
diff --git a/chocolateyUninstall.ps1.template.orig b/chocolateyUninstall.ps1.template.orig
index 7659c85..e2d665a 100644
--- a/chocolateyUninstall.ps1.template.orig
+++ b/chocolateyUninstall.ps1.template.orig
@@ -1,8 +1,7 @@
 $packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages
 $installerType = 'msi' #only one of these: exe, msi, msu
-$url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url
+$scriptPath =  $(Split-Path $MyInvocation.MyCommand.Path)
+$fileFullPath = Join-Path $scriptPath 'TimberWinR-${version}'
 $silentArgs = '${PROJECTGUID} /quiet' 
 $validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx
-UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes
-
-
+UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "fileFullPath" -validExitCodes $validExitCodes
\ No newline at end of file