Skip to content

#1078 Don't block install if VS version is below required version #1099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjbvz merged 1 commit into from
Jun 24, 2016
Merged

#1078 Don't block install if VS version is below required version #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions Nodejs/Setup/NodejsToolsInstaller/NodejsToolsInstaller.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 4 additions & 1 deletion Nodejs/Setup/NodejsToolsInstaller/Strings14.0.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
17 changes: 17 additions & 0 deletions Nodejs/Setup/NodejsToolsInstaller/UI.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down Expand Up @@ -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" />
Expand Down