diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-05-08 14:13:31 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-05-08 14:44:43 -0700 |
| commit | 75fd55d5a71c492c6ea904768858c51aa97da29f (patch) | |
| tree | 610047db1d5759a726ce88277bb2dfddcd01da45 /src/WixToolset.Core.WindowsInstaller/Bind/PathResolver.cs | |
| parent | d1dbe29f3856d012acf5f96e8e66c43b74ab490d (diff) | |
| download | wix-75fd55d5a71c492c6ea904768858c51aa97da29f.tar.gz wix-75fd55d5a71c492c6ea904768858c51aa97da29f.tar.bz2 wix-75fd55d5a71c492c6ea904768858c51aa97da29f.zip | |
Use new strongly typed tuples
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/PathResolver.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/PathResolver.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/PathResolver.cs b/src/WixToolset.Core.WindowsInstaller/Bind/PathResolver.cs index 492c9137..6dc18271 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/PathResolver.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/PathResolver.cs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
| 2 | 2 | ||
| 3 | namespace WixToolset.Core.WindowsInstaller.Bind | 3 | namespace WixToolset.Core.WindowsInstaller.Bind |
| 4 | { | 4 | { |
| @@ -6,6 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
| 7 | using System.IO; | 7 | using System.IO; |
| 8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
| 9 | using WixToolset.Data.WindowsInstaller; | ||
| 9 | 10 | ||
| 10 | internal static class PathResolver | 11 | internal static class PathResolver |
| 11 | { | 12 | { |
| @@ -28,7 +29,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 28 | { | 29 | { |
| 29 | if (null != componentIdGenSeeds && componentIdGenSeeds.ContainsKey(directory)) | 30 | if (null != componentIdGenSeeds && componentIdGenSeeds.ContainsKey(directory)) |
| 30 | { | 31 | { |
| 31 | resolvedDirectory.Path = (string)componentIdGenSeeds[directory]; | 32 | resolvedDirectory.Path = componentIdGenSeeds[directory]; |
| 32 | } | 33 | } |
| 33 | else if (canonicalize && WindowsInstallerStandard.IsStandardDirectory(directory)) | 34 | else if (canonicalize && WindowsInstallerStandard.IsStandardDirectory(directory)) |
| 34 | { | 35 | { |
