diff --git a/wix/main.wixproj b/wix/main.wixproj
index cab83fb431..77e48b12e7 100644
--- a/wix/main.wixproj
+++ b/wix/main.wixproj
@@ -29,6 +29,7 @@
+
diff --git a/wix/main.wxs b/wix/main.wxs
index df2504d6f3..88657b00f1 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -23,7 +23,7 @@
+ DowngradeErrorMessage="A newer version of [ProductName] is already installed. Setup will now exit." />
@@ -54,6 +54,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -92,35 +117,35 @@
+ Name="PATH"
+ Value="[BINDIR]"
+ Permanent="no"
+ Part="last"
+ Action="set"
+ System="no" />
+ Key="Software\nu"
+ Name="installed"
+ Type="integer"
+ Value="1"
+ KeyPath="yes" />
+ Name="PATH"
+ Value="[BINDIR]"
+ Permanent="no"
+ Part="last"
+ Action="set"
+ System="yes" />
+ Key="Software\nu"
+ Name="installed"
+ Type="integer"
+ Value="1"
+ KeyPath="yes" />
@@ -132,6 +157,14 @@
+
+
+
+
+
@@ -153,26 +186,44 @@
Value="[INSTALLDIR_USER]"
After="AppSearch"
Condition="MSIINSTALLPERUSER=1"
- Sequence="both"/>
+ Sequence="both" />
+ Sequence="both" />
+ Action="SetINSTALLDIR_Machine"
+ Value="[ProgramFiles64Folder][ApplicationFolderName]"
+ After="AppSearch"
+ Condition="ALLUSERS=1"
+ Sequence="both" />
+ Action="SetBINDIR_Machine"
+ Value="[ProgramFiles64Folder][ApplicationFolderName]\bin"
+ After="AppSearch"
+ Condition="ALLUSERS=1"
+ Sequence="both" />
+
+
+
+
+
+
+
+
+