PATCH: [ 2690509 ] Installer: First MSI setup - Add product version to filename if...

diff --git a/Installer/WiX/WinMerge.wixproj b/Installer/WiX/WinMerge.wixproj
index ce54cf4..652f60d 100644 (file)
--- a/Installer/WiX/WinMerge.wixproj
+++ b/Installer/WiX/WinMerge.wixproj
@@ -8,7 +8,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>\r
     \r
-    <OutputName>WinMerge-$(Platform)-Setup</OutputName>\r
+    <OutputName Condition=" '$(ProductVersion)' != '' ">WinMerge-$(ProductVersion)-$(Platform)-Setup</OutputName>\r
+    <OutputName Condition=" '$(ProductVersion)' == '' ">WinMerge-$(Platform)-Setup</OutputName>\r
     <OutputPath>..\..\Build\WiX\$(Configuration)\$(Platform)\</OutputPath>\r
     <IntermediateOutputPath>..\..\BuildTmp\WiX\$(Configuration)\$(Platform)\</IntermediateOutputPath>\r
     <OutputType>package</OutputType>\r