Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common/Setup/LaunchConditions.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Setup/NodejsToolsInstaller/Strings15.0.wxl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down