From 04cd5c55a1d807092baf626094da9f6a3875fc85 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 31 Jul 2020 13:14:34 +0200 Subject: [PATCH] [xharness] Resolve relative project references using the referencing project's directory. Otherwise it would end up being resolved from the current directory, which is not dependable. --- .../Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs index c4e35bebb864..b2e13b0e3e1f 100644 --- a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs +++ b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs @@ -87,6 +87,8 @@ List GetNestedReferenceProjects (string csproj) var fixPath = referenceProject.Replace ("\\", "/"); // do the replace in case we use win paths result.Add (fixPath); // get all possible references + if (!Path.IsPathRooted (fixPath)) + fixPath = Path.Combine (Path.GetDirectoryName (csproj), fixPath); result.AddRange (GetNestedReferenceProjects (fixPath)); } return result;