diff options
Diffstat (limited to 'src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs')
-rw-r--r-- | src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs b/src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs index 6edd4a35..56277912 100644 --- a/src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs +++ b/src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs | |||
@@ -178,11 +178,11 @@ namespace WixToolset.BaseBuildTasks | |||
178 | private string GetDefaultToolFullPath() | 178 | private string GetDefaultToolFullPath() |
179 | { | 179 | { |
180 | #if NETCOREAPP | 180 | #if NETCOREAPP |
181 | var thisTaskFolder = Path.GetDirectoryName(typeof(BaseToolsetTask).Assembly.Location); | 181 | var thisTaskFolder = Path.GetDirectoryName(Path.GetFullPath(typeof(BaseToolsetTask).Assembly.Location)); |
182 | 182 | ||
183 | return Path.Combine(thisTaskFolder, this.ToolExe); | 183 | return Path.Combine(thisTaskFolder, this.ToolExe); |
184 | #else | 184 | #else |
185 | var thisTaskFolder = Path.GetDirectoryName(new Uri(typeof(BaseToolsetTask).Assembly.CodeBase).AbsolutePath); | 185 | var thisTaskFolder = Path.GetDirectoryName(Path.GetFullPath(new Uri(typeof(BaseToolsetTask).Assembly.CodeBase).LocalPath)); |
186 | 186 | ||
187 | return this.FindArchitectureSpecificToolPath(thisTaskFolder); | 187 | return this.FindArchitectureSpecificToolPath(thisTaskFolder); |
188 | #endif | 188 | #endif |