diff options
Diffstat (limited to 'src/WixToolset.Core/Binder.cs')
-rw-r--r-- | src/WixToolset.Core/Binder.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/WixToolset.Core/Binder.cs b/src/WixToolset.Core/Binder.cs index 07a92d02..e282ead8 100644 --- a/src/WixToolset.Core/Binder.cs +++ b/src/WixToolset.Core/Binder.cs | |||
@@ -609,9 +609,9 @@ namespace WixToolset.Core | |||
609 | /// <param name="directory">Directory identifier.</param> | 609 | /// <param name="directory">Directory identifier.</param> |
610 | /// <param name="canonicalize">Canonicalize the path for standard directories.</param> | 610 | /// <param name="canonicalize">Canonicalize the path for standard directories.</param> |
611 | /// <returns>Source path of a directory.</returns> | 611 | /// <returns>Source path of a directory.</returns> |
612 | public static string GetDirectoryPath(Hashtable directories, Hashtable componentIdGenSeeds, string directory, bool canonicalize) | 612 | public static string GetDirectoryPath(Dictionary<string, ResolvedDirectory> directories, Dictionary<string, string> componentIdGenSeeds, string directory, bool canonicalize) |
613 | { | 613 | { |
614 | if (!directories.Contains(directory)) | 614 | if (!directories.ContainsKey(directory)) |
615 | { | 615 | { |
616 | throw new WixException(WixErrors.ExpectedDirectory(directory)); | 616 | throw new WixException(WixErrors.ExpectedDirectory(directory)); |
617 | } | 617 | } |
@@ -620,7 +620,7 @@ namespace WixToolset.Core | |||
620 | 620 | ||
621 | if (null == resolvedDirectory.Path) | 621 | if (null == resolvedDirectory.Path) |
622 | { | 622 | { |
623 | if (null != componentIdGenSeeds && componentIdGenSeeds.Contains(directory)) | 623 | if (null != componentIdGenSeeds && componentIdGenSeeds.ContainsKey(directory)) |
624 | { | 624 | { |
625 | resolvedDirectory.Path = (string)componentIdGenSeeds[directory]; | 625 | resolvedDirectory.Path = (string)componentIdGenSeeds[directory]; |
626 | } | 626 | } |
@@ -670,7 +670,7 @@ namespace WixToolset.Core | |||
670 | /// <param name="compressed">Specifies the package is compressed.</param> | 670 | /// <param name="compressed">Specifies the package is compressed.</param> |
671 | /// <param name="useLongName">Specifies the package uses long file names.</param> | 671 | /// <param name="useLongName">Specifies the package uses long file names.</param> |
672 | /// <returns>Source path of file relative to package directory.</returns> | 672 | /// <returns>Source path of file relative to package directory.</returns> |
673 | public static string GetFileSourcePath(Hashtable directories, string directoryId, string fileName, bool compressed, bool useLongName) | 673 | public static string GetFileSourcePath(Dictionary<string, ResolvedDirectory> directories, string directoryId, string fileName, bool compressed, bool useLongName) |
674 | { | 674 | { |
675 | string fileSourcePath = Common.GetName(fileName, true, useLongName); | 675 | string fileSourcePath = Common.GetName(fileName, true, useLongName); |
676 | 676 | ||