Index: DamClients/DamUI/trunk/setup/Dam.wixproj
===================================================================
diff -u -r6570 -r6571
--- DamClients/DamUI/trunk/setup/Dam.wixproj	(.../Dam.wixproj)	(revision 6570)
+++ DamClients/DamUI/trunk/setup/Dam.wixproj	(.../Dam.wixproj)	(revision 6571)
@@ -7,6 +7,7 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>f7a7c140-89cc-4479-9688-265bbbad274b</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
+    <MainExecutable>Deltares.Dam.Application.exe</MainExecutable>
     <OutputName>Dam</OutputName>
     <OutputType>Package</OutputType>
     <NuGetPackageImportStamp>
@@ -26,8 +27,14 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressAllWarnings>False</SuppressAllWarnings>
+    <Pedantic>False</Pedantic>
+    <SuppressValidation>False</SuppressValidation>
     <SuppressIces>ICE57</SuppressIces>
   </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);MainExecutable=$(MainExecutable);ReleaseVersion=$(ReleaseVersion)</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Harvest\DamFiles.wxs" />
     <Compile Include="Harvest\DamTestScriptsFiles.wxs" />
@@ -88,13 +95,13 @@
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Import Project="Harvest\Harvest.targets" />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+    <Error Text="The WiX Toolset v3.14 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\wix.3.14.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wix.3.14.1\build\wix.props'))" />
+    <Error Condition="!Exists('..\packages\WiX.3.14.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.14.1\build\wix.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -104,4 +111,34 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
+  <UsingTask
+    TaskName="GetFileVersion"
+    TaskFactory="CodeTaskFactory"
+    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+
+    <ParameterGroup>
+      <AssemblyPath ParameterType="System.String" Required="true" />
+      <Version ParameterType="System.String" Output="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.Diagnostics" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+      this.Version = FileVersionInfo.GetVersionInfo(this.AssemblyPath).FileVersion;  
+    ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
+  <Target Name="GetFileVersion" BeforeTargets="CopyAndSetProgramBuildVersion">
+    <GetFileVersion AssemblyPath="$(ReleaseFilesPath)\$(MainExecutable)">
+      <Output TaskParameter="Version" PropertyName="ProgramBuildVersion" />
+    </GetFileVersion>
+    <Message Text="File version is $(ProgramBuildVersion)" Importance="high" />
+  </Target>
+  <Target Name="CopyAndSetProgramBuildVersion" AfterTargets="AfterBuild">
+    <Message Text="File version is $(ProgramBuildVersion)" Importance="high" />
+    <Copy SourceFiles="$(OutputPath)%(CultureGroup.OutputFolder)\$(OutputName).msi" DestinationFiles="$(OutputPath)%(CultureGroup.OutputFolder)\$(OutputName)-$(ProgramBuildVersion).msi" />
+    <Delete Files="$(OutputPath)%(CultureGroup.OutputFolder)\$(OutputName).msi" />
+  </Target>
 </Project>
\ No newline at end of file