Skip to content

Commit d1b1956

Browse files
committed
fix: update IIS installer file
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
1 parent d925bdc commit d1b1956

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

iis/installer.wxs

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<FileSearch Id="CheckFile7" Name="lua5.1.dll" />
5454
</DirectorySearch>
5555
<DirectorySearch Id="CheckFileDir8" Path="C:\Windows\System32\inetsrv" Depth="0">
56-
<FileSearch Id="CheckFile8" Name="pcre.dll" />
56+
<FileSearch Id="CheckFile8" Name="pcre2-8.dll" />
5757
</DirectorySearch>
5858
<DirectorySearch Id="CheckFileDir9" Path="C:\Windows\System32\inetsrv" Depth="0">
5959
<FileSearch Id="CheckFile9" Name="zlib1.dll" />
@@ -80,7 +80,7 @@
8080
<FileSearch Id="CheckFile16" Name="lua5.1.dll" />
8181
</DirectorySearch>
8282
<DirectorySearch Id="CheckFileDir17" Path="C:\Windows\System32\inetsrv" Depth="0">
83-
<FileSearch Id="CheckFile17" Name="pcre.dll" />
83+
<FileSearch Id="CheckFile17" Name="pcre2-8.dll" />
8484
</DirectorySearch>
8585
<DirectorySearch Id="CheckFileDir18" Path="C:\Windows\System32\inetsrv" Depth="0">
8686
<FileSearch Id="CheckFile18" Name="zlib1.dll" />
@@ -205,15 +205,12 @@
205205
<?endif?>
206206
<ComponentRef Id="StartMenuShortcuts" />
207207
</Feature>
208-
<Feature Id="VCRedist" Title="Visual C++ 12.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
208+
<Feature Id="VCRedist" Title="Visual C++ 14.2 Runtime (VS2019)" AllowAdvertise="no" Display="hidden" Level="1">
209209
<?if $(var.Win64) = "yes" ?>
210-
<MergeRef Id="VCRedist110_64" />
211-
<MergeRef Id="VCRedist120_64" />
212-
<MergeRef Id="VCRedist110_32" />
213-
<MergeRef Id="VCRedist120_32" />
210+
<MergeRef Id="VCRedist142_64" />
211+
<MergeRef Id="VCRedist142_32" />
214212
<?else?>
215-
<MergeRef Id="VCRedist110_32" />
216-
<MergeRef Id="VCRedist120_32" />
213+
<MergeRef Id="VCRedist142_32" />
217214
<?endif?>
218215
</Feature>
219216
<?if $(var.Win64) = "yes" ?>
@@ -413,13 +410,10 @@
413410
<?endif?>
414411
<DirectoryRef Id="TARGETDIR">
415412
<?if $(var.Win64) = "yes" ?>
416-
<Merge Id="VCRedist120_64" SourceFile="wix\Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0" />
417-
<Merge Id="VCRedist110_64" SourceFile="wix\Microsoft_VC110_CRT_x64.msm" DiskId="1" Language="0" />
418-
<Merge Id="VCRedist120_32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
419-
<Merge Id="VCRedist110_32" SourceFile="wix\Microsoft_VC110_CRT_x86.msm" DiskId="1" Language="0" />
413+
<Merge Id="VCRedist142_64" SourceFile="wix\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0" />
414+
<Merge Id="VCRedist142_32" SourceFile="wix\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0" />
420415
<?else?>
421-
<Merge Id="VCRedist120_32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
422-
<Merge Id="VCRedist110_32" SourceFile="wix\Microsoft_VC110_CRT_x86.msm" DiskId="1" Language="0" />
416+
<Merge Id="VCRedist142_32" SourceFile="wix\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0" />
423417
<?endif?>
424418
</DirectoryRef>
425419
</Product>

0 commit comments

Comments
 (0)