Index: src/Deltares.DSoilModel.Setup/Devexpress.wxs
===================================================================
diff -u -r37 -r40
--- src/Deltares.DSoilModel.Setup/Devexpress.wxs	(.../Devexpress.wxs)	(revision 37)
+++ src/Deltares.DSoilModel.Setup/Devexpress.wxs	(.../Devexpress.wxs)	(revision 40)
@@ -1,94 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This file list was created using the DevExpress Assembly Deployment Tool (to gather the required files) and the WIX Heat utility -->
 <!-- command: heat.exe dir . -cg DevExpressComponents -dr INSTALLFOLDER -gg -sfrag -sreg -srd -o ..\Devexpress.wxs   (in the folder with the devexpress DLL's -->
-<!-- then the file was edited manually to fix the relative paths -->
+<!-- then the file was edited manually to replace "..\..\lib\DevExpress\ with -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Fragment>
-    <DirectoryRef Id="INSTALLFOLDER">
-      <Component Id="cmp43BC5E4F9A3F5C450EC2D0255D8703D5" Guid="{5B9F3A72-9CB6-443D-A498-3842F090153D}">
-        <File Id="filBCD99B996DC0EA83B896FAF4A0050AA3" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.BonusSkins.v12.2.dll" />
-      </Component>
-      <Component Id="cmp996ABBBBE9E03778BF4585E8CEF19279" Guid="{73AF6852-396E-4C53-A63B-87E3B6967A42}">
-        <File Id="filF0FCA7F2808FAD932F0769523C3CFE0F" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Charts.v12.2.Core.dll" />
-      </Component>
-      <Component Id="cmp0039CED4D69F8CEAB93B39B38948744A" Guid="{4B60AA1F-0160-4D27-B20D-C9E9B7AEAA84}">
-        <File Id="fil5B9EDF7534902DF0EAF50E3D0571ED23" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Data.v12.2.dll" />
-      </Component>
-      <Component Id="cmpD94E93F4A063551E9B44067C763703B2" Guid="{5F8DBF15-D73D-45D4-B05F-3B000510D0CE}">
-        <File Id="fil313C9A821892701E28D63DDA173C86C2" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.PivotGrid.v12.2.Core.dll" />
-      </Component>
-      <Component Id="cmp87239A0659F8FE56CCC0DCFE076B52FD" Guid="{482E7339-250D-4EDD-8BD8-B5D22F9671AC}">
-        <File Id="fil7E61890A18BDAA98513C43DADBEDBE83" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Printing.v12.2.Core.dll" />
-      </Component>
-      <Component Id="cmpBCFCF80C750ADAAF0F82A21102771F5C" Guid="{77243938-FC46-48FB-9BB8-F6C285EFD658}">
-        <File Id="filB19602B3AF6DD99EE5A2485EF03064B5" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Utils.v12.2.dll" />
-      </Component>
-      <Component Id="cmp259EE0B8981AF6A122783ABEBAD4A285" Guid="{2933F197-4230-41A8-BA7D-861F97943C95}">
-        <File Id="fil06280507F121C8ACBF20965624653FA5" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Utils.v12.2.UI.dll" />
-      </Component>
-      <Component Id="cmpCAB84ED2D7D11928ED90F9B664990894" Guid="{5955EC72-9C46-4F23-84FE-A62788770937}">
-        <File Id="filE91ECA41C9FCA910ADE2CC8797B8923C" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraBars.v12.2.dll" />
-      </Component>
-      <Component Id="cmpB8509970FE6966AB2A901E9F94BB0171" Guid="{DCD6D562-C9B0-4C6F-A05B-05E360CFE09E}">
-        <File Id="fil11F6A5AD582AAED5B98E452B18D8EA3A" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraCharts.v12.2.dll" />
-      </Component>
-      <Component Id="cmpCF8F9BCFAE73C66A7AE5A02FAFF2F01B" Guid="{5C02E61A-147C-4364-B534-14F04245C887}">
-        <File Id="fil4D0BDA80F84677DFCAC873CDF1841430" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraCharts.v12.2.UI.dll" />
-      </Component>
-      <Component Id="cmp8521B924DE31E819CDC6C7536C5B1DE6" Guid="{3C1C3089-9376-4414-AA97-F8E65337BACD}">
-        <File Id="fil557A2A6375B56B0CB547827A32A75EC7" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraEditors.v12.2.dll" />
-      </Component>
-      <Component Id="cmpAD53DFA06E6815D0D8895AD5EC399E81" Guid="{8B8D3194-C120-413B-A018-5A9D0D305F92}">
-        <File Id="fil573D8CC48C8CB2E0BDA9692B72DBC49B" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraGauges.v12.2.Core.dll" />
-      </Component>
-      <Component Id="cmpDFC3AE1FABED85D9451E42F8280DD9A5" Guid="{BF1B1151-D176-4D9D-B564-F73CB789CDF2}">
-        <File Id="fil14B0D8506080BFE89E1648C61BA9DFF6" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraGauges.v12.2.Win.dll" />
-      </Component>
-      <Component Id="cmp1393436B4396037C598451536CC3D3E6" Guid="{46E6DE9D-C5BB-4051-98AE-F6B720A5FD94}">
-        <File Id="filBF613996D68789A8FECE36161DA06280" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraGrid.v12.2.dll" />
-      </Component>
-      <Component Id="cmp8572B70BD92000429EB1DEEBDFAE9E49" Guid="{4F5B7409-9EE8-4714-AF29-B42EE5680D0A}">
-        <File Id="fil17F7E5CEDE0C21CA6D78BF23908CA00F" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraNavBar.v12.2.dll" />
-      </Component>
-      <Component Id="cmp5915BB6D2C0EF1B4AD2AC5F34B89A7E7" Guid="{8A0B5191-FDA6-4442-87B5-E261D941AFF4}">
-        <File Id="fil675AEB75C6A1D8696AC2E7D806441CAB" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraPivotGrid.v12.2.dll" />
-      </Component>
-      <Component Id="cmpEB0A5FB3D0F3C00D357085FE8C3A420F" Guid="{5294D272-9D89-427B-890A-0A60C201536A}">
-        <File Id="fil47B9CD151943E094C0571BF772AA7277" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraPrinting.v12.2.dll" />
-      </Component>
-      <Component Id="cmpCEDBB8AFEF740D19D7866ADE2831A655" Guid="{48D833F3-73FA-454D-9FD4-46AAFA756568}">
-        <File Id="fil7BB4904DCB8CA434B5EC0B218A767B36" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraReports.v12.2.dll" />
-      </Component>
-      <Component Id="cmpA094F522E4061AAF630BF632A197751B" Guid="{EE9E8CA8-B99E-4CED-83A4-69F9D7F2A20D}">
-        <File Id="fil4A7F96EBF7A39E900EFD373A450B5F3A" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraTreeList.v12.2.dll" />
-      </Component>
-      <Component Id="cmp62CF72B1D44112DB9D8A40401ED620BB" Guid="{A0443C0E-5E57-4350-B4DC-07D48C2E6141}">
-        <File Id="fil74394CDE29EC7D3154FF1C4B1849C3EF" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraVerticalGrid.v12.2.dll" />
-      </Component>
-    </DirectoryRef>
-  </Fragment>
-  <Fragment>
-    <ComponentGroup Id="DevExpressComponents">
-      <ComponentRef Id="cmp43BC5E4F9A3F5C450EC2D0255D8703D5" />
-      <ComponentRef Id="cmp996ABBBBE9E03778BF4585E8CEF19279" />
-      <ComponentRef Id="cmp0039CED4D69F8CEAB93B39B38948744A" />
-      <ComponentRef Id="cmpD94E93F4A063551E9B44067C763703B2" />
-      <ComponentRef Id="cmp87239A0659F8FE56CCC0DCFE076B52FD" />
-      <ComponentRef Id="cmpBCFCF80C750ADAAF0F82A21102771F5C" />
-      <ComponentRef Id="cmp259EE0B8981AF6A122783ABEBAD4A285" />
-      <ComponentRef Id="cmpCAB84ED2D7D11928ED90F9B664990894" />
-      <ComponentRef Id="cmpB8509970FE6966AB2A901E9F94BB0171" />
-      <ComponentRef Id="cmpCF8F9BCFAE73C66A7AE5A02FAFF2F01B" />
-      <ComponentRef Id="cmp8521B924DE31E819CDC6C7536C5B1DE6" />
-      <ComponentRef Id="cmpAD53DFA06E6815D0D8895AD5EC399E81" />
-      <ComponentRef Id="cmpDFC3AE1FABED85D9451E42F8280DD9A5" />
-      <ComponentRef Id="cmp1393436B4396037C598451536CC3D3E6" />
-      <ComponentRef Id="cmp8572B70BD92000429EB1DEEBDFAE9E49" />
-      <ComponentRef Id="cmp5915BB6D2C0EF1B4AD2AC5F34B89A7E7" />
-      <ComponentRef Id="cmpEB0A5FB3D0F3C00D357085FE8C3A420F" />
-      <ComponentRef Id="cmpCEDBB8AFEF740D19D7866ADE2831A655" />
-      <ComponentRef Id="cmpA094F522E4061AAF630BF632A197751B" />
-      <ComponentRef Id="cmp62CF72B1D44112DB9D8A40401ED620BB" />
-    </ComponentGroup>
-  </Fragment>
+    <Fragment>
+        <DirectoryRef Id="INSTALLFOLDER">
+            <Component Id="cmp43BC5E4F9A3F5C450EC2D0255D8703D5" Guid="{5B9F3A72-9CB6-443D-A498-3842F090153D}">
+                <File Id="filBCD99B996DC0EA83B896FAF4A0050AA3" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.BonusSkins.v12.2.dll" />
+            </Component>
+            <Component Id="cmp996ABBBBE9E03778BF4585E8CEF19279" Guid="{73AF6852-396E-4C53-A63B-87E3B6967A42}">
+                <File Id="filF0FCA7F2808FAD932F0769523C3CFE0F" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Charts.v12.2.Core.dll" />
+            </Component>
+            <Component Id="cmp0039CED4D69F8CEAB93B39B38948744A" Guid="{4B60AA1F-0160-4D27-B20D-C9E9B7AEAA84}">
+                <File Id="fil5B9EDF7534902DF0EAF50E3D0571ED23" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Data.v12.2.dll" />
+            </Component>
+            <Component Id="cmpD94E93F4A063551E9B44067C763703B2" Guid="{5F8DBF15-D73D-45D4-B05F-3B000510D0CE}">
+                <File Id="fil313C9A821892701E28D63DDA173C86C2" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.PivotGrid.v12.2.Core.dll" />
+            </Component>
+            <Component Id="cmp87239A0659F8FE56CCC0DCFE076B52FD" Guid="{482E7339-250D-4EDD-8BD8-B5D22F9671AC}">
+                <File Id="fil7E61890A18BDAA98513C43DADBEDBE83" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Printing.v12.2.Core.dll" />
+            </Component>
+            <Component Id="cmpBCFCF80C750ADAAF0F82A21102771F5C" Guid="{77243938-FC46-48FB-9BB8-F6C285EFD658}">
+                <File Id="filB19602B3AF6DD99EE5A2485EF03064B5" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Utils.v12.2.dll" />
+            </Component>
+            <Component Id="cmp259EE0B8981AF6A122783ABEBAD4A285" Guid="{2933F197-4230-41A8-BA7D-861F97943C95}">
+                <File Id="fil06280507F121C8ACBF20965624653FA5" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.Utils.v12.2.UI.dll" />
+            </Component>
+            <Component Id="cmpCAB84ED2D7D11928ED90F9B664990894" Guid="{5955EC72-9C46-4F23-84FE-A62788770937}">
+                <File Id="filE91ECA41C9FCA910ADE2CC8797B8923C" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraBars.v12.2.dll" />
+            </Component>
+            <Component Id="cmpB8509970FE6966AB2A901E9F94BB0171" Guid="{DCD6D562-C9B0-4C6F-A05B-05E360CFE09E}">
+                <File Id="fil11F6A5AD582AAED5B98E452B18D8EA3A" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraCharts.v12.2.dll" />
+            </Component>
+            <Component Id="cmpCF8F9BCFAE73C66A7AE5A02FAFF2F01B" Guid="{5C02E61A-147C-4364-B534-14F04245C887}">
+                <File Id="fil4D0BDA80F84677DFCAC873CDF1841430" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraCharts.v12.2.UI.dll" />
+            </Component>
+            <Component Id="cmpE95D5511A0AD44AEEC36D882ADE99258" Guid="{4683E314-9A7C-4F9F-848D-9B4B8A61B5B0}">
+                <File Id="fil62750E57B33BE4B71DF0464B52030B90" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraCharts.v12.2.Wizard.dll" />
+            </Component>
+            <Component Id="cmp8521B924DE31E819CDC6C7536C5B1DE6" Guid="{3C1C3089-9376-4414-AA97-F8E65337BACD}">
+                <File Id="fil557A2A6375B56B0CB547827A32A75EC7" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraEditors.v12.2.dll" />
+            </Component>
+            <Component Id="cmpAD53DFA06E6815D0D8895AD5EC399E81" Guid="{8B8D3194-C120-413B-A018-5A9D0D305F92}">
+                <File Id="fil573D8CC48C8CB2E0BDA9692B72DBC49B" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraGauges.v12.2.Core.dll" />
+            </Component>
+            <Component Id="cmpDFC3AE1FABED85D9451E42F8280DD9A5" Guid="{BF1B1151-D176-4D9D-B564-F73CB789CDF2}">
+                <File Id="fil14B0D8506080BFE89E1648C61BA9DFF6" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraGauges.v12.2.Win.dll" />
+            </Component>
+            <Component Id="cmp1393436B4396037C598451536CC3D3E6" Guid="{46E6DE9D-C5BB-4051-98AE-F6B720A5FD94}">
+                <File Id="filBF613996D68789A8FECE36161DA06280" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraGrid.v12.2.dll" />
+            </Component>
+            <Component Id="cmp8572B70BD92000429EB1DEEBDFAE9E49" Guid="{4F5B7409-9EE8-4714-AF29-B42EE5680D0A}">
+                <File Id="fil17F7E5CEDE0C21CA6D78BF23908CA00F" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraNavBar.v12.2.dll" />
+            </Component>
+            <Component Id="cmp5915BB6D2C0EF1B4AD2AC5F34B89A7E7" Guid="{8A0B5191-FDA6-4442-87B5-E261D941AFF4}">
+                <File Id="fil675AEB75C6A1D8696AC2E7D806441CAB" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraPivotGrid.v12.2.dll" />
+            </Component>
+            <Component Id="cmpEB0A5FB3D0F3C00D357085FE8C3A420F" Guid="{5294D272-9D89-427B-890A-0A60C201536A}">
+                <File Id="fil47B9CD151943E094C0571BF772AA7277" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraPrinting.v12.2.dll" />
+            </Component>
+            <Component Id="cmpCEDBB8AFEF740D19D7866ADE2831A655" Guid="{48D833F3-73FA-454D-9FD4-46AAFA756568}">
+                <File Id="fil7BB4904DCB8CA434B5EC0B218A767B36" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraReports.v12.2.dll" />
+            </Component>
+            <Component Id="cmpB7B06D5F8B58A71639931AC172928CFA" Guid="{B8A3C063-8FFA-497F-911E-DAD9B084A1E9}">
+                <File Id="fil6DF606FD46D5CCAF03085A9BB1466FBF" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraReports.v12.2.Extensions.dll" />
+            </Component>
+            <Component Id="cmpA094F522E4061AAF630BF632A197751B" Guid="{EE9E8CA8-B99E-4CED-83A4-69F9D7F2A20D}">
+                <File Id="fil4A7F96EBF7A39E900EFD373A450B5F3A" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraTreeList.v12.2.dll" />
+            </Component>
+            <Component Id="cmp62CF72B1D44112DB9D8A40401ED620BB" Guid="{A0443C0E-5E57-4350-B4DC-07D48C2E6141}">
+                <File Id="fil74394CDE29EC7D3154FF1C4B1849C3EF" KeyPath="yes" Source="..\..\lib\DevExpress\DevExpress.XtraVerticalGrid.v12.2.dll" />
+            </Component>
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="DevExpressComponents">
+            <ComponentRef Id="cmp43BC5E4F9A3F5C450EC2D0255D8703D5" />
+            <ComponentRef Id="cmp996ABBBBE9E03778BF4585E8CEF19279" />
+            <ComponentRef Id="cmp0039CED4D69F8CEAB93B39B38948744A" />
+            <ComponentRef Id="cmpD94E93F4A063551E9B44067C763703B2" />
+            <ComponentRef Id="cmp87239A0659F8FE56CCC0DCFE076B52FD" />
+            <ComponentRef Id="cmpBCFCF80C750ADAAF0F82A21102771F5C" />
+            <ComponentRef Id="cmp259EE0B8981AF6A122783ABEBAD4A285" />
+            <ComponentRef Id="cmpCAB84ED2D7D11928ED90F9B664990894" />
+            <ComponentRef Id="cmpB8509970FE6966AB2A901E9F94BB0171" />
+            <ComponentRef Id="cmpCF8F9BCFAE73C66A7AE5A02FAFF2F01B" />
+            <ComponentRef Id="cmpE95D5511A0AD44AEEC36D882ADE99258" />
+            <ComponentRef Id="cmp8521B924DE31E819CDC6C7536C5B1DE6" />
+            <ComponentRef Id="cmpAD53DFA06E6815D0D8895AD5EC399E81" />
+            <ComponentRef Id="cmpDFC3AE1FABED85D9451E42F8280DD9A5" />
+            <ComponentRef Id="cmp1393436B4396037C598451536CC3D3E6" />
+            <ComponentRef Id="cmp8572B70BD92000429EB1DEEBDFAE9E49" />
+            <ComponentRef Id="cmp5915BB6D2C0EF1B4AD2AC5F34B89A7E7" />
+            <ComponentRef Id="cmpEB0A5FB3D0F3C00D357085FE8C3A420F" />
+            <ComponentRef Id="cmpCEDBB8AFEF740D19D7866ADE2831A655" />
+            <ComponentRef Id="cmpB7B06D5F8B58A71639931AC172928CFA" />
+            <ComponentRef Id="cmpA094F522E4061AAF630BF632A197751B" />
+            <ComponentRef Id="cmp62CF72B1D44112DB9D8A40401ED620BB" />
+        </ComponentGroup>
+    </Fragment>
 </Wix>
\ No newline at end of file