Added versionnumber handeling i Wix installer

cabbagecreek · Dec 15, 2016 · c7a5548 · c7a5548
1 parent 174efe1
commit c7a5548
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 17 deletions.
diff --git a/Marlin3DprinterTool/InstallMarlin3DprinterTool/Marlin3DprinterTool.wxs b/Marlin3DprinterTool/InstallMarlin3DprinterTool/Marlin3DprinterTool.wxs
@@ -3,13 +3,16 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-  <Product Id="*" 
-           Name="Marlin3DprinterTool" 
-           Language="1033" 
-           Version="0.0.0.14" 
+  <Product Id="*"
+           Name="Marlin3DprinterTool"
+           Language="1033"
+           Version="!(bind.fileVersion.Marlin3DprinterTool.exe)"
            Manufacturer="Cabbagecreek"  
            UpgradeCode="949b3c33-bdd2-4519-b2e1-823cfc2806f1">
-
+
+
+
+
     <Package InstallerVersion="200" 
              Compressed="yes" 
              InstallScope="perMachine" />
@@ -132,15 +135,6 @@
 
 
 
-  <!-- Fragment-->
-    <!-- DirectoryRef Id="APPLICATIONROOTDIRECTORY"-->
-      <!-- Component Id="marlin3dprintertool.exe" Guid="{A2AF9ACC-1E11-4A1C-8DC4-FA022907E0BB}"-->
-        <!-- File Id="Marlin3DprinterTool.exe" Source="$(var.Marlin3DprinterTool.TargetDir)\Marlin3DprinterTool.exe" KeyPath="yes" Checksum="yes" /-->
-      <!-- /Component-->
-    <!-- /DirectoryRef-->
-  <!-- /Fragment -->
-
-
 
 
   <Fragment>

diff --git a/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Debug/Marlin3DprinterTool.msi b/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Debug/Marlin3DprinterTool.msi
diff --git a/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Debug/Marlin3DprinterTool.wixpdb b/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Debug/Marlin3DprinterTool.wixpdb
diff --git a/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Release/Marlin3DprinterTool.msi b/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Release/Marlin3DprinterTool.msi
diff --git a/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Release/Marlin3DprinterTool.wixpdb b/Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Release/Marlin3DprinterTool.wixpdb
diff --git a/Marlin3DprinterTool/InstallMarlin3DprinterTool/obj/Release/Marlin3DprinterTool.wixobj b/Marlin3DprinterTool/InstallMarlin3DprinterTool/obj/Release/Marlin3DprinterTool.wixobj
diff --git a/...l/MarlinComunicationHelper/obj/Debug/MarlinComunicationHelper.csproj.FileListAbsolute.txt b/...l/MarlinComunicationHelper/obj/Debug/MarlinComunicationHelper.csproj.FileListAbsolute.txt
@@ -21,3 +21,4 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marl
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Debug\MarlinComunicationHelper.csproj.GenerateResource.Cache
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Debug\MarlinComunicationHelper.dll
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Debug\MarlinComunicationHelper.pdb
+C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Debug\MarlinComunicationHelper.csprojResolveAssemblyReference.cache
diff --git a/...MarlinComunicationHelper/obj/Release/MarlinComunicationHelper.csproj.FileListAbsolute.txt b/...MarlinComunicationHelper/obj/Release/MarlinComunicationHelper.csproj.FileListAbsolute.txt
@@ -21,4 +21,3 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marl
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Release\MarlinComunicationHelper.csproj.GenerateResource.Cache
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Release\MarlinComunicationHelper.dll
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Release\MarlinComunicationHelper.pdb
-C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinComunicationHelper\obj\Release\MarlinComunicationHelper.csprojResolveAssemblyReference.cache
diff --git a/Marlin3DprinterTool/MarlinEditor/obj/Release/MarlinEditor.csproj.FileListAbsolute.txt b/Marlin3DprinterTool/MarlinEditor/obj/Release/MarlinEditor.csproj.FileListAbsolute.txt
@@ -14,4 +14,3 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marl
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinEditor\obj\Release\MarlinEditor.csproj.GenerateResource.Cache
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinEditor\obj\Release\MarlinEditor.exe
 C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinEditor\obj\Release\MarlinEditor.pdb
-C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\MarlinEditor\obj\Release\MarlinEditor.csprojResolveAssemblyReference.cache