Skip to content

Commit d6dd1f0

Browse files
author
Felipe "Zimmerle" Costa
committed
iis: Adding VC110 files to the Windows installer
For some reason the DLLs still demands the dependencies of the VC110 files. Providing those as part of the MSI installer
1 parent 28d4f9f commit d6dd1f0

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

iis/installer.wxs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,13 @@
441441
</Feature>
442442
<Feature Id="VCRedist" Title="Visual C++ 12.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
443443
<?if $(var.Win64) = "yes" ?>
444-
<MergeRef Id="VCRedist64" />
445-
<MergeRef Id="VCRedist32" />
444+
<MergeRef Id="VCRedist110_64" />
445+
<MergeRef Id="VCRedist120_64" />
446+
<MergeRef Id="VCRedist110_32" />
447+
<MergeRef Id="VCRedist120_32" />
446448
<?else ?>
447-
<MergeRef Id="VCRedist32" />
449+
<MergeRef Id="VCRedist110_32" />
450+
<MergeRef Id="VCRedist120_32" />
448451
<?endif ?>
449452
</Feature>
450453
<?if $(var.Win64) = "yes" ?>
@@ -641,10 +644,13 @@
641644
<?endif ?>
642645
<DirectoryRef Id="TARGETDIR">
643646
<?if $(var.Win64) = "yes" ?>
644-
<Merge Id="VCRedist64" SourceFile="wix\Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0" />
645-
<Merge Id="VCRedist32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
647+
<Merge Id="VCRedist120_64" SourceFile="wix\Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0" />
648+
<Merge Id="VCRedist110_64" SourceFile="wix\Microsoft_VC110_CRT_x64.msm" DiskId="1" Language="0" />
649+
<Merge Id="VCRedist120_32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
650+
<Merge Id="VCRedist110_32" SourceFile="wix\Microsoft_VC110_CRT_x86.msm" DiskId="1" Language="0" />
646651
<?else ?>
647-
<Merge Id="VCRedist32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
652+
<Merge Id="VCRedist120_32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
653+
<Merge Id="VCRedist110_32" SourceFile="wix\Microsoft_VC110_CRT_x86.msm" DiskId="1" Language="0" />
648654
<?endif ?>
649655
</DirectoryRef>
650656
</Product>

iis/wix/Microsoft_VC110_CRT_x64.msm

728 KB
Binary file not shown.

iis/wix/Microsoft_VC110_CRT_x86.msm

748 KB
Binary file not shown.

0 commit comments

Comments
 (0)