dependabot-nuget 0.321.3 → 0.322.1

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

@@ -21,7 +21,18 @@ public abstract record UpdateOperationBase
     public required NuGetVersion NewVersion { get; init; }
     public required ImmutableArray<string> UpdatedFiles { get; init; }
 
-    public abstract string GetReport();
+    protected abstract string GetReportText();
+
+    public string GetReport(bool includeFileNames)
+    {
+        var report = GetReportText();
+        if (includeFileNames)
+        {
+            report += $" in {string.Join(", ", UpdatedFiles)}";
+        }
+
+        return report;
+    }
 
     public ReportedDependency ToReportedDependency(string projectPath, IEnumerable<ReportedDependency> previouslyReportedDependencies, IEnumerable<Dependency> updatedDependencies)
     {
@@ -49,9 +60,9 @@ public abstract record UpdateOperationBase
         };
     }
 
-    internal static string GenerateUpdateOperationReport(IEnumerable<UpdateOperationBase> updateOperations)
+    internal static string GenerateUpdateOperationReport(IEnumerable<UpdateOperationBase> updateOperations, bool includeFileNames = true)
     {
-        var updateMessages = updateOperations.Select(u => u.GetReport()).ToImmutableArray();
+        var updateMessages = updateOperations.Select(u => u.GetReport(includeFileNames)).Distinct(StringComparer.OrdinalIgnoreCase).ToImmutableArray();
         if (updateMessages.Length == 0)
         {
             return string.Empty;
@@ -144,12 +155,12 @@ public abstract record UpdateOperationBase
 public record DirectUpdate : UpdateOperationBase
 {
     public override string Type => nameof(DirectUpdate);
-    public override string GetReport()
+    protected override string GetReportText()
     {
         var fromText = OldVersion is null
             ? string.Empty
             : $"from {OldVersion} ";
-        return $"Updated {DependencyName} {fromText}to {NewVersion} in {string.Join(", ", UpdatedFiles)}";
+        return $"Updated {DependencyName} {fromText}to {NewVersion}";
     }
 
     public sealed override string ToString() => GetString();
@@ -158,7 +169,7 @@ public record DirectUpdate : UpdateOperationBase
 public record PinnedUpdate : UpdateOperationBase
 {
     public override string Type => nameof(PinnedUpdate);
-    public override string GetReport() => $"Pinned {DependencyName} at {NewVersion} in {string.Join(", ", UpdatedFiles)}";
+    protected override string GetReportText() => $"Pinned {DependencyName} at {NewVersion}";
     public sealed override string ToString() => GetString();
 }
 
@@ -168,7 +179,7 @@ public record ParentUpdate : UpdateOperationBase, IEquatable<UpdateOperationBase
     public required string ParentDependencyName { get; init; }
     public required NuGetVersion ParentNewVersion { get; init; }
 
-    public override string GetReport() => $"Updated {DependencyName} to {NewVersion} indirectly via {ParentDependencyName}/{ParentNewVersion} in {string.Join(", ", UpdatedFiles)}";
+    protected override string GetReportText() => $"Updated {DependencyName} to {NewVersion} indirectly via {ParentDependencyName}/{ParentNewVersion}";
 
     bool IEquatable<UpdateOperationBase>.Equals(UpdateOperationBase? other)
     {

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

@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -10,7 +9,6 @@ using NuGetUpdater.Core.Discover;
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Updater;
 using NuGetUpdater.Core.Updater.FileWriters;
-using NuGetUpdater.Core.Utilities;
 
 namespace NuGetUpdater.Core;
 
@@ -77,70 +75,23 @@ public class UpdaterWorker : IUpdaterWorker
             workspacePath = Path.GetFullPath(Path.Join(repoRootPath, workspacePath));
         }
 
-        if (_experimentsManager.UseNewFileUpdater)
-        {
-            var worker = new FileWriterWorker(
-                new DiscoveryWorker(_jobId, _experimentsManager, _logger),
-                new MSBuildDependencySolver(new DirectoryInfo(repoRootPath), new FileInfo(workspacePath), _experimentsManager, _logger),
-                new XmlFileWriter(_logger),
-                _logger
-            );
-            var updateOperations = await worker.RunAsync(
-                new DirectoryInfo(repoRootPath),
-                new FileInfo(workspacePath),
-                dependencyName,
-                NuGetVersion.Parse(previousDependencyVersion),
-                NuGetVersion.Parse(newDependencyVersion)
-            );
-            return new UpdateOperationResult()
-            {
-                UpdateOperations = updateOperations,
-            };
-        }
-
-        if (!isTransitive)
-        {
-            await DotNetToolsJsonUpdater.UpdateDependencyAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, _logger);
-            await GlobalJsonUpdater.UpdateDependencyAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, _logger);
-        }
-
-        UpdateOperationResult result;
-        var extension = Path.GetExtension(workspacePath).ToLowerInvariant();
-        switch (extension)
-        {
-            case ".sln":
-                result = await RunForSolutionAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
-                break;
-            case ".proj":
-                result = await RunForProjFileAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
-                break;
-            case ".csproj":
-            case ".fsproj":
-            case ".vbproj":
-                result = await RunForProjectAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
-                break;
-            default:
-                _logger.Info($"File extension [{extension}] is not supported.");
-                result = new UpdateOperationResult()
-                {
-                    UpdateOperations = [],
-                };
-                break;
-        }
-
-        result = result with { UpdateOperations = UpdateOperationBase.NormalizeUpdateOperationCollection(repoRootPath, result.UpdateOperations) };
-
-        if (!_experimentsManager.NativeUpdater)
+        var worker = new FileWriterWorker(
+            new DiscoveryWorker(_jobId, _experimentsManager, _logger),
+            new MSBuildDependencySolver(new DirectoryInfo(repoRootPath), new FileInfo(workspacePath), _experimentsManager, _logger),
+            new XmlFileWriter(_logger),
+            _logger
+        );
+        var updateOperations = await worker.RunAsync(
+            new DirectoryInfo(repoRootPath),
+            new FileInfo(workspacePath),
+            dependencyName,
+            NuGetVersion.Parse(previousDependencyVersion),
+            NuGetVersion.Parse(newDependencyVersion)
+        );
+        return new UpdateOperationResult()
         {
-            // native updater reports the changes elsewhere
-            var updateReport = UpdateOperationBase.GenerateUpdateOperationReport(result.UpdateOperations);
-            _logger.Info(updateReport);
-        }
-
-        _logger.Info("Update complete.");
-
-        _processedProjectPaths.Clear();
-        return result;
+            UpdateOperations = updateOperations,
+        };
     }
 
     internal static string Serialize(UpdateOperationResult result)
@@ -156,139 +107,4 @@ public class UpdaterWorker : IUpdaterWorker
         var resultJson = Serialize(result);
         await File.WriteAllTextAsync(resultOutputPath, resultJson);
     }
-
-    private async Task<UpdateOperationResult> RunForSolutionAsync(
-        string repoRootPath,
-        string solutionPath,
-        string dependencyName,
-        string previousDependencyVersion,
-        string newDependencyVersion,
-        bool isTransitive)
-    {
-        _logger.Info($"Running for solution [{Path.GetRelativePath(repoRootPath, solutionPath)}]");
-        var updateOperations = new List<UpdateOperationBase>();
-        var projectPaths = MSBuildHelper.GetProjectPathsFromSolution(solutionPath);
-        foreach (var projectPath in projectPaths)
-        {
-            var projectResult = await RunForProjectAsync(repoRootPath, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
-            updateOperations.AddRange(projectResult.UpdateOperations);
-        }
-
-        return new UpdateOperationResult()
-        {
-            UpdateOperations = updateOperations.ToImmutableArray(),
-        };
-    }
-
-    private async Task<UpdateOperationResult> RunForProjFileAsync(
-        string repoRootPath,
-        string projFilePath,
-        string dependencyName,
-        string previousDependencyVersion,
-        string newDependencyVersion,
-        bool isTransitive)
-    {
-        _logger.Info($"Running for proj file [{Path.GetRelativePath(repoRootPath, projFilePath)}]");
-        if (!File.Exists(projFilePath))
-        {
-            _logger.Info($"File [{projFilePath}] does not exist.");
-            return new UpdateOperationResult()
-            {
-                UpdateOperations = [],
-            };
-        }
-
-        var updateOperations = new List<UpdateOperationBase>();
-        var projectFilePaths = MSBuildHelper.GetProjectPathsFromProject(projFilePath);
-        foreach (var projectFullPath in projectFilePaths)
-        {
-            // If there is some MSBuild logic that needs to run to fully resolve the path skip the project
-            if (File.Exists(projectFullPath))
-            {
-                var projectResult = await RunForProjectAsync(repoRootPath, projectFullPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
-                updateOperations.AddRange(projectResult.UpdateOperations);
-            }
-        }
-
-        return new UpdateOperationResult()
-        {
-            UpdateOperations = updateOperations.ToImmutableArray(),
-        };
-    }
-
-    private async Task<UpdateOperationResult> RunForProjectAsync(
-        string repoRootPath,
-        string projectPath,
-        string dependencyName,
-        string previousDependencyVersion,
-        string newDependencyVersion,
-        bool isTransitive)
-    {
-        _logger.Info($"Running for project file [{Path.GetRelativePath(repoRootPath, projectPath)}]");
-        if (!File.Exists(projectPath))
-        {
-            _logger.Info($"File [{projectPath}] does not exist.");
-            return new UpdateOperationResult()
-            {
-                UpdateOperations = [],
-            };
-        }
-
-        var updateOperations = new List<UpdateOperationBase>();
-        var projectFilePaths = MSBuildHelper.GetProjectPathsFromProject(projectPath);
-        foreach (var projectFullPath in projectFilePaths.Concat([projectPath]))
-        {
-            // If there is some MSBuild logic that needs to run to fully resolve the path skip the project
-            if (File.Exists(projectFullPath))
-            {
-                var performedOperations = await RunUpdaterAsync(repoRootPath, projectFullPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive);
-                updateOperations.AddRange(performedOperations);
-            }
-        }
-
-        return new UpdateOperationResult()
-        {
-            UpdateOperations = updateOperations.ToImmutableArray(),
-        };
-    }
-
-    private async Task<IEnumerable<UpdateOperationBase>> RunUpdaterAsync(
-        string repoRootPath,
-        string projectPath,
-        string dependencyName,
-        string previousDependencyVersion,
-        string newDependencyVersion,
-        bool isTransitive)
-    {
-        if (_processedProjectPaths.Contains(projectPath))
-        {
-            return [];
-        }
-
-        _processedProjectPaths.Add(projectPath);
-
-        _logger.Info($"Updating project [{projectPath}]");
-
-        var updateOperations = new List<UpdateOperationBase>();
-        var additionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(projectPath, ProjectHelper.PathFormat.Full);
-        var packagesConfigFullPath = additionalFiles.Where(p => Path.GetFileName(p).Equals(ProjectHelper.PackagesConfigFileName, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-        if (packagesConfigFullPath is not null)
-        {
-            var packagesConfigOperations = await PackagesConfigUpdater.UpdateDependencyAsync(repoRootPath, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, packagesConfigFullPath, _logger);
-            updateOperations.AddRange(packagesConfigOperations);
-        }
-
-        // Some repos use a mix of packages.config and PackageReference
-        var packageReferenceOperations = await PackageReferenceUpdater.UpdateDependencyAsync(repoRootPath, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive, _experimentsManager, _logger);
-        updateOperations.AddRange(packageReferenceOperations);
-
-        // Update lock file if exists
-        var packagesLockFullPath = additionalFiles.Where(p => Path.GetFileName(p).Equals(ProjectHelper.PackagesLockJsonFileName, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-        if (packagesLockFullPath is not null)
-        {
-            await LockFileUpdater.UpdateLockFileAsync(repoRootPath, projectPath, _experimentsManager, _logger);
-        }
-
-        return updateOperations;
-    }
 }