Index: trunk/src/Dam/Dam.Setup/BinFolder.wxs
===================================================================
diff -u -r7 -r9
--- trunk/src/Dam/Dam.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 7)
+++ trunk/src/Dam/Dam.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 9)
@@ -2,447 +2,423 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
-            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{8A4E7B43-B667-4F26-AB62-73924BF03830}">
+            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{0D726EB4-9AFD-4B46-A3AA-7FA2566FDC58}">
                 <File Id="fil4F2F84FF87942002C8948E87F05D7778" KeyPath="yes" Source="$(var.BinFolder)\borlndmm.dll" />
             </Component>
-            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{B1038D45-7E81-4D8D-859E-7E1C994D0365}">
+            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{635C4821-56BC-4DAE-9EC9-CA6D37AF842C}">
                 <File Id="filF6F8D425085FF74F926B9D6CC8C495EA" KeyPath="yes" Source="$(var.BinFolder)\BruTile.Desktop.dll" />
             </Component>
-            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{BBABEE96-050D-4515-8F0C-B9C72C1FEFDF}">
+            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{19FDFE02-BC7D-41BB-93AE-63E4C4FE76F7}">
                 <File Id="filA1A79E623D117F91354458DC3D241736" KeyPath="yes" Source="$(var.BinFolder)\BruTile.dll" />
             </Component>
-            <Component Id="cmp76B395AC76732C708298AE915D938968" Guid="{D48DB519-2EE0-428E-A8FC-5B4FD7CDA24B}">
+            <Component Id="cmp76B395AC76732C708298AE915D938968" Guid="{CCCE2A4F-DC56-4372-ACF0-480AF14B6285}">
                 <File Id="fil456603B0F140817EB6FF8617BE648330" KeyPath="yes" Source="$(var.BinFolder)\cc3280mt.dll" />
             </Component>
-            <Component Id="cmp6D03510DA362E272E5A3686EB254D738" Guid="{32089D79-3299-46A3-8205-92537B894EFD}">
+            <Component Id="cmp6D03510DA362E272E5A3686EB254D738" Guid="{D523E6F7-5332-4CD9-91BA-F1BA441B8AE4}">
                 <File Id="filC75261E0054914C258FE797BB21EBBA3" KeyPath="yes" Source="$(var.BinFolder)\cm2lapack.dll" />
             </Component>
-            <Component Id="cmpDD049B5EF79DA1DE81D21942D86D8565" Guid="{49F6C535-ED45-43EC-8934-163BD261EB02}">
+            <Component Id="cmpDD049B5EF79DA1DE81D21942D86D8565" Guid="{01BC4474-D77F-46F3-897A-19C1391D4656}">
                 <File Id="fil27211D8077FD8BC085A42978B1471FBA" KeyPath="yes" Source="$(var.BinFolder)\cm2math1.dll" />
             </Component>
-            <Component Id="cmpC560055F9429518EB189DC2B52894CFB" Guid="{7A808DAF-6C59-4ED7-9E03-1836AA2F3DF5}">
+            <Component Id="cmpC560055F9429518EB189DC2B52894CFB" Guid="{3FE7C229-3AE3-4252-80AA-C96D2AF90C8B}">
                 <File Id="fil2ACEEAF8EA44F1A19B607FBBD5EDB997" KeyPath="yes" Source="$(var.BinFolder)\cm2meshtools.dll" />
             </Component>
-            <Component Id="cmp7EFDA81322DAC79F9D4149649E3CDE28" Guid="{29E9C837-1F05-4CF2-AFF8-0B74361BE2BB}">
+            <Component Id="cmp7EFDA81322DAC79F9D4149649E3CDE28" Guid="{E3621114-7907-4D7F-B0B8-D8CC4FC27634}">
                 <File Id="filF5ACBED4F3549C0211D47AAF4454071E" KeyPath="yes" Source="$(var.BinFolder)\cm2meshtools1d.dll" />
             </Component>
-            <Component Id="cmp3C353FF993043318DFF0E7B214B4D4A5" Guid="{2B340373-E6C4-45DD-97FD-AC3B353C720F}">
+            <Component Id="cmp3C353FF993043318DFF0E7B214B4D4A5" Guid="{5BEB4D73-BA65-4820-B550-025816B23FC4}">
                 <File Id="fil90E97BAD2947FB7CD397DFE17569264C" KeyPath="yes" Source="$(var.BinFolder)\cm2meshtools2d.dll" />
             </Component>
-            <Component Id="cmpA072DE5E59CA0E10FFBF35D631F95BA5" Guid="{D667A394-CFA8-4593-8160-0759E0500E19}">
+            <Component Id="cmpA072DE5E59CA0E10FFBF35D631F95BA5" Guid="{0F0B2BE3-D563-4647-80E5-0F1467984FAB}">
                 <File Id="fil4EEABD8D00C254B29F22972CFB18AB9E" KeyPath="yes" Source="$(var.BinFolder)\cm2misc.dll" />
             </Component>
-            <Component Id="cmpD4873156D4DC4B1D81006E8D0F92DAD6" Guid="{C8E58219-6546-4971-B989-151F6828684E}">
+            <Component Id="cmpD4873156D4DC4B1D81006E8D0F92DAD6" Guid="{72674056-D810-468C-9C30-EE37739B5879}">
                 <File Id="filCEB3F9D6C51850AFDD1D71B2324C46C9" KeyPath="yes" Source="$(var.BinFolder)\cm2quadmesh.dll" />
             </Component>
-            <Component Id="cmpC1F0E5553FDF3B4AAB486AC8293DA31C" Guid="{A0FE13F8-2E75-446C-AFC9-9E59E912E60E}">
+            <Component Id="cmpC1F0E5553FDF3B4AAB486AC8293DA31C" Guid="{606D2008-509C-4B44-8792-DA949DDC60B9}">
                 <File Id="filC07E6532C88EC858CC620CB42EFDA15F" KeyPath="yes" Source="$(var.BinFolder)\cm2triamesh.dll" />
             </Component>
-            <Component Id="cmpCC5600A0E0013FC2479752FF2E317D0E" Guid="{9529C20D-12E8-4806-A3EE-761DA028374D}">
+            <Component Id="cmpCC5600A0E0013FC2479752FF2E317D0E" Guid="{2C166748-78C9-41B6-9D29-19952CAF5BB5}">
                 <File Id="filA37EA31C1F18E8079A0153A07EC2C1F2" KeyPath="yes" Source="$(var.BinFolder)\CommandLine.dll" />
             </Component>
-            <Component Id="cmp1E79642B0C11D101EF141136BB99312D" Guid="{E3A91F5C-2626-4FD1-AEA7-39A7ADD13E99}">
+            <Component Id="cmp1E79642B0C11D101EF141136BB99312D" Guid="{9BE58059-54F6-444C-AC77-6ABC579BCA2C}">
                 <File Id="fil15F5E6A23B41DE653F48646CA3EBDF78" KeyPath="yes" Source="$(var.BinFolder)\CommandLine.xml" />
             </Component>
-            <Component Id="cmp640D57506CC6F233458551E3B1650DA2" Guid="{AF247319-D41B-4544-8AB8-D4EF5B3E2364}">
+            <Component Id="cmp640D57506CC6F233458551E3B1650DA2" Guid="{626C1758-1055-4495-88A5-1D48332E29D5}">
                 <File Id="filDD88C814891E6C7E4E99046E9617B910" KeyPath="yes" Source="$(var.BinFolder)\CSDupuitNet.dll" />
             </Component>
-            <Component Id="cmp42E95448C3995BD05BD648D70093C9C6" Guid="{E075789E-BDF1-4B7C-9441-A6CAD9042727}">
+            <Component Id="cmpB0B36965FAF5E1BD84D164D58F2DB38B" Guid="{CDE1C13C-8E25-4738-8FBB-80A724EFEE63}">
+                <File Id="fil8236345CD7889E343073CFA6AEEB8404" KeyPath="yes" Source="$(var.BinFolder)\CsvToDamx.exe" />
+            </Component>
+            <Component Id="cmp862A33756524B7D08946AABF813D05DB" Guid="{93184FE2-3B55-4C2B-B041-8DAF1CFC3ED3}">
+                <File Id="fil902EE7E0AEDB15E06202D32B9A03074A" KeyPath="yes" Source="$(var.BinFolder)\CsvToDamx.exe.config" />
+            </Component>
+            <Component Id="cmp42E95448C3995BD05BD648D70093C9C6" Guid="{4DBB13B4-EC74-46D0-8D9D-DAEAB9C2D0FE}">
                 <File Id="fil6175B3AD0265D70E19EB6A67E94F910E" KeyPath="yes" Source="$(var.BinFolder)\DamLive.exe" />
             </Component>
-            <Component Id="cmpCA13194B5AAE81EF0BCA050CF6FB525B" Guid="{198146AD-C1B9-4115-8C5D-1A8F74294348}">
+            <Component Id="cmpCA13194B5AAE81EF0BCA050CF6FB525B" Guid="{909C94EF-DF0E-4C5F-A528-FBF8DFE1FB05}">
                 <File Id="fil9C6E28B1E764D7FC3D7B4C091D6295D6" KeyPath="yes" Source="$(var.BinFolder)\DamLive.exe.config" />
             </Component>
-            <Component Id="cmp140B320553D2BE4B52132E17C2E0A1C3" Guid="{55235521-1F97-4AFC-B73F-804E02B9E3AE}">
+            <Component Id="cmp140B320553D2BE4B52132E17C2E0A1C3" Guid="{93F7CEC7-9941-415B-A15A-6A9E78A13509}">
                 <File Id="filE91B935B9B824D92C1DD2BC5E02E9A53" KeyPath="yes" Source="$(var.BinFolder)\DamLiveTest.cmd" />
             </Component>
-            <Component Id="cmp95FE0B2D22F1842980095D942FF0CA03" Guid="{BABB912B-4E98-4104-A52A-FDD311737B9A}">
+            <Component Id="cmp95FE0B2D22F1842980095D942FF0CA03" Guid="{B20A2884-24B7-4595-A03F-B9BD7A70F1DC}">
                 <File Id="fil60735D92B8E3B643E7F7CCBCDEEF92D0" KeyPath="yes" Source="$(var.BinFolder)\dauth.dll" />
             </Component>
-            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{C2BEB8EB-79CF-488E-AC19-484916F7F88D}">
+            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{8C1DA4B9-70EE-4709-B36F-A99C704FD6C4}">
                 <File Id="fil10BD73AB0BB296E6DFEAA7D72CC26003" KeyPath="yes" Source="$(var.BinFolder)\Deltares.AssessmentMechanism.dll" />
             </Component>
-            <Component Id="cmpE02F1A050649344CD66E0BCEB7385B36" Guid="{95BF5427-C1B1-4AB6-8A44-3F961FCAA4A6}">
+            <Component Id="cmpE02F1A050649344CD66E0BCEB7385B36" Guid="{87542E38-2AAD-4F9B-9E14-B2F497C38136}">
                 <File Id="filEB32C58A58278D18F2BF219ED110518F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Authorization.dll" />
             </Component>
-            <Component Id="cmp5384ACA5D53344EC9F30AB341DB1A895" Guid="{E71F7429-7981-4166-AB3B-BF2FEC1F397A}">
+            <Component Id="cmp5384ACA5D53344EC9F30AB341DB1A895" Guid="{29CC37C3-B6B3-4117-9F93-CC6B09FBB4E0}">
                 <File Id="filFD6014854D9E987A47FB00A5B217C46C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.Application.exe" />
             </Component>
-            <Component Id="cmpD63BB20177C5A0ECE04AAD91AFDBB2D1" Guid="{CEE090CD-6F86-45FB-813A-7945F45BBD81}">
+            <Component Id="cmpD63BB20177C5A0ECE04AAD91AFDBB2D1" Guid="{78768319-0FD7-46A2-826E-2D27D6FED7C8}">
                 <File Id="fil3F0DC0BCB6A157A0A062410AE2E316B8" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.Application.exe.config" />
             </Component>
-            <Component Id="cmp0DECD179D729DF04056DE39C266F35A7" Guid="{86D93706-2844-4B90-8401-4EC582E081A3}">
+            <Component Id="cmp0DECD179D729DF04056DE39C266F35A7" Guid="{E67AD0E3-0AD7-4F94-B210-8893B50E7762}">
                 <File Id="fil382F264D8E1B289E3C1AC2592BF1E82D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.DamLiveLiveSensors.exe" />
             </Component>
-            <Component Id="cmpE856AA0D9D4EB3C7519B957F94A02BEB" Guid="{C8AA5464-D430-46CD-A8EE-A4F79F8D1E64}">
+            <Component Id="cmpE856AA0D9D4EB3C7519B957F94A02BEB" Guid="{6B87FFF1-A3AC-40D0-A405-28FFE45A299A}">
                 <File Id="fil5B2C4567FF3DC4C7C33A92655850BA3F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.DamLiveLiveSensors.exe.config" />
             </Component>
-            <Component Id="cmp806EF4EBCE2FA0E9204E5518B9CA0F0D" Guid="{EBCDD7BB-044E-4500-BB72-B42BF94EE754}">
-                <File Id="filB517E4AC6C7D8908A5D71BFCC5763E32" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.DamLiveLiveSensors.vshost.exe" />
-            </Component>
-            <Component Id="cmp1BA9424CC48CBB8AB81D3DD5BB2B72D3" Guid="{25095ABE-4D32-4191-9886-CF2879C0E3F6}">
+            <Component Id="cmp1BA9424CC48CBB8AB81D3DD5BB2B72D3" Guid="{60BC9D45-B992-4AD0-B373-2B3922027AC4}">
                 <File Id="filC55021FEBE437A51C88F20A2589C47D8" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.DamLiveSensorSliders.exe" />
             </Component>
-            <Component Id="cmp8971CF8878075A9838DF164D02809B24" Guid="{DFF878BC-7002-43AB-A26C-1EC1DA315938}">
+            <Component Id="cmp8971CF8878075A9838DF164D02809B24" Guid="{6E5478C3-300F-4698-A0BA-F92110F039F2}">
                 <File Id="fil89B15EAC753BF78D8D3431FD779E5984" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.DamLiveSensorSliders.exe.config" />
             </Component>
-            <Component Id="cmpD5B395A098C14AD29C215BE9460FD233" Guid="{47066074-FACA-42DE-A21D-AEF1EE02ACA5}">
+            <Component Id="cmpD5B395A098C14AD29C215BE9460FD233" Guid="{B9A9462E-7B53-4924-BA53-7ACB98AE03B2}">
                 <File Id="fil4B3CFB9838E97871E565F3B5BD819C7D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.DamLiveShowcase.exe" />
             </Component>
-            <Component Id="cmpC63F2749102F2D5C93814B6859339080" Guid="{5F428700-A383-435C-9715-A43E8BA6B449}">
+            <Component Id="cmpC63F2749102F2D5C93814B6859339080" Guid="{5E57F02F-9E46-4686-BA90-A2A474B7A228}">
                 <File Id="fil52178EBA3D49BAA80A7FC9C0C4DCCF04" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.DamLiveShowcase.exe.config" />
             </Component>
-            <Component Id="cmp2C7A2E7A4D0CF547CE1126901C9984D7" Guid="{A5F5612B-D068-4F13-BA9C-1029D288527A}">
+            <Component Id="cmp2C7A2E7A4D0CF547CE1126901C9984D7" Guid="{A5248617-4C81-479A-B686-2060F93BB118}">
                 <File Id="filE3A6E581559157AD4E08E4AFF6D95E1A" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.Data.dll" />
             </Component>
-            <Component Id="cmp62AAF572A75D63A639BB99FDD9624CC0" Guid="{8DE4AD2E-D1B4-4A0E-9F56-A2F193DB6DAC}">
+            <Component Id="cmp62AAF572A75D63A639BB99FDD9624CC0" Guid="{2CC2E680-BDD6-4EC9-BB99-1C0D115DE519}">
                 <File Id="filAD52D9EE6790FCF382CA54E2C9BDC16D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Dam.Forms.dll" />
             </Component>
-            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{8FD0B0CB-04EC-4AF1-8F5D-C016F4F3F221}">
+            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{9C1A38FE-DCE0-45D5-A28D-B47C659FC949}">
                 <File Id="fil1992AA5619D465310A20205E7D1B118B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DeltaModel.dll" />
             </Component>
-            <Component Id="cmp547CFBC4D7186459EB8AFDFE65FF0466" Guid="{14B272D1-F3F0-4633-A9A8-9318D6F9F2BD}">
+            <Component Id="cmp547CFBC4D7186459EB8AFDFE65FF0466" Guid="{3ED3E833-69EE-40BE-959C-15D71A0F6D76}">
                 <File Id="filA45979800BEBCA44BEF6F778CF0B6A15" KeyPath="yes" Source="$(var.BinFolder)\Deltares.FlowSlide.Data.dll" />
             </Component>
-            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{D95B8CD2-13C7-44DA-B569-D7855B022C08}">
+            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{C153208B-E26C-46C9-9E41-B4D47C15F779}">
                 <File Id="filF58BF540C920CCF88B65E501DCFB6B4C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geographic.dll" />
             </Component>
-            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{2DEF7D7E-82A7-4543-9890-2D7A61F326E6}">
+            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{12FC1A2A-2496-4450-BDA3-2D7607C27CED}">
                 <File Id="filA7DD37798AA8266B91004255DD8B8A5B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.dll" />
             </Component>
-            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{0B328060-E6C4-46A7-9783-1C96FBFDEEFC}">
+            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{C7ACC10B-3D46-4159-ADCE-A6C777EDD7AE}">
                 <File Id="filA863E0BA8ED734C9127D6BCD52E05F67" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.Forms.dll" />
             </Component>
-            <Component Id="cmpEB1070EA5F0F17D09E2F888D8809817C" Guid="{A499F074-9FE8-4703-AC7D-05CD1764AE99}">
-                <File Id="filF73DF51A0305EEA1A457125162A29371" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.Forms.xml" />
-            </Component>
-            <Component Id="cmpB16FBA1E637592E55B6A1B132D5248A3" Guid="{5B680648-E793-49D5-A8AB-E1F5353D767A}">
-                <File Id="fil84DE63DFD62DBC5155FC721F8817B965" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.xml" />
-            </Component>
-            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{216E4647-6C18-475F-8C33-CA22F8C010F5}">
+            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{D40FAB72-68F7-48DD-BD03-CDAC7D06011E}">
                 <File Id="filD9CE646D943931633DFA5796BDB4CAA6" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.dll" />
             </Component>
-            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{5CDBBAFE-5092-4B64-83DF-6B9AA86D696E}">
+            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{08F8CB4C-B1D6-471D-A0FC-0C813899E1F2}">
                 <File Id="fil752D455EF949ECF337DDA3E26765A9B0" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.Forms.dll" />
             </Component>
-            <Component Id="cmpE92DD2BDFF0076181DA48203B6C3B879" Guid="{AA4D6736-B963-4B49-82A2-1CE4F45DBCCA}">
-                <File Id="fil536195B825DE2B2A3A461C75DD9D8752" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.Forms.xml" />
-            </Component>
-            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{E1EF2ED5-80DB-4572-A95F-C567693971BD}">
+            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{FCEEDC3B-DFEE-48A1-B331-45C4E9B29788}">
                 <File Id="fil73E1BEB42310ADB6CE87A583123DECD5" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.IO.dll" />
             </Component>
-            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{304DA7FE-CD48-4864-B3E6-F5EDE16FFE55}">
+            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{A1B5FB64-E407-4B17-B9A9-0AAB62FCE4A7}">
                 <File Id="filD609F583F9120C092011AFCFCCC2CA2A" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.WaternetCreator.dll" />
             </Component>
-            <Component Id="cmp542E142E7F161B276CEBD5C405B1CC5A" Guid="{F9EA683A-6C0F-49F8-96FE-28DFBCD78BD4}">
-                <File Id="fil20365C96973A91871E08EFC30F156CC2" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.xml" />
-            </Component>
-            <Component Id="cmp95821E44AD89805508113BF2C1D66FB9" Guid="{2EBA817C-6407-4205-A61E-986213E82564}">
+            <Component Id="cmp95821E44AD89805508113BF2C1D66FB9" Guid="{7FD39ECE-0059-4A41-ADCA-466BDEE8B72C}">
                 <File Id="fil9A519DEA2B11560BA1BD5161BA72171A" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Maps.dll" />
             </Component>
-            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{EC4A9375-8135-41AD-A696-E1484ED7D775}">
+            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{881831A1-38D5-4681-B891-22B23F82065C}">
                 <File Id="fil2465D685D3FEC60224C7831BBFA4FB94" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Mathematics.dll" />
             </Component>
-            <Component Id="cmpA57A54CE84837F19C73BB3DD8865F957" Guid="{C16D36B2-63FE-4787-B74A-F7B9C85858AB}">
-                <File Id="fil6AC4555BDD3E30F9DE832564CA932F59" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Mathematics.xml" />
-            </Component>
-            <Component Id="cmp7379FEAD9393E7CE4322F5E14E81177A" Guid="{1A32DA2A-84A8-4F39-92FC-22057AA05DA9}">
+            <Component Id="cmp7379FEAD9393E7CE4322F5E14E81177A" Guid="{D1A31C46-1745-4E92-96AE-A5DC23596AC1}">
                 <File Id="filADA4DCA106706A85A6540B7F5341F9BA" KeyPath="yes" Source="$(var.BinFolder)\Deltares.MStab.dll" />
             </Component>
-            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{8689380E-BAE2-4BE2-AC4F-4BF844E372EC}">
+            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{3FD8DD07-2F50-4EE9-AB54-7A7905824717}">
                 <File Id="fil9A91397F5BD956AB1251C9635BA53B48" KeyPath="yes" Source="$(var.BinFolder)\Deltares.MStab.IO.Classic.dll" />
             </Component>
-            <Component Id="cmp5EBAC94058E39529B423C3E02582274A" Guid="{E114A5FB-5B2E-4705-B70A-552FD6506094}">
+            <Component Id="cmp5EBAC94058E39529B423C3E02582274A" Guid="{D73CC1F7-437B-4DE4-BEDC-CC57A9890B52}">
                 <File Id="fil9F19D771246ED71D93A4209DE72EAC07" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Piping.Data.dll" />
             </Component>
-            <Component Id="cmp02836ACE00BDC07EAC334B5BBFFD5799" Guid="{90EB14F9-29CA-4D95-8297-2A4BD6C57A9E}">
+            <Component Id="cmp02836ACE00BDC07EAC334B5BBFFD5799" Guid="{220466E1-8F40-464F-A45C-F0AE48FE8F78}">
                 <File Id="filFF8E0682AB03C7B92F7A8402A24C4439" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.Calculation.dll" />
             </Component>
-            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{3C2A9E28-64E6-4BDA-910E-6F18892F8E85}">
+            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{B289F012-D296-43D7-BA67-A9414D6ACA05}">
                 <File Id="filE5592BB6738BBDCE69B114AF5CF76D87" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.dll" />
             </Component>
-            <Component Id="cmp24A86A28ACAC0B96109FF4A8A7AAD8F7" Guid="{2F353FBB-D065-4980-9907-A1F1E39409A8}">
-                <File Id="fil553D782747FA40D10F0ED4C92EC07FDF" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.xml" />
-            </Component>
-            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{DDE1EC72-CAD6-47F6-A717-C0FAC7B83BB7}">
+            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{D2586A56-6D6C-4E8C-9A72-941EE2158626}">
                 <File Id="fil526AA9AE0BE0AC023B0F474FB7A7829F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Soilbase.dll" />
             </Component>
-            <Component Id="cmp31F1C0A9752DD43A96D62673B8E48A5D" Guid="{553A3A45-120E-47E4-B4B2-4888E152845A}">
+            <Component Id="cmp31F1C0A9752DD43A96D62673B8E48A5D" Guid="{43DF6A65-E229-4C5B-BFD3-F958EB791524}">
                 <File Id="fil8C73CAFC8B83D37BAA3EBCB567537ACE" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.Calculation.dll" />
             </Component>
-            <Component Id="cmpEB1D983E2980A41BAF1017CDA8317670" Guid="{7383CEED-F611-4615-98EC-EAA2BA220D25}">
+            <Component Id="cmpEB1D983E2980A41BAF1017CDA8317670" Guid="{D4C05BBF-4A35-4A3D-AFCB-FE3199800BD3}">
                 <File Id="filE8C9FA8D046FD351AF5EB2BACA88C932" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.Calculation.Inner.dll" />
             </Component>
-            <Component Id="cmp6CAFB64C21044D537882A20F122F53F2" Guid="{0B12A019-E354-4429-A512-3184DE718FE0}">
+            <Component Id="cmp6CAFB64C21044D537882A20F122F53F2" Guid="{9E970333-C1E5-43CE-BB66-083FCA089535}">
                 <File Id="fil7DD005C028877EC997A8E3F6F6E497C3" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.Calculation2.dll" />
             </Component>
-            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{FA8F7338-9453-4532-A50C-E308A0E25835}">
+            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{BA2CE214-B326-4DE7-9857-C65E16DE20A3}">
                 <File Id="fil8D6B9C2156EADA1AAD9A42D76A95873D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.dll" />
             </Component>
-            <Component Id="cmpE3F88A24F80927F336C2D54C341FA663" Guid="{CD56C10D-25B1-4104-8BD4-D58B0141BF5A}">
+            <Component Id="cmpE3F88A24F80927F336C2D54C341FA663" Guid="{B222B80C-F60B-4B23-B2AE-99CDF1A5A74C}">
                 <File Id="fil40C291832C40F9C6E12C0598BC14B36F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.IO.WTI.dll" />
             </Component>
-            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{9A42CDB0-8FA6-4F19-BC3E-EA48EFA6E290}">
+            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{619F26EF-A43F-40E7-AD3F-CC03843229B2}">
                 <File Id="filACB76FF5040E1CE5916354F73FFD79FD" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.dll" />
             </Component>
-            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{D8BFE0E0-C9F2-4197-B632-5DD5977CC69A}">
+            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{8D0CBDBD-1561-40D9-B3BE-AA1B015960B8}">
                 <File Id="filA03E1477F2EC4D82F67AF45FE6F36FCB" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.DExpress.dll" />
             </Component>
-            <Component Id="cmpD19A2C12363171EF0C511CC6FDE83CA5" Guid="{65371BC4-9A44-42AF-9C6E-F75003CC6AB5}">
+            <Component Id="cmpD19A2C12363171EF0C511CC6FDE83CA5" Guid="{4BB8BCAC-0B77-427A-822B-57BE186685AE}">
                 <File Id="filE00EB0186CC506AB0CF4B67C9224F16C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.DExpress.xml" />
             </Component>
-            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{08F9C556-0716-4EFA-B474-3C154E0FAAF3}">
+            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{332BBB35-A51D-46D5-B1D6-FDD29A2A22DE}">
                 <File Id="filBCFD0AFC655FAF059DAB71A78DD340FA" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.dll" />
             </Component>
-            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{7BC3EA63-6BE4-43B6-B875-6B67E98F7B0B}">
+            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{47D6FEC1-080F-4D72-92CB-70881618D734}">
                 <File Id="fil90A24F951D0CA4F0849D4F1132902AF2" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.Maps.dll" />
             </Component>
-            <Component Id="cmp84A280A8C39033613D2B440B4D36294C" Guid="{40C5F3CB-CF1E-4DB8-B4AF-11990438F883}">
-                <File Id="fil6EF7BF600524910A625EBEDBC2E645B6" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.Maps.xml" />
-            </Component>
-            <Component Id="cmp3FCD8EF7F93C2CDC3323E073176BD86E" Guid="{907A7EBA-8D2D-4AA5-AB42-F2C0DEEDB76D}">
+            <Component Id="cmp3FCD8EF7F93C2CDC3323E073176BD86E" Guid="{377F11B6-E532-4925-BBFF-6651A559F62A}">
                 <File Id="filC22D00970C0C001C526777F6C69222BE" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.xml" />
             </Component>
-            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{9E3D3821-2246-49CA-A9CD-53D82E3E3954}">
+            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{CE7368A6-8765-4E6A-8C63-698BD7773E73}">
                 <File Id="fil6E31E187D604DCC574208AC9949F8D98" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Maps.dll" />
             </Component>
-            <Component Id="cmp23B25A790E0500883D490DD3A4E5673C" Guid="{20609EBA-4721-4D2B-BB8B-F0024502036F}">
-                <File Id="fil1BEFF0F633D83CC456D769F6A49BC2C5" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Maps.xml" />
-            </Component>
-            <Component Id="cmpD2EF45F5D1C5E6242DF0C125431F759C" Guid="{4BC231BC-5C78-4177-943F-0779002C8AEA}">
-                <File Id="fil6083E66A99B0B05F44160D9E82410F49" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.xml" />
-            </Component>
-            <Component Id="cmp9358D66B3D64F3DD7067952DE5DEDDC6" Guid="{33F47316-D5E0-4EB7-B691-0E4076D651D6}">
+            <Component Id="cmp9358D66B3D64F3DD7067952DE5DEDDC6" Guid="{9174E6D3-5201-46E3-8239-952DE98496B7}">
                 <File Id="fil2344A2D94B094858076B86C91B686010" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Uplift.dll" />
             </Component>
-            <Component Id="cmp196F1868D512A147E1961167281BA4E4" Guid="{AFFE1E12-9106-4558-9635-54F39F0ECEDE}">
+            <Component Id="cmp196F1868D512A147E1961167281BA4E4" Guid="{D1AB3CF8-32C8-4DE3-A450-56ACD56DB143}">
                 <File Id="filAA1BD3234E4F3B89634CEBDBA601C4AE" KeyPath="yes" Source="$(var.BinFolder)\Deltares.WTIPiping.dll" />
             </Component>
-            <Component Id="cmp7CE040865D4414C9C4B71FFDFD6CA1E7" Guid="{56D01500-A7F7-448A-B5A0-E5626858E4BB}">
+            <Component Id="cmp7CE040865D4414C9C4B71FFDFD6CA1E7" Guid="{24EB3C93-C29E-47F0-9E9E-FEC88A445030}">
                 <File Id="fil54C80E689D33A31D707F20AD81820752" KeyPath="yes" Source="$(var.BinFolder)\DGeoStability.exe" />
             </Component>
-            <Component Id="cmp2BEFBCDB6611EAEAD3A420C22A85D66F" Guid="{933CF3BC-EA33-4B6C-8747-7CF69CA4543E}">
+            <Component Id="cmp2BEFBCDB6611EAEAD3A420C22A85D66F" Guid="{F9714445-640B-4739-9E40-33DE39CF2A62}">
                 <File Id="filC9EA605D6AB580A2EA41DC12770EB6D1" KeyPath="yes" Source="$(var.BinFolder)\DGSDAMSlopeW.dll" />
             </Component>
-            <Component Id="cmp3FBC6ADE6BDA76363373FB4DAF1A808D" Guid="{BE9A0770-FAA4-4EEF-8104-6741DAF3B0BF}">
+            <Component Id="cmp3FBC6ADE6BDA76363373FB4DAF1A808D" Guid="{CAFF88A5-32B5-4424-A3C7-F552B8F0245C}">
                 <File Id="fil109F28ED3C5616DFB08400B6897601E1" KeyPath="yes" Source="$(var.BinFolder)\DGSMStabDAM.dll" />
             </Component>
-            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{1E478DBD-36D2-4F57-951B-1B3AE0CAB620}">
+            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{3F346BA1-185C-4B00-B596-05778B11EB13}">
                 <File Id="filBEA5E161DDC438A31EA77F1BF1916C48" KeyPath="yes" Source="$(var.BinFolder)\DGSMStabSerializer.dll" />
             </Component>
-            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{D7F44B18-38A6-4BFA-8D41-8A2E6892D5DD}">
+            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{D335B455-8701-4C19-9A7E-5AFBCCFA2C25}">
                 <File Id="fil9520B1B9A5AFC3FDB971A10F03EC8CB8" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.dll" />
             </Component>
-            <Component Id="cmp5CC80658F4F2B44E395911512437ABAA" Guid="{333771ED-4403-400D-AC03-115822D253D7}">
+            <Component Id="cmp5CC80658F4F2B44E395911512437ABAA" Guid="{ECE7F701-9869-4151-AA4A-D880ED16BBC4}">
                 <File Id="fil954697444778DEB1D7CA1D94324ACEBA" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.xml" />
             </Component>
-            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{E805B46E-8A8D-405D-8092-8686F52C3D16}">
+            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{C6E2C3AA-E62C-43AC-A0C3-CEE92BEBB3AE}">
                 <File Id="filD0C467F1DF28BF727E39F7C10430F474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.dll" />
             </Component>
-            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{6C224F74-E180-4640-858E-8D5B877D3559}">
+            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{5474406D-73ED-42FC-8B80-342A8D01A8A5}">
                 <File Id="fil2F9A79508558F53BD2343DC5C118A4EB" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Forms.dll" />
             </Component>
-            <Component Id="cmpDAD81733135473E925DB78655C6E5992" Guid="{FC09A8CA-5BAE-4581-9D54-D17773CBBCC9}">
+            <Component Id="cmpDAD81733135473E925DB78655C6E5992" Guid="{C0B60D68-B0D1-4081-B171-F3D5806CE22E}">
                 <File Id="filA3DE8584E16C584748EBFA471262F954" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Forms.xml" />
             </Component>
-            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{15B19E7B-89DC-4C52-B236-869E9B28F62B}">
+            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{1D59B0D1-7158-40EE-9D98-7D97F9FB6221}">
                 <File Id="filC95772BD906C6022EF697886806A5DCD" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Rasters.GdalExtension.dll" />
             </Component>
-            <Component Id="cmp6CDED7F5E17DE7B1D2D555DA040D2F34" Guid="{37D42E7A-9E65-433A-B40F-5225CA254B78}">
+            <Component Id="cmp6CDED7F5E17DE7B1D2D555DA040D2F34" Guid="{82D6B59B-1EA7-4C6A-9B7F-C45E3B93D832}">
                 <File Id="filF4CD56E56597F304E7E8CCD300644DAD" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.xml" />
             </Component>
-            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{E647F61D-B515-4931-9211-DF4A05F085DA}">
+            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{6503299E-837F-4E50-96ED-E7ECD9A81148}">
                 <File Id="filC72E3D7BC7E19BAF1B3D8B6EAD78881A" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.dll" />
             </Component>
-            <Component Id="cmp5D32B7C21A4A5A8FB8A51A756E2D500E" Guid="{BA5999D5-7540-46E0-B34F-908B3CFFB312}">
+            <Component Id="cmp5D32B7C21A4A5A8FB8A51A756E2D500E" Guid="{684B3307-C2BD-4FA7-ADBD-39418DD187FB}">
                 <File Id="fil47A943B7673C83DD515D724325C6DE58" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.xml" />
             </Component>
-            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{C86ED073-60B0-4FE9-9BEE-E676E2EE2CBA}">
+            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{33CEACB6-685F-4F03-A340-D58AFDBFE506}">
                 <File Id="filB3E0D08FBE5254C0F088A8C621CCD4E5" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.dll" />
             </Component>
-            <Component Id="cmpEF4C9BB8D8DCCC05BD0C0FDC0F1D27E4" Guid="{82B6B93C-25C9-4D7E-BF17-0A1AFBC67585}">
+            <Component Id="cmpEF4C9BB8D8DCCC05BD0C0FDC0F1D27E4" Guid="{A8BD40B9-BA68-492F-BF09-D85DACE0B5FC}">
                 <File Id="fil062FDD475D430A1D5DE3B6A66A556FB3" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.xml" />
             </Component>
-            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{CB51EB31-CD5C-4DD3-B6AD-CB21D8CAA511}">
+            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{5C19712A-2A28-4040-B182-98A6BDCA68A1}">
                 <File Id="filDB65EB11731F9F6C9F2577DA7EB72B02" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.dll" />
             </Component>
-            <Component Id="cmp2F41A31E598EEA6BC0B8363182A7E58D" Guid="{865B5B9C-8C62-452D-A73C-A30B98E5BC0B}">
+            <Component Id="cmp2F41A31E598EEA6BC0B8363182A7E58D" Guid="{B03DCAAB-F779-4FB5-93FE-8D742DAA0138}">
                 <File Id="filFE9AB3C4FA31AF5B5B40BC209543B15D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.xml" />
             </Component>
-            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{77825E45-6A57-461F-8138-B116557D7D02}">
+            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{B185D704-BFA8-4FCE-AC50-73715FB73224}">
                 <File Id="fil4F36B405D36414D50469C1B930CD5F41" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Plugins.BruTileLayer.dll" />
             </Component>
-            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{F88D9A83-1E46-4077-B948-1C06E95A6488}">
+            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{37485963-4996-4CB8-9D16-55A4495601BF}">
                 <File Id="fil633A635CD1999CA278E4CAF66737F1BE" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.dll" />
             </Component>
-            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{CAB7AB47-6CAD-4361-91D8-58721202375F}">
+            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{E6C94C93-4E4E-4CC8-9D80-2C91ACBB8232}">
                 <File Id="fil77520A9338FE58511FFA1BE8685DF474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.dll" />
             </Component>
-            <Component Id="cmp08621A5E8154EADC2AE8D5BAA9CB0D41" Guid="{AF0528E7-DCDD-4582-89BE-7E008BAF165F}">
+            <Component Id="cmp08621A5E8154EADC2AE8D5BAA9CB0D41" Guid="{5164DF2D-AE0A-432A-8A7A-7A9FD5F3C63F}">
                 <File Id="fil3732E838CFFE5D33AB39D6C53CD4230E" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.xml" />
             </Component>
-            <Component Id="cmpCDB737A1AA738083E633902C87F9D47E" Guid="{53098859-C8F9-4696-A839-765C58252F0E}">
+            <Component Id="cmpCDB737A1AA738083E633902C87F9D47E" Guid="{3C5B6711-16BF-4B6F-A2E3-2E5E7B4DE419}">
                 <File Id="fil5DD03FDCC8FDA2555E4CEBE59432BF6D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.xml" />
             </Component>
-            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{5FAE2776-E512-4EFD-A596-13FEF4A74548}">
+            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{581315DD-9EA3-474D-9BBD-2B4D7006F8C8}">
                 <File Id="fil05F11F140B2B59A85D38669DA41E8816" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.dll" />
             </Component>
-            <Component Id="cmpF5361ACAC638363CEA70A35ACE92D28E" Guid="{E6C2540E-4C5C-4AAE-B7B5-BA6BA90A3B90}">
+            <Component Id="cmpF5361ACAC638363CEA70A35ACE92D28E" Guid="{9739F587-174C-4E71-A63E-383A286DF3DE}">
                 <File Id="fil0AFCFA3AF1F3984965386D8545E317D1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.xml" />
             </Component>
-            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{69DFDB4F-BD1A-4F85-81B7-B19A738F0063}">
+            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{026D1D16-3E9E-49C0-909F-7A0F50D023AB}">
                 <File Id="fil3271680B2C8E226D1D2CDD194F77FFA1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.dll" />
             </Component>
-            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{07123D7B-F3A0-46D6-B65D-2EFC83A9DE9E}">
+            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{AA853FD6-8B52-4AF0-B52D-3A2F080D713B}">
                 <File Id="fil82F207E2AC29239FD761F230254FCFB1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.dll" />
             </Component>
-            <Component Id="cmp18DBE8559882FDB1E9F7F1DE31FAEC92" Guid="{9B282E22-16F8-403A-80FF-35B916E1FCB4}">
+            <Component Id="cmp18DBE8559882FDB1E9F7F1DE31FAEC92" Guid="{629FAE52-B7AE-4603-97FF-26EC661076FE}">
                 <File Id="fil66ED67D1CCEC55A07C06A8494EDCD501" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.xml" />
             </Component>
-            <Component Id="cmp07BE718FDECF4127DA9083B5288E8F06" Guid="{5EFAC6A4-ACF3-4D47-98FC-F06923AA9DCF}">
+            <Component Id="cmp07BE718FDECF4127DA9083B5288E8F06" Guid="{5BC6055F-3154-4AAD-B616-BEA49456612A}">
                 <File Id="fil26873270142840951E5B34A531971C87" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.xml" />
             </Component>
-            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{03AD41C0-0E8B-4186-B15D-74C590AF63A5}">
+            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{BF073679-B58C-42AD-A699-D3923BCE3528}">
                 <File Id="filEA078EED09626E9475CF9C0FE6B9581D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.dll" />
             </Component>
-            <Component Id="cmpDB848C600CE1A433C73635BCB7613680" Guid="{AC113C8B-DEBE-4471-A570-736773609A25}">
+            <Component Id="cmpDB848C600CE1A433C73635BCB7613680" Guid="{7E143DE2-1F46-4DB0-A747-9F57A2DA3715}">
                 <File Id="fil0E57FA78EABA9DB3B76A9E76B300B409" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.xml" />
             </Component>
-            <Component Id="cmp4688D508EFA739F2BE873B02871CEF2B" Guid="{337950C6-D708-44CD-8ECE-B789D13D61CF}">
+            <Component Id="cmp4688D508EFA739F2BE873B02871CEF2B" Guid="{089CD72F-69BE-48A4-8A7D-054641A08EF8}">
                 <File Id="fil37E8128D5481EC18891FD13AE71922A8" KeyPath="yes" Source="$(var.BinFolder)\DupuitInterface.dll" />
             </Component>
-            <Component Id="cmp562706812108CCB5E1BA42E08E64048F" Guid="{8ED9DE02-78E1-4523-B758-2E58A331934F}">
+            <Component Id="cmp562706812108CCB5E1BA42E08E64048F" Guid="{28458547-6199-484D-A9F7-BB3E39DC38DE}">
                 <File Id="fil4487DDA49CF47A5C3DAA67E35736C5B8" KeyPath="yes" Source="$(var.BinFolder)\DupuitLib.dll" />
             </Component>
-            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{AD14F0B0-7F6F-4C56-AEAB-F4F468746919}">
+            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{39F04013-9F1D-4709-8902-BAA4D756965A}">
                 <File Id="fil234C916FCD1D852EC8438002B8BAEDEA" KeyPath="yes" Source="$(var.BinFolder)\FirebirdSql.Data.FirebirdClient.dll" />
             </Component>
-            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{6CD82AE4-27BB-48C7-B0A9-9A9AB6706B15}">
+            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{9FAAF36C-7652-46DC-8C3C-6A15CFD713CC}">
                 <File Id="filDD73F351863FEF37BD9EA1EDA68D49A6" KeyPath="yes" Source="$(var.BinFolder)\gdal_csharp.dll" />
             </Component>
-            <Component Id="cmp45A0ADE7943B7A4A2E589D96D210770D" Guid="{8B5F3086-B720-4C84-9E90-725D6CDDD2F6}">
+            <Component Id="cmp45A0ADE7943B7A4A2E589D96D210770D" Guid="{B0E37D1B-0EBD-4AEA-B1EC-6DFF894CE013}">
                 <File Id="filDF048C4845A59576DEF0AAF729816264" KeyPath="yes" Source="$(var.BinFolder)\GeoAPI.dll" />
             </Component>
-            <Component Id="cmp7FD40D6A078B43B57CA8891A471BA3B3" Guid="{01D2FA2E-C595-4C7D-90AE-BD63A5EA6AB9}">
+            <Component Id="cmp7FD40D6A078B43B57CA8891A471BA3B3" Guid="{685CA635-2D9C-44D1-BBE0-C14C9C2F8594}">
                 <File Id="fil8DEBA284FAF178B3365B08BA1AABA09B" KeyPath="yes" Source="$(var.BinFolder)\GsDoc.dll" />
             </Component>
-            <Component Id="cmp00050649369E6A4C367E09F028BA8B25" Guid="{D42C952A-1FBF-4EAE-9440-A7C288D939DF}">
+            <Component Id="cmp00050649369E6A4C367E09F028BA8B25" Guid="{DED270F9-8505-405D-A5FD-5486D3806348}">
                 <File Id="fil335C0E33E27CA4D4012DB19F6353E208" KeyPath="yes" Source="$(var.BinFolder)\GSI.dll" />
             </Component>
-            <Component Id="cmp38129C1E2F239E96DC7267C973967CDC" Guid="{86828A21-2B7E-4DF2-9C1D-4BB543378594}">
+            <Component Id="cmp38129C1E2F239E96DC7267C973967CDC" Guid="{7905F8DB-6FF4-4FC1-95AD-4FD4EAD83699}">
                 <File Id="fil52C34A1815BF8A439E83C178B57B006D" KeyPath="yes" Source="$(var.BinFolder)\GSIDB.dll" />
             </Component>
-            <Component Id="cmp40455DF639E5CD2527410814C36D9981" Guid="{FE59922C-8D8B-4471-BBF6-F5FDACEF8B06}">
+            <Component Id="cmp40455DF639E5CD2527410814C36D9981" Guid="{6CF532C6-71C3-41A9-A31C-07DEB9E5B634}">
                 <File Id="fil10F6B7A36F0662ED8128CB53DB4AF385" KeyPath="yes" Source="$(var.BinFolder)\GSILIB.dll" />
             </Component>
-            <Component Id="cmp13D58469BCB864EB53214ED46E622188" Guid="{00BF58CD-8885-4D2B-98AC-4E42877B8BEB}">
+            <Component Id="cmp13D58469BCB864EB53214ED46E622188" Guid="{8BC629AD-69BC-47D2-90BB-342260F6BE84}">
                 <File Id="fil28F7A9478894C77C5F6C2A95DAA4B459" KeyPath="yes" Source="$(var.BinFolder)\log4net.dll" />
             </Component>
-            <Component Id="cmp742785C9A7B88BE6B2E81C2322E3D2EE" Guid="{BA294998-38A5-40EE-A463-9FB208427001}">
+            <Component Id="cmp742785C9A7B88BE6B2E81C2322E3D2EE" Guid="{27812D67-BBF1-43DD-8CF9-6E5B16235C4F}">
                 <File Id="filA307C00D897BECB908C510DE71A3AD29" KeyPath="yes" Source="$(var.BinFolder)\log4net.xml" />
             </Component>
-            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{955A4BCA-365C-498F-89CD-CDBF0C6CA393}">
+            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{4E637919-E6EA-4620-9CAB-B5DAD8CE52AD}">
                 <File Id="fil14B37B6F117880072CC8B3DD806A47D6" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.dll" />
             </Component>
-            <Component Id="cmp968AC9A7D1F89ACEC42E7A1933B1DC85" Guid="{A9F4C474-B14D-4F78-98A5-DD2ECE3B2246}">
-                <File Id="filEFC68F06EA163C1C28037C23DA95C0C7" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.xml" />
+            <Component Id="cmpDC09C75FBBAC60AD17D28E01B766E612" Guid="{C9855C03-072B-459C-89D3-5ADE423235CB}">
+                <File Id="fil5E77B78C4F48B2E49C0D170B87AFED9C" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.XML" />
             </Component>
-            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{22876E95-0D96-4FFA-990B-15C85BB31286}">
+            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{42933095-CE4C-44A5-90A9-5ADE7692C79D}">
                 <File Id="fil7074B34CCDD7ABC6B6FDB40762FB4CF9" KeyPath="yes" Source="$(var.BinFolder)\MathNet.Numerics.dll" />
             </Component>
-            <Component Id="cmp0C01E37B8C87BA8B8F7E670695F7F3B5" Guid="{4E675CAB-7B48-4D3B-8DA5-9F6ABD43F5D6}">
-                <File Id="fil8675D14895962EE7B0E118F1F68851CD" KeyPath="yes" Source="$(var.BinFolder)\MathNet.Numerics.xml" />
-            </Component>
-            <Component Id="cmp43FDD6B197F1079277BC0366BA6154D1" Guid="{20F104B9-DEFD-431D-86D0-F7E208F3F498}">
+            <Component Id="cmp43FDD6B197F1079277BC0366BA6154D1" Guid="{5849C1AE-121A-4601-BD62-E1F4AC0F7DDA}">
                 <File Id="fil3048294232FE90938F194F8731941F69" KeyPath="yes" Source="$(var.BinFolder)\MNGSRV.dll" />
             </Component>
-            <Component Id="cmpE1A276CBD4AA0395A6D00E549496DB5C" Guid="{B1E14C62-E43B-4CB1-B1A6-19537E1A3B58}">
+            <Component Id="cmpE1A276CBD4AA0395A6D00E549496DB5C" Guid="{B5CC6B52-584D-4212-BFF7-C3F5ABEB323D}">
                 <File Id="filAB89E906D8C3E63F4810FD84943E839D" KeyPath="yes" Source="$(var.BinFolder)\NetTopologySuite.dll" />
             </Component>
-            <Component Id="cmp4B9C8C489E471DCCDA7CE6E8B4DDD3DF" Guid="{D814999E-9120-4938-B5B8-BEA41AC40959}">
+            <Component Id="cmp4B9C8C489E471DCCDA7CE6E8B4DDD3DF" Guid="{810016BA-8B64-45BC-AC6C-F9D0D7F150DE}">
                 <File Id="filCDB52F7478A34CD2296F21A4A640B70E" KeyPath="yes" Source="$(var.BinFolder)\NetTopologySuite.IO.GeoTools.dll" />
             </Component>
-            <Component Id="cmpD90473204CCAB0A43FC061A35D678A91" Guid="{F3A664E7-AB29-4DFC-AAE2-7683075A65E0}">
+            <Component Id="cmpD90473204CCAB0A43FC061A35D678A91" Guid="{4D34793C-4160-4313-9B57-31926D0F49C8}">
                 <File Id="filA01CED104EF0290D28633629C9C17845" KeyPath="yes" Source="$(var.BinFolder)\OC.dll" />
             </Component>
-            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{EDBF49F4-398A-444E-8DD1-3A8708D764AB}">
+            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{68663F59-253E-477E-8BB1-CEA161CC0672}">
                 <File Id="fil58FA97A82C74E7C028484557C2E9031F" KeyPath="yes" Source="$(var.BinFolder)\ogr_csharp.dll" />
             </Component>
-            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{B829B9BD-46E2-448B-BC20-D92EE2E2CE37}">
+            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{5AC5BED0-7461-4912-B9D7-12875832B9D4}">
                 <File Id="fil85F845F2C104287D16405A9C5D4DD89C" KeyPath="yes" Source="$(var.BinFolder)\osr_csharp.dll" />
             </Component>
-            <Component Id="cmp948F2A115662237A56B75C9C52DF14D3" Guid="{E5887C55-0D12-4F78-8BB9-5F90BEC31113}">
+            <Component Id="cmp948F2A115662237A56B75C9C52DF14D3" Guid="{99D97921-1D19-4554-A018-47E5DD09FE5B}">
                 <File Id="fil12C87229BDF20DDEEA53A5EB2E7AF4A8" KeyPath="yes" Source="$(var.BinFolder)\Packages.xml" />
             </Component>
-            <Component Id="cmpF7185223D1FA31FD87A041D8FDCC891A" Guid="{B87B3063-EEB7-47E2-A5B4-0E59FAD7C090}">
+            <Component Id="cmpF7185223D1FA31FD87A041D8FDCC891A" Guid="{551A205A-9C92-4CFD-85EA-B1954864D004}">
                 <File Id="filE77A66E32A3103E54CF36456541D6CEB" KeyPath="yes" Source="$(var.BinFolder)\PowerCollections.dll" />
             </Component>
-            <Component Id="cmp2F7FFD20D730ADD41137B8DD81868512" Guid="{6D22D151-B946-4858-B521-9C6A0BECDD14}">
+            <Component Id="cmp2F7FFD20D730ADD41137B8DD81868512" Guid="{66C2AF45-A95D-4B02-9D14-8AF970CA4142}">
                 <File Id="fil224D2BA085FF5B41CE6C82BE44CCFE45" KeyPath="yes" Source="$(var.BinFolder)\Slope2.exe" />
             </Component>
-            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{BE37CBD4-F7B0-43F3-A841-70762A434EB0}">
+            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{F22ADAA6-C770-4A73-BA2E-741625447ACE}">
                 <File Id="fil5A492671E7E6729B61DA592709A368FE" KeyPath="yes" Source="$(var.BinFolder)\SmartThreadPool.dll" />
             </Component>
+            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{3BE0E46C-A59F-48A6-9472-CA13C1F78315}">
+                <File Id="fil86030949C08D40073D1F77D572C14B0D" KeyPath="yes" Source="$(var.BinFolder)\System.Data.SQLite.dll" />
+            </Component>
             <Directory Id="dirCDB9BBC59A051D8EADD204A058D555D4" Name="CalcDlls">
-                <Component Id="cmpE1EE7CF75D6C7FA876BE1C63ECA9A427" Guid="{53C84693-CAFD-4E79-94BC-51A9DF38FAF6}">
+                <Component Id="cmpE1EE7CF75D6C7FA876BE1C63ECA9A427" Guid="{0A14A3A5-97CC-4543-95E6-B2395FA31C86}">
                     <File Id="fil1D98D04203E700CF883BB51941BA6920" KeyPath="yes" Source="$(var.BinFolder)\CalcDlls\BayesBuilder.dll" />
                 </Component>
-                <Component Id="cmpBD0B6803EA6D9668A580A341849B1FC1" Guid="{D00CAC25-86B9-4CAC-BBCE-CCF09A21157B}">
+                <Component Id="cmpBD0B6803EA6D9668A580A341849B1FC1" Guid="{E0FB6AB5-890D-4934-9EDD-5C1F80B35519}">
                     <File Id="fil8AF6EDC4EE29F2C3E2BCFC1E3CFE0DB5" KeyPath="yes" Source="$(var.BinFolder)\CalcDlls\DAM Piping.bbnet" />
                 </Component>
-                <Component Id="cmp9BFC77C8A87B2068B58DD1426257CB39" Guid="{824B3DBD-1021-45D3-B082-0D6420B1E3DE}">
+                <Component Id="cmp9BFC77C8A87B2068B58DD1426257CB39" Guid="{8327077D-2DE6-49BA-AF61-FA5FCFF52A75}">
                     <File Id="filE0D5A389716874F1CB595441B5829FA5" KeyPath="yes" Source="$(var.BinFolder)\CalcDlls\DGSDAMPipingBBN.dll" />
                 </Component>
-                <Component Id="cmpADDB15E4C5F359505C7A072BF4C8851E" Guid="{77C2A18A-2765-4106-AF3C-3589CB284BAD}">
+                <Component Id="cmpADDB15E4C5F359505C7A072BF4C8851E" Guid="{1B45AAD5-344C-4FD7-AF15-95284CCA236F}">
                     <File Id="fil5483D2BEF817DD2DB822CA4ED47D76C7" KeyPath="yes" Source="$(var.BinFolder)\CalcDlls\MPipingCalc2.dll" />
                 </Component>
-                <Component Id="cmp869D5A80DF54F545D48901C78651DF04" Guid="{072E9B4A-495B-4CBB-9F3E-1AB40B953DC4}">
+                <Component Id="cmp869D5A80DF54F545D48901C78651DF04" Guid="{AE407B1B-9BAD-440F-8442-3E0756F48F32}">
                     <File Id="filCECDA1FA5CE0BE59CF8CBCB0527890C6" KeyPath="yes" Source="$(var.BinFolder)\CalcDlls\MPipingCalc3.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir669D581EF9B2195684EDE59C25D2DF49" Name="DemoPictures">
-                <Component Id="cmp7CD5E199AD770190D813EF5A045DE66D" Guid="{AB1B40F5-976B-4A3A-B84F-1DA2C3BB9345}">
+                <Component Id="cmp7CD5E199AD770190D813EF5A045DE66D" Guid="{1D658886-942E-4BC5-B348-BD63374C8702}">
                     <File Id="fil8BE8160800FA3808A590E95AC0DD0E42" KeyPath="yes" Source="$(var.BinFolder)\DemoPictures\PictureStep01.wmf" />
                 </Component>
-                <Component Id="cmpED59CD9618F4F342D9095A753C83093E" Guid="{81AC6A2E-36A6-4313-B8E9-507F251851F1}">
+                <Component Id="cmpED59CD9618F4F342D9095A753C83093E" Guid="{278EA9BE-8CE3-4D4A-A2FF-FEA7B65D5AD4}">
                     <File Id="fil320822D5715E698317085A84064502A9" KeyPath="yes" Source="$(var.BinFolder)\DemoPictures\PictureStep02.wmf" />
                 </Component>
-                <Component Id="cmp8F74D5680ED18970DA17ECD785ACA54D" Guid="{ED4DE5D0-FF88-49BE-8E4C-6E48D5E3B590}">
+                <Component Id="cmp8F74D5680ED18970DA17ECD785ACA54D" Guid="{553C1D45-E5F4-4B67-B435-EC9251FE1C28}">
                     <File Id="fil4B6805023AAA953DE30B9BD5BC7D8D68" KeyPath="yes" Source="$(var.BinFolder)\DemoPictures\PictureStep03.wmf" />
                 </Component>
-                <Component Id="cmp7E7C6C2DD9215D160289F622DAE7AD70" Guid="{2B9AEF45-61C2-4FC0-A826-498B6BDCCD2E}">
+                <Component Id="cmp7E7C6C2DD9215D160289F622DAE7AD70" Guid="{61332772-7F97-4CED-B2DD-A1800365909C}">
                     <File Id="fil9D1D1A3AE508286F1C2303D101B97B9C" KeyPath="yes" Source="$(var.BinFolder)\DemoPictures\PictureStep04.wmf" />
                 </Component>
             </Directory>
             <Directory Id="dir6D988BCF7B4F2F22F1D2EF98D63A662F" Name="Dupuit">
-                <Component Id="cmpBBF44ED4E9413938172B6087A85B4EAC" Guid="{4B40609A-F26E-4F41-BC52-1EDF4C2F571B}">
+                <Component Id="cmpBBF44ED4E9413938172B6087A85B4EAC" Guid="{187C5DB9-009A-44F8-A3BB-B0DFC4B45FA0}">
                     <File Id="filFB4EFADF9B55AE9AB29B87F0962DB611" KeyPath="yes" Source="$(var.BinFolder)\Dupuit\DikeFlow.exe" />
                 </Component>
             </Directory>
             <Directory Id="dir2F3D431E0ED26930C4D37E679C7700A1" Name="nl">
-                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{86B34B7F-0EDC-48A0-BBF7-022A099C5F42}">
+                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{282FB04B-28B6-484B-8552-5A49DBF3C41E}">
                     <File Id="filF7D36D11E7B251700E8C6B6DB2B21155" KeyPath="yes" Source="$(var.BinFolder)\nl\DotSpatial.Projections.Forms.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir97F42FF68945B97AAE670945C4FDAE93" Name="x86">
-                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{08CD5431-114E-408D-8DF7-FE314BE34652}">
+                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{930B7FFB-8210-4E9E-9D88-05C1F9834B53}">
                     <File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source="$(var.BinFolder)\x86\SQLite.Interop.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir8C5E37FA87D1897FFB78337F53EB198C" Name="zh-CN">
-                <Component Id="cmp18FA27B4817B990D0E9D3FDC6B4746DD" Guid="{2BC7F1FA-A69E-491F-A635-64A9E82AA0C7}">
+                <Component Id="cmp18FA27B4817B990D0E9D3FDC6B4746DD" Guid="{07C09EBB-2036-4C80-B085-60FF72BCA330}">
                     <File Id="fil1DDC97C9C38C3EF9F8CD545D5CA32626" KeyPath="yes" Source="$(var.BinFolder)\zh-CN\DotSpatial.Controls.resources.dll" />
                 </Component>
-                <Component Id="cmp746A90DF1AD5328D83858AD24084E3F8" Guid="{505FE763-3DBF-4BF3-8297-8FE5FD19C41B}">
+                <Component Id="cmp746A90DF1AD5328D83858AD24084E3F8" Guid="{EE7A2EF3-7DFE-407F-B9E1-D4279CBCAC3E}">
                     <File Id="filE43705159F43BBF575EE5F0295A8E69C" KeyPath="yes" Source="$(var.BinFolder)\zh-CN\DotSpatial.Data.Forms.resources.dll" />
                 </Component>
-                <Component Id="cmpDDF11AB16DF8CAED0CAD6B7BCE6BDF69" Guid="{46EAF2C1-0A17-479E-A11F-0DE9EDC5CEE5}">
+                <Component Id="cmpDDF11AB16DF8CAED0CAD6B7BCE6BDF69" Guid="{0DD7AE14-96E7-41E1-84C6-972E10E0DEAF}">
                     <File Id="fil8FCA0886BBAF6130AA95157D40B8039D" KeyPath="yes" Source="$(var.BinFolder)\zh-CN\DotSpatial.Modeling.Forms.resources.dll" />
                 </Component>
-                <Component Id="cmp768086833EAFD2F44BED01985BD6224A" Guid="{DC36E5E7-72C0-4D63-834C-E914BA39DB8D}">
+                <Component Id="cmp768086833EAFD2F44BED01985BD6224A" Guid="{5B8B66EA-0A4E-4759-9783-5C5DD382E869}">
                     <File Id="fil694961F5AE6911E7C5CA4E9283FFFE23" KeyPath="yes" Source="$(var.BinFolder)\zh-CN\DotSpatial.Projections.Forms.resources.dll" />
                 </Component>
-                <Component Id="cmp631599123128B18F3A0167EC90F286A4" Guid="{FF3D7B66-4CA5-4BD6-8461-BA335474C028}">
+                <Component Id="cmp631599123128B18F3A0167EC90F286A4" Guid="{CC4F3B8F-4676-49E8-83A7-6E48888311EE}">
                     <File Id="fil81BF228480B0CBED09126F92652C31BB" KeyPath="yes" Source="$(var.BinFolder)\zh-CN\DotSpatial.Symbology.Forms.resources.dll" />
                 </Component>
             </Directory>
@@ -465,6 +441,8 @@
             <ComponentRef Id="cmpCC5600A0E0013FC2479752FF2E317D0E" />
             <ComponentRef Id="cmp1E79642B0C11D101EF141136BB99312D" />
             <ComponentRef Id="cmp640D57506CC6F233458551E3B1650DA2" />
+            <ComponentRef Id="cmpB0B36965FAF5E1BD84D164D58F2DB38B" />
+            <ComponentRef Id="cmp862A33756524B7D08946AABF813D05DB" />
             <ComponentRef Id="cmp42E95448C3995BD05BD648D70093C9C6" />
             <ComponentRef Id="cmpCA13194B5AAE81EF0BCA050CF6FB525B" />
             <ComponentRef Id="cmp140B320553D2BE4B52132E17C2E0A1C3" />
@@ -475,7 +453,6 @@
             <ComponentRef Id="cmpD63BB20177C5A0ECE04AAD91AFDBB2D1" />
             <ComponentRef Id="cmp0DECD179D729DF04056DE39C266F35A7" />
             <ComponentRef Id="cmpE856AA0D9D4EB3C7519B957F94A02BEB" />
-            <ComponentRef Id="cmp806EF4EBCE2FA0E9204E5518B9CA0F0D" />
             <ComponentRef Id="cmp1BA9424CC48CBB8AB81D3DD5BB2B72D3" />
             <ComponentRef Id="cmp8971CF8878075A9838DF164D02809B24" />
             <ComponentRef Id="cmpD5B395A098C14AD29C215BE9460FD233" />
@@ -487,23 +464,17 @@
             <ComponentRef Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" />
             <ComponentRef Id="cmp8F02543F5A177E07008D465661BE6810" />
             <ComponentRef Id="cmp846E665755E74A31C4115F7E2CE4EB8C" />
-            <ComponentRef Id="cmpEB1070EA5F0F17D09E2F888D8809817C" />
-            <ComponentRef Id="cmpB16FBA1E637592E55B6A1B132D5248A3" />
             <ComponentRef Id="cmp47320FABBCEC7CB30E200DC70C25B49D" />
             <ComponentRef Id="cmpDEDC9982F4F16DB2666CA200F6905509" />
-            <ComponentRef Id="cmpE92DD2BDFF0076181DA48203B6C3B879" />
             <ComponentRef Id="cmp583C9725DA10A33056818F01A7058161" />
             <ComponentRef Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" />
-            <ComponentRef Id="cmp542E142E7F161B276CEBD5C405B1CC5A" />
             <ComponentRef Id="cmp95821E44AD89805508113BF2C1D66FB9" />
             <ComponentRef Id="cmp142E814CD559E72BE075552B024E95E1" />
-            <ComponentRef Id="cmpA57A54CE84837F19C73BB3DD8865F957" />
             <ComponentRef Id="cmp7379FEAD9393E7CE4322F5E14E81177A" />
             <ComponentRef Id="cmpAB6353B86E37B66F258CB44FD793D6EC" />
             <ComponentRef Id="cmp5EBAC94058E39529B423C3E02582274A" />
             <ComponentRef Id="cmp02836ACE00BDC07EAC334B5BBFFD5799" />
             <ComponentRef Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" />
-            <ComponentRef Id="cmp24A86A28ACAC0B96109FF4A8A7AAD8F7" />
             <ComponentRef Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" />
             <ComponentRef Id="cmp31F1C0A9752DD43A96D62673B8E48A5D" />
             <ComponentRef Id="cmpEB1D983E2980A41BAF1017CDA8317670" />
@@ -515,11 +486,8 @@
             <ComponentRef Id="cmpD19A2C12363171EF0C511CC6FDE83CA5" />
             <ComponentRef Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" />
             <ComponentRef Id="cmp0349193C60319F06835040E18EF2B3EB" />
-            <ComponentRef Id="cmp84A280A8C39033613D2B440B4D36294C" />
             <ComponentRef Id="cmp3FCD8EF7F93C2CDC3323E073176BD86E" />
             <ComponentRef Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" />
-            <ComponentRef Id="cmp23B25A790E0500883D490DD3A4E5673C" />
-            <ComponentRef Id="cmpD2EF45F5D1C5E6242DF0C125431F759C" />
             <ComponentRef Id="cmp9358D66B3D64F3DD7067952DE5DEDDC6" />
             <ComponentRef Id="cmp196F1868D512A147E1961167281BA4E4" />
             <ComponentRef Id="cmp7CE040865D4414C9C4B71FFDFD6CA1E7" />
@@ -564,9 +532,8 @@
             <ComponentRef Id="cmp13D58469BCB864EB53214ED46E622188" />
             <ComponentRef Id="cmp742785C9A7B88BE6B2E81C2322E3D2EE" />
             <ComponentRef Id="cmp9DD47D0347AE254D923E22047764B092" />
-            <ComponentRef Id="cmp968AC9A7D1F89ACEC42E7A1933B1DC85" />
+            <ComponentRef Id="cmpDC09C75FBBAC60AD17D28E01B766E612" />
             <ComponentRef Id="cmp3ED5A0A4D782A8BF371C8403342D615B" />
-            <ComponentRef Id="cmp0C01E37B8C87BA8B8F7E670695F7F3B5" />
             <ComponentRef Id="cmp43FDD6B197F1079277BC0366BA6154D1" />
             <ComponentRef Id="cmpE1A276CBD4AA0395A6D00E549496DB5C" />
             <ComponentRef Id="cmp4B9C8C489E471DCCDA7CE6E8B4DDD3DF" />
@@ -577,6 +544,7 @@
             <ComponentRef Id="cmpF7185223D1FA31FD87A041D8FDCC891A" />
             <ComponentRef Id="cmp2F7FFD20D730ADD41137B8DD81868512" />
             <ComponentRef Id="cmp20B8D4726881994439470FFC8B08FD93" />
+            <ComponentRef Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" />
             <ComponentRef Id="cmpE1EE7CF75D6C7FA876BE1C63ECA9A427" />
             <ComponentRef Id="cmpBD0B6803EA6D9668A580A341849B1FC1" />
             <ComponentRef Id="cmp9BFC77C8A87B2068B58DD1426257CB39" />
Index: trunk/src/Dam/Dam.Setup/BuildWixProject.bat
===================================================================
diff -u -r7 -r9
--- trunk/src/Dam/Dam.Setup/BuildWixProject.bat	(.../BuildWixProject.bat)	(revision 7)
+++ trunk/src/Dam/Dam.Setup/BuildWixProject.bat	(.../BuildWixProject.bat)	(revision 9)
@@ -7,7 +7,7 @@
 
 echo cleaning and building project...
 rd /s /q ..\..\bin\Release > nul 2>&1
-%build% ..\Dam.sln /p:Configuration=Release;Platform=x86 >BuildHarvest.log
+%build% ..\..\Dam.sln /p:Configuration=Release;Platform=x86 >BuildHarvest.log
 
 echo/
 echo cleaning up bin folder...
Index: trunk/src/Dam.sln
===================================================================
diff -u -r8 -r9
--- trunk/src/Dam.sln	(.../Dam.sln)	(revision 8)
+++ trunk/src/Dam.sln	(.../Dam.sln)	(revision 9)
@@ -253,7 +253,6 @@
 		{2C1BFE67-A106-4926-BA5A-0374EA6B99B6}.Release|x86.Build.0 = Release|x86
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}.Debug|x86.ActiveCfg = Debug|x86
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}.Release|x86.ActiveCfg = Release|x86
-		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}.Release|x86.Build.0 = Release|x86
 		{731A8E36-4E16-4C13-B548-D47DA12B813F}.Debug|x86.ActiveCfg = Debug|x86
 		{731A8E36-4E16-4C13-B548-D47DA12B813F}.Debug|x86.Build.0 = Debug|x86
 		{731A8E36-4E16-4C13-B548-D47DA12B813F}.Release|x86.ActiveCfg = Release|x86