dependabot-nuget 0.372.0 → 0.373.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a058182c9ce909abc8398d444a3cba984f43528a7655fd5ee96cc8c607bbfd76
-  data.tar.gz: ffd8f02946da91739938e89ca13e3beb4e6b3ef157bb23083251df98cf45930f
+  metadata.gz: ed8631b7dbf0b7afe45ac609f37741c2baac7757d164bd02682de074a8dbf9a8
+  data.tar.gz: 64b23850d13693a34fd1dbf990839e8aab0d71c4c05c5f100753d25740cd4cb3
 SHA512:
-  metadata.gz: 4d9d90b837aa4ebd014a46c1dc0a89ae29689f30bbe84fc49c16deec4c260625e263aa731f100d0ef909ad2da00a48c131e9086393866f54e83e48e6678a77f8
-  data.tar.gz: d8c27b9ff9c1837c191ce89ae005e3071f5fc5cd09d76d8c1e0ecc3ea1bd511ed1cd544bac6bdd0ea17aef43dc49747b2c87cc8cbe0f3e3645f6977582ec3394
+  metadata.gz: 07e2ccca8cbfd5459b93cf3bde39eeed3e9d021fb99e184809a6b925d0699bda70dc5b41245bd32c2cac745aff8d45fc2868cf5989773c9f4dfb0344c6f2f4e5
+  data.tar.gz: c983ddf3a66ab1d75ee33de6c4feefee4af2f3f34003e94b4546afa68979ac4c26668c72cf75fda1d2a66cb80365658b018cf14000b037c0ab32ad5124c77dd9

data/helpers/lib/NuGetUpdater/Directory.Build.props

@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <Import Project="Directory.Common.props" />

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/AnalyzeWorker.cs

@@ -84,7 +84,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
             .Select(NuGetFramework.Parse)
             .ToImmutableArray();
         var propertyBasedDependencies = discovery.Projects.SelectMany(p
-            => p.Dependencies.Where(d => !d.IsTransitive &&
+            => p.Dependencies.Where(d => d.IsTopLevel &&
                 d.EvaluationResult?.RootPropertyName is not null)
             ).ToImmutableArray();
         var dotnetToolsHasDependency = discovery.DotNetToolsJson?.Dependencies.Any(d => d.Name.Equals(dependencyInfo.Name, StringComparison.OrdinalIgnoreCase)) == true;
@@ -149,12 +149,12 @@ public partial class AnalyzeWorker : IAnalyzeWorker
             else if (dotnetToolsHasDependency)
             {
                 var infoUrl = await nugetContext.GetPackageInfoUrlAsync(dependencyInfo.Name, updatedVersion.ToNormalizedString(), CancellationToken.None);
-                updatedDependencies = [new Dependency(dependencyInfo.Name, updatedVersion.ToNormalizedString(), DependencyType.DotNetTool, IsDirect: true, InfoUrl: infoUrl)];
+                updatedDependencies = [new Dependency(dependencyInfo.Name, updatedVersion.ToNormalizedString(), DependencyType.DotNetTool, InfoUrl: infoUrl)];
             }
             else if (globalJsonHasDependency)
             {
                 var infoUrl = await nugetContext.GetPackageInfoUrlAsync(dependencyInfo.Name, updatedVersion.ToNormalizedString(), CancellationToken.None);
-                updatedDependencies = [new Dependency(dependencyInfo.Name, updatedVersion.ToNormalizedString(), DependencyType.MSBuildSdk, IsDirect: true, InfoUrl: infoUrl)];
+                updatedDependencies = [new Dependency(dependencyInfo.Name, updatedVersion.ToNormalizedString(), DependencyType.MSBuildSdk, InfoUrl: infoUrl)];
             }
             else
             {
@@ -193,11 +193,11 @@ public partial class AnalyzeWorker : IAnalyzeWorker
             return true;
         }
 
-        // Since the dependency is not vulnerable, we only need to update if it is not transitive.
+        // Since the dependency is not vulnerable, we only need to update if it is a top-level dependency.
         return projectsWithDependency.Any(p =>
             p.Dependencies.Any(d =>
                 d.Name.Equals(dependencyInfo.Name, StringComparison.OrdinalIgnoreCase) &&
-                !d.IsTransitive));
+                d.IsTopLevel));
     }
 
     private static Task<WorkspaceDiscoveryResult> DeserializeWorkspaceDiscoveryResultFileAsync(string path)
@@ -392,7 +392,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
         // When updating peer dependencies, we only need to consider top-level dependencies.
         var projectDependencyNames = projectsWithDependency
             .SelectMany(p => p.Dependencies)
-            .Where(d => !d.IsTransitive)
+            .Where(d => d.IsTopLevel)
             .Select(d => d.Name)
             .ToImmutableHashSet(StringComparer.OrdinalIgnoreCase);
 
@@ -427,7 +427,7 @@ public partial class AnalyzeWorker : IAnalyzeWorker
     {
         var packageDeclarationsUsingProperty = discovery.Projects
             .SelectMany(p =>
-                p.Dependencies.Where(d => !d.IsTransitive &&
+                p.Dependencies.Where(d => d.IsTopLevel &&
                     d.Name.Equals(packageId, StringComparison.OrdinalIgnoreCase) &&
                     d.EvaluationResult?.RootPropertyName is not null)
             ).ToImmutableArray();

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/DependencyFinder.cs

@@ -34,7 +34,7 @@ internal static class DependencyFinder
             foreach (var dependency in dependencies)
             {
                 var infoUrl = await nugetContext.GetPackageInfoUrlAsync(dependency.Name, dependency.Version!, cancellationToken);
-                var updatedDependency = dependency with { IsTransitive = false, InfoUrl = infoUrl };
+                var updatedDependency = dependency with { IsTopLevel = true, InfoUrl = infoUrl };
                 updatedDependencies.Add(updatedDependency);
             }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Dependency.cs

@@ -10,10 +10,7 @@ public sealed record Dependency(
     DependencyType Type,
     EvaluationResult? EvaluationResult = null,
     ImmutableArray<string>? TargetFrameworks = null,
-    bool IsDevDependency = false,
-    bool IsDirect = false,
-    bool IsTransitive = false,
-    bool IsOverride = false,
+    bool IsTopLevel = true,
     bool IsUpdate = false,
     string? InfoUrl = null) : IEquatable<Dependency>
 {
@@ -34,10 +31,7 @@ public sealed record Dependency(
                Type == other.Type &&
                EvaluationResult == other.EvaluationResult &&
                TargetFrameworks.SequenceEqual(other.TargetFrameworks) &&
-               IsDevDependency == other.IsDevDependency &&
-               IsDirect == other.IsDirect &&
-               IsTransitive == other.IsTransitive &&
-               IsOverride == other.IsOverride &&
+               IsTopLevel == other.IsTopLevel &&
                IsUpdate == other.IsUpdate &&
                InfoUrl == other.InfoUrl;
     }
@@ -50,10 +44,7 @@ public sealed record Dependency(
         hash.Add(Type);
         hash.Add(EvaluationResult);
         hash.Add(TargetFrameworks);
-        hash.Add(IsDevDependency);
-        hash.Add(IsDirect);
-        hash.Add(IsTransitive);
-        hash.Add(IsOverride);
+        hash.Add(IsTopLevel);
         hash.Add(IsUpdate);
         hash.Add(InfoUrl);
         return hash.ToHashCode();

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DiscoveryWorker.cs

@@ -171,10 +171,11 @@ public partial class DiscoveryWorker : IDiscoveryWorker
     {
         _logger.Info($"  Discovering projects beneath [{Path.GetRelativePath(repoRootPath, workspacePath)}].");
         var entryPoints = FindEntryPoints(workspacePath);
+        _logger.Info($"    Entry points found: {string.Join(", ", entryPoints)}");
         ImmutableArray<string> projects;
         try
         {
-            projects = await ExpandEntryPointsIntoProjectsAsync(entryPoints, _experimentsManager);
+            projects = await ExpandEntryPointsIntoProjectsAsync(entryPoints, _experimentsManager, _logger);
         }
         catch (InvalidProjectFileException e)
         {
@@ -193,7 +194,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
         }
         if (projects.IsEmpty)
         {
-            _logger.Info("  No project files found.");
+            _logger.Info("    No project files found.");
             return [];
         }
 
@@ -222,7 +223,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
             .ToImmutableArray();
     }
 
-    internal async static Task<ImmutableArray<string>> ExpandEntryPointsIntoProjectsAsync(IEnumerable<string> entryPoints, ExperimentsManager experimentsManager)
+    internal async static Task<ImmutableArray<string>> ExpandEntryPointsIntoProjectsAsync(IEnumerable<string> entryPoints, ExperimentsManager experimentsManager, ILogger logger)
     {
         HashSet<string> expandedProjects = new(PathComparer.Instance);
         HashSet<string> seenProjects = new(PathComparer.Instance);
@@ -235,28 +236,34 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                 string extension = Path.GetExtension(candidateEntryPoint).ToLowerInvariant();
                 if (extension == ".sln")
                 {
+                    logger.Info($"    Expanding solution: {candidateEntryPoint}:");
                     SolutionFile solution = SolutionFile.Parse(candidateEntryPoint);
                     foreach (ProjectInSolution project in solution.ProjectsInOrder)
                     {
+                        logger.Info($"      Expanded project: {project.AbsolutePath}");
                         filesToExpand.Push(project.AbsolutePath);
                     }
                 }
                 else if (extension == ".slnx")
                 {
+                    logger.Info($"    Expanding solution: {candidateEntryPoint}:");
                     SolutionModel solution = await SolutionSerializers.SlnXml.OpenAsync(candidateEntryPoint, CancellationToken.None);
                     string solutionPath = Path.GetDirectoryName(candidateEntryPoint) ?? string.Empty;
 
                     foreach (SolutionProjectModel project in solution.SolutionProjects)
                     {
                         string projectPath = Path.Combine(solutionPath, project.FilePath);
+                        logger.Info($"      Expanded project: {projectPath}");
                         filesToExpand.Push(projectPath);
                     }
                 }
                 else if (extension == ".proj")
                 {
+                    logger.Info($"    Expanding file: {candidateEntryPoint}:");
                     var foundProjects = ExpandItemGroupFilesFromProject(candidateEntryPoint, "ProjectFile", "ProjectReference");
                     foreach (var foundProject in foundProjects)
                     {
+                        logger.Info($"      Expanded project: {foundProject}");
                         filesToExpand.Push(foundProject);
                     }
                 }
@@ -337,7 +344,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
         try
         {
             // get all packages.config results first
-            var expandedProjects = await ExpandEntryPointsIntoProjectsAsync(normalizedProjectPaths, _experimentsManager);
+            var expandedProjects = await ExpandEntryPointsIntoProjectsAsync(normalizedProjectPaths, _experimentsManager, _logger);
             foreach (var expandedProject in expandedProjects)
             {
                 var packagesConfigResult = await PackagesConfigDiscovery.Discover(repoRootPath, workspacePath, expandedProject, _logger);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs

@@ -621,7 +621,7 @@ internal static class SdkProjectDiscovery
                     }
 
                     var normalizedTfms = combinedTfms.OrderBy(t => t).ToImmutableArray();
-                    groupedDependencies[package.Key] = new Dependency(packageName, packageVersion, dependencyType, TargetFrameworks: normalizedTfms, IsDirect: isTopLevel, IsTransitive: !isTopLevel);
+                    groupedDependencies[package.Key] = new Dependency(packageName, packageVersion, dependencyType, TargetFrameworks: normalizedTfms, IsTopLevel: isTopLevel);
                 }
             }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/PackagesConfigBuildFile.cs

@@ -26,6 +26,5 @@ internal sealed class PackagesConfigBuildFile : XmlBuildFile
         .Select(p => new Dependency(
             p.GetAttributeValue("id", StringComparison.OrdinalIgnoreCase),
             p.GetAttributeValue("version", StringComparison.OrdinalIgnoreCase),
-            DependencyType.PackagesConfig,
-            IsDevDependency: (p.GetAttribute("developmentDependency", StringComparison.OrdinalIgnoreCase)?.Value ?? "false").Equals(true.ToString(), StringComparison.OrdinalIgnoreCase)));
+            DependencyType.PackagesConfig));
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/ProjectBuildFile.cs

@@ -108,12 +108,10 @@ internal sealed class ProjectBuildFile : XmlBuildFile
             return null;
         }
 
-        var isVersionOverride = false;
         var version = element.GetAttributeOrSubElementValue("Version", StringComparison.OrdinalIgnoreCase);
         if (version is null)
         {
             version = element.GetAttributeOrSubElementValue("VersionOverride", StringComparison.OrdinalIgnoreCase);
-            isVersionOverride = version is not null;
         }
 
         dependencies.AddRange(
@@ -122,8 +120,7 @@ internal sealed class ProjectBuildFile : XmlBuildFile
                         Name: dep.Trim(),
                         Version: string.IsNullOrEmpty(version) ? null : version,
                         Type: GetDependencyType(element.Name),
-                        IsUpdate: isUpdate,
-                        IsOverride: isVersionOverride))
+                        IsUpdate: isUpdate))
         );
 
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/IUpdaterWorker.cs

@@ -5,5 +5,5 @@ namespace NuGetUpdater.Core;
 
 public interface IUpdaterWorker
 {
-    Task<UpdateOperationResult> RunAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTransitive);
+    Task<UpdateOperationResult> RunAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTopLevel);
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/Job.cs

@@ -210,8 +210,8 @@ public sealed record Job
                     return true;
                 }
 
-                // ...no specific update being performed, do it if it's not transitive
-                return !dependency.IsTransitive;
+                // ...no specific update being performed, do it if it's a top-level dependency
+                return dependency.IsTopLevel;
             }
         }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/UpdateHandlers/CreateSecurityUpdatePullRequestHandler.cs

@@ -111,7 +111,7 @@ internal class CreateSecurityUpdatePullRequestHandler : IUpdateHandler
 
                     logger.Info($"Attempting update of {dependency.Name} from {dependency.Version} to {analysisResult.UpdatedVersion} for {projectPath}.");
                     var projectDiscovery = discoveryResult.GetProjectDiscoveryFromPath(projectPath);
-                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTransitive);
+                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTopLevel);
                     if (updaterResult.Error is not null)
                     {
                         logger.Error($"Error updating {dependency.Name} in {projectPath}: {updaterResult.Error.GetReport()}");

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/UpdateHandlers/GroupUpdateAllVersionsHandler.cs

@@ -117,7 +117,7 @@ internal class GroupUpdateAllVersionsHandler : IUpdateHandler
                     }
 
                     var projectDiscovery = discoveryResult.GetProjectDiscoveryFromPath(projectPath);
-                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTransitive);
+                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTopLevel);
                     if (updaterResult.Error is not null)
                     {
                         logger.Error($"Error updating {dependency.Name} in {projectPath}: {updaterResult.Error.GetReport()}");
@@ -236,7 +236,7 @@ internal class GroupUpdateAllVersionsHandler : IUpdateHandler
                     }
 
                     var projectDiscovery = discoveryResult.GetProjectDiscoveryFromPath(projectPath);
-                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTransitive);
+                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTopLevel);
                     if (updaterResult.Error is not null)
                     {
                         await apiHandler.RecordUpdateJobError(updaterResult.Error, logger);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/UpdateHandlers/RefreshGroupUpdatePullRequestHandler.cs

@@ -117,7 +117,7 @@ internal class RefreshGroupUpdatePullRequestHandler : IUpdateHandler
 
                     logger.Info($"Attempting update of {dependency.Name} from {dependency.Version} to {analysisResult.UpdatedVersion} for {projectPath}.");
                     var projectDiscovery = discoveryResult.GetProjectDiscoveryFromPath(projectPath);
-                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTransitive);
+                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTopLevel);
                     if (updaterResult.Error is not null)
                     {
                         logger.Error($"Error updating {dependency.Name} in {projectPath}: {updaterResult.Error.GetReport()}");

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/UpdateHandlers/RefreshSecurityUpdatePullRequestHandler.cs

@@ -112,7 +112,7 @@ internal class RefreshSecurityUpdatePullRequestHandler : IUpdateHandler
 
                     logger.Info($"Attempting update of {dependency.Name} from {dependency.Version} to {analysisResult.UpdatedVersion} for {projectPath}.");
                     var projectDiscovery = discoveryResult.GetProjectDiscoveryFromPath(projectPath);
-                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTransitive);
+                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTopLevel);
                     if (updaterResult.Error is not null)
                     {
                         logger.Error($"Error updating {dependency.Name} in {projectPath}: {updaterResult.Error.GetReport()}");

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/UpdateHandlers/RefreshVersionUpdatePullRequestHandler.cs

@@ -102,7 +102,7 @@ internal class RefreshVersionUpdatePullRequestHandler : IUpdateHandler
 
                     logger.Info($"Attempting update of {dependency.Name} from {dependency.Version} to {analysisResult.UpdatedVersion} for {projectPath}.");
                     var projectDiscovery = discoveryResult.GetProjectDiscoveryFromPath(projectPath);
-                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTransitive);
+                    var updaterResult = await updaterWorker.RunAsync(repoContentsPath.FullName, projectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, dependency.IsTopLevel);
                     if (updaterResult.Error is not null)
                     {
                         logger.Error($"Error updating {dependency.Name} in {projectPath}: {updaterResult.Error.GetReport()}");

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/FileWriters/FileWriterWorker.cs

@@ -167,7 +167,7 @@ public class FileWriterWorker
         }
 
         var initialTopLevelDependencies = initialProjectDiscovery.Dependencies
-            .Where(d => !d.IsTransitive)
+            .Where(d => d.IsTopLevel)
             .ToImmutableArray();
         var newDependency = new Dependency(dependencyName, newDependencyVersion.ToString(), DependencyType.Unknown);
         var desiredDependencies = initialTopLevelDependencies.Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase))
@@ -243,7 +243,7 @@ public class FileWriterWorker
                 }
 
                 var rerunTopLevelDependencies = rerunProjectDiscovery.Dependencies
-                    .Where(d => !d.IsTransitive)
+                    .Where(d => d.IsTopLevel)
                     .ToImmutableArray();
                 var rerunDesiredDependencies = rerunTopLevelDependencies.Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase))
                     ? rerunTopLevelDependencies.Select(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase) ? newDependency : d).ToImmutableArray()

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/UpdaterWorker.cs

@@ -32,9 +32,9 @@ public class UpdaterWorker : IUpdaterWorker
         _logger = logger;
     }
 
-    public async Task RunAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTransitive, string? resultOutputPath = null)
+    public async Task RunAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTopLevel, string? resultOutputPath = null)
     {
-        var result = await RunWithErrorHandlingAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
+        var result = await RunWithErrorHandlingAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, isTopLevel);
         if (resultOutputPath is { })
         {
             await WriteResultFile(result, resultOutputPath, _logger);
@@ -42,11 +42,11 @@ public class UpdaterWorker : IUpdaterWorker
     }
 
     // this is a convenient method for tests
-    internal async Task<UpdateOperationResult> RunWithErrorHandlingAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTransitive)
+    internal async Task<UpdateOperationResult> RunWithErrorHandlingAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTopLevel)
     {
         try
         {
-            var result = await RunAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
+            var result = await RunAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, isTopLevel);
             return result;
         }
         catch (Exception ex)
@@ -66,7 +66,7 @@ public class UpdaterWorker : IUpdaterWorker
         }
     }
 
-    public async Task<UpdateOperationResult> RunAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTransitive)
+    public async Task<UpdateOperationResult> RunAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTopLevel)
     {
         MSBuildHelper.RegisterMSBuild(Environment.CurrentDirectory, repoRootPath, _logger);
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs

@@ -197,10 +197,7 @@ internal static partial class MSBuildHelper
                 DependencyType.Unknown,
                 null,
                 null,
-                false,
-                false,
-                false,
-                false,
+                true,
                 false
             ))
             .ToList();

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/AnalyzeWorkerTestBase.cs

@@ -73,8 +73,7 @@ public class AnalyzeWorkerTestBase : TestBase
                 Assert.Equal(expectedDependency.Version, actualDependency.Version);
                 Assert.Equal(expectedDependency.Type, actualDependency.Type);
                 AssertEx.Equal(expectedDependency.TargetFrameworks, actualDependency.TargetFrameworks);
-                Assert.Equal(expectedDependency.IsDirect, actualDependency.IsDirect);
-                Assert.Equal(expectedDependency.IsTransitive, actualDependency.IsTransitive);
+                Assert.Equal(expectedDependency.IsTopLevel, actualDependency.IsTopLevel);
                 Assert.Equal(expectedDependency.InfoUrl, actualDependency.InfoUrl);
             }
         }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/AnalyzeWorkerTests.cs

@@ -53,7 +53,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect : true),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
                 ],
             }
         );
@@ -104,7 +104,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "4.9.2", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                    new("Some.Package", "4.9.2", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
                     new("Some.Transitive.Dependency", "4.9.2", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
                 ],
             }
@@ -362,7 +362,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 UpdatedVersion = "1.1.0",
                 CanUpdate = true,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
                 ],
             }
         );
@@ -409,7 +409,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks :["net8.0"]),
                 ],
             }
         );
@@ -464,7 +464,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks :["net8.0"]),
                 ],
             }
         );
@@ -517,7 +517,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.0.1", DependencyType.PackageReference, TargetFrameworks: ["net9.0-windows"], IsDirect: true),
+                    new("Some.Package", "1.0.1", DependencyType.PackageReference, TargetFrameworks: ["net9.0-windows"]),
                 ],
             }
         );
@@ -739,7 +739,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies =
                 [
-                    new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
+                    new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks :["net8.0"]),
                 ],
             }
         );
@@ -937,7 +937,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies =
                 [
-                    new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
+                    new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks :["net8.0"]),
                 ],
             }
         );
@@ -1125,7 +1125,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies =
                 [
-                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
                 ],
             }
         );

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs

@@ -28,7 +28,8 @@ public class DiscoveryWorkerTestBase : TestBase
             await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, directoryPath, includeCommonPackages: includeCommonPackages);
 
             repoContentsPath ??= directoryPath;
-            var worker = new DiscoveryWorker("TEST-JOB-ID", experimentsManager, new TestLogger());
+            var logger = new StringLogger();
+            var worker = new DiscoveryWorker("TEST-JOB-ID", experimentsManager, logger);
             var result = await worker.RunWithErrorHandlingAsync(repoContentsPath, workspacePath);
             return result;
         });
@@ -123,8 +124,7 @@ public class DiscoveryWorkerTestBase : TestBase
                 return d.Name == expectedDependency.Name
                     && d.Type == expectedDependency.Type
                     && d.Version == expectedDependency.Version
-                    && d.IsDirect == expectedDependency.IsDirect
-                    && d.IsTransitive == expectedDependency.IsTransitive
+                    && d.IsTopLevel == expectedDependency.IsTopLevel
                     && d.TargetFrameworks.SequenceEqual(expectedDependency.TargetFrameworks);
             }).ToArray();
             Assert.True(matchingDependencies.Length == 1, $"""
@@ -132,8 +132,7 @@ public class DiscoveryWorkerTestBase : TestBase
                     Name: {expectedDependency.Name}
                     Type: {expectedDependency.Type}
                     Version: {expectedDependency.Version}
-                    IsDirect: {expectedDependency.IsDirect}
-                    IsTransitive: {expectedDependency.IsTransitive}
+                    IsTopLevel: {expectedDependency.IsTopLevel}
                     TargetFrameworks: {string.Join(", ", expectedDependency.TargetFrameworks ?? [])}
                 Found:{"\n\t"}{string.Join("\n\t", actualDependencies)}
                 """);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.PackagesConfig.cs

@@ -97,7 +97,7 @@ public partial class DiscoveryWorkerTests
                             TargetFrameworks = ["net46"],
                             Dependencies = [
                                 new("Package.A", "1.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("Package.B", "2.0.0", DependencyType.PackageReference, IsDirect: true, TargetFrameworks: ["net46"]),
+                                new("Package.B", "2.0.0", DependencyType.PackageReference, TargetFrameworks: ["net46"]),
                             ],
                             ReferencedProjectPaths = [],
                             ImportedFiles = [],
@@ -186,7 +186,7 @@ public partial class DiscoveryWorkerTests
                             TargetFrameworks = ["net48"],
                             Dependencies = [
                                 new("PackageReferencedThroughLegacyMechanism", "1.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net48"]),
-                                new("PackageReferencedThroughCPMMechanism", "2.0.0", DependencyType.PackageReference, TargetFrameworks: ["net48"], IsDirect: true),
+                                new("PackageReferencedThroughCPMMechanism", "2.0.0", DependencyType.PackageReference, TargetFrameworks: ["net48"]),
                             ],
                             ReferencedProjectPaths = [],
                             ImportedFiles = [

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Proj.cs

@@ -66,7 +66,7 @@ public partial class DiscoveryWorkerTests
                             FilePath = "../src/project1/project1.csproj",
                             Dependencies =
                             [
-                                new("Package.A", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                                new("Package.A", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
                             ],
                             TargetFrameworks = ["net8.0"],
                             ReferencedProjectPaths = [],
@@ -78,7 +78,7 @@ public partial class DiscoveryWorkerTests
                             FilePath = "../src/project2/project2.csproj",
                             Dependencies =
                             [
-                                new("Package.B", "2.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                                new("Package.B", "2.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
                             ],
                             TargetFrameworks = ["net8.0"],
                             ReferencedProjectPaths = [],