Index: DamClients/DamUI/trunk/Dam.Setup/Product.wxs
===================================================================
diff -u -r6646 -r6704
--- DamClients/DamUI/trunk/Dam.Setup/Product.wxs	(.../Product.wxs)	(revision 6646)
+++ DamClients/DamUI/trunk/Dam.Setup/Product.wxs	(.../Product.wxs)	(revision 6704)
@@ -1,27 +1,36 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define ProductId="Deltares.Dam.Application"?>
-  <?define ProductName="DAM"?>
-  <?define ProductVersion="25.3.0"?>
-  <?define ProductExtension=".damx"?>
-  <?define ProductDescription="Analysis and management of flood defence systems"?>
-  <?define ProductManualTitle="DAM UI - User manual"?>
+  <?include "$(var.ProjectDir)\ApplicationDefines.wxi"?>
   
-  <Package Name="Deltares $(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" 
-           Manufacturer="Deltares" UpgradeCode="ACFF668C-B877-4A28-8422-65D04B09394D" InstallerVersion="200">
+  <Package Id = "$(var.ProductNameWithVersion)" Name="Deltares $(var.ProductNameWithVersion)" Language="1033" 
+           Version="$(var.ProductVersion)" Manufacturer="Deltares" UpgradeCode="$(var.UpgradeGuid)" 
+           InstallerVersion="200">
 
-    <!--Look for proper version of Ds_Flex (>= 7.8.0.0) -->
+    <!--Look for current version of Ds_Flex in registry -->
     <Property Id="DSFLEXVERSION" Secure="yes">
       <RegistrySearch Id="DSFlexVersion"
                       Root="HKLM"
                       Key="SOFTWARE\WOW6432Node\WL | Delft Hydraulics\DS_Flex"
                       Name="InstallerVersion"
                       Type="raw" />
     </Property>
+    
+    <!--Look for current version of Common Files in registry -->
+    <Property Id="COMMONFILESVERSION" Value="0.0">
+      <RegistrySearch Id="CommonFilesVersion" 
+                      Root="HKLM" 
+                      Key="SOFTWARE\WOW6432Node\Deltares" 
+                      Name="Common Version" 
+                      Type="raw" />
+    </Property>
 
-    <!-- Add the launch condition for the check on Ds_Flex -->
-    <Launch Message="There is a problem. The Ds_Flex Files are missing or too old. A new version must be installed before we can install [ProductName]."
-            Condition="Installed OR (DSFLEXVERSION >= &quot;7.8.0.0&quot;)" />
+    <!-- Add the launch condition for the check on Ds_Flex version (>= MinimumDsFlexVersion) -->
+    <Launch Message="There is a problem. The Ds_Flex Files are missing or too old (Found [DSFLEXVERSION] is smaller than required $(var.MinimumDsFlexVersion)). A new version must be installed before we can install [ProductName]."
+            Condition="Installed OR (DSFLEXVERSION >= &quot;$(var.MinimumDsFlexVersion)&quot;)" />
 
+    <!-- Add the launch condition for the check on Common Files version (>= MinimumCommonFilesVersion) -->
+    <Launch Message="There is a problem. The Common Files Files are missing or too old (Found [COMMONFILESVERSION] is smaller than required $(var.MinimumCommonFilesVersion)). A new version must be installed before we can install [ProductName].>"
+            Condition="Installed OR (COMMONFILESVERSION >= &quot;$(var.MinimumCommonFilesVersion)&quot;)" />
+    
     <!-- Specify the required product components -->
     <!-- Program and manual -->
     <ComponentGroup Id="ProductComponent" Directory="INSTALLFOLDER">
@@ -30,14 +39,15 @@
     <!-- Tutorial files -->
     <Property Id="PROGRAMTUTORIALS" Secure="yes"/>
     <CustomAction Id="SetTutorialsDir" Property="PROGRAMTUTORIALS" 
-                  Value="C:\Users\Public\Documents\Deltares\$(var.ProductId)"/>
+                  Value="C:\Users\Public\Documents\Deltares\$(var.ProductIdWithVersion)"/>
     <InstallUISequence>
       <Custom Action="SetTutorialsDir" Before="CostInitialize" Condition="NOT Installed"/>
     </InstallUISequence>
 
     <ComponentGroup Id="TutorialFilesComponent" Directory="PROGRAMTUTORIALS">
-        <Component Id="TutorialFilesComponents" Guid="{0A36B967-DA38-4C33-AA45-D6E4080ABC30}">
-            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\$(var.ProductId)" Name="PROGRAMTUTORIALS" Type="integer" Value="1" KeyPath="yes" />
+        <Component Id="TutorialFilesComponents" Guid="$(var.ExamplesDirGuid)">
+            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)" 
+                           Name="PROGRAMTUTORIALS" Type="integer" Value="1" KeyPath="yes" />
             <RemoveFolder Id="PROGRAMTUTORIALS" Directory="PROGRAMTUTORIALS" On="uninstall" />
         </Component>
         <Files Include="$(var.TutorialFolder)\**\*" />
@@ -54,7 +64,7 @@
             Message="This setup requires Microsoft .NET Framework 4.0 Full or 4.5 package to be installed for this installation to continue." />
 
     <!-- components to install -->
-    <Feature Id="ProductFeature" Title="$(var.ProductId).Setup" Level="1">
+    <Feature Id="ProductFeature" Title="$(var.ProductIdWithVersion).Setup" Level="1">
       <ComponentGroupRef Id="ProductComponent" />
       <ComponentGroupRef Id="TutorialFilesComponent" />
       <ComponentRef Id="ApplicationShortcut" />
@@ -82,59 +92,72 @@
       <!-- installation folder -->
       <StandardDirectory Id="ProgramFilesFolder">
         <Directory Id="ProgramFilesDeltares" Name="Deltares">
-          <Directory Id="INSTALLFOLDER" Name="$(var.ProductId)" />
+          <Directory Id="INSTALLFOLDER" Name="$(var.ProductIdWithVersion)" />
             <Directory Id="MANUALFOLDER" Name="Manual" />
         </Directory>
       </StandardDirectory>
       <!-- Start menu folder -->
       <StandardDirectory Id="ProgramMenuFolder">
-        <Directory Id="ProgramMenuDeltares" Name="$(var.ProductName)">
-          <Directory Id="ProgramMenuShortcut" Name="$(var.ProductName)" />
+        <Directory Id="ProgramMenuDeltares" Name="$(var.ProductNameWithVersion)">
+          <Directory Id="ProgramMenuShortcut" Name="$(var.ProductNameWithVersion)" />
         </Directory>
       </StandardDirectory>
       <!-- Public Documents folder for the tutorials -->
-      <Directory Id="PROGRAMTUTORIALS" Name="$(var.ProductId)"/>
+      <Directory Id="PROGRAMTUTORIALS" Name="$(var.ProductIdWithVersion)"/>
   </Fragment>
-  
-  <!-- Start Menu shortcut -->
+
+  <!-- Desktop application shortcut -->
   <Fragment>
-    <Component Id="ApplicationShortcut" Directory="ProgramMenuShortcut" Guid="{2D5E5E99-0005-41C8-AABB-278F6790C82F}">
-      <Shortcut Id="ApplicationStartMenuShortcut" Name="$(var.ProductName)" Description="$(var.ProductDescription)" 
-                Icon="icon.ico" IconIndex="0" Target="[INSTALLFOLDER]$(var.ProductId).exe" WorkingDirectory="INSTALLFOLDER" />
+    <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)">
+      <Shortcut Id="desktop" Directory="DesktopFolder" Name="$(var.ProductNameWithVersion)" 
+                WorkingDirectory="INSTALLFOLDER" Icon="icon.ico" IconIndex="0" 
+                Target="[INSTALLFOLDER]\$(var.ProductId).exe" />
+      <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)" 
+                     Name="installedDesktopShortcut" Type="integer" Value="1" KeyPath="yes" />
+      <RemoveFolder Id="CleanUpDesktopShortcut" Directory="DeltaresDir" On="uninstall" />
+    </Component>
+  </Fragment>
+  <!-- Start Menu application shortcut -->
+  <Fragment>
+    <Component Id="ApplicationShortcut" Directory="ProgramMenuShortcut" Guid="$(var.StartMenuShortcutGuid)">
+      <Shortcut Id="ApplicationStartMenuShortcut" Name="$(var.ProductNameWithVersion)" 
+                Description="$(var.ProductDescription)" Icon="icon.ico" IconIndex="0" 
+                Target="[INSTALLFOLDER]$(var.ProductId).exe" WorkingDirectory="INSTALLFOLDER" />
       <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuShortcut" On="uninstall" />
       <RemoveFolder Id="RemoveProgramMenuDeltares" Directory="ProgramMenuDeltares" On="uninstall" />
-      <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductId)" Name="installed" Type="integer" 
-                     Value="1" KeyPath="yes" />
+      <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)" 
+                     Name="installed" Type="integer" Value="1" KeyPath="yes" />
     </Component>
   </Fragment>
-
+  <!-- Start Menu manual shortcut -->
   <Fragment>
-    <Component Id="ManualShortcut" Directory="ProgramMenuShortcut" Guid="{9A570BAF-5E33-41A2-BF72-821150213478}">
-      <Shortcut Id="ManualStartMenuShortcut" Name="$(var.ProductName) Manual" Description="$(var.ProductName) Manual" 
-                Target="[INSTALLFOLDER]\Manual\$(var.ProductManualTitle).pdf" />
-      <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductId)\Manual" Name="installed" Type="integer" 
-                     Value="1" KeyPath="yes" />
+    <Component Id="ManualShortcut" Directory="ProgramMenuShortcut" Guid="$(var.ManualsMenuShortcutsGuid)">
+      <Shortcut Id="ManualStartMenuShortcut" Name="$(var.ProductNameWithVersion) Manual" 
+                Description="$(var.ProductName) Manual" Target="[INSTALLFOLDER]\Manual\$(var.ProductManualTitle).pdf" />
+      <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)\Manual" Name="installed" 
+                     Type="integer" Value="1" KeyPath="yes" />
     </Component>
   </Fragment>
-
+  <!-- Start Menu uninstall application shortcut -->
   <Fragment>
-    <Component Id="UninstallShortcut" Directory="ProgramMenuShortcut" Guid="{76B0A433-FAD2-4C18-9588-67B8A7F84C38}">
-      <Shortcut Id="UninstallProduct" Name="Uninstall $(var.ProductName)" Description="Uninstalls $(var.ProductName)" 
-                Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
-      <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductId)" Name="InstalledUninstallerShortcut" 
-                     Type="integer" Value="1" KeyPath="yes" />
+    <Component Id="UninstallShortcut" Directory="ProgramMenuShortcut" Guid="$(var.UninstallShortcutGuid)">
+      <Shortcut Id="UninstallProduct" Name="Uninstall $(var.ProductNameWithVersion)" 
+                Description="Uninstalls $(var.ProductName)" Target="[System64Folder]msiexec.exe" 
+                Arguments="/x [ProductCode]" />
+      <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)" 
+                     Name="InstalledUninstallerShortcut" Type="integer" Value="1" KeyPath="yes" />
     </Component>
   </Fragment>
-  
+  <!-- Application association -->
   <Fragment>
-    <Component Id="$(var.ProductId)FileAssociation" Guid="{C698D90C-BB28-4414-A0FB-1A44156AACB9}">
+    <Component Id="$(var.ProductId)FileAssociation" Guid="$(var.ProgramAssociationsGuid)">
     <!-- Register the application -->
     <RegistryValue Root="HKLM" 
-                   Key="SOFTWARE\Classes\$(var.ProductId).exe" 
+                   Key="SOFTWARE\Classes\$(var.ProductIdWithVersion).exe" 
                    Value="$(var.ProductId).exe" 
                    Type="string" />
     <RegistryValue Root="HKLM" 
-                   Key="SOFTWARE\Classes\$(var.ProductId).exe\DefaultIcon" 
+                   Key="SOFTWARE\Classes\$(var.ProductIdWithVersion).exe\DefaultIcon" 
                    Value="[INSTALLFOLDER]$(var.ProductId).exe,0" 
                    Type="string" />