Skip to content

Handle multiple trailing directory separators #1475

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

Merged
merged 2 commits into from
Oct 24, 2025
Merged

Handle multiple trailing directory separators #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63ea835
Handle multiple trailing directory separators
ericstj Oct 21, 2025
777711f
Don't trim the root separator
ericstj Oct 21, 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
16 changes: 15 additions & 1 deletion src/Microsoft.ComponentDetection.Detectors/dotnet/DotNetComponentDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,22 @@ public DotNetComponentDetector(

public override IEnumerable<string> Categories => ["DotNet"];

private static string TrimAllEndingDirectorySeparators(string path)
{
string last;

do
{
last = path;
path = Path.TrimEndingDirectorySeparator(last);
}
while (!ReferenceEquals(last, path));

return path;
}

[return: NotNullIfNotNull(nameof(path))]
private string? NormalizeDirectory(string? path) => string.IsNullOrEmpty(path) ? path : Path.TrimEndingDirectorySeparator(this.pathUtilityService.NormalizePath(path));
private string? NormalizeDirectory(string? path) => string.IsNullOrEmpty(path) ? path : TrimAllEndingDirectorySeparators(this.pathUtilityService.NormalizePath(path));

/// <summary>
/// Given a path under sourceDirectory, and the same path in another filesystem,
Expand Down
15 changes: 13 additions & 2 deletions test/Microsoft.ComponentDetection.Detectors.Tests/DotNetComponentDetectorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,8 +654,19 @@ public async Task TestDotNetDetectorNoGlobalJsonSourceRoot()
discoveredComponents.Where(component => component.Component.Id == "0.0.0 net8.0 unknown - DotNet").Should().ContainSingle();
}

#pragma warning disable SA1201 // Elements should appear in the correct order
private static IEnumerable<object[]> AdditionalPathSegments { get; } =
#pragma warning restore SA1201 // Elements should appear in the correct order
[
[string.Empty],
[$"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}"],
[$"{Path.AltDirectorySeparatorChar}{Path.DirectorySeparatorChar}"],
[$"{Path.AltDirectorySeparatorChar}{Path.AltDirectorySeparatorChar}"],
];

[TestMethod]
public async Task TestDotNetDetectorRebasePaths()
[DynamicData(nameof(AdditionalPathSegments))]
public async Task TestDotNetDetectorRebasePaths(string additionalPathSegment)
{
// DetectorTestUtility runs under Path.GetTempPath()
var scanRoot = Path.TrimEndingDirectorySeparator(Path.GetTempPath());
Expand All @@ -676,7 +687,7 @@ public async Task TestDotNetDetectorRebasePaths()
this.AddFile(libraryProjectPath, null);

var libraryOutputPath = Path.Combine(Path.GetDirectoryName(libraryProjectPath), "obj");
var libraryBuildOutputPath = Path.Combine(Path.GetDirectoryName(libraryBuildProjectPath), "obj");
var libraryBuildOutputPath = Path.Combine(Path.GetDirectoryName(libraryBuildProjectPath), "obj") + additionalPathSegment;
var libraryAssetsPath = Path.Combine(libraryOutputPath, "project.assets.json");

// use "build" paths to simulate an Assets file that has a different root. Here the build assets have RootDir, but the scanned filesystem has scanRoot.
Expand Down