diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs index e93a29336126..39fc007ee98b 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs @@ -49,7 +49,7 @@ private void Info() // Allow up to four attempts (with up to three retries) to run `dotnet --info`, to mitigate transient issues for (int attempt = 0; attempt < 4; attempt++) { - var exitCode = dotnetCliInvoker.RunCommandExitCode("--info", silent: false); + var exitCode = dotnetCliInvoker.RunCommandExitCode(["--info"], silent: false); switch (exitCode) { case 0: @@ -63,9 +63,9 @@ private void Info() } } - private string GetRestoreArgs(RestoreSettings restoreSettings) + private List GetRestoreArgs(RestoreSettings restoreSettings) { - var args = $"restore --no-dependencies \"{restoreSettings.File}\" --packages \"{restoreSettings.PackageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal"; + List args = ["restore", "--no-dependencies", restoreSettings.File, "--packages", restoreSettings.PackageDirectory, "/p:DisableImplicitNuGetFallbackFolder=true", "--verbosity", "normal"]; if (restoreSettings.ForceDotnetRefAssemblyFetching) { @@ -77,28 +77,20 @@ private string GetRestoreArgs(RestoreSettings restoreSettings) Directory.CreateDirectory(path); } - args += $" /p:TargetFrameworkRootPath=\"{path}\" /p:NetCoreTargetingPackRoot=\"{path}\" /p:AllowMissingPrunePackageData=true"; - } - - if (restoreSettings.PathToNugetConfig != null) - { - args += $" --configfile \"{restoreSettings.PathToNugetConfig}\""; + args.AddRange([$"/p:TargetFrameworkRootPath={path}", $"/p:NetCoreTargetingPackRoot={path}", "/p:AllowMissingPrunePackageData=true"]); } if (restoreSettings.ForceReevaluation) { - args += " --force"; + args.Add("--force"); } if (restoreSettings.TargetWindows) { - args += " /p:EnableWindowsTargeting=true"; + args.Add("/p:EnableWindowsTargeting=true"); } - if (restoreSettings.NugetSources is not null) - { - args += $" {restoreSettings.NugetSources}"; - } + args.AddRange(restoreSettings.NugetSources); return args; } @@ -112,48 +104,48 @@ public RestoreResult Restore(RestoreSettings restoreSettings) public bool New(string folder) { - var args = $"new console --no-restore --output \"{folder}\""; + List args = ["new", "console", "--no-restore", "--output", folder]; return dotnetCliInvoker.RunCommand(args); } public bool AddPackage(string folder, string package) { - var args = $"add \"{folder}\" package \"{package}\" --no-restore"; + List args = ["add", folder, "package", package, "--no-restore"]; return dotnetCliInvoker.RunCommand(args); } - public IList GetListedRuntimes() => GetResultList("--list-runtimes"); + public IList GetListedRuntimes() => GetResultList(["--list-runtimes"]); - public IList GetListedSdks() => GetResultList("--list-sdks"); + public IList GetListedSdks() => GetResultList(["--list-sdks"]); - private IList GetResultList(string args, string? workingDirectory = null, bool silent = true) + private IList GetResultList(List args, string? workingDirectory = null, bool silent = true) { if (dotnetCliInvoker.RunCommand(args, workingDirectory, out var results, silent)) { return results; } - logger.LogWarning($"Running 'dotnet {args}' failed."); - return []; + logger.LogWarning($"Running 'dotnet {string.Join(" ", args)}' failed."); + return new List(); } - public bool Exec(string execArgs) + public bool Exec(List execArgs) { - var args = $"exec {execArgs}"; + List args = ["exec", .. execArgs]; return dotnetCliInvoker.RunCommand(args); } - private const string nugetListSourceCommand = "nuget list source --format Short"; + private static readonly IReadOnlyList nugetListSourceCommandArgs = ["nuget", "list", "source", "--format", "Short"]; public IList GetNugetFeeds(string nugetConfig) { logger.LogInfo($"Getting NuGet feeds from '{nugetConfig}'..."); - return GetResultList($"{nugetListSourceCommand} --configfile \"{nugetConfig}\""); + return GetResultList([.. nugetListSourceCommandArgs, "--configfile", nugetConfig]); } public IList GetNugetFeedsFromFolder(string folderPath) { logger.LogInfo($"Getting NuGet feeds in folder '{folderPath}'..."); - return GetResultList(nugetListSourceCommand, folderPath); + return GetResultList(nugetListSourceCommandArgs.ToList(), folderPath); } // The version number should be kept in sync with the version .NET version used for building the application. diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs index 4c4e789973ca..0f022b188c6f 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Diagnostics; using Semmle.Util; using Semmle.Util.Logging; @@ -25,7 +24,7 @@ public DotNetCliInvoker(ILogger logger, string exec, DependabotProxy? dependabot logger.LogInfo($"Using .NET CLI executable: '{Exec}'"); } - private ProcessStartInfo MakeDotnetStartInfo(string args, string? workingDirectory) + private ProcessStartInfo MakeDotnetStartInfo(List args, string? workingDirectory) { var startInfo = new ProcessStartInfo(Exec, args) { @@ -33,6 +32,7 @@ private ProcessStartInfo MakeDotnetStartInfo(string args, string? workingDirecto RedirectStandardOutput = true, RedirectStandardError = true }; + if (!string.IsNullOrWhiteSpace(workingDirectory)) { startInfo.WorkingDirectory = workingDirectory; @@ -57,39 +57,39 @@ private ProcessStartInfo MakeDotnetStartInfo(string args, string? workingDirecto return startInfo; } - private int RunCommandExitCodeAux(string args, string? workingDirectory, out IList output, out string dirLog, bool silent) + private int RunCommandExitCodeAux(List args, string? workingDirectory, out IList output, out string dirLog, bool silent) { dirLog = string.IsNullOrWhiteSpace(workingDirectory) ? "" : $" in {workingDirectory}"; var pi = MakeDotnetStartInfo(args, workingDirectory); var threadId = Environment.CurrentManagedThreadId; void onOut(string s) => logger.Log(silent ? Severity.Debug : Severity.Info, s, threadId); void onError(string s) => logger.LogError(s, threadId); - logger.LogInfo($"Running '{Exec} {args}'{dirLog}"); + logger.LogInfo($"Running '{Exec} {string.Join(" ", args)}'{dirLog}"); var exitCode = pi.ReadOutput(out output, onOut, onError); return exitCode; } - private bool RunCommandAux(string args, string? workingDirectory, out IList output, bool silent) + private bool RunCommandAux(List args, string? workingDirectory, out IList output, bool silent) { var exitCode = RunCommandExitCodeAux(args, workingDirectory, out output, out var dirLog, silent); if (exitCode != 0) { - logger.LogError($"Command '{Exec} {args}'{dirLog} failed with exit code {exitCode}"); + logger.LogError($"Command '{Exec} {string.Join(" ", args)}'{dirLog} failed with exit code {exitCode}"); return false; } return true; } - public bool RunCommand(string args, bool silent = true) => + public bool RunCommand(List args, bool silent = true) => RunCommandAux(args, null, out _, silent); - public int RunCommandExitCode(string args, bool silent = true) => + public int RunCommandExitCode(List args, bool silent = true) => RunCommandExitCodeAux(args, null, out _, out _, silent); - public bool RunCommand(string args, out IList output, bool silent = true) => + public bool RunCommand(List args, out IList output, bool silent = true) => RunCommandAux(args, null, out output, silent); - public bool RunCommand(string args, string? workingDirectory, out IList output, bool silent = true) => + public bool RunCommand(List args, string? workingDirectory, out IList output, bool silent = true) => RunCommandAux(args, workingDirectory, out output, silent); } } diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs index 744b60f3d3f5..0086c26acbaf 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs @@ -24,20 +24,85 @@ internal sealed partial class FeedManager : IDisposable private readonly FileProvider fileProvider; private readonly DependabotProxy? dependabotProxy; private readonly DependencyDirectory emptyPackageDirectory; + private readonly ImmutableHashSet privateRegistryFeeds; - public ImmutableHashSet PrivateRegistryFeeds { get; } + /// + /// Gets whether there are private package registries configured for C#. + /// public bool HasPrivateRegistryFeeds { get; } + + /// + /// Gets whether the reachability of the NuGet feeds should be checked before using them for restore. + /// public bool CheckNugetFeedResponsiveness { get; } = EnvironmentVariables.GetBooleanOptOut(EnvironmentVariableNames.CheckNugetFeedResponsiveness); + private readonly Lazy> lazyExplicitFeeds; + + /// + /// Gets the list of NuGet feeds that are explicitly configured + /// - NuGet configuration files. + /// - Private package registries that are configured for C#. + /// + public ImmutableHashSet ExplicitFeeds => lazyExplicitFeeds.Value; + + private readonly Lazy> lazyAllFeeds; + + /// + /// Gets the list of all NuGet feeds that are configured in the environment. That is + /// - Explicit feeds + /// - Inherited feeds from the machine and environment (if not explicitly disabled by a + /// root directory NuGet configuration). + /// + public ImmutableHashSet AllFeeds => lazyAllFeeds.Value; + + /// + /// Gets the list of inherited NuGet feeds that are configured in the environment. + /// + public ImmutableHashSet InheritedFeeds => AllFeeds.Except(ExplicitFeeds).ToImmutableHashSet(); + + private readonly Lazy> lazyReachableExplicitFeeds; + + /// + /// Gets the list of reachable NuGet feeds that are explicitly configured. + /// + public ImmutableHashSet ReachableExplicitFeeds => lazyReachableExplicitFeeds.Value; + + private readonly Lazy> lazyReachableFeeds; + /// + /// Gets the list of reachable NuGet feeds that are configured in the environment. + /// + public ImmutableHashSet ReachableFeeds => lazyReachableFeeds.Value; + + private readonly Lazy> lazyReachableFallbackFeeds; + /// + /// Gets the list of reachable NuGet feeds that are configured as fallback feeds. + /// + public ImmutableHashSet ReachableFallbackFeeds => lazyReachableFallbackFeeds.Value; + public FeedManager(ILogger logger, IDotNet dotnet, DependabotProxy? dependabotProxy, FileProvider fileProvider) { this.logger = logger; this.dotnet = dotnet; this.dependabotProxy = dependabotProxy; this.fileProvider = fileProvider; - PrivateRegistryFeeds = dependabotProxy?.RegistryURLs.ToImmutableHashSet() ?? []; - HasPrivateRegistryFeeds = PrivateRegistryFeeds.Count > 0; + privateRegistryFeeds = dependabotProxy?.RegistryURLs.ToImmutableHashSet() ?? []; + HasPrivateRegistryFeeds = privateRegistryFeeds.Count > 0; emptyPackageDirectory = new DependencyDirectory("empty", "empty package", logger); + + lazyExplicitFeeds = new Lazy>(GetExplicitFeeds); + lazyAllFeeds = new Lazy>(GetAllFeeds); + lazyReachableExplicitFeeds = new Lazy>(() => CheckSpecifiedFeeds(ExplicitFeeds)); + lazyReachableFeeds = new Lazy>(() => + { + // Inherited feeds should only be used, if they are indeed reachable (as they may be environment specific). + var reachableInheritedFeeds = CheckSpecifiedFeeds(InheritedFeeds); + return ReachableExplicitFeeds.Union(reachableInheritedFeeds).ToImmutableHashSet(); + }); + lazyReachableFallbackFeeds = new Lazy>(() => + { + var reachableFallbackFeeds = GetReachableFallbackNugetFeeds(); + return reachableFallbackFeeds.ToImmutableHashSet(); + }); } private string? GetDirectoryName(string path) @@ -84,27 +149,41 @@ private IEnumerable GetFeeds(Func> getNugetFeeds) private IEnumerable GetFeedsFromFolder(string folderPath) => GetFeeds(() => dotnet.GetNugetFeedsFromFolder(folderPath)); - private IEnumerable GetFeedsFromNugetConfig(string nugetConfigPath) => GetFeeds(() => dotnet.GetNugetFeeds(nugetConfigPath)); - public string FeedsToRestoreArgument(IEnumerable feeds, string sourceArgumentPrefix) + /// + /// Constructs the NuGet sources argument for the restore command based on the given feeds. + /// If there are no feeds, a dummy source argument is added to override any default feeds that `restore` would use. + /// + /// The list of feeds to use for the restore command. + /// The prefix to use for each source argument (e.g., "-s"). + /// The list of NuGet sources arguments for the restore command. + public List FeedsToRestoreArgument(IEnumerable feeds, string sourceArgumentPrefix) { // If there are no feeds, we want to override any default feeds that `restore` would use by passing a dummy source argument. if (!feeds.Any()) { - return $" {sourceArgumentPrefix} \"{emptyPackageDirectory.DirInfo.FullName}\""; + return [sourceArgumentPrefix, emptyPackageDirectory.DirInfo.FullName]; } // Add package sources. If any are present, they override all sources specified in // the configuration file(s). - var feedArgs = new StringBuilder(); - foreach (var feed in feeds) + return feeds.SelectMany(feed => [sourceArgumentPrefix, feed]).ToList(); + } + + private IEnumerable FeedsToUseAux(HashSet feedsToConsider) + { + if (HasPrivateRegistryFeeds) { - feedArgs.Append($" {sourceArgumentPrefix} \"{feed}\""); + feedsToConsider.UnionWith(privateRegistryFeeds); } - return feedArgs.ToString(); + var feedsToUse = CheckNugetFeedResponsiveness + ? feedsToConsider.Where(ReachableFeeds.Contains) + : feedsToConsider; + + return feedsToUse; } /// @@ -113,24 +192,24 @@ public string FeedsToRestoreArgument(IEnumerable feeds, string sourceArg /// (2) Use private registries, if they are configured /// /// Path to project/solution/packages.config - /// The set of reachable NuGet feeds. /// The list of NuGet feeds to use for this restore. - public IEnumerable FeedsToUse(string path, HashSet reachableFeeds) + public IEnumerable FeedsToUse(string path) { // Find the path specific feeds. var folder = GetDirectoryName(path); var feedsToConsider = folder is not null ? GetFeedsFromFolder(folder).ToHashSet() : new HashSet(); - if (HasPrivateRegistryFeeds) - { - feedsToConsider.UnionWith(PrivateRegistryFeeds); - } - - var feedsToUse = CheckNugetFeedResponsiveness - ? feedsToConsider.Where(reachableFeeds.Contains) - : feedsToConsider; + return FeedsToUseAux(feedsToConsider); + } - return feedsToUse; + /// + /// Constructs the NuGet sources argument for the `dotnet restore` command based on the given feeds. + /// + /// The list of NuGet feeds to use for the restore command. + /// A list representing the NuGet sources arguments for the `dotnet restore` command. + public List FeedsToDotnetRestoreArgument(IEnumerable feeds) + { + return FeedsToRestoreArgument(feeds, "-s"); } /// @@ -139,19 +218,18 @@ public IEnumerable FeedsToUse(string path, HashSet reachableFeed /// (2) Use private registries, if they are configured /// /// Path to project/solution - /// The set of reachable NuGet feeds. - /// A string representing the NuGet sources argument for the restore command. - public string? MakeDotnetRestoreSourcesArgument(string path, HashSet reachableFeeds) + /// A string representing the NuGet sources argument for the `dotnet restore` command. + public List MakeDotnetRestoreSourcesArguments(string path) { // Do not construct a set of explicit NuGet sources to use for restore. if (!CheckNugetFeedResponsiveness && !HasPrivateRegistryFeeds) { - return null; + return []; } - var feedsToUse = FeedsToUse(path, reachableFeeds); + var feedsToUse = FeedsToUse(path); - return FeedsToRestoreArgument(feedsToUse, "-s"); + return FeedsToDotnetRestoreArgument(feedsToUse); } private (int initialTimeout, int tryCount) GetFeedRequestSettings(bool isFallback) @@ -178,7 +256,7 @@ private static async Task ExecuteGetRequest(string address, return await httpClient.GetAsync(address, HttpCompletionOption.ResponseHeadersRead, cancellationToken); } - private bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount, out bool isTimeout) + private bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount) { logger.LogInfo($"Checking if NuGet feed '{feed}' is reachable..."); @@ -211,8 +289,6 @@ private bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount, using HttpClient client = new(httpClientHandler); - isTimeout = false; - for (var i = 0; i < tryCount; i++) { using var cts = new CancellationTokenSource(); @@ -242,7 +318,6 @@ private bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount, } logger.LogWarning($"Didn't receive answer from NuGet feed '{feed}'. Tried it {tryCount} times."); - isTimeout = true; return false; } @@ -266,12 +341,8 @@ private HashSet GetExcludedFeeds() /// Checks that we can connect to the specified NuGet feeds. /// /// The set of package feeds to check. - /// The list of feeds that were reachable. - /// - /// True if there is a timeout when trying to reach the feeds (excluding any feeds that are configured - /// to be excluded from the check) or false otherwise. - /// - public bool CheckSpecifiedFeeds(HashSet feeds, out HashSet reachableFeeds) + /// The list of feeds that were reachable. + private ImmutableHashSet CheckSpecifiedFeeds(ImmutableHashSet feeds) { // Exclude any feeds from the feed check that are configured by the corresponding environment variable. // These feeds are always assumed to be reachable. @@ -287,20 +358,23 @@ public bool CheckSpecifiedFeeds(HashSet feeds, out HashSet reach return true; }).ToHashSet(); - reachableFeeds = GetReachableNuGetFeeds(feedsToCheck, isFallback: false, out var isTimeout).ToHashSet(); + var reachable = GetReachableNuGetFeeds(feedsToCheck, isFallback: false); // Always consider feeds excluded for the reachability check as reachable. - reachableFeeds.UnionWith(feeds.Where(feed => excludedFeeds.Contains(feed))); - - return isTimeout; + return reachable.Union(feeds.Where(feed => excludedFeeds.Contains(feed))).ToImmutableHashSet(); } + /// + /// Return true if the default NuGet feed is reachable, false otherwise. + /// If the reachability check is disabled, this method will always return true. + /// + /// True if the default NuGet feed is reachable, false otherwise. public bool IsDefaultFeedReachable() { if (CheckNugetFeedResponsiveness) { var (initialTimeout, tryCount) = GetFeedRequestSettings(isFallback: false); - return IsFeedReachable(PublicNugetOrgFeed, initialTimeout, tryCount, out var _); + return IsFeedReachable(PublicNugetOrgFeed, initialTimeout, tryCount); } return true; @@ -311,22 +385,15 @@ public bool IsDefaultFeedReachable() /// /// The feeds to check. /// Whether the feeds are fallback feeds or not. - /// Whether a timeout occurred while checking the feeds. /// The list of feeds that could be reached. - private List GetReachableNuGetFeeds(HashSet feedsToCheck, bool isFallback, out bool isTimeout) + private List GetReachableNuGetFeeds(HashSet feedsToCheck, bool isFallback) { var fallbackStr = isFallback ? "fallback " : ""; logger.LogInfo($"Checking {fallbackStr}NuGet feed reachability on feeds: {string.Join(", ", feedsToCheck.OrderBy(f => f))}"); var (initialTimeout, tryCount) = GetFeedRequestSettings(isFallback); - var timeout = false; var reachableFeeds = feedsToCheck - .Where(feed => - { - var reachable = IsFeedReachable(feed, initialTimeout, tryCount, out var feedTimeout); - timeout |= feedTimeout; - return reachable; - }) + .Where(feed => IsFeedReachable(feed, initialTimeout, tryCount)) .ToList(); if (reachableFeeds.Count == 0) @@ -338,11 +405,10 @@ private List GetReachableNuGetFeeds(HashSet feedsToCheck, bool i logger.LogInfo($"Reachable {fallbackStr}NuGet feeds: {string.Join(", ", reachableFeeds.OrderBy(f => f))}"); } - isTimeout = timeout; return reachableFeeds; } - public List GetReachableFallbackNugetFeeds(HashSet? feedsFromNugetConfigs) + private List GetReachableFallbackNugetFeeds() { var fallbackFeeds = EnvironmentVariables.GetURLs(EnvironmentVariableNames.FallbackNugetFeeds).ToHashSet(); if (fallbackFeeds.Count == 0) @@ -353,19 +419,19 @@ public List GetReachableFallbackNugetFeeds(HashSet? feedsFromNug var shouldAddNugetConfigFeeds = EnvironmentVariables.GetBooleanOptOut(EnvironmentVariableNames.AddNugetConfigFeedsToFallback); logger.LogInfo($"Adding feeds from nuget.config to fallback restore: {shouldAddNugetConfigFeeds}"); - if (shouldAddNugetConfigFeeds && feedsFromNugetConfigs?.Count > 0) + if (shouldAddNugetConfigFeeds && ExplicitFeeds.Count > 0) { - // There are some feeds in `feedsFromNugetConfigs` that have already been checked for reachability, we could skip those. - // But we might use different responsiveness testing settings when we try them in the fallback logic, so checking them again is safer. - fallbackFeeds.UnionWith(feedsFromNugetConfigs); - logger.LogInfo($"Using NuGet feeds from nuget.config files as fallback feeds: {string.Join(", ", feedsFromNugetConfigs.OrderBy(f => f))}"); + // Feeds in `ExplicitFeeds` may already have been checked for reachability. + // However, the fallback logic may use different responsiveness settings, so check them again. + fallbackFeeds.UnionWith(ExplicitFeeds); + logger.LogInfo($"Using NuGet feeds from nuget.config files as fallback feeds: {string.Join(", ", ExplicitFeeds.OrderBy(f => f))}"); } } - return GetReachableNuGetFeeds(fallbackFeeds, isFallback: true, out var _); + return GetReachableNuGetFeeds(fallbackFeeds, isFallback: true); } - public (HashSet explicitFeeds, HashSet allFeeds) GetAllFeeds() + private ImmutableHashSet GetExplicitFeeds() { var nugetConfigs = fileProvider.NugetConfigs; @@ -387,14 +453,21 @@ public List GetReachableFallbackNugetFeeds(HashSet? feedsFromNug // in addition to the ones that are configured in `nuget.config` files. if (HasPrivateRegistryFeeds) { - logger.LogInfo($"Found {PrivateRegistryFeeds.Count} private registry feeds configured for C#: {string.Join(", ", PrivateRegistryFeeds.OrderBy(f => f))}"); - explicitFeeds.UnionWith(PrivateRegistryFeeds); + logger.LogInfo($"Found {privateRegistryFeeds.Count} private registry feeds configured for C#: {string.Join(", ", privateRegistryFeeds.OrderBy(f => f))}"); + explicitFeeds.UnionWith(privateRegistryFeeds); } + return explicitFeeds.ToImmutableHashSet(); + } + + private ImmutableHashSet GetAllFeeds() + { + var nugetConfigs = fileProvider.NugetConfigs; + HashSet allFeeds = []; // Add all explicitFeeds to the set of all feeds. - allFeeds.UnionWith(explicitFeeds); + allFeeds.UnionWith(ExplicitFeeds); // Obtain the list of feeds from the root source directory. // If a NuGet file is present it will be respected, otherwise we will just get the machine/environment specific feeds. @@ -414,7 +487,7 @@ public List GetReachableFallbackNugetFeeds(HashSet? feedsFromNug logger.LogInfo($"Found {allFeeds.Count} NuGet feeds (with inherited ones) in nuget.config files: {string.Join(", ", allFeeds.OrderBy(f => f))}"); - return (explicitFeeds, allFeeds); + return allFeeds.ToImmutableHashSet(); } [GeneratedRegex(@"^E\s(.*)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)] diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs index d14dee506524..0e93fa92813a 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs @@ -12,12 +12,12 @@ public interface IDotNet bool AddPackage(string folder, string package); IList GetListedRuntimes(); IList GetListedSdks(); - bool Exec(string execArgs); + bool Exec(List execArgs); IList GetNugetFeeds(string nugetConfig); IList GetNugetFeedsFromFolder(string folderPath); } - public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? NugetSources = null, string? PathToNugetConfig = null, bool ForceReevaluation = false, bool TargetWindows = false); + public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, List NugetSources, bool ForceReevaluation = false, bool TargetWindows = false); public partial record class RestoreResult(bool Success, IList Output) { diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs index ef5bcd4753bb..b5400ec63319 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs @@ -30,26 +30,26 @@ internal interface IDotNetCliInvoker /// Execute `dotnet ` and return true if the command succeeded, otherwise false. /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`. /// - bool RunCommand(string args, bool silent = true); + bool RunCommand(List args, bool silent = true); /// /// Execute `dotnet ` and return the exit code. /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`. /// - int RunCommandExitCode(string args, bool silent = true); + int RunCommandExitCode(List args, bool silent = true); /// /// Execute `dotnet ` and return true if the command succeeded, otherwise false. /// The output of the command is returned in `output`. /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`. /// - bool RunCommand(string args, out IList output, bool silent = true); + bool RunCommand(List args, out IList output, bool silent = true); /// /// Execute `dotnet ` in `` and return true if the command succeeded, otherwise false. /// The output of the command is returned in `output`. /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`. /// - bool RunCommand(string args, string? workingDirectory, out IList output, bool silent = true); + bool RunCommand(List args, string? workingDirectory, out IList output, bool silent = true); } } diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs index 9da2018dffbc..fac49018dd27 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs @@ -4,7 +4,6 @@ using System.Collections.Immutable; using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; @@ -53,7 +52,9 @@ public NugetPackageRestorer( public string? TryRestore(string package) { - if (TryRestorePackageManually(package)) + var feeds = feedManager.CheckNugetFeedResponsiveness ? feedManager.ReachableFeeds : feedManager.AllFeeds; + var nugetSources = feedManager.FeedsToDotnetRestoreArgument(feeds); + if (TryRestorePackageManually(package, nugetSources)) { var packageDir = DependencyManager.GetPackageDirectory(package, missingPackageDirectory.DirInfo); if (packageDir is not null) @@ -110,48 +111,29 @@ public HashSet Restore() logger.LogInfo($"Checking NuGet feed responsiveness: {feedManager.CheckNugetFeedResponsiveness}"); compilationInfoContainer.CompilationInfos.Add(("NuGet feed responsiveness checked", feedManager.CheckNugetFeedResponsiveness ? "1" : "0")); - HashSet reachableFeeds = []; - EmitNugetConfigDiagnostics(); // Find feeds that are configured in NuGet.config files and divide them into ones that // are explicitly configured for the project or by a private registry, and "all feeds" // (including inherited ones) from other locations on the host outside of the working directory. - (var explicitFeeds, var allFeeds) = feedManager.GetAllFeeds(); + var explicitFeeds = feedManager.ExplicitFeeds; if (feedManager.CheckNugetFeedResponsiveness) { - var inheritedFeeds = allFeeds.Except(explicitFeeds).ToHashSet(); + var inheritedFeeds = feedManager.InheritedFeeds; if (inheritedFeeds.Count > 0) { compilationInfoContainer.CompilationInfos.Add(("Inherited NuGet feed count", inheritedFeeds.Count.ToString())); } - var timeout = feedManager.CheckSpecifiedFeeds(explicitFeeds, out var reachableExplicitFeeds); - reachableFeeds.UnionWith(reachableExplicitFeeds); - - var allExplicitReachable = explicitFeeds.Count == reachableExplicitFeeds.Count; + var allExplicitReachable = explicitFeeds.Count == feedManager.ReachableExplicitFeeds.Count; EmitUnreachableFeedsDiagnostics(allExplicitReachable); - - if (timeout) - { - // If we experience a timeout, we use this fallback. - // todo: we could also check the reachability of the inherited nuget feeds, but to use those in the fallback we would need to handle authentication too. - var unresponsiveMissingPackageLocation = DownloadMissingPackagesFromSpecificFeeds([], explicitFeeds); - return unresponsiveMissingPackageLocation is null - ? [] - : [unresponsiveMissingPackageLocation]; - } - - // Inherited feeds should only be used, if they are indeed reachable (as they may be environment specific). - feedManager.CheckSpecifiedFeeds(inheritedFeeds, out var reachableInheritedFeeds); - reachableFeeds.UnionWith(reachableInheritedFeeds); } try { - var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager, reachableFeeds); + var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager); var count = packagesConfigRestore.InstallPackages(); if (packagesConfigRestore.PackageCount > 0) { @@ -189,9 +171,9 @@ public HashSet Restore() } // Restore project dependencies with `dotnet restore`. - var restoredProjects = RestoreSolutions(reachableFeeds, out var container); + var restoredProjects = RestoreSolutions(out var container); var projects = fileProvider.Projects.Except(restoredProjects); - RestoreProjects(projects, reachableFeeds, out var containers); + RestoreProjects(projects, out var containers); var dependencies = containers.Flatten(container); @@ -203,9 +185,7 @@ public HashSet Restore() var usedPackageNames = GetAllUsedPackageDirNames(dependencies); - var missingPackageLocation = feedManager.CheckNugetFeedResponsiveness - ? DownloadMissingPackagesFromSpecificFeeds(usedPackageNames, explicitFeeds) - : DownloadMissingPackages(usedPackageNames); + var missingPackageLocation = DownloadMissingPackages(usedPackageNames); if (missingPackageLocation is not null) { @@ -223,7 +203,7 @@ public HashSet Restore() /// Populates dependencies with the relevant dependencies from the assets files generated by the restore. /// Returns a list of projects that are up to date with respect to restore. /// - private IEnumerable RestoreSolutions(HashSet reachableFeeds, out DependencyContainer dependencies) + private IEnumerable RestoreSolutions(out DependencyContainer dependencies) { var successCount = 0; var nugetSourceFailures = 0; @@ -236,7 +216,7 @@ private IEnumerable RestoreSolutions(HashSet reachableFeeds, out var projects = fileProvider.Solutions.SelectMany(solution => { logger.LogInfo($"Restoring solution {solution}..."); - var nugetSources = feedManager.MakeDotnetRestoreSourcesArgument(solution, reachableFeeds); + var nugetSources = feedManager.MakeDotnetRestoreSourcesArguments(solution); var res = dotnet.Restore(new(solution, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: nugetSources, TargetWindows: isWindows)); if (res.Success) { @@ -267,8 +247,7 @@ private IEnumerable RestoreSolutions(HashSet reachableFeeds, out /// Populates dependencies with the relative paths to the assets files generated by the restore. /// /// A list of paths to project files. - /// The set of reachable NuGet feeds. - private void RestoreProjects(IEnumerable projects, HashSet reachableFeeds, out ConcurrentBag dependencies) + private void RestoreProjects(IEnumerable projects, out ConcurrentBag dependencies) { var successCount = 0; var nugetSourceFailures = 0; @@ -285,7 +264,7 @@ private void RestoreProjects(IEnumerable projects, HashSet reach foreach (var project in projectGroup) { logger.LogInfo($"Restoring project {project}..."); - var nugetSources = feedManager.MakeDotnetRestoreSourcesArgument(project, reachableFeeds); + var nugetSources = feedManager.MakeDotnetRestoreSourcesArguments(project); var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: nugetSources, TargetWindows: isWindows)); assets.AddDependenciesRange(res.AssetsFilePaths); lock (sync) @@ -312,22 +291,28 @@ private void RestoreProjects(IEnumerable projects, HashSet reach compilationInfoContainer.CompilationInfos.Add(("Failed project restore with missing package error", nugetMissingPackageFailures.ToString())); } - private AssemblyLookupLocation? DownloadMissingPackagesFromSpecificFeeds(IEnumerable usedPackageNames, HashSet? feedsFromNugetConfigs) + private AssemblyLookupLocation? DownloadMissingPackages(IEnumerable usedPackageNames) { - var reachableFallbackFeeds = feedManager.GetReachableFallbackNugetFeeds(feedsFromNugetConfigs); - compilationInfoContainer.CompilationInfos.Add(("Reachable fallback NuGet feed count", reachableFallbackFeeds.Count.ToString())); + ImmutableHashSet feeds; + if (feedManager.CheckNugetFeedResponsiveness) + { + // Attempt to get the fallback configuration. + var reachableFallbackFeeds = feedManager.ReachableFallbackFeeds; + compilationInfoContainer.CompilationInfos.Add(("Reachable fallback NuGet feed count", reachableFallbackFeeds.Count.ToString())); - if (reachableFallbackFeeds.Count > 0) + if (reachableFallbackFeeds.Count == 0) + { + logger.LogWarning("Skipping download of missing packages from specific feeds as no fallback NuGet feeds are reachable."); + return null; + } + feeds = reachableFallbackFeeds; + } + else { - return DownloadMissingPackages(usedPackageNames, fallbackNugetFeeds: reachableFallbackFeeds); + feeds = feedManager.AllFeeds; } - logger.LogWarning("Skipping download of missing packages from specific feeds as no fallback NuGet feeds are reachable."); - return null; - } - - private AssemblyLookupLocation? DownloadMissingPackages(IEnumerable usedPackageNames, IEnumerable? fallbackNugetFeeds = null) - { + var nugetSources = feedManager.FeedsToDotnetRestoreArgument(feeds); var alreadyDownloadedPackages = usedPackageNames.Select(p => p.ToLowerInvariant()); var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames(); @@ -359,10 +344,6 @@ private void RestoreProjects(IEnumerable projects, HashSet reach } logger.LogInfo($"Found {notYetDownloadedPackages.Count} packages that are not yet restored"); - using var tempDir = new TemporaryDirectory(ComputeTempDirectoryPath("nugetconfig"), "generated nuget config", logger); - var nugetConfig = fallbackNugetFeeds is null - ? GetNugetConfig() - : CreateFallbackNugetConfig(fallbackNugetFeeds, tempDir.DirInfo.FullName); compilationInfoContainer.CompilationInfos.Add(("Fallback nuget restore", notYetDownloadedPackages.Count.ToString())); @@ -371,7 +352,7 @@ private void RestoreProjects(IEnumerable projects, HashSet reach Parallel.ForEach(notYetDownloadedPackages, new ParallelOptions { MaxDegreeOfParallelism = DependencyManager.Threads }, package => { - var success = TryRestorePackageManually(package.Name, nugetConfig, package.PackageReferenceSource, tryWithoutNugetConfig: fallbackNugetFeeds is null); + var success = TryRestorePackageManually(package.Name, nugetSources, package.PackageReferenceSource); if (!success) { return; @@ -388,53 +369,6 @@ private void RestoreProjects(IEnumerable projects, HashSet reach return missingPackageDirectory.DirInfo.FullName; } - private string? CreateFallbackNugetConfig(IEnumerable fallbackNugetFeeds, string folderPath) - { - var sb = new StringBuilder(); - fallbackNugetFeeds.ForEach((feed, index) => sb.AppendLine($"")); - - var nugetConfigPath = Path.Join(folderPath, "nuget.config"); - logger.LogInfo($"Creating fallback nuget.config file {nugetConfigPath}."); - File.WriteAllText(nugetConfigPath, - $""" - - - - - {sb} - - - """); - - return nugetConfigPath; - } - - private string? GetNugetConfig() - { - var nugetConfigs = fileProvider.NugetConfigs; - string? nugetConfig; - if (nugetConfigs.Count > 1) - { - logger.LogInfo($"Found multiple nuget.config files: {string.Join(", ", nugetConfigs)}."); - nugetConfig = fileProvider.RootNugetConfig; - if (nugetConfig == null) - { - logger.LogInfo("Could not find a top-level nuget.config file."); - } - } - else - { - nugetConfig = nugetConfigs.FirstOrDefault(); - } - - if (nugetConfig != null) - { - logger.LogInfo($"Using nuget.config file {nugetConfig}."); - } - - return nugetConfig; - } - private IEnumerable GetAllUsedPackageDirNames(DependencyContainer dependencies) { var allPackageDirectories = GetAllPackageDirectories(); @@ -498,8 +432,7 @@ private static IEnumerable GetRestoredPackageDirectoryNames(DirectoryInf .Select(d => Path.GetFileName(d).ToLowerInvariant()); } - private bool TryRestorePackageManually(string package, string? nugetConfig = null, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj, - bool tryWithoutNugetConfig = true, bool tryPrereleaseVersion = true) + private bool TryRestorePackageManually(string package, List nugetSources, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj, bool tryPrereleaseVersion = true) { logger.LogInfo($"Restoring package {package}..."); using var tempDir = new TemporaryDirectory( @@ -521,17 +454,17 @@ private bool TryRestorePackageManually(string package, string? nugetConfig = nul return false; } - var res = TryRestorePackageManually(package, nugetConfig, tempDir, tryPrereleaseVersion); + var res = TryRestorePackageManually(package, nugetSources, tempDir, tryPrereleaseVersion); if (res.Success) { return true; } - if (tryWithoutNugetConfig && res.HasNugetPackageSourceError && nugetConfig is not null) + if (!feedManager.CheckNugetFeedResponsiveness && res.HasNugetPackageSourceError && nugetSources is not null) { - logger.LogDebug($"Trying to restore '{package}' without nuget.config."); - // Restore could not be completed because the listed source is unavailable. Try without the nuget.config: - res = TryRestorePackageManually(package, nugetConfig: null, tempDir, tryPrereleaseVersion); + logger.LogDebug($"Trying to restore '{package}' without explicitly providing NuGet sources."); + // Restore could not be completed because the listed source is unavailable. Try without an explicit restore source argument. + res = TryRestorePackageManually(package, [], tempDir, tryPrereleaseVersion); if (res.Success) { return true; @@ -542,16 +475,16 @@ private bool TryRestorePackageManually(string package, string? nugetConfig = nul return false; } - private RestoreResult TryRestorePackageManually(string package, string? nugetConfig, TemporaryDirectory tempDir, bool tryPrereleaseVersion) + private RestoreResult TryRestorePackageManually(string package, List nugetSources, TemporaryDirectory tempDir, bool tryPrereleaseVersion) { - var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig, ForceReevaluation: true)); + var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, nugetSources, ForceReevaluation: true)); if (!res.Success && tryPrereleaseVersion && res.HasNugetNoStablePackageVersionError) { logger.LogDebug($"Failed to restore nuget package {package} because no stable version was found."); TryChangePackageVersion(tempDir.DirInfo, "*-*"); - res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig, ForceReevaluation: true)); + res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, nugetSources, ForceReevaluation: true)); if (!res.Success) { TryChangePackageVersion(tempDir.DirInfo, "*"); diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs index af484ba406e4..305897ed926e 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; using System.IO; using System.Linq; @@ -33,11 +34,11 @@ internal interface IPackagesConfigRestore /// internal class PackagesConfigRestoreFactory { - public static IPackagesConfigRestore Create(FileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, HashSet reachableFeeds) + public static IPackagesConfigRestore Create(FileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager) { if (SystemBuildActions.Instance.IsWindows() || SystemBuildActions.Instance.IsMonoInstalled()) { - return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager, reachableFeeds); + return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager); } return new NoOpPackagesConfig(fileProvider.PackagesConfigs, logger); @@ -64,7 +65,6 @@ private class NugetExeWrapper : IPackagesConfigRestore /// private readonly DependencyDirectory packageDirectory; private readonly FeedManager feedManager; - private readonly HashSet reachableFeeds; private bool IsWindows => SystemBuildActions.Instance.IsWindows(); @@ -75,13 +75,12 @@ private class NugetExeWrapper : IPackagesConfigRestore /// /// Create the package manager for a specified source tree. /// - public NugetExeWrapper(FileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, HashSet reachableFeeds) + public NugetExeWrapper(FileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager) { this.fileProvider = fileProvider; this.packageDirectory = packageDirectory; this.logger = logger; this.feedManager = feedManager; - this.reachableFeeds = reachableFeeds; if (fileProvider.PackagesConfigs.Count > 0) { @@ -169,8 +168,8 @@ private bool TryRestoreNugetPackage(string packagesConfig) { logger.LogInfo($"Restoring file \"{packagesConfig}\"..."); - var sourcesArgument = ""; - var feedsToUse = feedManager.FeedsToUse(packagesConfig, reachableFeeds).ToList(); + List sourcesArgument = []; + var feedsToUse = feedManager.FeedsToUse(packagesConfig).ToList(); var useDefaultFeed = feedsToUse.Count == 0 && IsDefaultFeedReachable; // Explicitly construct the sources to be used for the restore command when checking feed @@ -190,16 +189,18 @@ private bool TryRestoreNugetPackage(string packagesConfig) * really unwieldy and this solution works for now. */ - string exe, args; + string exe; + List args; + if (RunWithMono) { exe = "mono"; - args = $"\"{nugetExe}\" install -OutputDirectory \"{packageDirectory}\" {sourcesArgument} \"{packagesConfig}\""; + args = [nugetExe!, "install", "-OutputDirectory", packageDirectory.ToString(), .. sourcesArgument, packagesConfig]; } else { exe = nugetExe!; - args = $"install -OutputDirectory \"{packageDirectory}\" {sourcesArgument} \"{packagesConfig}\""; + args = ["install", "-OutputDirectory", packageDirectory.ToString(), .. sourcesArgument, packagesConfig]; } var pi = new ProcessStartInfo(exe, args) diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs index 9518afac4008..8ecf13d53a6a 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs @@ -79,7 +79,7 @@ public IEnumerable RunSourceGenerator(IEnumerable additionalFile sw.Write(argsString); } - dotnet.Exec($"\"{cscPath}\" /noconfig @\"{cscArgsPath}\""); + dotnet.Exec([cscPath, "/noconfig", $"@{cscArgsPath}"]); var files = Directory.GetFiles(outputFolder, "*.*", new EnumerationOptions { RecurseSubdirectories = true }); diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs index a2996497e005..998e6e295365 100644 --- a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs +++ b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs @@ -9,7 +9,7 @@ namespace Semmle.Extraction.Tests internal class DotNetCliInvokerStub : IDotNetCliInvoker { private readonly IList output; - private string lastArgs = ""; + private List lastArgs = new List(); public string WorkingDirectory { get; private set; } = ""; public bool Success { get; set; } = true; public int ExitCode { get; set; } = 0; @@ -21,32 +21,32 @@ public DotNetCliInvokerStub(IList output) public string Exec => "dotnet"; - public bool RunCommand(string args, bool silent) + public bool RunCommand(List args, bool silent) { lastArgs = args; return Success; } - public int RunCommandExitCode(string args, bool silent) + public int RunCommandExitCode(List args, bool silent) { lastArgs = args; return ExitCode; } - public bool RunCommand(string args, out IList output, bool silent) + public bool RunCommand(List args, out IList output, bool silent) { lastArgs = args; output = this.output; return Success; } - public bool RunCommand(string args, string? workingDirectory, out IList output, bool silent) + public bool RunCommand(List args, string? workingDirectory, out IList output, bool silent) { WorkingDirectory = workingDirectory ?? ""; return RunCommand(args, out output, silent); } - public string GetLastArgs() => lastArgs; + public string GetLastArgs() => string.Join(" ", lastArgs); } public class DotNetTests @@ -115,11 +115,11 @@ public void TestDotnetRestoreProjectToDirectory1() var dotnet = MakeDotnet(dotnetCliInvoker); // Execute - dotnet.Restore(new("myproject.csproj", "mypackages", false)); + dotnet.Restore(new("myproject.csproj", "mypackages", false, [])); // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs); + Assert.Equal("restore --no-dependencies myproject.csproj --packages mypackages /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs); } [Fact] @@ -130,11 +130,11 @@ public void TestDotnetRestoreProjectToDirectory2() var dotnet = MakeDotnet(dotnetCliInvoker); // Execute - var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, null, "myconfig.config")); + var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, [])); // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\"", lastArgs); + Assert.Equal("restore --no-dependencies myproject.csproj --packages mypackages /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs); Assert.Equal(2, res.AssetsFilePaths.Count()); Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths); Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths); @@ -148,11 +148,11 @@ public void TestDotnetRestoreProjectToDirectory3() var dotnet = MakeDotnet(dotnetCliInvoker); // Execute - var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, null, "myconfig.config", true)); + var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, [], true)); // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\" --force", lastArgs); + Assert.Equal("restore --no-dependencies myproject.csproj --packages mypackages /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --force", lastArgs); Assert.Equal(2, res.AssetsFilePaths.Count()); Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths); Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths); @@ -166,11 +166,11 @@ public void TestDotnetRestoreSolutionToDirectory1() var dotnet = MakeDotnet(dotnetCliInvoker); // Execute - var res = dotnet.Restore(new("mysolution.sln", "mypackages", false)); + var res = dotnet.Restore(new("mysolution.sln", "mypackages", false, [])); // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs); + Assert.Equal("restore --no-dependencies mysolution.sln --packages mypackages /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs); Assert.Equal(2, res.RestoredProjects.Count()); Assert.Contains("/path/to/project.csproj", res.RestoredProjects); Assert.Contains("/path/to/project2.csproj", res.RestoredProjects); @@ -188,11 +188,11 @@ public void TestDotnetRestoreSolutionToDirectory2() dotnetCliInvoker.Success = false; // Execute - var res = dotnet.Restore(new("mysolution.sln", "mypackages", false)); + var res = dotnet.Restore(new("mysolution.sln", "mypackages", false, [])); // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs); + Assert.Equal("restore --no-dependencies mysolution.sln --packages mypackages /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs); Assert.Empty(res.RestoredProjects); Assert.Empty(res.AssetsFilePaths); } @@ -209,7 +209,7 @@ public void TestDotnetNew() // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("new console --no-restore --output \"myfolder\"", lastArgs); + Assert.Equal("new console --no-restore --output myfolder", lastArgs); } [Fact] @@ -224,7 +224,7 @@ public void TestDotnetAddPackage() // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("add \"myfolder\" package \"mypackage\" --no-restore", lastArgs); + Assert.Equal("add myfolder package mypackage --no-restore", lastArgs); } [Fact] @@ -270,7 +270,7 @@ public void TestDotnetExec() var dotnet = MakeDotnet(dotnetCliInvoker); // Execute - dotnet.Exec("myarg1 myarg2"); + dotnet.Exec(["myarg1", "myarg2"]); // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); @@ -289,7 +289,7 @@ public void TestNugetFeeds() // Verify var lastArgs = dotnetCliInvoker.GetLastArgs(); - Assert.Equal("nuget list source --format Short --configfile \"abc\"", lastArgs); + Assert.Equal("nuget list source --format Short --configfile abc", lastArgs); } [Fact] diff --git a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs index 38101420fab2..348cadae2fd0 100644 --- a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs +++ b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs @@ -25,7 +25,7 @@ public DotNetStub(IList runtimes, IList sdks) public IList GetListedSdks() => sdks; - public bool Exec(string execArgs) => true; + public bool Exec(List execArgs) => true; public IList GetNugetFeeds(string nugetConfig) => []; diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected index 5a7abcf543c8..4acd4f54e8a6 100644 --- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected +++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected @@ -1,4 +1,8 @@ | All NuGet feeds reachable | 0.0 | +| Failed project restore with missing package error | 1.0 | +| Failed project restore with package source error | 0.0 | +| Failed solution restore with missing package error | 0.0 | +| Failed solution restore with package source error | 0.0 | | Fallback nuget restore | 1.0 | | Inherited NuGet feed count | 1.0 | | NuGet feed responsiveness checked | 1.0 | @@ -7,10 +11,13 @@ | Resolved assembly conflicts | 7.0 | | Resource extraction enabled | 0.0 | | Restored .NET framework variants | 0.0 | +| Restored projects through solution files | 0.0 | | Solution files on filesystem | 1.0 | | Source files generated | 0.0 | | Source files on filesystem | 1.0 | | Successfully ran fallback nuget restore | 1.0 | +| Successfully restored project files | 0.0 | +| Successfully restored solution files | 1.0 | | Unresolved references | 0.0 | | UseWPF set | 0.0 | | UseWindowsForms set | 0.0 | diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected index 9cc03f2f5372..d421cfc42e1a 100644 --- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected +++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected @@ -1,4 +1,8 @@ | All NuGet feeds reachable | 0.0 | +| Failed project restore with missing package error | 1.0 | +| Failed project restore with package source error | 0.0 | +| Failed solution restore with missing package error | 0.0 | +| Failed solution restore with package source error | 0.0 | | Fallback nuget restore | 1.0 | | Inherited NuGet feed count | 1.0 | | NuGet feed responsiveness checked | 1.0 | @@ -7,10 +11,13 @@ | Resolved assembly conflicts | 7.0 | | Resource extraction enabled | 0.0 | | Restored .NET framework variants | 0.0 | +| Restored projects through solution files | 0.0 | | Solution files on filesystem | 1.0 | | Source files generated | 0.0 | | Source files on filesystem | 1.0 | | Successfully ran fallback nuget restore | 1.0 | +| Successfully restored project files | 0.0 | +| Successfully restored solution files | 1.0 | | Unresolved references | 0.0 | | UseWPF set | 0.0 | | UseWindowsForms set | 0.0 | diff --git a/csharp/ql/lib/change-notes/2026-07-17-nuget-package-restore.md b/csharp/ql/lib/change-notes/2026-07-17-nuget-package-restore.md new file mode 100644 index 000000000000..0673bffa3049 --- /dev/null +++ b/csharp/ql/lib/change-notes/2026-07-17-nuget-package-restore.md @@ -0,0 +1,4 @@ +--- +category: majorAnalysis +--- +* Simplified and streamlined the use of NuGet sources when downloading dependencies. In fallback scenarios and specialized package downloads, NuGet sources are now passed directly to `dotnet restore` via `-s`. Furthermore, no `nuget.config` files are created for fallback scenarios, and private registries are used when attempting to download missing packages that were not restored as part of the normal `dotnet restore` process.