|
53 | 53 | <FileSearch Id="CheckFile7" Name="lua5.1.dll" /> |
54 | 54 | </DirectorySearch> |
55 | 55 | <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" /> |
57 | 57 | </DirectorySearch> |
58 | 58 | <DirectorySearch Id="CheckFileDir9" Path="C:\Windows\System32\inetsrv" Depth="0"> |
59 | 59 | <FileSearch Id="CheckFile9" Name="zlib1.dll" /> |
|
80 | 80 | <FileSearch Id="CheckFile16" Name="lua5.1.dll" /> |
81 | 81 | </DirectorySearch> |
82 | 82 | <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" /> |
84 | 84 | </DirectorySearch> |
85 | 85 | <DirectorySearch Id="CheckFileDir18" Path="C:\Windows\System32\inetsrv" Depth="0"> |
86 | 86 | <FileSearch Id="CheckFile18" Name="zlib1.dll" /> |
|
205 | 205 | <?endif?> |
206 | 206 | <ComponentRef Id="StartMenuShortcuts" /> |
207 | 207 | </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"> |
209 | 209 | <?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" /> |
214 | 212 | <?else?> |
215 | | - <MergeRef Id="VCRedist110_32" /> |
216 | | - <MergeRef Id="VCRedist120_32" /> |
| 213 | + <MergeRef Id="VCRedist142_32" /> |
217 | 214 | <?endif?> |
218 | 215 | </Feature> |
219 | 216 | <?if $(var.Win64) = "yes" ?> |
|
413 | 410 | <?endif?> |
414 | 411 | <DirectoryRef Id="TARGETDIR"> |
415 | 412 | <?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" /> |
420 | 415 | <?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" /> |
423 | 417 | <?endif?> |
424 | 418 | </DirectoryRef> |
425 | 419 | </Product> |
|
0 commit comments