From a2eaa9e42379118b288e084806fc5cb2e1458dcd Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 7 Apr 2016 16:03:27 -0700 Subject: [PATCH 1/4] Gate NTVS 1.2 Alpha Install to VS 2015 Update 2 or Later **Bug** Currently you can install NTVS 1.2 Alpha on older version of VS 2015 just fine, but many features will not work as expected. **Fix This change prevents installing NTVS 1.2 alpha on version of VS 2015 before update 2 closes #806 --- 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 insertions(+) diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs index 7bfb3074b..20c1bc1ab 100644 --- a/Common/Setup/LaunchConditions.wxs +++ b/Common/Setup/LaunchConditions.wxs @@ -73,4 +73,15 @@ + + + + + + + + + + + diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs index 8ba800483..caadcaa86 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs +++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs @@ -25,6 +25,9 @@ NOT VS_PRERELEASE OR Installed + + NOT VS_IS_UNSUPPORTED_2015_VERSION OR Installed + NETFRAMEWORK45 OR Installed diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl index 37a64c23c..69666b608 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl @@ -13,6 +13,7 @@ Your version of !(loc.WDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. Your version of !(loc.VWDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. 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). + NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. The Microsoft .NET Framework 4.5 is required. Please install it from http://go.microsoft.com/fwlink/?LinkId=398711 Registering extension in !(loc.VSProductName)... Removing extension from !(loc.VSProductName)... diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl index 4898f6e35..8f9443f7a 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl @@ -13,6 +13,7 @@ Your version of !(loc.WDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. Your version of !(loc.VWDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. 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). + NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. The Microsoft .NET Framework 4.5 is required. Please install it from http://go.microsoft.com/fwlink/?LinkId=398711 Registering extension in !(loc.VSProductName)... Removing extension from !(loc.VSProductName)... From dea52de18adaf665fb6eb50528768d5afbfedbf3 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 7 Apr 2016 16:07:53 -0700 Subject: [PATCH 2/4] Invert condition to be more clear --- Common/Setup/LaunchConditions.wxs | 4 ++-- Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs index 20c1bc1ab..c02d1799e 100644 --- a/Common/Setup/LaunchConditions.wxs +++ b/Common/Setup/LaunchConditions.wxs @@ -74,10 +74,10 @@ - + - + diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs index caadcaa86..177d9f665 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs +++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs @@ -25,8 +25,8 @@ NOT VS_PRERELEASE OR Installed - - NOT VS_IS_UNSUPPORTED_2015_VERSION OR Installed + + VS_IS_2015_UPDATE_2_OR_LATER OR Installed NETFRAMEWORK45 OR Installed From 86b5de120e195e429cd744aae5aed50874aff921 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 7 Apr 2016 16:09:58 -0700 Subject: [PATCH 3/4] More clarification --- Common/Setup/LaunchConditions.wxs | 4 ++-- Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs index c02d1799e..e52bd1cec 100644 --- a/Common/Setup/LaunchConditions.wxs +++ b/Common/Setup/LaunchConditions.wxs @@ -74,10 +74,10 @@ - + - + diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs index 177d9f665..dc6cb871f 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs +++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs @@ -25,8 +25,8 @@ NOT VS_PRERELEASE OR Installed - - VS_IS_2015_UPDATE_2_OR_LATER OR Installed + + NOT VS_IS_2015_PRE_UPDATE_2 OR Installed NETFRAMEWORK45 OR Installed From a792f8873cecd958523eb706f5f485b1b126b526 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 7 Apr 2016 16:13:33 -0700 Subject: [PATCH 4/4] whitespace cleanup --- Common/Setup/LaunchConditions.wxs | 1 - Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl | 2 +- Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs index e52bd1cec..c57b76f85 100644 --- a/Common/Setup/LaunchConditions.wxs +++ b/Common/Setup/LaunchConditions.wxs @@ -83,5 +83,4 @@ - diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl index 69666b608..df17b15cc 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl @@ -13,7 +13,7 @@ Your version of !(loc.WDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. Your version of !(loc.VWDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. 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). - NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. + NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. The Microsoft .NET Framework 4.5 is required. Please install it from http://go.microsoft.com/fwlink/?LinkId=398711 Registering extension in !(loc.VSProductName)... Removing extension from !(loc.VSProductName)... diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl index 8f9443f7a..52ac46293 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl @@ -13,7 +13,7 @@ Your version of !(loc.WDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. Your version of !(loc.VWDProductName) is not supported. Please install the latest update from http://www.visualstudio.com/. 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). - NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. + NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. The Microsoft .NET Framework 4.5 is required. Please install it from http://go.microsoft.com/fwlink/?LinkId=398711 Registering extension in !(loc.VSProductName)... Removing extension from !(loc.VSProductName)...