From dfda5e36c807fdb91ea9095771e44f9105461282 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Thu, 10 Aug 2023 16:00:19 +0200
Subject: [PATCH] Setup: using version number from Elwig.exe

---
 Setup/MainComponents.wxs |  8 ++++----
 Setup/Package.wxs        | 17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Setup/MainComponents.wxs b/Setup/MainComponents.wxs
index b92efc2..168f519 100644
--- a/Setup/MainComponents.wxs
+++ b/Setup/MainComponents.wxs
@@ -2,14 +2,14 @@
   <Fragment>
     <ComponentGroup Id="MainComponents">
       <Component Directory="InstallFolder">
-        <File Source="$(var.Elwig.ProjectDir)\bin\Publish\Elwig.exe" Id="Elwig.exe"  />
+        <File Source="$(var.Elwig.ProjectDir)\bin\Publish\Elwig.exe" Id="Elwig.exe"/>
       </Component>
       <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
-		<File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"  /> 
+        <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>
       </Component>
 	  <Component Directory="InstallFolder">
-	    <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe" />
+	    <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
 	  </Component>
     </ComponentGroup>
   </Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/Setup/Package.wxs b/Setup/Package.wxs
index 55bf833..2c469f4 100644
--- a/Setup/Package.wxs
+++ b/Setup/Package.wxs
@@ -1,18 +1,17 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="Elwig" Manufacturer="Elwig" Version="0.1.0" Language="3079" UpgradeCode="a459416a-756a-4be6-b6f4-40872c8425a7" Compressed="true">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="Elwig" Manufacturer="Elwig" Version="!(bind.FileVersion.Elwig.exe)" Language="3079" UpgradeCode="a459416a-756a-4be6-b6f4-40872c8425a7" Compressed="true">
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 	<MediaTemplate EmbedCab="true"/>
 
 	<Icon Id="icon.ico" SourceFile="$(var.Elwig.ProjectDir)\elwig.ico"/>
-	<Property Id="ARPPRODUCTICON" Value="icon.ico" />
+	<Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
 	<Feature Id="Main">
-      <ComponentGroupRef Id="ShortcutComponents" />
-      <ComponentGroupRef Id="MainComponents" />
-      <ComponentGroupRef Id="BuildFiles" />
-      <ComponentGroupRef Id="DocumentTemplates" />
-	  <ComponentGroupRef Id="DocumentTemplateComponents" />
+      <ComponentGroupRef Id="ShortcutComponents"/>
+      <ComponentGroupRef Id="MainComponents"/>
+      <ComponentGroupRef Id="BuildFiles"/>
+      <ComponentGroupRef Id="DocumentTemplates"/>
+      <ComponentGroupRef Id="DocumentTemplateComponents"/>
     </Feature>
-  
   </Package>
 </Wix>