From ee2cacb6cde34491d5f04c0d86bbbb1f9707aff6 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Fri, 9 Aug 2019 10:32:11 +0200
Subject: [PATCH] Update devexpress references to v18.1

---
 app/SetupWix/Config.wxi  |  2 ++
 app/SetupWix/Product.wxs | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/SetupWix/Config.wxi b/app/SetupWix/Config.wxi
index 91a3697..85b08fc 100644
--- a/app/SetupWix/Config.wxi
+++ b/app/SetupWix/Config.wxi
@@ -6,4 +6,6 @@
   <?define Description="Clipboard Watcher"?>
   <?define Comments="Clipboard Watcher"?>
   <?define UpgradeCode="BB3A9D50-7CCE-42DA-84F2-D67129F57B59"?>
+
+  <?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
 </Include>
\ No newline at end of file
diff --git a/app/SetupWix/Product.wxs b/app/SetupWix/Product.wxs
index 1fd16d6..b214c08 100644
--- a/app/SetupWix/Product.wxs
+++ b/app/SetupWix/Product.wxs
@@ -103,14 +103,18 @@
 
       <!-- DEVEXPRESS Bibliotheken -->
       <Component Id="DevExpressLibs" Guid="665D0AC8-93FC-4499-BA89-F660CAC6C577">
-        <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes" />
-        <File Id="DevExpress.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll" />
-        <File Id="DevExpress.Sparkline.v15.2.Core" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" />
-        <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll" />
-        <File Id="DevExpress.XtraEditors.v15.2" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" />
-        <File Id="DevExpress.XtraGrid.v15.2" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" />
-        <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" />
-        <File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" />
+        <File Id="DevExpress.Data.v18.1" Name="DevExpress.Data.v18.1.dll" KeyPath="yes" />
+        <File Id="DevExpress.Images.v18.1" Name="DevExpress.Images.v18.1.dll" />
+        <File Id="DevExpress.Printing.v18.1.Core" Name="DevExpress.Printing.v18.1.Core.dll" />
+        <File Id="DevExpress.Sparkline.v18.1.Core" Name="DevExpress.Sparkline.v18.1.Core.dll" />
+        <File Id="DevExpress.Utils.v18.1" Name="DevExpress.Utils.v18.1.dll" />
+        <File Id="DevExpress.XtraBars.v18.1" Name="DevExpress.XtraBars.v18.1.dll" />
+        <File Id="DevExpress.XtraEditors.v18.1" Name="DevExpress.XtraEditors.v18.1.dll" />
+        <File Id="DevExpress.XtraGauges.v18.1.Core" Name="DevExpress.XtraGauges.v18.1.Core.dll" />
+        <File Id="DevExpress.XtraGauges.v18.1.Win" Name="DevExpress.XtraGauges.v18.1.Win.dll" />
+        <File Id="DevExpress.XtraGrid.v18.1" Name="DevExpress.XtraGrid.v18.1.dll" />
+        <File Id="DevExpress.XtraLayout.v18.1" Name="DevExpress.XtraLayout.v18.1.dll" />
+        <File Id="DevExpress.XtraPrinting.v18.1" Name="DevExpress.XtraPrinting.v18.1.dll" />
       </Component>
 
       <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">