Fix bug when adding solution folder containing .. (#46456)

edvilme · web-flow · commit b36ab2e8d913 · 2025-02-04T13:21:00.000-08:00
diff --git a/src/Cli/dotnet/commands/dotnet-sln/add/Program.cs b/src/Cli/dotnet/commands/dotnet-sln/add/Program.cs
@@ -100,8 +100,10 @@ private async Task AddProjectsToSolutionAsync(string solutionFileFullPath, IEnum
             foreach (var projectPath in projectPaths)
             {
                 string relativePath = Path.GetRelativePath(Path.GetDirectoryName(solutionFileFullPath), projectPath);
-                // Add fallback solution folder
-                string relativeSolutionFolder = Path.GetDirectoryName(relativePath);
+                // Add fallback solution folder if relative path does not contain `..`.
+                string relativeSolutionFolder =  relativePath.Split(Path.DirectorySeparatorChar).Any(p => p == "..")
+                    ? string.Empty : Path.GetDirectoryName(relativePath);
+
                 if (!_inRoot && solutionFolder is null && !string.IsNullOrEmpty(relativeSolutionFolder))
                 {
                     if (relativeSolutionFolder.Split(Path.DirectorySeparatorChar).LastOrDefault() == Path.GetFileNameWithoutExtension(relativePath))

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,10 @@ private async Task AddProjectsToSolutionAsync(string solutionFileFullPath, IEnum`
`100`	`100`	`foreach (var projectPath in projectPaths)`
`101`	`101`	`{`
`102`	`102`	`string relativePath = Path.GetRelativePath(Path.GetDirectoryName(solutionFileFullPath), projectPath);`
`103`		`- // Add fallback solution folder`
`104`		`- string relativeSolutionFolder = Path.GetDirectoryName(relativePath);`
	`103`	+ // Add fallback solution folder if relative path does not contain `..`.
	`104`	`+ string relativeSolutionFolder = relativePath.Split(Path.DirectorySeparatorChar).Any(p => p == "..")`
	`105`	`+ ? string.Empty : Path.GetDirectoryName(relativePath);`
	`106`	`+`
`105`	`107`	`if (!_inRoot && solutionFolder is null && !string.IsNullOrEmpty(relativeSolutionFolder))`
`106`	`108`	`{`
`107`	`109`	`if (relativeSolutionFolder.Split(Path.DirectorySeparatorChar).LastOrDefault() == Path.GetFileNameWithoutExtension(relativePath))`