From f5dd12d71e8a3210bdb46d209b00b3bc81353b9a Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 7 Jun 2017 12:37:44 -0700
Subject: WiX: Switch to Visual Studio 2015.

The Windows builders now use Visual Studio 2015.

Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1
Reviewed-on: https://code.wireshark.org/review/22018
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1)
Reviewed-on: https://code.wireshark.org/review/22019
---
 packaging/wix/InputPaths.wxi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packaging/wix/InputPaths.wxi')

diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi
index c85863162a..1b7d016250 100644
--- a/packaging/wix/InputPaths.wxi
+++ b/packaging/wix/InputPaths.wxi
@@ -7,7 +7,7 @@
   <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
   <?endif?>
 
-  <?define VCRedist.Version = "VC120" ?>
+  <?define VCRedist.Version = "VC140" ?>
   <?define VCRedist.Dir ="C:\Program Files (x86)\Common Files\Merge Modules\" ?>
 
   <?define Staging.Dir ="$(var.BuildOutputDir)" ?>
-- 
cgit v1.2.3