From 787c67994caae291dcea36d33bfd74ecf11af45d Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 13 Jun 2016 11:59:40 -0700 Subject: [PATCH 1/2] Move all of VS_IS_2015_PRE_UPDATE_2 into VS14 guard Issue # 1022 **Bug** I believe that on machines with only VS15, the gating introduced by #1009 may actually incorreclty resolve to true because the directory search succeeds. **Fix** Move the if dev14 guard to outer scope. --- Common/Setup/LaunchConditions.wxs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs index db62b4dc8..a1b9d1900 100644 --- a/Common/Setup/LaunchConditions.wxs +++ b/Common/Setup/LaunchConditions.wxs @@ -65,13 +65,13 @@ - - - - - - - + + + + + + + From 54f0acf378eefbdd28bb3b4102ca2fe2e06ff0cd Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 13 Jun 2016 12:03:14 -0700 Subject: [PATCH 2/2] Spacing fix --- Common/Setup/LaunchConditions.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs index a1b9d1900..8663843c4 100644 --- a/Common/Setup/LaunchConditions.wxs +++ b/Common/Setup/LaunchConditions.wxs @@ -67,7 +67,7 @@ - +