From 4cac8cba2de2099d18ee6af15747a9e08f560240 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 9 Jun 2016 13:07:55 -0700
Subject: [PATCH 1/2] Remove vs12 gate launch condition

---
 Common/Setup/LaunchConditions.wxs                      | 10 ----------
 .../NodejsToolsInstaller/NodejsToolsInstaller.wxs      |  3 ---
 Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl      |  1 -
 Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl      |  1 -
 4 files changed, 15 deletions(-)

diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs
index c57b76f85..30a15ba3f 100644
--- a/Common/Setup/LaunchConditions.wxs
+++ b/Common/Setup/LaunchConditions.wxs
@@ -63,16 +63,6 @@
     </Property>
   </Fragment>
 
-  <Fragment>
-    <Property Id="VS_PRERELEASE" Secure="yes">
-      <?if "$(var.VSTargetVersion)"="12.0" ?>
-      <DirectorySearch Id="VSDevEnvFilePathSearch" Path="[VSINSTALLPATH]">
-        <FileSearch Id="VSDevEnvFileVersionSearch" Name="devenv.exe" MinVersion="12.0.0.0" MaxVersion="12.0.21004.0"/>
-      </DirectorySearch>
-      <?endif ?>
-    </Property>
-  </Fragment>
-
   <Fragment>
     <Property Id="VS_IS_2015_PRE_UPDATE_2" Secure="yes">
       <?if "$(var.VSTargetVersion)"="14.0" ?>
diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
index dc6cb871f..be65c9c1d 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
+++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
@@ -22,9 +22,6 @@
         <Property Id="ARPPRODUCTICON">AddRemoveProgramsIcon</Property>
 
         <!-- Conditions for install -->
-        <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>
         
diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
index df17b15cc..3e92b0f45 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
+++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
@@ -12,7 +12,6 @@
     <String Id="NoExePath">Your version of !(loc.VSProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <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="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>
diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
index 52ac46293..6c8184dbc 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
+++ b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
@@ -12,7 +12,6 @@
     <String Id="NoExePath">Your version of !(loc.VSProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <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="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>

From df057fcbf6b1b77ffa54c84387725ec757eabd41 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 9 Jun 2016 14:13:50 -0700
Subject: [PATCH 2/2] Remove check entirely

---
 Common/Setup/LaunchConditions.wxs                     | 11 -----------
 .../NodejsToolsInstaller/NodejsToolsInstaller.wxs     |  3 ---
 Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl     |  1 -
 Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl     |  1 -
 4 files changed, 16 deletions(-)

diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs
index 30a15ba3f..041281612 100644
--- a/Common/Setup/LaunchConditions.wxs
+++ b/Common/Setup/LaunchConditions.wxs
@@ -62,15 +62,4 @@
       </DirectorySearch>
     </Property>
   </Fragment>
-
-  <Fragment>
-    <Property Id="VS_IS_2015_PRE_UPDATE_2" 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"/>
-      </DirectorySearch>
-      <?endif ?>
-    </Property>
-  </Fragment>
-
 </Wix>
diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
index be65c9c1d..7b1982fdf 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
+++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
@@ -22,9 +22,6 @@
         <Property Id="ARPPRODUCTICON">AddRemoveProgramsIcon</Property>
 
         <!-- Conditions for install -->
-        <PropertyRef Id="VS_IS_2015_PRE_UPDATE_2"/>
-        <Condition Message="!(loc.VSRequires2015Update2)"> NOT VS_IS_2015_PRE_UPDATE_2 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 3e92b0f45..9cd803553 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
+++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
@@ -12,7 +12,6 @@
     <String Id="NoExePath">Your version of !(loc.VSProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <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="VSRequires2015Update2">NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2.</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 6c8184dbc..4d7213218 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
+++ b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
@@ -12,7 +12,6 @@
     <String Id="NoExePath">Your version of !(loc.VSProductName) is not supported.  Please install the latest update from http://www.visualstudio.com/.</String>
     <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="VSRequires2015Update2">NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2.</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>