Skip to content

Commit e23819d

Browse files
committed
C#: Use Path.Join instead of Path.Combine.
1 parent 401865d commit e23819d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public HashSet<AssemblyLookupLocation> Restore()
209209

210210
var paths = dependencies
211211
.Paths
212-
.Select(d => Path.Combine(PackageDirectory.DirInfo.FullName, d))
212+
.Select(d => Path.Join(PackageDirectory.DirInfo.FullName, d))
213213
.ToList();
214214
assemblyLookupLocations.UnionWith(paths.Select(p => new AssemblyLookupLocation(p)));
215215

@@ -527,7 +527,7 @@ private void RestoreProjects(IEnumerable<string> projects, HashSet<string> reach
527527
var sb = new StringBuilder();
528528
fallbackNugetFeeds.ForEach((feed, index) => sb.AppendLine($"<add key=\"feed{index}\" value=\"{feed}\" />"));
529529

530-
var nugetConfigPath = Path.Combine(folderPath, "nuget.config");
530+
var nugetConfigPath = Path.Join(folderPath, "nuget.config");
531531
logger.LogInfo($"Creating fallback nuget.config file {nugetConfigPath}.");
532532
File.WriteAllText(nugetConfigPath,
533533
$"""
@@ -1052,15 +1052,15 @@ public void Dispose()
10521052
/// </summary>
10531053
private static string ComputeTempDirectoryPath(string subfolderName)
10541054
{
1055-
return Path.Combine(FileUtils.GetTemporaryWorkingDirectory(out _), subfolderName);
1055+
return Path.Join(FileUtils.GetTemporaryWorkingDirectory(out _), subfolderName);
10561056
}
10571057

10581058
/// <summary>
10591059
/// Computes a unique temporary directory path based on the source directory and the subfolder name.
10601060
/// </summary>
10611061
private static string ComputeTempDirectoryPath(string srcDir, string subfolderName)
10621062
{
1063-
return Path.Combine(FileUtils.GetTemporaryWorkingDirectory(out _), FileUtils.ComputeHash(srcDir), subfolderName);
1063+
return Path.Join(FileUtils.GetTemporaryWorkingDirectory(out _), FileUtils.ComputeHash(srcDir), subfolderName);
10641064
}
10651065
}
10661066
}

0 commit comments

Comments
 (0)