aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-12-28 17:48:42 -0800
committerRob Mensching <rob@firegiant.com>2024-12-28 17:48:42 -0800
commita662db540ffa0f45c0d4950a2cc8e74dcce45762 (patch)
tree670d203289aea1f27030d8a139e3f22d4bfb405f
parent6a19d81ab8c5614dd670ab3f392c804df3ac5ac6 (diff)
downloadwix-a662db540ffa0f45c0d4950a2cc8e74dcce45762.tar.gz
wix-a662db540ffa0f45c0d4950a2cc8e74dcce45762.tar.bz2
wix-a662db540ffa0f45c0d4950a2cc8e74dcce45762.zip
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.
-rw-r--r--src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs3
-rw-r--r--src/api/wix/WixToolset.Data/WixStandardLibrary.cs3
2 files changed, 5 insertions, 1 deletions
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
223 ["MyPicturesFolder"] = "Pictures", 223 ["MyPicturesFolder"] = "Pictures",
224 ["NetHoodFolder"] = "NetHood", 224 ["NetHoodFolder"] = "NetHood",
225 ["PersonalFolder"] = "Personal", 225 ["PersonalFolder"] = "Personal",
226 ["PerUserProgramFilesFolder"] = "Programs",
226 ["PrintHoodFolder"] = "Printers", 227 ["PrintHoodFolder"] = "Printers",
227 ["ProgramFilesFolder"] = "PFiles", 228 ["ProgramFilesFolder"] = "PFiles",
228 ["ProgramFiles64Folder"] = "PFiles64", 229 ["ProgramFiles64Folder"] = "PFiles64",
@@ -264,7 +265,7 @@ namespace WixToolset.Data.WindowsInstaller
264 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.AdminUISequence }, 265 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.AdminUISequence },
265 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminUISequence }, 266 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminUISequence },
266 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/ExecuteAction")) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.AdminUISequence }, 267 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/ExecuteAction")) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.AdminUISequence },
267 268
268 // AdvertiseExecuteSequence 269 // AdvertiseExecuteSequence
269 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdvertiseExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdvertiseExecuteSequence }, 270 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdvertiseExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
270 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdvertiseExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdvertiseExecuteSequence }, 271 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
162 case "CommonFiles6432Folder": 162 case "CommonFiles6432Folder":
163 return platform == Platform.X86 ? "CommonFilesFolder" : "CommonFiles64Folder"; 163 return platform == Platform.X86 ? "CommonFilesFolder" : "CommonFiles64Folder";
164 164
165 case "PerUserProgramFilesFolder":
166 return "LocalAppDataFolder";
167
165 case "ProgramFiles6432Folder": 168 case "ProgramFiles6432Folder":
166 return platform == Platform.X86 ? "ProgramFilesFolder" : "ProgramFiles64Folder"; 169 return platform == Platform.X86 ? "ProgramFilesFolder" : "ProgramFiles64Folder";
167 170