Skip to content

InMemoryFileSystem fixes for tests in dotnet sdk #9011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: release/9.0.3xx
Choose a base branch
from
Open

InMemoryFileSystem fixes for tests in dotnet sdk #9011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20b8640
Added test to verify root can be virtualized
nobowned May 12, 2025
7a3a999
Update InMemoryFileSystemTests.cs
nobowned May 12, 2025
bd3a363
Update InMemoryFileSystem.cs
nobowned May 12, 2025
2d7c5d5
Update InMemoryFileSystem.cs
nobowned May 13, 2025
b326caa
Remove Console WriteLine
nobowned May 13, 2025
239ed9f
Re-introduce handling mount point in IsPathInCone
nobowned May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 6 additions & 52 deletions src/Microsoft.TemplateEngine.Utils/InMemoryFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,58 +696,12 @@ public IDisposable WatchFileChanges(string filePath, FileSystemEventHandler file

private bool IsPathInCone(string path, out string processedPath)
{
if (!Path.IsPathRooted(path))
{
path = Path.Combine(GetCurrentDirectory(), path);
}

path = path.Replace('\\', '/');

bool leadSlash = path[0] == '/';

if (leadSlash)
{
path = path.Substring(1);
}

string[] parts = path.Split('/');

List<string> realParts = new();

for (int i = 0; i < parts.Length; ++i)
{
if (string.IsNullOrEmpty(parts[i]))
{
continue;
}

switch (parts[i])
{
case ".":
continue;
case "..":
realParts.RemoveAt(realParts.Count - 1);
break;
default:
realParts.Add(parts[i]);
break;
}
}

if (leadSlash)
{
realParts.Insert(0, string.Empty);
}

processedPath = string.Join(Path.DirectorySeparatorChar + string.Empty, realParts);
if (processedPath.Equals(_root.FullPath) || processedPath.StartsWith(_root.FullPath.TrimEnd('/', '\\') + Path.DirectorySeparatorChar))
{
return true;
}
else
{
return false;
}
processedPath = Path.IsPathRooted(path) ? path : Path.Combine(GetCurrentDirectory(), path);
processedPath = processedPath
.Replace('/', Path.DirectorySeparatorChar)
.Replace('\\', Path.DirectorySeparatorChar)
.Replace($"{Path.DirectorySeparatorChar}.{Path.DirectorySeparatorChar}", $"{Path.DirectorySeparatorChar}");
return processedPath.StartsWith(_root.FullPath);
}

private class FileSystemDirectory
Expand Down
15 changes: 15 additions & 0 deletions test/Microsoft.TemplateEngine.Utils.UnitTests/InMemoryFileSystemTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,20 @@ public void VerifyMultipleVirtualizationsAreHandled()
Assert.True(virtualized1.FileExists(testFilePath));
Assert.True(virtualized2.FileExists(testFilePath));
}

[Fact]
public void VerifyRootCanBeVirtualized()
{
IPhysicalFileSystem mockFileSystem = new MockFileSystem();
IPhysicalFileSystem virtualized = new InMemoryFileSystem(Path.GetPathRoot(Directory.GetCurrentDirectory())!, mockFileSystem);

string testFilePath = Path.Combine(Directory.GetCurrentDirectory(), "test.txt");
virtualized.WriteAllText(testFilePath, "test");

var entries = virtualized.EnumerateFileSystemEntries(Directory.GetCurrentDirectory(), "*", SearchOption.TopDirectoryOnly).ToList();
Assert.Single(entries);

Assert.Equal(testFilePath, entries[0]);
}
}
}