From ae8264ac0df30b1503311af52ed6c615d83a67fc Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 28 Dec 2024 17:48:42 -0800 Subject: Add "PerUserProgramFilesFolder" as standard directory Windows Installer uses LocalAppDataFolder\Programs as the replacement for ProgramFilesFolder when installing per-user in a dual-mode package. Add a standard directory in WiX to match it for use by default INSTALLFOLDER. --- .../wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs | 3 ++- src/api/wix/WixToolset.Data/WixStandardLibrary.cs | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs index 971a0416..778688bc 100644 --- a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs +++ b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs @@ -223,6 +223,7 @@ namespace WixToolset.Data.WindowsInstaller ["MyPicturesFolder"] = "Pictures", ["NetHoodFolder"] = "NetHood", ["PersonalFolder"] = "Personal", + ["PerUserProgramFilesFolder"] = "Programs", ["PrintHoodFolder"] = "Printers", ["ProgramFilesFolder"] = "PFiles", ["ProgramFiles64Folder"] = "PFiles64", @@ -264,7 +265,7 @@ namespace WixToolset.Data.WindowsInstaller new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.AdminUISequence }, new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminUISequence }, new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/ExecuteAction")) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.AdminUISequence }, - + // AdvertiseExecuteSequence new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdvertiseExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdvertiseExecuteSequence }, new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdvertiseExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdvertiseExecuteSequence }, diff --git a/src/api/wix/WixToolset.Data/WixStandardLibrary.cs b/src/api/wix/WixToolset.Data/WixStandardLibrary.cs index 3f851f09..dc7c5a8b 100644 --- a/src/api/wix/WixToolset.Data/WixStandardLibrary.cs +++ b/src/api/wix/WixToolset.Data/WixStandardLibrary.cs @@ -162,6 +162,9 @@ namespace WixToolset.Data case "CommonFiles6432Folder": return platform == Platform.X86 ? "CommonFilesFolder" : "CommonFiles64Folder"; + case "PerUserProgramFilesFolder": + return "LocalAppDataFolder"; + case "ProgramFiles6432Folder": return platform == Platform.X86 ? "ProgramFilesFolder" : "ProgramFiles64Folder"; -- cgit v1.2.3-55-g6feb