diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-11-21 11:59:19 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-11-21 15:25:02 -0800 |
| commit | 2245144eb5923eca93bd16c7892eb4670a51e10a (patch) | |
| tree | 1016990384a68b7d0cd02557e33afb9434568336 /src/internal | |
| parent | 8a4c0810ea2756888df18b0da5813e8c5bad4c54 (diff) | |
| download | wix-2245144eb5923eca93bd16c7892eb4670a51e10a.tar.gz wix-2245144eb5923eca93bd16c7892eb4670a51e10a.tar.bz2 wix-2245144eb5923eca93bd16c7892eb4670a51e10a.zip | |
Handle spaces when finding path to executables in MSBuild task
Fixes 7035
Diffstat (limited to 'src/internal')
| -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 |