From 751752dccbf31c3b8bb3d21713c4b790db7f93dc Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 9 Jun 2016 14:32:15 -0700 Subject: [PATCH 1/5] Restore gating for Pre Update 2 for NTVS 1.2 Tested on RTM machine and on saw gating, plus tested on update 2 machine that was not gated. closes #1003 --- Common/Setup/LaunchConditions.wxs | 15 ++++++++++++++- .../NodejsToolsInstaller/NodejsToolsInstaller.wxs | 3 +++ Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl | 1 + Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs index 041281612..db62b4dc8 100644 --- a/Common/Setup/LaunchConditions.wxs +++ b/Common/Setup/LaunchConditions.wxs @@ -62,4 +62,17 @@ - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs index 7b1982fdf..60144f1da 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs +++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs @@ -22,6 +22,9 @@ AddRemoveProgramsIcon + + NOT VS_IS_2015_PRE_UPDATE_2 + NETFRAMEWORK45 OR Installed diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl index 9cd803553..1329c154a 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl @@ -21,4 +21,5 @@ Removing extension from !(loc.VWDProductName)... I agree to the license terms and conditions and to the privacy statement + NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. \ No newline at end of file diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl index 4d7213218..6c54c2d75 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl @@ -21,4 +21,5 @@ Removing extension from !(loc.VWDProductName)... I agree to the license terms and conditions and to the privacy statement + NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. \ No newline at end of file From efa8d8d2de8400b64c4e0fc7231cd32e11e657ee Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 9 Jun 2016 14:34:46 -0700 Subject: [PATCH 2/5] Add back or install check --- Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs index 60144f1da..1af7d1477 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs +++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs @@ -23,7 +23,7 @@ - NOT VS_IS_2015_PRE_UPDATE_2 + NOT VS_IS_2015_PRE_UPDATE_2 OR Installed NETFRAMEWORK45 OR Installed From 26f1fcd0881f62527d1dadc4f7601e064c413698 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 9 Jun 2016 15:56:29 -0700 Subject: [PATCH 3/5] Update NodejsToolsInstaller.wxs Revert or installed logic --- Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs index 1af7d1477..92d1bd5f6 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs +++ b/Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs @@ -23,7 +23,7 @@ - NOT VS_IS_2015_PRE_UPDATE_2 OR Installed + NOT VS_IS_2015_PRE_UPDATE_2 NETFRAMEWORK45 OR Installed @@ -160,4 +160,4 @@ - \ No newline at end of file + From 2a1e3919d123539a252875f49bf647de6cfa5fdf Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 9 Jun 2016 16:04:05 -0700 Subject: [PATCH 4/5] Adding link to update 2 download Adding link to update 2 download --- Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl index 6c54c2d75..1e50cd11a 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl @@ -21,5 +21,5 @@ Removing extension from !(loc.VWDProductName)... I agree to the license terms and conditions and to the privacy statement - NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. - \ No newline at end of file + NTVS requires Visual Studio 2015 Update 2 or later. Please install it from http://go.microsoft.com/fwlink/?LinkID=808380 + From bf630bc63efdbfb0c576a3a4c513f2b0dba2df31 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 9 Jun 2016 16:04:18 -0700 Subject: [PATCH 5/5] Update Strings14.0.wxl --- Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl index 1329c154a..88d87993d 100644 --- a/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl +++ b/Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl @@ -21,5 +21,5 @@ Removing extension from !(loc.VWDProductName)... I agree to the license terms and conditions and to the privacy statement - NTVS requires Visual Studio 2015 Update 2 or later. Please update to Visual Studio 2015 Update 2. - \ No newline at end of file + NTVS requires Visual Studio 2015 Update 2 or later. Please install it from http://go.microsoft.com/fwlink/?LinkID=808380 +