Index: setup/Plugins/WtiSetup/GenerateVariables.wxi.svn
===================================================================
diff -u
--- setup/Plugins/WtiSetup/GenerateVariables.wxi.svn	(revision 0)
+++ setup/Plugins/WtiSetup/GenerateVariables.wxi.svn	(revision c891c010c2d22c3303983631dac57cf8112837e2)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+	<?define Revision="SVNREV"?>
+</Include>
Index: setup/Plugins/WtiSetup/Localization_nl-NL.wxl
===================================================================
diff -u -rdc06c866920149657481b4ca16c79dcb34047f57 -rc891c010c2d22c3303983631dac57cf8112837e2
--- setup/Plugins/WtiSetup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision dc06c866920149657481b4ca16c79dcb34047f57)
+++ setup/Plugins/WtiSetup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision c891c010c2d22c3303983631dac57cf8112837e2)
@@ -5,4 +5,5 @@
   <String Id="Manufacturer">Deltares</String>
   <String Id="NetFramework45Required">De installatie vereist dat Microsoft .NET Framework 4.5 geïnstalleerd is om verder te gaan.</String>
   <String Id="DowngradeErrorMessage">Een nieuwere versie van !(loc.ApplicationLongName) is al geïnstalleerd.</String>
+  <String Id="StartApplicationDescription">Start het !(loc.ApplicationLongName).</String>
 </WixLocalization>
\ No newline at end of file
Index: setup/Plugins/WtiSetup/Product.wxs
===================================================================
diff -u -rdc06c866920149657481b4ca16c79dcb34047f57 -rc891c010c2d22c3303983631dac57cf8112837e2
--- setup/Plugins/WtiSetup/Product.wxs	(.../Product.wxs)	(revision dc06c866920149657481b4ca16c79dcb34047f57)
+++ setup/Plugins/WtiSetup/Product.wxs	(.../Product.wxs)	(revision c891c010c2d22c3303983631dac57cf8112837e2)
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-	<Product Id="C8F4EE7D-F2BA-4E1E-ABDB-C454FC68E780" Name="!(loc.ApplicationLongName)" Language="1043" Version="0.5.0" Manufacturer="!(loc.Manufacturer)" UpgradeCode="8c52b205-2bc3-4281-9d81-080fb1b2105d">
+  <!-- GenerateVariables.wxi will be generated on pre-build. -->
+  <?include GenerateVariables.wxi ?>
+  <!-- Static variables. -->
+  <?include Variables.wxi ?>
+  
+	<Product Id="C8F4EE7D-F2BA-4E1E-ABDB-C454FC68E780" Name="$(var.ApplicationFullName)" Language="1043" Version="$(var.FullReleaseVersion)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="8c52b205-2bc3-4281-9d81-080fb1b2105d">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Media Id="1" Cabinet="WtiFull.cab" EmbedCab="yes"/>
     <Property Id="ARPPRODUCTICON" Value="Wti.ico" />
@@ -22,7 +27,7 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="Deltares" Name="!(loc.Manufacturer)">
-          <Directory Id="INSTALLDIR" Name="!(loc.ApplicationLongName)">
+          <Directory Id="INSTALLDIR" Name="$(var.ApplicationFullName)">
             <Directory Id="APPLICATIONDIR" Name="application"/>
             
             <!--
@@ -33,6 +38,7 @@
             <Component Id="InstalledShortcut" Guid="441A8BC7-0B13-453D-9FBB-F03293282A3D">
               <Shortcut Id="ApplicationInstallDirShortcut"
                         Name="!(loc.ApplicationLongName)"
+                        Description="!(loc.StartApplicationDescription)"
                         Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
                         WorkingDirectory="APPLICATIONDIR"
                         Icon="Wti.ico"/>
@@ -54,6 +60,7 @@
             <Component Id="ProgramMenuShortcut" Guid="1BF4BE48-FB81-425D-85E4-C30F1BF51DA4">
               <Shortcut Id="ApplicationStartMenuShortcut"
                         Name="!(loc.ApplicationLongName)"
+                        Description="!(loc.StartApplicationDescription)"
                         Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
                         WorkingDirectory="APPLICATIONDIR"
                         Icon="Wti.ico"/>
@@ -74,6 +81,7 @@
         <Component Id="DesktopShortcut" Guid="A871DE12-BE7D-4A80-86F6-5BA23249A8BB">
           <Shortcut Id="ApplicationDesktopShortcut"
                     Name="!(loc.ApplicationLongName)"
+                    Description="!(loc.StartApplicationDescription)"
                     Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
                     WorkingDirectory="APPLICATIONDIR"
                     Icon="Wti.ico"/>
Index: setup/Plugins/WtiSetup/Variables.wxi
===================================================================
diff -u
--- setup/Plugins/WtiSetup/Variables.wxi	(revision 0)
+++ setup/Plugins/WtiSetup/Variables.wxi	(revision c891c010c2d22c3303983631dac57cf8112837e2)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <!--Version:-->
+  <?define Major="0" ?>
+  <?define Minor="5" ?>
+  <?define Build="0" ?>
+  <!--Revision is defined in GenerateVariables.wxi-->
+  <?define ReleaseVersion="0.5.0" ?>
+  <?define FullReleaseVersion="$(var.ReleaseVersion).$(var.Revision)" ?>
+  
+  <?define ApplicationFullName="!(loc.ApplicationLongName) $(var.FullReleaseVersion)" ?>
+</Include>
Index: setup/Plugins/WtiSetup/WtiSetup.wixproj
===================================================================
diff -u -rfbbd9584a4c38bd750d48c340b625e5b2765900c -rc891c010c2d22c3303983631dac57cf8112837e2
--- setup/Plugins/WtiSetup/WtiSetup.wixproj	(.../WtiSetup.wixproj)	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
+++ setup/Plugins/WtiSetup/WtiSetup.wixproj	(.../WtiSetup.wixproj)	(revision c891c010c2d22c3303983631dac57cf8112837e2)
@@ -23,7 +23,7 @@
     <SuppressPdbOutput>True</SuppressPdbOutput>
     <WixVariables>
     </WixVariables>
-    <DefineConstants>ApplicationBinFolder=..\..\..\src\DeltaShell\DeltaShell.Gui\bin</DefineConstants>
+    <DefineConstants>ApplicationBinFolder=..\..\..\src\DeltaShell\DeltaShell.Gui\bin;FullReleaseVersion=$(FullReleaseVersion)</DefineConstants>
     <Cultures>nl-NL</Cultures>
     <SuppressAllWarnings>True</SuppressAllWarnings>
     <Pedantic>False</Pedantic>
@@ -44,6 +44,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Banner.jpg" />
+    <Content Include="GenerateVariables.wxi" />
+    <Content Include="Variables.wxi" />
     <Content Include="Wti.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -61,7 +63,8 @@
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
-    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\src\DeltaShell\DeltaShell.Gui\bin -cg WtiApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)WtiPayload.wxs"</PreBuildEvent>
+    <PreBuildEvent>$(ProjectDir)..\..\..\svn_insert_version.cmd $(ProjectDir) GenerateVariables.wxi.svn GenerateVariables.wxi
+"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\src\DeltaShell\DeltaShell.Gui\bin -cg WtiApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)WtiPayload.wxs"</PreBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.