hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-21 06:55:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Make path concatenation OS invariant.

Browse Source
This commit is contained in:
Michael Nebel
2023-11-03 13:35:06 +01:00
parent 4689bdb468
commit 31f602cd47
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Dependencies.cs
View File

@@ -29,7 +29,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
private static string GetPackageName(string package) =>
package
.Split("/")
.Split(Path.DirectorySeparatorChar)
.First();
/// <summary>
@@ -47,9 +47,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
/// </summary>
public Dependencies Add(string package, string dependency)
{
var path = Path.Combine(package, ParseFilePath(dependency));
var p = package.Replace('/', Path.DirectorySeparatorChar);
var d = dependency.Replace('/', Path.DirectorySeparatorChar);
var path = Path.Combine(p, ParseFilePath(d));
required.Add(path);
usedPackages.Add(GetPackageName(package));
usedPackages.Add(GetPackageName(p));
return this;
}
@@ -58,8 +62,11 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
/// </summary>
public Dependencies Add(string package)
{
required.Add(package);
usedPackages.Add(GetPackageName(package));
var p = package.Replace('/', Path.DirectorySeparatorChar);
required.Add(p);
usedPackages.Add(GetPackageName(p));
return this;
}
}