Added paket references for WiX tools

hopefully fixing the packaging of the msi
julienadam · Sep 1, 2017 · 9da710f · 9da710f
1 parent 123fae5
commit 9da710f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -223,4 +223,9 @@ Pickles/
 .paket/paket.exe
 .paket/paket.targets
 
-.vs/
+.vs/
+
+*.msi
+*.wixobj
+*.wixpdb
+*files.wxs
diff --git a/BuildMsi.cmd b/BuildMsi.cmd
@@ -5,7 +5,7 @@ del installer\*.wixpdb
 del installer\*.msi
 del installer\attachrfiles.wxs
 pushd installer
-..\packages\ParaffinBundler.3.61\paraffin.exe -dir ..\AttachR\bin\release -groupName AttachRFiles attachrfiles.wxs -ext pdb -ext xml -ext exe -regexexclude .*\.vshost\..* -norootdirectory
-..\packages\WiX.Toolset.3.9.1208.0\tools\wix\candle.exe *.wxs
-..\packages\WiX.Toolset.3.9.1208.0\tools\wix\light.exe -ext WixNetFxExtension -ext WixUIExtension *.wixobj -o AttachR.msi
+..\packages\ParaffinBundler\paraffin.exe -dir ..\AttachR\bin\release -groupName AttachRFiles attachrfiles.wxs -ext pdb -ext xml -ext exe -regexexclude .*\.vshost\..* -norootdirectory
+..\packages\WiX.Toolset\tools\wix\candle.exe *.wxs
+..\packages\WiX.Toolset\tools\wix\light.exe -ext WixNetFxExtension -ext WixUIExtension *.wixobj -o AttachR.msi
 popd
diff --git a/installer/AttachR.wxs b/installer/AttachR.wxs
@@ -19,9 +19,7 @@
     <UIRef Id="WixUI_Minimal" />
     <UIRef Id="WixUI_ErrorProgressText" />
     <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
-
-
-
+
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='AttachR'>

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,5 +1,10 @@
 source https://www.nuget.org/api/v2/
 
+# WiX Installer tools
+nuget ParaffinBundler
+nuget WiX.Toolset
+
+# Dependencies
 nuget AutoMapper 3 restriction: >= net451
 nuget Caliburn.Micro restriction: >= net451
 nuget Caliburn.Micro.Core restriction: >= net451
@@ -10,6 +15,8 @@ nuget Newtonsoft.Json restriction: >= net451
 nuget NFluent restriction: >= net452
 nuget NHotkey restriction: >= net451
 nuget NHotkey.Wpf restriction: >= net451
+
+# Testing
 nuget xunit restriction: >= net452
 nuget xunit.abstractions restriction: >= net452
 nuget xunit.assert restriction: >= net452

diff --git a/paket.lock b/paket.lock
@@ -12,6 +12,8 @@ NUGET
     NHotkey (1.2.1) - restriction: >= net451
     NHotkey.Wpf (1.2.1) - restriction: >= net451
       NHotkey (>= 1.2.1)
+    ParaffinBundler (3.61)
+    WiX.Toolset (3.9.1208)
     xunit (2.2) - restriction: >= net452
       xunit.assert (2.2)
       xunit.core (2.2)