From 2245144eb5923eca93bd16c7892eb4670a51e10a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 21 Nov 2022 11:59:19 -0800 Subject: Handle spaces when finding path to executables in MSBuild task Fixes 7035 --- src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/internal/WixInternal.BaseBuildTasks.Sources') 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 private string GetDefaultToolFullPath() { #if NETCOREAPP - var thisTaskFolder = Path.GetDirectoryName(typeof(BaseToolsetTask).Assembly.Location); + var thisTaskFolder = Path.GetDirectoryName(Path.GetFullPath(typeof(BaseToolsetTask).Assembly.Location)); return Path.Combine(thisTaskFolder, this.ToolExe); #else - var thisTaskFolder = Path.GetDirectoryName(new Uri(typeof(BaseToolsetTask).Assembly.CodeBase).AbsolutePath); + var thisTaskFolder = Path.GetDirectoryName(Path.GetFullPath(new Uri(typeof(BaseToolsetTask).Assembly.CodeBase).LocalPath)); return this.FindArchitectureSpecificToolPath(thisTaskFolder); #endif -- cgit v1.2.3-55-g6feb