PATCH: [ 2690509 ] Installer: First MSI setup - Change output path to normal build...

diff --git a/Installer/WiX/WinMerge.wixproj b/Installer/WiX/WinMerge.wixproj
index bdd20c3..9980e02 100644 (file)
--- a/Installer/WiX/WinMerge.wixproj
+++ b/Installer/WiX/WinMerge.wixproj
@@ -1,15 +1,16 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
     <DefineSolutionProperties>false</DefineSolutionProperties>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup>\r
+    \r
     <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3\bin\</WixToolPath>\r
     <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup>\r
-    <OutputName>WinMerge</OutputName>\r
+    \r
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>\r
+    \r
+    <OutputName>WinMerge-$(Platform)-Setup</OutputName>\r
+    <OutputPath>..\..\Build\WiX\$(Configuration)\$(Platform)\</OutputPath>\r
+    <IntermediateOutputPath>..\..\BuildTmp\WiX\$(Configuration)\$(Platform)\</IntermediateOutputPath>\r
     <OutputType>package</OutputType>\r
   </PropertyGroup>\r
   \r