Skip to content

Revert PR 6043 - Remove failing script from MSI #6203

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
TravisEz13 merged 1 commit into from
Feb 21, 2018
Merged

Revert PR 6043 - Remove failing script from MSI #6203

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
18 changes: 0 additions & 18 deletions assets/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,6 @@
<!-- Default value of Checkbox of starting PowerShell after installation -->
<Property Id="WixShellExecTarget" Value="[$(var.ProductVersionWithName)]pwsh.exe"/>
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
<CustomAction Id="SaveShortcutPath" Property="ShortcutPath" Value="[$ApplicationProgramsMenuShortcut]$(var.ProductSemanticVersionWithNameAndOptionalArchitecture).lnk" />
<CustomAction Id="FixShortcutWorkingDirectory" Script="vbscript" HideTarget="no" Impersonate="no">
shortcutPath = Session.Property("ShortcutPath")
Set fso = CreateObject("Scripting.FileSystemObject")
if (fso.FileExists(shortcutPath)) Then
Set wshShell = CreateObject("WSCript.Shell")
Set shortcut = wshShell.CreateShortcut(shortcutPath)

shortcut.workingdirectory = "%HOMEDRIVE%%HOMEPATH%"
shortcut.save
End If
</CustomAction>
<UI>
<Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
<Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(env.ProductName)">
Expand Down Expand Up @@ -202,12 +190,6 @@
</Directory>
</Directory>
</Directory>
<InstallExecuteSequence>
<Custom Action="SaveShortcutPath" After="InstallFinalize" />
<Custom Action="FixShortcutWorkingDirectory" After="SaveShortcutPath">
NOT Installed OR NOT REMOVE OR UPGRADINGPRODUCTCODE
</Custom>
</InstallExecuteSequence>
</Product>

<!-- Explorer Context Menu Dialog -->
Expand Down