Skip to content
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

Jump to bottom

Implementing changes suggested in #1992 #2116

Merged
merged 2 commits into from
Apr 17, 2020
Merged

Implementing changes suggested in #1992 #2116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99e7225
Implementing changes suggested in #1992
ebenezerew Apr 14, 2020
4c31833
Update Product.wxs
ebenezerew Apr 16, 2020
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
11 changes: 4 additions & 7 deletions installer/PowerToysSetup/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,9 @@
</Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="PowerToys"/>
</Directory>
<Directory Id="ProgramMenuFolder"/>
<Directory Id="DesktopFolder" Name="Desktop"/>
</Directory>
</Directory>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to remove this line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am getting an error "Tag was not closed" when that line was not added.
That was why I added the extra line to end the directory tag

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, alright

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is because line 209 and 210 were removed. 208 should be a /> or just removed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tested both cases, Removing line 208 would result in an "Unresolved reference to symbol error" because "ProgramMenuFolder" is being used in the shortcut definition on line 225.

changing line 208 to a /> returns the same error

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something here isn't right due to nesting. With how the code is now i don't think desktop folder is supposed to be nested in to programmenufolder.

this is the new nesting

    <Directory Id="ProgramMenuFolder">
      <Directory Id="DesktopFolder" Name="Desktop"/>
    </Directory>

before it was this

      <Directory Id="ProgramMenuFolder">
        <Directory Id="ApplicationProgramsFolder" Name="PowerToys"/>
      </Directory>
      <Directory Id="DesktopFolder" Name="Desktop"/>

</Fragment>

<Fragment>
Expand All @@ -226,8 +224,7 @@
<Shortcut Id="ApplicationStartMenuShortcut"
Name="PowerToys (Preview)"
Description="PowerToys - Windows system utilities to maximize productivity"
Directory="ApplicationProgramsFolder"
WorkingDirectory="INSTALLFOLDER"
Directory="ProgramMenuFolder"
Icon="powertoys.exe"
IconIndex="0"
Advertise="yes">
Expand All @@ -247,7 +244,7 @@
</RegistryKey>
</RegistryKey>

<RemoveFolder Id="DeleteShortcutFolder" Directory="ApplicationProgramsFolder" On="uninstall" />

</Component>

<Component Id="settings_exe" Guid="A5A461A9-7097-4CBA-9D39-3DBBB6B7B80C" Win64="yes">
Expand Down