From 1ee6d631c6614aa4b33f81800c625175b2f415bf Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Fri, 10 Apr 2026 11:47:12 +0200 Subject: [PATCH] C#: Rename ExtraArgs to NugetSources. --- .../DotNet.cs | 4 ++-- .../IDotNet.cs | 2 +- .../NugetPackageRestorer.cs | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs index 9d3d79e4c4f..699e06d273c 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs @@ -95,9 +95,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching args += " /p:EnableWindowsTargeting=true"; } - if (restoreSettings.ExtraArgs is not null) + if (restoreSettings.NugetSources is not null) { - args += $" {restoreSettings.ExtraArgs}"; + args += $" {restoreSettings.NugetSources}"; } return args; diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs index eec6a2b8d3b..58d4f9b550b 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs @@ -17,7 +17,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching IList GetNugetFeedsFromFolder(string folderPath); } - public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? ExtraArgs = null, string? PathToNugetConfig = null, bool ForceReevaluation = false, bool TargetWindows = false); + public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? NugetSources = null, string? PathToNugetConfig = null, bool ForceReevaluation = false, bool TargetWindows = false); public partial record class RestoreResult(bool Success, IList Output) { diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs index 4c196b5d627..9c4073e78b7 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs @@ -118,7 +118,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching compilationInfoContainer.CompilationInfos.Add(("NuGet feed responsiveness checked", CheckNugetFeedResponsiveness ? "1" : "0")); HashSet explicitFeeds = []; - string? explicitRestoreSources = null; + string? explicitNugetSources = null; try { @@ -153,13 +153,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching // If feed responsiveness is being checked, we only want to use the feeds that are reachable (note this set includes private // registry feeds if they are reachable). - explicitRestoreSources = MakeRestoreSourcesArgument(reachableFeeds); + explicitNugetSources = MakeRestoreSourcesArgument(reachableFeeds); } else if (HasPrivateRegistryFeeds) { // If private registries are configured they need to be included as sources for the restore, which requires that // they are provided as source arguments for the restore. The private registries are included in the `allFeeds` set. - explicitRestoreSources = MakeRestoreSourcesArgument(allFeeds); + explicitNugetSources = MakeRestoreSourcesArgument(allFeeds); } using (var nuget = new NugetExeWrapper(fileProvider, legacyPackageDirectory, logger)) @@ -202,9 +202,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching } // Restore project dependencies with `dotnet restore`. - var restoredProjects = RestoreSolutions(explicitRestoreSources, out var container); + var restoredProjects = RestoreSolutions(explicitNugetSources, out var container); var projects = fileProvider.Projects.Except(restoredProjects); - RestoreProjects(projects, explicitRestoreSources, out var containers); + RestoreProjects(projects, explicitNugetSources, out var containers); var dependencies = containers.Flatten(container); @@ -291,7 +291,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching /// 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(string? explicitRestoreSources, out DependencyContainer dependencies) + private IEnumerable RestoreSolutions(string? nugetSources, out DependencyContainer dependencies) { var successCount = 0; var nugetSourceFailures = 0; @@ -302,7 +302,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching var projects = fileProvider.Solutions.SelectMany(solution => { logger.LogInfo($"Restoring solution {solution}..."); - var res = dotnet.Restore(new(solution, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, ExtraArgs: explicitRestoreSources, TargetWindows: isWindows)); + var res = dotnet.Restore(new(solution, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: nugetSources, TargetWindows: isWindows)); if (res.Success) { successCount++; @@ -357,7 +357,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching foreach (var project in projectGroup) { logger.LogInfo($"Restoring project {project}..."); - var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, ExtraArgs: explicitRestoreSources, TargetWindows: isWindows)); + var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: explicitRestoreSources, TargetWindows: isWindows)); assets.AddDependenciesRange(res.AssetsFilePaths); lock (sync) {