From 8c9c97588acd8aa98a1c3bcb0593fec90f407e33 Mon Sep 17 00:00:00 2001
From: Sara Itani <sitani@microsoft.com>
Date: Fri, 24 Jun 2016 09:40:41 -0700
Subject: [PATCH] #1078 Don't block install if VS version is below required
 version Instead warn users, but allow them to continue with the installation
 even if the detected version is less than what NTVS requires

---
 .../NodejsToolsInstaller.wxs                    |  2 --
 .../Setup/NodejsToolsInstaller/Strings14.0.wxl  |  5 ++++-
 Nodejs/Setup/NodejsToolsInstaller/UI.wxs        | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
index 92d1bd5f6..3fa13ef4c 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
+++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
@@ -23,8 +23,6 @@
 
         <!-- Conditions for install -->
         <PropertyRef Id="VS_IS_2015_PRE_UPDATE_2"/> 
-        <Condition Message="!(loc.VSRequires2015Update2)"> NOT VS_IS_2015_PRE_UPDATE_2 </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 88d87993d..159ad4999 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
+++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
@@ -21,5 +21,8 @@
     <String Id="VWDExpressSetup_Rollback">Removing extension from !(loc.VWDProductName)...</String>
     <String Id="AcceptLicenseText">I agree to the license terms and conditions and to the</String>
     <String Id="PrivacyStatementLinkText">privacy statement</String>
-    <String Id="VSRequires2015Update2">NTVS requires Visual Studio 2015 Update 2 or later. Please install it from  http://go.microsoft.com/fwlink/?LinkID=808380</String> 
+    <String Id="VSRequires2015Update2">Node.js Tools requires Visual Studio 2015 Update 2 or later. Please install it from  http://go.microsoft.com/fwlink/?LinkID=808380</String> 
+    <String Id="VSRequires2015Update2ContinueWarning">Continuing your installation of Node.js Tools without installing Update 2 may result in a degraded IntelliSense experience.</String>
+    <String Id="DontInstallLabel">Don't install</String>
+    <String Id="InstallAnywayLabel">Install anyway</String>
 </WixLocalization>
diff --git a/Nodejs/Setup/NodejsToolsInstaller/UI.wxs b/Nodejs/Setup/NodejsToolsInstaller/UI.wxs
index b379a81a6..aa3f69f44 100644
--- a/Nodejs/Setup/NodejsToolsInstaller/UI.wxs
+++ b/Nodejs/Setup/NodejsToolsInstaller/UI.wxs
@@ -7,6 +7,22 @@
       <ProgressText Action="VWDSetup">Updating extension registration with Visual Studio Web Express...</ProgressText>
       <ProgressText Action="VWDSetup_Rollback">Removing extension registration with Visual Studio Web Express...</ProgressText>
 
+      <Dialog Id="VsPreUpdate2WarningDlg" Width="260" Height="120" Title="!(loc.CancelDlg_Title)">
+        <Control Id="AbortInstall" Type="PushButton" X="136" Y="90" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.DontInstallLabel)">
+          <Publish Event="EndDialog" Value="Exit">1</Publish>
+        </Control>
+        <Control Id="ContinueInstall" Type="PushButton" X="68" Y="90" Width="64" Height="17" Text="!(loc.InstallAnywayLabel)">
+          <Publish Property="ContinueInstall" Value="1">1</Publish>
+          <Publish Event="EndDialog" Value="Return">1</Publish>
+        </Control>
+        <Control Id="TextVersionWarning" Type="Text" X="48" Y="15" Width="194" Height="45" Text="!(loc.VSRequires2015Update2)" />
+        <Control Id="TextContinueWarning" Type="Text" X="48" Y="50" Width="194" Height="35" Text="!(loc.VSRequires2015Update2ContinueWarning)"/>
+        <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.CancelDlgIconTooltip)" FixedSize="yes" IconSize="48" Text="WixUI_Ico_Exclam" />
+      </Dialog>
+      <Publish Event="SpawnDialog" Dialog="CustomAdvancedWelcomeEulaDlg" Control="LicenseText" Value="VsPreUpdate2WarningDlg">
+        <![CDATA[VS_IS_2015_PRE_UPDATE_2="1" AND ContinueInstall<>"1"]]>
+      </Publish>
+
       <Dialog Id="CustomAdvancedWelcomeEulaDlg" Width="370" Height="270" Title="!(loc.AdvancedWelcomeEulaDlg_Title)">
         <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdvancedWelcomeEulaDlgBannerBitmap)" />
         <Control Id="Title" Type="Text" X="20" Y="10" Width="300" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.AdvancedWelcomeEulaDlgTitle)" />
@@ -152,6 +168,7 @@
     </UI>
 
     <Property Id="EasyInstall" Value="0" />
+    <Property Id="ContinueInstall" Value="0"/>
     <UIRef Id="WixUI_Common" />
 
     <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />