dependabot-nuget 0.251.0 → 0.252.0

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

@@ -1,22 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
 using Microsoft.Language.Xml;
 
 namespace NuGetUpdater.Core;
 
 internal sealed class PackagesConfigBuildFile : XmlBuildFile
 {
-    public static PackagesConfigBuildFile Open(string repoRootPath, string path)
-        => Parse(repoRootPath, path, File.ReadAllText(path));
+    public static PackagesConfigBuildFile Open(string basePath, string path)
+        => Parse(basePath, path, File.ReadAllText(path));
 
-    public static PackagesConfigBuildFile Parse(string repoRootPath, string path, string xml)
-        => new(repoRootPath, path, Parser.ParseText(xml));
+    public static PackagesConfigBuildFile Parse(string basePath, string path, string xml)
+        => new(basePath, path, Parser.ParseText(xml));
 
-    public PackagesConfigBuildFile(string repoRootPath, string path, XmlDocumentSyntax contents)
-        : base(repoRootPath, path, contents)
+    public PackagesConfigBuildFile(string basePath, string path, XmlDocumentSyntax contents)
+        : base(basePath, path, contents)
     {
     }
 
@@ -27,6 +22,6 @@ internal sealed class PackagesConfigBuildFile : XmlBuildFile
         .Select(p => new Dependency(
             p.GetAttributeValue("id", StringComparison.OrdinalIgnoreCase),
             p.GetAttributeValue("version", StringComparison.OrdinalIgnoreCase),
-            DependencyType.PackageConfig,
-            (p.GetAttribute("developmentDependency", StringComparison.OrdinalIgnoreCase)?.Value ?? "false").Equals(true.ToString(), StringComparison.OrdinalIgnoreCase)));
+            DependencyType.PackagesConfig,
+            IsDevDependency: (p.GetAttribute("developmentDependency", StringComparison.OrdinalIgnoreCase)?.Value ?? "false").Equals(true.ToString(), StringComparison.OrdinalIgnoreCase)));
 }

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

@@ -1,33 +1,36 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
 using Microsoft.Language.Xml;
 
 namespace NuGetUpdater.Core;
 
 internal sealed class ProjectBuildFile : XmlBuildFile
 {
-    public static ProjectBuildFile Open(string repoRootPath, string path)
-        => Parse(repoRootPath, path, File.ReadAllText(path));
+    public static ProjectBuildFile Open(string basePath, string path)
+        => Parse(basePath, path, File.ReadAllText(path));
 
-    public static ProjectBuildFile Parse(string repoRootPath, string path, string xml)
-        => new(repoRootPath, path, Parser.ParseText(xml));
+    public static ProjectBuildFile Parse(string basePath, string path, string xml)
+        => new(basePath, path, Parser.ParseText(xml));
 
-    public ProjectBuildFile(string repoRootPath, string path, XmlDocumentSyntax contents)
-        : base(repoRootPath, path, contents)
+    public ProjectBuildFile(string basePath, string path, XmlDocumentSyntax contents)
+        : base(basePath, path, contents)
     {
     }
 
-    public IEnumerable<IXmlElementSyntax> PropertyNodes => Contents.RootSyntax
+    public IXmlElementSyntax ProjectNode => Contents.RootSyntax;
+
+    public IEnumerable<IXmlElementSyntax> SdkNodes => ProjectNode
+        .GetElements("Sdk", StringComparison.OrdinalIgnoreCase);
+
+    public IEnumerable<IXmlElementSyntax> ImportNodes => ProjectNode
+        .GetElements("Import", StringComparison.OrdinalIgnoreCase);
+
+    public IEnumerable<IXmlElementSyntax> PropertyNodes => ProjectNode
         .GetElements("PropertyGroup", StringComparison.OrdinalIgnoreCase)
         .SelectMany(e => e.Elements);
 
     public IEnumerable<KeyValuePair<string, string>> GetProperties() => PropertyNodes
         .Select(e => new KeyValuePair<string, string>(e.Name, e.GetContentValue()));
 
-    public IEnumerable<IXmlElementSyntax> ItemNodes => Contents.RootSyntax
+    public IEnumerable<IXmlElementSyntax> ItemNodes => ProjectNode
         .GetElements("ItemGroup", StringComparison.OrdinalIgnoreCase)
         .SelectMany(e => e.Elements);
 
@@ -36,14 +39,67 @@ internal sealed class ProjectBuildFile : XmlBuildFile
         e.Name.Equals("GlobalPackageReference", StringComparison.OrdinalIgnoreCase) ||
         e.Name.Equals("PackageVersion", StringComparison.OrdinalIgnoreCase));
 
-    public IEnumerable<Dependency> GetDependencies() => PackageItemNodes
-        .Select(GetDependency)
-        .OfType<Dependency>();
+    public IEnumerable<Dependency> GetDependencies()
+    {
+        var sdkDependencies = GetSdkDependencies();
+        var packageDependencies = PackageItemNodes
+            .Select(GetPackageDependency)
+            .OfType<Dependency>();
+        return sdkDependencies.Concat(packageDependencies);
+    }
 
-    private static Dependency? GetDependency(IXmlElementSyntax element)
+    private IEnumerable<Dependency> GetSdkDependencies()
     {
-        var name = element.GetAttributeOrSubElementValue("Include", StringComparison.OrdinalIgnoreCase)
-                   ?? element.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase);
+        List<Dependency> dependencies = [];
+        if (ProjectNode.GetAttributeValueCaseInsensitive("Sdk") is string sdk)
+        {
+            dependencies.Add(GetMSBuildSdkDependency(sdk));
+        }
+
+        foreach (var sdkNode in SdkNodes)
+        {
+            var name = sdkNode.GetAttributeValueCaseInsensitive("Name");
+            var version = sdkNode.GetAttributeValueCaseInsensitive("Version");
+
+            if (name is not null)
+            {
+                dependencies.Add(GetMSBuildSdkDependency(name, version));
+            }
+        }
+
+        foreach (var importNode in ImportNodes)
+        {
+            var name = importNode.GetAttributeValueCaseInsensitive("Name");
+            var version = importNode.GetAttributeValueCaseInsensitive("Version");
+
+            if (name is not null)
+            {
+                dependencies.Add(GetMSBuildSdkDependency(name, version));
+            }
+        }
+
+        return dependencies;
+    }
+
+    private static Dependency GetMSBuildSdkDependency(string name, string? version = null)
+    {
+        var parts = name.Split('/');
+        return parts.Length == 2
+            ? new Dependency(parts[0], parts[1], DependencyType.MSBuildSdk)
+            : new Dependency(name, version, DependencyType.MSBuildSdk);
+    }
+
+    private static Dependency? GetPackageDependency(IXmlElementSyntax element)
+    {
+        var isUpdate = false;
+
+        var name = element.GetAttributeOrSubElementValue("Include", StringComparison.OrdinalIgnoreCase);
+        if (name is null)
+        {
+            isUpdate = true;
+            name = element.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase);
+        }
+
         if (name is null || name.StartsWith("@("))
         {
             return null;
@@ -61,6 +117,7 @@ internal sealed class ProjectBuildFile : XmlBuildFile
             Name: name,
             Version: version?.Length == 0 ? null : version,
             Type: GetDependencyType(element.Name),
+            IsUpdate: isUpdate,
             IsOverride: isVersionOverride);
     }
 
@@ -92,4 +149,28 @@ internal sealed class ProjectBuildFile : XmlBuildFile
             (_, n) => n.WithContent(n.GetContentValue().Replace("/", "\\")).AsNode);
         Update(updatedXml);
     }
+
+    public ProjectBuildFileType GetFileType()
+    {
+        var extension = System.IO.Path.GetExtension(Path);
+        return extension.ToLower() switch
+        {
+            ".csproj" => ProjectBuildFileType.Project,
+            ".vbproj" => ProjectBuildFileType.Project,
+            ".fsproj" => ProjectBuildFileType.Project,
+            ".proj" => ProjectBuildFileType.Proj,
+            ".props" => ProjectBuildFileType.Props,
+            ".targets" => ProjectBuildFileType.Targets,
+            _ => ProjectBuildFileType.Unknown
+        };
+    }
+}
+
+public enum ProjectBuildFileType
+{
+    Unknown,
+    Proj,
+    Project,
+    Props,
+    Targets
 }

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

@@ -4,8 +4,8 @@ namespace NuGetUpdater.Core;
 
 internal abstract class XmlBuildFile : BuildFile<XmlDocumentSyntax>
 {
-    public XmlBuildFile(string repoRootPath, string path, XmlDocumentSyntax contents)
-        : base(repoRootPath, path, contents)
+    public XmlBuildFile(string basePath, string path, XmlDocumentSyntax contents)
+        : base(basePath, path, contents)
     {
     }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/NuGetUpdater.Core.csproj

@@ -12,12 +12,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GuiLabs.Language.Xml" Version="1.2.60" />
-    <PackageReference Include="DiffPlex" Version="1.7.1" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.6.1" />
-    <PackageReference Include="Microsoft.Build" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
-    <PackageReference Include="NuGet.Core" Version="2.14.0-rtm-832" Aliases="CoreV2" />
+    <PackageReference Include="GuiLabs.Language.Xml" />
+    <PackageReference Include="DiffPlex" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="All" />
+    <PackageReference Include="NuGet.Core" Aliases="CoreV2" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -0,0 +1,6 @@
+namespace NuGetUpdater.Core;
+
+public sealed record Property(
+    string Name,
+    string Value,
+    string SourceFilePath);

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

@@ -1,59 +1,46 @@
-using System;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace NuGetUpdater.Core;
 
 internal static class DotNetToolsJsonUpdater
 {
-    public static async Task UpdateDependencyAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion,
+    public static async Task UpdateDependencyAsync(
+        string repoRootPath,
+        string workspacePath,
+        string dependencyName,
+        string previousDependencyVersion,
+        string newDependencyVersion,
         Logger logger)
     {
-        var buildFiles = LoadBuildFiles(repoRootPath, workspacePath, logger);
-        if (buildFiles.Length == 0)
+        if (!MSBuildHelper.TryGetDotNetToolsJsonPath(repoRootPath, workspacePath, out var dotnetToolsJsonPath))
         {
-            logger.Log("  No dotnet-tools.json files found.");
+            logger.Log("  No dotnet-tools.json file found.");
             return;
         }
 
-        logger.Log("  Updating dotnet-tools.json files.");
+        var dotnetToolsJsonFile = DotNetToolsJsonBuildFile.Open(repoRootPath, dotnetToolsJsonPath, logger);
 
+        logger.Log($"  Updating [{dotnetToolsJsonFile.RelativePath}] file.");
 
-        var filesToUpdate = buildFiles.Where(f =>
-                f.GetDependencies().Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase)))
-            .ToImmutableArray();
-        if (filesToUpdate.Length == 0)
+        var containsDependency = dotnetToolsJsonFile.GetDependencies().Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase));
+        if (!containsDependency)
         {
-            logger.Log($"    Dependency [{dependencyName}] not found in any dotnet-tools.json files.");
+            logger.Log($"    Dependency [{dependencyName}] not found.");
             return;
         }
 
-        foreach (var buildFile in filesToUpdate)
-        {
-            var tool = buildFile.Tools
-                .Single(kvp => kvp.Key.Equals(dependencyName, StringComparison.OrdinalIgnoreCase));
+        var tool = dotnetToolsJsonFile.Tools
+            .Single(kvp => kvp.Key.Equals(dependencyName, StringComparison.OrdinalIgnoreCase));
 
-            var toolObject = tool.Value?.AsObject();
+        var toolObject = tool.Value?.AsObject();
 
-            if (toolObject is not null &&
-                toolObject["version"]?.GetValue<string>() == previousDependencyVersion)
-            {
-                buildFile.UpdateProperty(["tools", dependencyName, "version"], newDependencyVersion);
+        if (toolObject is not null &&
+            toolObject["version"]?.GetValue<string>() == previousDependencyVersion)
+        {
+            dotnetToolsJsonFile.UpdateProperty(["tools", dependencyName, "version"], newDependencyVersion);
 
-                if (await buildFile.SaveAsync())
-                {
-                    logger.Log($"    Saved [{buildFile.RepoRelativePath}].");
-                }
+            if (await dotnetToolsJsonFile.SaveAsync())
+            {
+                logger.Log($"    Saved [{dotnetToolsJsonFile.RelativePath}].");
             }
         }
     }
-
-    private static ImmutableArray<DotNetToolsJsonBuildFile> LoadBuildFiles(string repoRootPath, string workspacePath, Logger logger)
-    {
-        var dotnetToolsJsonPath = PathHelper.GetFileInDirectoryOrParent(workspacePath, repoRootPath, "./.config/dotnet-tools.json");
-        return dotnetToolsJsonPath is not null
-            ? [DotNetToolsJsonBuildFile.Open(repoRootPath, dotnetToolsJsonPath, logger)]
-            : [];
-    }
 }

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

@@ -1,29 +1,24 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace NuGetUpdater.Core;
 
 internal static class GlobalJsonUpdater
 {
     public static async Task UpdateDependencyAsync(
         string repoRootPath,
-        string globalJsonPath,
+        string workspacePath,
         string dependencyName,
         string previousDependencyVersion,
         string newDependencyVersion,
         Logger logger)
     {
-        if (!File.Exists(globalJsonPath))
+        if (!MSBuildHelper.TryGetGlobalJsonPath(repoRootPath, workspacePath, out var globalJsonPath))
         {
-            logger.Log($"  No global.json file found at [{globalJsonPath}].");
+            logger.Log("  No global.json file found.");
             return;
         }
 
         var globalJsonFile = GlobalJsonBuildFile.Open(repoRootPath, globalJsonPath, logger);
 
-        logger.Log($"  Updating [{globalJsonFile.RepoRelativePath}] file.");
+        logger.Log($"  Updating [{globalJsonFile.RelativePath}] file.");
 
         var containsDependency = globalJsonFile.GetDependencies().Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase));
         if (!containsDependency)
@@ -48,7 +43,7 @@ internal static class GlobalJsonUpdater
 
         if (await globalJsonFile.SaveAsync())
         {
-            logger.Log($"    Saved [{globalJsonFile.RepoRelativePath}].");
+            logger.Log($"    Saved [{globalJsonFile.RelativePath}].");
         }
     }
 }

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

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 
 using Microsoft.Language.Xml;
 
@@ -25,7 +20,7 @@ internal static class SdkPackageUpdater
         // SDK-style project, modify the XML directly
         logger.Log("  Running for SDK-style project");
 
-        var buildFiles = await MSBuildHelper.LoadBuildFiles(repoRootPath, projectPath);
+        var buildFiles = await MSBuildHelper.LoadBuildFilesAsync(repoRootPath, projectPath);
         var tfms = MSBuildHelper.GetTargetFrameworkMonikers(buildFiles);
 
         // Get the set of all top-level dependencies in the current project
@@ -84,7 +79,7 @@ internal static class SdkPackageUpdater
                 tfm,
                 topLevelDependencies,
                 logger);
-            foreach (var (packageName, packageVersion, _, _, _, _) in dependencies)
+            foreach (var (packageName, packageVersion, _, _, _, _, _, _, _, _) in dependencies)
             {
                 if (packageVersion is null)
                 {
@@ -269,7 +264,7 @@ internal static class SdkPackageUpdater
         var packagesAndVersions = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         foreach (var (_, dependencies) in tfmsAndDependencies)
         {
-            foreach (var (packageName, packageVersion, _, _, _, _) in dependencies)
+            foreach (var (packageName, packageVersion, _, _, _, _, _, _, _, _) in dependencies)
             {
                 if (packagesAndVersions.TryGetValue(packageName, out var existingVersion) &&
                     existingVersion != packageVersion)
@@ -356,12 +351,12 @@ internal static class SdkPackageUpdater
                         var currentVersion = versionAttribute.Value.TrimStart('[', '(').TrimEnd(']', ')');
                         if (currentVersion.Contains(',') || currentVersion.Contains('*'))
                         {
-                            logger.Log($"    Found unsupported [{packageNode.Name}] version attribute value [{versionAttribute.Value}] in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found unsupported [{packageNode.Name}] version attribute value [{versionAttribute.Value}] in [{buildFile.RelativePath}].");
                             foundUnsupported = true;
                         }
                         else if (string.Equals(currentVersion, previousDependencyVersion, StringComparison.Ordinal))
                         {
-                            logger.Log($"    Found incorrect [{packageNode.Name}] version attribute in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found incorrect [{packageNode.Name}] version attribute in [{buildFile.RelativePath}].");
                             updateNodes.Add(versionAttribute);
                         }
                         else if (previousDependencyVersion == null && NuGetVersion.TryParse(currentVersion, out var previousVersion))
@@ -371,13 +366,13 @@ internal static class SdkPackageUpdater
                             {
                                 previousPackageVersion = currentVersion;
 
-                                logger.Log($"    Found incorrect peer [{packageNode.Name}] version attribute in [{buildFile.RepoRelativePath}].");
+                                logger.Log($"    Found incorrect peer [{packageNode.Name}] version attribute in [{buildFile.RelativePath}].");
                                 updateNodes.Add(versionAttribute);
                             }
                         }
                         else if (string.Equals(currentVersion, newDependencyVersion, StringComparison.Ordinal))
                         {
-                            logger.Log($"    Found correct [{packageNode.Name}] version attribute in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found correct [{packageNode.Name}] version attribute in [{buildFile.RelativePath}].");
                             foundCorrect = true;
                         }
                     }
@@ -394,12 +389,12 @@ internal static class SdkPackageUpdater
                         var currentVersion = versionValue.TrimStart('[', '(').TrimEnd(']', ')');
                         if (currentVersion.Contains(',') || currentVersion.Contains('*'))
                         {
-                            logger.Log($"    Found unsupported [{packageNode.Name}] version node value [{versionValue}] in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found unsupported [{packageNode.Name}] version node value [{versionValue}] in [{buildFile.RelativePath}].");
                             foundUnsupported = true;
                         }
                         else if (currentVersion == previousDependencyVersion)
                         {
-                            logger.Log($"    Found incorrect [{packageNode.Name}] version node in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found incorrect [{packageNode.Name}] version node in [{buildFile.RelativePath}].");
                             if (versionElement is XmlElementSyntax elementSyntax)
                             {
                                 updateNodes.Add(elementSyntax);
@@ -416,7 +411,7 @@ internal static class SdkPackageUpdater
                             {
                                 previousPackageVersion = currentVersion;
 
-                                logger.Log($"    Found incorrect peer [{packageNode.Name}] version node in [{buildFile.RepoRelativePath}].");
+                                logger.Log($"    Found incorrect peer [{packageNode.Name}] version node in [{buildFile.RelativePath}].");
                                 if (versionElement is XmlElementSyntax elementSyntax)
                                 {
                                     updateNodes.Add(elementSyntax);
@@ -430,7 +425,7 @@ internal static class SdkPackageUpdater
                         }
                         else if (currentVersion == newDependencyVersion)
                         {
-                            logger.Log($"    Found correct [{packageNode.Name}] version node in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found correct [{packageNode.Name}] version node in [{buildFile.RelativePath}].");
                             foundCorrect = true;
                         }
                     }
@@ -506,12 +501,12 @@ internal static class SdkPackageUpdater
                         var currentVersion = propertyContents.TrimStart('[', '(').TrimEnd(']', ')');
                         if (currentVersion.Contains(',') || currentVersion.Contains('*'))
                         {
-                            logger.Log($"    Found unsupported version property [{propertyElement.Name}] value [{propertyContents}] in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found unsupported version property [{propertyElement.Name}] value [{propertyContents}] in [{buildFile.RelativePath}].");
                             foundUnsupported = true;
                         }
                         else if (currentVersion == previousDependencyVersion)
                         {
-                            logger.Log($"    Found incorrect version property [{propertyElement.Name}] in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found incorrect version property [{propertyElement.Name}] in [{buildFile.RelativePath}].");
                             updateProperties.Add((XmlElementSyntax)propertyElement.AsNode);
                         }
                         else if (previousDependencyVersion is null && NuGetVersion.TryParse(currentVersion, out var previousVersion))
@@ -521,13 +516,13 @@ internal static class SdkPackageUpdater
                             {
                                 previousPackageVersion = currentVersion;
 
-                                logger.Log($"    Found incorrect peer version property [{propertyElement.Name}] in [{buildFile.RepoRelativePath}].");
+                                logger.Log($"    Found incorrect peer version property [{propertyElement.Name}] in [{buildFile.RelativePath}].");
                                 updateProperties.Add((XmlElementSyntax)propertyElement.AsNode);
                             }
                         }
                         else if (currentVersion == newDependencyVersion)
                         {
-                            logger.Log($"    Found correct version property [{propertyElement.Name}] in [{buildFile.RepoRelativePath}].");
+                            logger.Log($"    Found correct version property [{propertyElement.Name}] in [{buildFile.RelativePath}].");
                             foundCorrect = true;
                         }
                     }
@@ -585,7 +580,7 @@ internal static class SdkPackageUpdater
         {
             if (await buildFile.SaveAsync())
             {
-                logger.Log($"    Saved [{buildFile.RepoRelativePath}].");
+                logger.Log($"    Saved [{buildFile.RelativePath}].");
             }
         }
     }

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

@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace NuGetUpdater.Core;
 
 public class UpdaterWorker
 {
     private readonly Logger _logger;
-    private readonly HashSet<string> _processedGlobalJsonPaths = new(StringComparer.OrdinalIgnoreCase);
     private readonly HashSet<string> _processedProjectPaths = new(StringComparer.OrdinalIgnoreCase);
 
     public UpdaterWorker(Logger logger)
@@ -29,6 +22,7 @@ public class UpdaterWorker
         if (!isTransitive)
         {
             await DotNetToolsJsonUpdater.UpdateDependencyAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, _logger);
+            await GlobalJsonUpdater.UpdateDependencyAsync(repoRootPath, workspacePath, dependencyName, previousDependencyVersion, newDependencyVersion, _logger);
         }
 
         var extension = Path.GetExtension(workspacePath).ToLowerInvariant();
@@ -50,7 +44,8 @@ public class UpdaterWorker
                 break;
         }
 
-        _processedGlobalJsonPaths.Clear();
+        _logger.Log("Update complete.");
+
         _processedProjectPaths.Clear();
     }
 
@@ -139,22 +134,12 @@ public class UpdaterWorker
 
         _logger.Log($"Updating project [{projectPath}]");
 
-        if (!isTransitive
-            && MSBuildHelper.GetGlobalJsonPath(repoRootPath, projectPath) is { } globalJsonPath
-            && !_processedGlobalJsonPaths.Contains(globalJsonPath))
-        {
-            _processedGlobalJsonPaths.Add(globalJsonPath);
-            await GlobalJsonUpdater.UpdateDependencyAsync(repoRootPath, globalJsonPath, dependencyName, previousDependencyVersion, newDependencyVersion, _logger);
-        }
-
-        if (NuGetHelper.HasPackagesConfigFile(projectPath))
+        if (NuGetHelper.TryGetPackagesConfigFile(projectPath, out _))
         {
             await PackagesConfigUpdater.UpdateDependencyAsync(repoRootPath, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive, _logger);
         }
 
         // Some repos use a mix of packages.config and PackageReference
         await SdkPackageUpdater.UpdateDependencyAsync(repoRootPath, projectPath, dependencyName, previousDependencyVersion, newDependencyVersion, isTransitive, _logger);
-
-        _logger.Log("Update complete.");
     }
 }

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

@@ -0,0 +1,14 @@
+using System.Collections.Immutable;
+
+namespace NuGetUpdater.Core.Utilities;
+
+public static class HashSetExtensions
+{
+    public static void AddRange<T>(this HashSet<T> hashSet, IEnumerable<T> items)
+    {
+        foreach (var item in items)
+        {
+            hashSet.Add(item);
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+using System.Collections.Immutable;
+
+namespace NuGetUpdater.Core.Utilities;
+
+public static class ImmutableArrayExtensions
+{
+    public static bool SequenceEqual<T>(this ImmutableArray<T>? expected, ImmutableArray<T>? actual, IEqualityComparer<T>? equalityComparer = null)
+    {
+        if (expected is null)
+        {
+            return actual is null;
+        }
+        else
+        {
+            return actual is not null && expected.Value.SequenceEqual(actual.Value, equalityComparer);
+        }
+    }
+}

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

@@ -155,7 +155,6 @@ namespace NuGetUpdater.Core.Utilities
                 }
             }
 
-
             resultJson = string.Join('\n', updatedJsonLines);
 
             // the JSON writer doesn't properly maintain newlines, so we need to normalize everything