diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-10 07:44:29 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-10 07:51:45 -0700 |
| commit | 33f14b793d674355f87f0224f5be3329c3c12d56 (patch) | |
| tree | 2f90b81ffed35c1abb0ee6acecf6f11dadca6e48 /src/WixToolset.Core | |
| parent | c58da76f6b8c41f645582fb9a5cd8cacf6fede8d (diff) | |
| download | wix-33f14b793d674355f87f0224f5be3329c3c12d56.tar.gz wix-33f14b793d674355f87f0224f5be3329c3c12d56.tar.bz2 wix-33f14b793d674355f87f0224f5be3329c3c12d56.zip | |
Fix crossplat pathing and other small issues in extension caching
Diffstat (limited to 'src/WixToolset.Core')
| -rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs b/src/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs index f71c0fd1..c23c8383 100644 --- a/src/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs +++ b/src/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs | |||
| @@ -123,14 +123,14 @@ namespace WixToolset.Core.ExtensibilityServices | |||
| 123 | 123 | ||
| 124 | private IEnumerable<string> CacheLocations() | 124 | private IEnumerable<string> CacheLocations() |
| 125 | { | 125 | { |
| 126 | var path = Path.Combine(Environment.CurrentDirectory, @".wix\extensions\"); | 126 | var path = Path.Combine(Environment.CurrentDirectory, ".wix", "extensions"); |
| 127 | if (Directory.Exists(path)) | 127 | if (Directory.Exists(path)) |
| 128 | { | 128 | { |
| 129 | yield return path; | 129 | yield return path; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | path = Environment.GetEnvironmentVariable("WIX_EXTENSIONS") ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); | 132 | path = Environment.GetEnvironmentVariable("WIX_EXTENSIONS") ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); |
| 133 | path = Path.Combine(path, @".wix\extensions\"); | 133 | path = Path.Combine(path, ".wix", "extensions"); |
| 134 | if (Directory.Exists(path)) | 134 | if (Directory.Exists(path)) |
| 135 | { | 135 | { |
| 136 | yield return path; | 136 | yield return path; |
