Skip to content

Commit d59526d

Browse files
authored
Fix local installer builds (#355)
- download prerequisites
1 parent e315b50 commit d59526d

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

build/WixPatchableInstaller.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@
138138
LocalFilename="$(WixLibsDir)/vcredist_2012_x86.exe"/> <!-- VisualC++ 11 runtime -->
139139
<DownloadFileOnce Address="http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe"
140140
LocalFilename="$(WixLibsDir)/vcredist_2013_x86.exe"/> <!-- VisualC++ 12 runtime -->
141+
<!-- Chorus merge module. Needed to make local installer builds work. This will not download anything on TeamCity, because this file will
142+
already have been imported from TC build dependencies. If developers ever need a new version, they can delete their old one. -->
143+
<DownloadFileOnce LocalFilename="$(RootDir)\lib\Release\ChorusMergeModule.msm"
144+
Address="https://build.palaso.org/guestAuth/repository/download/Chorus_Win32masterContinuous/.lastSuccessful/ChorusMergeModule.msm"/>
141145
</Target>
142146

143147
<UsingTask TaskName="DownloadFileOnce" TaskFactory="CodeTaskFactory"

lib/Release/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*

0 commit comments

Comments
 (0)