From d1020d304d661e24d5825f42c8235aea1bdcdb93 Mon Sep 17 00:00:00 2001 From: SpecterShell <56779163+SpecterShell@users.noreply.github.com> Date: Sat, 5 Nov 2022 00:09:44 +0800 Subject: [PATCH] Use INSTALLDIR in install location switch for WiX installers --- src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp b/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp index d6c194a5af..8401ab7035 100644 --- a/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp +++ b/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp @@ -556,6 +556,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) + "\"")} + }; case InstallerTypeEnum::Msi: return {