WorkloadRestoreCommand.DiscoverAllProjects: Return full paths (#47415)

edvilme · web-flow · commit d8512e155ecb · 2025-03-10T17:41:29.000Z
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs
@@ -136,10 +136,11 @@ internal static List<string> DiscoverAllProjects(string currentDirectory,
                     .Select(Path.GetFullPath).ToList();
             }
 
-            foreach (string file in slnFiles)
+            foreach (string solutionFilePath in slnFiles)
             {
-                var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(file);
-                projectFiles.AddRange(solutionFile.SolutionProjects.Select(p => p.FilePath));
+                var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(solutionFilePath);
+                projectFiles.AddRange(solutionFile.SolutionProjects.Select(
+                    p => Path.GetFullPath(p.FilePath, Path.GetDirectoryName(solutionFilePath))));
             }
 
             if (projectFiles.Count == 0)

Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,11 @@ internal static List<string> DiscoverAllProjects(string currentDirectory,`
`136`	`136`	`.Select(Path.GetFullPath).ToList();`
`137`	`137`	`}`
`138`	`138`
`139`		`- foreach (string file in slnFiles)`
	`139`	`+ foreach (string solutionFilePath in slnFiles)`
`140`	`140`	`{`
`141`		`- var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(file);`
`142`		`- projectFiles.AddRange(solutionFile.SolutionProjects.Select(p => p.FilePath));`
	`141`	`+ var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(solutionFilePath);`
	`142`	`+ projectFiles.AddRange(solutionFile.SolutionProjects.Select(`
	`143`	`+ p => Path.GetFullPath(p.FilePath, Path.GetDirectoryName(solutionFilePath))));`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`if (projectFiles.Count == 0)`