Handle project references that return invalid target paths

Closes 7277

1 files changed, 14 insertions, 2 deletions

diff --git a/src/wix/WixToolset.BuildTasks/CreateProjectReferenceDefineConstantsAndBindPaths.cs b/src/wix/WixToolset.BuildTasks/CreateProjectReferenceDefineConstantsAndBindPaths.cs
index ae9d8abe..8b870717 100644
--- a/src/wix/WixToolset.BuildTasks/CreateProjectReferenceDefineConstantsAndBindPaths.cs
+++ b/src/wix/WixToolset.BuildTasks/CreateProjectReferenceDefineConstantsAndBindPaths.cs
@@ -48,19 +48,31 @@ namespace WixToolset.BuildTasks
 
         private void AddBindPathsForResolvedReference(IDictionary<string, List<ITaskItem>> bindPathByPaths, ITaskItem resolvedReference)
         {
+            var projectPath = resolvedReference.GetMetadata("MSBuildSourceProjectFile");
+
             // If the BindName was not explicitly provided, try to use the source project's filename
             // as the bind name.
             var name = resolvedReference.GetMetadata("BindName");
             if (String.IsNullOrWhiteSpace(name))
             {
-                var projectPath = resolvedReference.GetMetadata("MSBuildSourceProjectFile");
                 name = String.IsNullOrWhiteSpace(projectPath) ? String.Empty : Path.GetFileNameWithoutExtension(projectPath);
             }
 
             var path = resolvedReference.GetMetadata("BindPath");
             if (String.IsNullOrWhiteSpace(path))
             {
-                path = Path.GetDirectoryName(resolvedReference.GetMetadata("FullPath"));
+                var fullpath = resolvedReference.GetMetadata("FullPath");
+                path = Path.GetDirectoryName(fullpath);
+
+                // If the resolved project reference (incorrectly) points at a file then use the file's
+                // file's directory instead. When this happens, it is a problem in the referenced project
+                // 
+                while (File.Exists(path))
+                {
+                    this.Log.LogWarning("The project '{0}' target path '{1}' resolved to an invalid path where a filename was a child of a file. Using the parent directory '{2}' instead.", projectPath, fullpath, path);
+
+                    path = Path.GetDirectoryName(path);
+                }
             }
 
             if (!bindPathByPaths.TryGetValue(path, out var bindPathsForPath) ||