diff options
author | Rob Mensching <rob@firegiant.com> | 2022-08-16 18:11:54 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-08-16 23:21:06 -0700 |
commit | 94e722baab4e848a615812a45fecc8322335d1f0 (patch) | |
tree | 8b1124ba75f3b1fc55981113660407c903d45543 /src/tools/heat/RegFileHarvester.cs | |
parent | da5cc586114e537461b239a882c5bbea470d812d (diff) | |
download | wix-94e722baab4e848a615812a45fecc8322335d1f0.tar.gz wix-94e722baab4e848a615812a45fecc8322335d1f0.tar.bz2 wix-94e722baab4e848a615812a45fecc8322335d1f0.zip |
Update heat to use StandardDirectory element
Fixes 6631
Diffstat (limited to 'src/tools/heat/RegFileHarvester.cs')
-rw-r--r-- | src/tools/heat/RegFileHarvester.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/heat/RegFileHarvester.cs b/src/tools/heat/RegFileHarvester.cs index b7ad8c7b..3e7acaba 100644 --- a/src/tools/heat/RegFileHarvester.cs +++ b/src/tools/heat/RegFileHarvester.cs | |||
@@ -63,8 +63,7 @@ namespace WixToolset.Harvesters | |||
63 | throw new WixException(HarvesterErrors.FileNotFound(path)); | 63 | throw new WixException(HarvesterErrors.FileNotFound(path)); |
64 | } | 64 | } |
65 | 65 | ||
66 | Wix.Directory directory = new Wix.Directory(); | 66 | var directory = DirectoryHelper.CreateDirectory("TARGETDIR"); |
67 | directory.Id = "TARGETDIR"; | ||
68 | 67 | ||
69 | // Use absolute paths | 68 | // Use absolute paths |
70 | path = Path.GetFullPath(path); | 69 | path = Path.GetFullPath(path); |
@@ -119,7 +118,7 @@ namespace WixToolset.Harvesters | |||
119 | /// <param name="directory">A WiX directory reference.</param> | 118 | /// <param name="directory">A WiX directory reference.</param> |
120 | /// <param name="root">The root key.</param> | 119 | /// <param name="root">The root key.</param> |
121 | /// <param name="line">The current line.</param> | 120 | /// <param name="line">The current line.</param> |
122 | private void ConvertKey(StreamReader sr, ref Wix.Directory directory, Wix.RegistryRootType root, string line) | 121 | private void ConvertKey(StreamReader sr, ref Wix.DirectoryBase directory, Wix.RegistryRootType root, string line) |
123 | { | 122 | { |
124 | Wix.Component component = new Wix.Component(); | 123 | Wix.Component component = new Wix.Component(); |
125 | 124 | ||