hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 20:26:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#: Use nuget.config file for dotnet restore fallback logic

Browse Source
This commit is contained in:
Tamas Vajk
2023-07-07 13:49:28 +02:00
parent 139585fe5c
commit 23f3e44fa1
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
csharp/extractor/Semmle.Extraction.CSharp.Standalone/BuildAnalysis.cs
View File

@@ -133,9 +133,9 @@ namespace Semmle.BuildAnalyser
DateTime.Now - startTime); DateTime.Now - startTime);
} }
private IEnumerable<string> GetFiles(string pattern) private IEnumerable<string> GetFiles(string pattern, bool recurseSubdirectories = true)
{ {
return sourceDir.GetFiles(pattern, SearchOption.AllDirectories) return sourceDir.GetFiles(pattern, new EnumerationOptions { RecurseSubdirectories = recurseSubdirectories, MatchCasing = MatchCasing.CaseInsensitive })
.Select(d => d.FullName) .Select(d => d.FullName)
.Where(d => !options.ExcludesFile(d)); .Where(d => !options.ExcludesFile(d));
} }
@@ -318,16 +318,16 @@ namespace Semmle.BuildAnalyser
} }
private bool Restore(string target) private bool Restore(string target, string? pathToNugetConfig = null)
{ {
return dotnet.RestoreToDirectory(target, packageDirectory.DirInfo.FullName); return dotnet.RestoreToDirectory(target, packageDirectory.DirInfo.FullName, pathToNugetConfig);
} }
private void Restore(IEnumerable<string> targets) private void Restore(IEnumerable<string> targets, string? pathToNugetConfig = null)
{ {
foreach (var target in targets) foreach (var target in targets)
{ {
Restore(target); Restore(target, pathToNugetConfig);
} }
} }
@@ -336,7 +336,23 @@ namespace Semmle.BuildAnalyser
var alreadyDownloadedPackages = Directory.GetDirectories(packageDirectory.DirInfo.FullName).Select(d => Path.GetFileName(d).ToLowerInvariant()).ToHashSet(); var alreadyDownloadedPackages = Directory.GetDirectories(packageDirectory.DirInfo.FullName).Select(d => Path.GetFileName(d).ToLowerInvariant()).ToHashSet();
var notYetDownloadedPackages = new HashSet<string>(); var notYetDownloadedPackages = new HashSet<string>();
var allFiles = GetFiles("*.*").ToArray(); var nugetConfigs = GetFiles("nuget.config", recurseSubdirectories: true).ToArray();
string? nugetConfig = null;
if (nugetConfigs.Length > 1)
{
progressMonitor.MultipleNugetConfig(nugetConfigs);
nugetConfig = GetFiles("nuget.config", recurseSubdirectories: false).FirstOrDefault();
if (nugetConfig == null)
{
progressMonitor.NoTopLevelNugetConfig();
}
}
else
{
nugetConfig = nugetConfigs.FirstOrDefault();
}
var allFiles = GetFiles("*.*");
foreach (var file in allFiles) foreach (var file in allFiles)
{ {
try try
@@ -390,7 +406,7 @@ namespace Semmle.BuildAnalyser
continue; continue;
} }
success = Restore(tempDir.DirInfo.FullName); success = Restore(tempDir.DirInfo.FullName, nugetConfig);
// TODO: the restore might fail, we could retry with a prerelease (*-* instead of *) version of the package. // TODO: the restore might fail, we could retry with a prerelease (*-* instead of *) version of the package.

4
csharp/extractor/Semmle.Extraction.CSharp.Standalone/DotNet.cs
View File

@@ -45,9 +45,11 @@ namespace Semmle.BuildAnalyser
return true; return true;
} }
public bool RestoreToDirectory(string projectOrSolutionFile, string packageDirectory) public bool RestoreToDirectory(string projectOrSolutionFile, string packageDirectory, string? pathToNugetConfig = null)
{ {
var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true"; var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";
if (pathToNugetConfig != null)
args += $" --configfile \"{pathToNugetConfig}\"";
return RunCommand(args); return RunCommand(args);
} }

10
csharp/extractor/Semmle.Extraction.CSharp.Standalone/ProgressMonitor.cs
View File

@@ -118,5 +118,15 @@ namespace Semmle.BuildAnalyser
logger.Log(Severity.Info, $"Failed to read file {file}"); logger.Log(Severity.Info, $"Failed to read file {file}");
logger.Log(Severity.Debug, $"Failed to read file {file}, exception: {ex}"); logger.Log(Severity.Debug, $"Failed to read file {file}, exception: {ex}");
} }
public void MultipleNugetConfig(string[] nugetConfigs)
{
logger.Log(Severity.Info, $"Found multiple nuget.config files: {string.Join(", ", nugetConfigs)}.");
}
internal void NoTopLevelNugetConfig()
{
logger.Log(Severity.Info, $"Could not find a top-level nuget.config file.");
}
} }
} }