Fixes bad merge for issue #28110

zooba · zooba · commit 7e3dfd1548a5 · 2016-09-17T16:34:38.000-07:00
diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat
@@ -171,6 +171,7 @@ if not "%SKIPBUILD%" EQU "1" (
 )
 
 set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%
+msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%
 msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true
 if errorlevel 1 exit /B
 msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ if not "%SKIPBUILD%" EQU "1" (`
`171`	`171`	`)`
`172`	`172`
`173`	`173`	`set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%`
	`174`	`+msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%`
`174`	`175`	`msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true`
`175`	`176`	`if errorlevel 1 exit /B`
`176`	`177`	`msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false`