From d3fcda11f5a0a552fc975f507ce9d319f9a739d6 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 8 Jun 2016 11:45:18 -0700
Subject: [PATCH] Gate 1.2 Beta installer to VS 2015 update 3 or later

This prevents installing NTVS 1.2 Beta on anything before VS 2015 Update 3 RC. For the final 1.2 release, we will want to change the gate to target the final version of Update 3 instead.

closes #990
---
 Common/Setup/LaunchConditions.wxs                          | 4 ++--
 Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs | 4 ++--
 Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl          | 2 +-
 Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs
index c57b76f85..ba6bc3b5a 100644
--- a/Common/Setup/LaunchConditions.wxs
+++ b/Common/Setup/LaunchConditions.wxs
@@ -74,10 +74,10 @@
   </Fragment>
 
   <Fragment>
-    <Property Id="VS_IS_2015_PRE_UPDATE_2" Secure="yes">
+    <Property Id="VS_IS_2015_PRE_UPDATE_3" Secure="yes">
       <?if "$(var.VSTargetVersion)"="14.0" ?>
       <DirectorySearch Id="VSDevEnvFilePathSearch" Path="[VSINSTALLPATH]">
-        <FileSearch Id="VSDevEnvFileVersionSearch" Name="devenv.exe" MinVersion="14.0.0.0" MaxVersion="14.0.25122.0"/>
+        <FileSearch Id="VSDevEnvFileVersionSearch" Name="devenv.exe" MinVersion="14.0.0.0" MaxVersion="14.0.25401.0"/>
       </DirectorySearch>
       <?endif ?>
     </Property>
diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
index dc6cb871f..8c7c2afa8 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
+++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
@@ -25,8 +25,8 @@
         <PropertyRef Id="VS_PRERELEASE"/>
         <Condition Message="!(loc.VSPrerelease)"> NOT VS_PRERELEASE OR Installed </Condition>
         
-        <PropertyRef Id="VS_IS_2015_PRE_UPDATE_2"/>
-        <Condition Message="!(loc.VSRequires2015Update2)"> NOT VS_IS_2015_PRE_UPDATE_2 OR Installed </Condition>
+        <PropertyRef Id="VS_IS_2015_PRE_UPDATE_3"/>
+        <Condition Message="!(loc.VSRequires2015Update3)"> NOT VS_IS_2015_PRE_UPDATE_3 OR Installed </Condition>
         
         <PropertyRef Id="NETFRAMEWORK45"/>
         <Condition Message="!(loc.NetFx45NotInstalled)"> NETFRAMEWORK45 OR Installed </Condition>
diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
index df17b15cc..23f7eeb22 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
+++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
@@ -13,7 +13,7 @@
     <String Id="WDInstallPathButNoExe">Your version of !(loc.WDProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <String Id="VWDInstallPathButNoExe">Your version of !(loc.VWDProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <String Id="VSPrerelease">A pre-release version of !(loc.VSProductName) was detected.  This version of !(loc.ProductName) is not supported on pre-release builds of !(loc.VSProductName).  Please upgrade to !(loc.VSProductName).</String>
-    <String Id="VSRequires2015Update2">NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2.</String>
+    <String Id="VSRequires2015Update3">NTVS requires Visual Studio 2015 Update 3 or later. Please update to Visual Studio 2015 Update 3.</String>
     <String Id="NetFx45NotInstalled">The Microsoft .NET Framework 4.5 is required. Please install it from http://go.microsoft.com/fwlink/?LinkId=398711</String>
     <String Id="DevEnvSetup">Registering extension in !(loc.VSProductName)...</String>
     <String Id="DevEnvSetup_Rollback">Removing extension from !(loc.VSProductName)...</String>
diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
index 52ac46293..deca02754 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
+++ b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
@@ -13,7 +13,7 @@
     <String Id="WDInstallPathButNoExe">Your version of !(loc.WDProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <String Id="VWDInstallPathButNoExe">Your version of !(loc.VWDProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <String Id="VSPrerelease">A pre-release version of !(loc.VSProductName) was detected.  This version of !(loc.ProductName) is not supported on pre-release builds of !(loc.VSProductName).  Please upgrade to !(loc.VSProductName).</String>
-    <String Id="VSRequires2015Update2">NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2.</String>
+    <String Id="VSRequires2015Update3">NTVS requires Visual Studio 2015 Update 3 or later. Please update to Visual Studio 2015 Update 3.</String>
     <String Id="NetFx45NotInstalled">The Microsoft .NET Framework 4.5 is required. Please install it from http://go.microsoft.com/fwlink/?LinkId=398711</String>
     <String Id="DevEnvSetup">Registering extension in !(loc.VSProductName)...</String>
     <String Id="DevEnvSetup_Rollback">Removing extension from !(loc.VSProductName)...</String>