Skip to content

Use INSTALLDIR as install location switch for WiX installers #2671

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

Open
SpecterShell wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use INSTALLDIR as install location switch for WiX installers #2671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1020d3
Use INSTALLDIR in install location switch for WiX installers
SpecterShell Nov 4, 2022
92ae79f
Merge branch 'microsoft:master' into wix-installdir-20221105-1
SpecterShell Mar 8, 2024
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
7 changes: 7 additions & 0 deletions src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,13 @@ namespace AppInstaller::Manifest
{
case InstallerTypeEnum::Burn:
case InstallerTypeEnum::Wix:
return
{
{InstallerSwitchType::Silent, ManifestInstaller::string_t("/quiet /norestart")},
{InstallerSwitchType::SilentWithProgress, ManifestInstaller::string_t("/passive /norestart")},
{InstallerSwitchType::Log, ManifestInstaller::string_t("/log \"" + std::string(ARG_TOKEN_LOGPATH) + "\"")},
{InstallerSwitchType::InstallLocation, ManifestInstaller::string_t("INSTALLDIR=\"" + std::string(ARG_TOKEN_INSTALLPATH) + "\"")}
};
Comment on lines +967 to +973
Copy link

@sharunkumar sharunkumar Sep 12, 2023

Choose a reason for hiding this comment

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

previously, InstallerTypeEnum::Burn case would fallthrough to InstallerTypeEnum::Msi, but now is going to fallthrough to this code? 🤔

case InstallerTypeEnum::Msi:
return
{
Expand Down