* Main.cs (Execute): Build the project/sln with current directory set to

[mono.git] / mcs / tools / xbuild / SolutionParser.cs

diff --git a/mcs/tools/xbuild/SolutionParser.cs b/mcs/tools/xbuild/SolutionParser.cs
index 8c212055a205bc73fa02d9b5bcbdc4c560525a8b..3a10101a98eed179af2d951f8b2142171b446a68 100644 (file)
--- a/mcs/tools/xbuild/SolutionParser.cs
+++ b/mcs/tools/xbuild/SolutionParser.cs
@@ -93,6 +93,7 @@ namespace Mono.XBuild.CommandLine {
                        StreamReader reader = new StreamReader (file);
                        string line = reader.ReadToEnd ();
                        line = line.Replace ("\r\n", "\n");
+                       string solutionDir = Path.GetDirectoryName (file);
 
                        List<TargetInfo> solutionTargets = new List<TargetInfo> ();
                        Dictionary<Guid, ProjectInfo> projectInfos = new Dictionary<Guid, ProjectInfo> ();
@@ -110,7 +111,8 @@ namespace Mono.XBuild.CommandLine {
                                projectInfos.Add (new Guid (m.Groups[4].Value), projectInfo);
 
                                Project currentProject = p.ParentEngine.CreateNewProject ();
-                               currentProject.Load (projectInfo.FileName.Replace ('\\', Path.DirectorySeparatorChar));
+                               currentProject.Load (Path.Combine (solutionDir,
+                                                       projectInfo.FileName.Replace ('\\', Path.DirectorySeparatorChar)));
 
                                foreach (BuildItem bi in currentProject.GetEvaluatedItemsByName ("ProjectReference")) {
                                        string projectReferenceGuid = bi.GetEvaluatedMetadata ("Project");