File tree Expand file tree Collapse file tree 3 files changed +12
-6
lines changed
Expand file tree Collapse file tree 3 files changed +12
-6
lines changed Original file line number Diff line number Diff line change 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" ?>
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 >
You can’t perform that action at this time.
0 commit comments