dependabot-nuget 0.242.0 → 0.243.0

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

@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 
 using NuGetUpdater.Core.Utilities;
@@ -35,7 +36,7 @@ internal abstract class JsonBuildFile : BuildFile<string>
             {
                 return JsonHelper.ParseNode(Contents);
             }
-            catch (System.Text.Json.JsonException ex)
+            catch (JsonException ex)
             {
                 // We can't police that people have legal JSON files.
                 // If they don't, we just return null.

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

@@ -11,6 +11,7 @@ internal sealed class PackagesConfigBuildFile : XmlBuildFile
 {
     public static PackagesConfigBuildFile Open(string repoRootPath, string path)
         => Parse(repoRootPath, path, File.ReadAllText(path));
+
     public static PackagesConfigBuildFile Parse(string repoRootPath, string path, string xml)
         => new(repoRootPath, path, Parser.ParseText(xml));
 

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

@@ -11,6 +11,7 @@ internal sealed class ProjectBuildFile : XmlBuildFile
 {
     public static ProjectBuildFile Open(string repoRootPath, string path)
         => Parse(repoRootPath, path, File.ReadAllText(path));
+
     public static ProjectBuildFile Parse(string repoRootPath, string path, string xml)
         => new(repoRootPath, path, Parser.ParseText(xml));
 
@@ -31,9 +32,9 @@ internal sealed class ProjectBuildFile : XmlBuildFile
         .SelectMany(e => e.Elements);
 
     public IEnumerable<IXmlElementSyntax> PackageItemNodes => ItemNodes.Where(e =>
-            e.Name.Equals("PackageReference", StringComparison.OrdinalIgnoreCase) ||
-            e.Name.Equals("GlobalPackageReference", StringComparison.OrdinalIgnoreCase) ||
-            e.Name.Equals("PackageVersion", StringComparison.OrdinalIgnoreCase));
+        e.Name.Equals("PackageReference", StringComparison.OrdinalIgnoreCase) ||
+        e.Name.Equals("GlobalPackageReference", StringComparison.OrdinalIgnoreCase) ||
+        e.Name.Equals("PackageVersion", StringComparison.OrdinalIgnoreCase));
 
     public IEnumerable<Dependency> GetDependencies() => PackageItemNodes
         .Select(GetDependency)
@@ -42,7 +43,7 @@ internal sealed class ProjectBuildFile : XmlBuildFile
     private static Dependency? GetDependency(IXmlElementSyntax element)
     {
         var name = element.GetAttributeOrSubElementValue("Include", StringComparison.OrdinalIgnoreCase)
-            ?? element.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase);
+                   ?? element.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase);
         if (name is null || name.StartsWith("@("))
         {
             return null;

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/CompatabilityChecker.cs

@@ -33,6 +33,7 @@ public class CompatibilityChecker
                 // effort by including just the platform.
                 framework = new NuGetFramework(framework.Framework, framework.Version, framework.Platform, FrameworkConstants.EmptyVersion);
             }
+
             return framework;
         }
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 
 using NuGet.Frameworks;
+
 using NuGetGallery.Frameworks;
 
 namespace NuGetUpdater.Core.FrameworkChecker;
@@ -15,7 +16,7 @@ public class FrameworkCompatibilityService
     private static readonly IReadOnlyList<NuGetFramework> AllSupportedFrameworks = SupportedFrameworks.AllSupportedNuGetFrameworks;
     private static readonly IReadOnlyDictionary<NuGetFramework, ISet<NuGetFramework>> CompatibilityMatrix = GetCompatibilityMatrix();
 
-    public ISet<NuGetFramework> GetCompatibleFrameworks(IEnumerable<NuGetFramework> packageFrameworks)
+    public ISet<NuGetFramework> GetCompatibleFrameworks(IEnumerable<NuGetFramework>? packageFrameworks)
     {
         if (packageFrameworks == null)
         {
@@ -63,10 +64,14 @@ public class FrameworkCompatibilityService
             }
         }
 
-        matrix.Add(SupportedFrameworks.Net60Windows7,
-            new HashSet<NuGetFramework>() {
-                    SupportedFrameworks.Net60Windows, SupportedFrameworks.Net60Windows7,
-                    SupportedFrameworks.Net70Windows, SupportedFrameworks.Net70Windows7 });
+        matrix.Add(
+            SupportedFrameworks.Net60Windows7,
+            new HashSet<NuGetFramework>
+            {
+                SupportedFrameworks.Net60Windows, SupportedFrameworks.Net60Windows7,
+                SupportedFrameworks.Net70Windows, SupportedFrameworks.Net70Windows7
+            }
+        );
 
         return matrix;
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/SupportedFrameworks.cs

@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+
 using NuGet.Frameworks;
+
 using static NuGet.Frameworks.FrameworkConstants;
 using static NuGet.Frameworks.FrameworkConstants.CommonFrameworks;
 
@@ -42,7 +44,9 @@ namespace NuGetGallery.Frameworks
         public static readonly NuGetFramework Net70MacCatalyst = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "maccatalyst", EmptyVersion);
         public static readonly NuGetFramework Net70TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "tvos", EmptyVersion);
         public static readonly NuGetFramework Net70Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "windows", EmptyVersion);
+
         public static readonly NuGetFramework Net80 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8); // https://github.com/NuGet/Engineering/issues/5112
+
         public static readonly NuGetFramework Net80Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "android", EmptyVersion);
         public static readonly NuGetFramework Net80Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "ios", EmptyVersion);
         public static readonly NuGetFramework Net80MacOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "macos", EmptyVersion);
@@ -91,16 +95,16 @@ namespace NuGetGallery.Frameworks
         /// </summary>
         public static class TfmFilters
         {
-            public static readonly List<NuGetFramework> NetTfms = new List<NuGetFramework>
-            {
+            public static readonly List<NuGetFramework> NetTfms =
+            [
                 Net80,
                 Net70,
                 Net60,
                 Net50
-            };
+            ];
 
-            public static readonly List<NuGetFramework> NetCoreAppTfms = new List<NuGetFramework>
-            {
+            public static readonly List<NuGetFramework> NetCoreAppTfms =
+            [
                 NetCoreApp31,
                 NetCoreApp30,
                 NetCoreApp22,
@@ -108,10 +112,10 @@ namespace NuGetGallery.Frameworks
                 NetCoreApp20,
                 NetCoreApp11,
                 NetCoreApp10
-            };
+            ];
 
-            public static readonly List<NuGetFramework> NetStandardTfms = new List<NuGetFramework>
-            {
+            public static readonly List<NuGetFramework> NetStandardTfms =
+            [
                 NetStandard21,
                 NetStandard20,
                 NetStandard16,
@@ -121,10 +125,10 @@ namespace NuGetGallery.Frameworks
                 NetStandard12,
                 NetStandard11,
                 NetStandard10
-            };
+            ];
 
-            public static readonly List<NuGetFramework> NetFrameworkTfms = new List<NuGetFramework>
-            {
+            public static readonly List<NuGetFramework> NetFrameworkTfms =
+            [
                 Net481,
                 Net48,
                 Net472,
@@ -140,7 +144,7 @@ namespace NuGetGallery.Frameworks
                 Net35,
                 Net3,
                 Net2
-            };
+            ];
         }
     }
 }

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

@@ -7,11 +7,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
+using CoreV2::NuGet.Runtime;
+
 using Microsoft.Language.Xml;
 
 using NuGet.ProjectManagement;
 
-using AssemblyBinding = CoreV2::NuGet.Runtime.AssemblyBinding;
+using Runtime_AssemblyBinding = CoreV2::NuGet.Runtime.AssemblyBinding;
 
 namespace NuGetUpdater.Core;
 
@@ -150,7 +152,7 @@ internal static class BindingRedirectManager
 
             var path = Path.GetFileName(content);
             return (element.Name == "None" && string.Equals(path, "app.config", StringComparison.OrdinalIgnoreCase))
-                || (element.Name == "Content" && string.Equals(path, "web.config", StringComparison.OrdinalIgnoreCase));
+                   || (element.Name == "Content" && string.Equals(path, "web.config", StringComparison.OrdinalIgnoreCase));
         }
 
         static string GetConfigFileName(XmlDocumentSyntax document)
@@ -171,13 +173,13 @@ internal static class BindingRedirectManager
         {
             var frameworkVersion = GetFrameworkVersion(document);
             return $"""
-            <?xml version="1.0" encoding="utf-8" ?>
-            <configuration>
-                <startup>
-                    <supportedRuntime version="v4.0" sku=".NETFramework,Version={frameworkVersion}" />
-                </startup>
-            </configuration>
-            """;
+                <?xml version="1.0" encoding="utf-8" ?>
+                <configuration>
+                    <startup>
+                        <supportedRuntime version="v4.0" sku=".NETFramework,Version={frameworkVersion}" />
+                    </startup>
+                </configuration>
+                """;
         }
 
         static string? GetFrameworkVersion(XmlDocumentSyntax document)
@@ -190,7 +192,7 @@ internal static class BindingRedirectManager
         }
     }
 
-    private static string AddBindingRedirects(ConfigurationFile configFile, IEnumerable<AssemblyBinding> bindingRedirects)
+    private static string AddBindingRedirects(ConfigurationFile configFile, IEnumerable<Runtime_AssemblyBinding> bindingRedirects)
     {
         // Do nothing if there are no binding redirects to add, bail out
         if (!bindingRedirects.Any())
@@ -261,7 +263,7 @@ internal static class BindingRedirectManager
 
         static void UpdateBindingRedirectElement(
             XElement existingDependentAssemblyElement,
-            AssemblyBinding newBindingRedirect)
+            Runtime_AssemblyBinding newBindingRedirect)
         {
             var existingBindingRedirectElement = existingDependentAssemblyElement.Element(BindingRedirectName);
             // Since we've successfully parsed this node, it has to be valid and this child must exist.
@@ -287,12 +289,11 @@ internal static class BindingRedirectManager
                 .Elements(DependentAssemblyName);
 
             // We're going to need to know which element is associated with what binding for removal
-            var assemblyElementPairs = from dependentAssemblyElement in dependencyAssemblyElements
-                                       select new
-                                       {
-                                           Binding = AssemblyBinding.Parse(dependentAssemblyElement),
-                                           Element = dependentAssemblyElement
-                                       };
+            var assemblyElementPairs = dependencyAssemblyElements.Select(dependentAssemblyElement => new
+            {
+                Binding = Runtime_AssemblyBinding.Parse(dependentAssemblyElement),
+                Element = dependentAssemblyElement
+            });
 
             // Return a mapping from binding to element
             return assemblyElementPairs.ToDictionary(p => (p.Binding.Name, p.Binding.PublicKeyToken), p => p.Element);

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

@@ -8,14 +8,14 @@ using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-using AssemblyBinding = CoreV2::NuGet.Runtime.AssemblyBinding;
-using IAssembly = CoreV2::NuGet.Runtime.IAssembly;
+using Runtime_AssemblyBinding = CoreV2::NuGet.Runtime.AssemblyBinding;
+using Runtime_IAssembly = CoreV2::NuGet.Runtime.IAssembly;
 
 namespace NuGetUpdater.Core;
 
 public static partial class BindingRedirectResolver
 {
-    public static IEnumerable<AssemblyBinding> GetBindingRedirects(string projectPath, IEnumerable<string> includes)
+    public static IEnumerable<Runtime_AssemblyBinding> GetBindingRedirects(string projectPath, IEnumerable<string> includes)
     {
         var directoryPath = Path.GetDirectoryName(projectPath);
         if (directoryPath is null)
@@ -27,7 +27,7 @@ public static partial class BindingRedirectResolver
         {
             if (TryParseIncludesString(include, out var assemblyInfo))
             {
-                yield return new AssemblyBinding(assemblyInfo);
+                yield return new Runtime_AssemblyBinding(assemblyInfo);
             }
         }
 
@@ -63,9 +63,9 @@ public static partial class BindingRedirectResolver
     private static readonly Regex IncludesRegex = IncludesPattern();
 
     /// <summary>
-    /// Wraps systme<see cref="Assembly"/> type in the nuget interface <see cref="IAssembly"/> to interop with nuget apis
+    /// Wraps system<see cref="Assembly"/> type in the nuget interface <see cref="NuGet.Runtime.IAssembly"/> to interop with nuget apis
     /// </summary>
-    private class AssemblyWrapper : IAssembly
+    private class AssemblyWrapper : Runtime_IAssembly
     {
         public AssemblyWrapper(string name, Version version, string? publicKeyToken = null, string? culture = null)
         {
@@ -79,7 +79,7 @@ public static partial class BindingRedirectResolver
         public Version Version { get; }
         public string? PublicKeyToken { get; }
         public string? Culture { get; }
-        public IEnumerable<IAssembly> ReferencedAssemblies { get; } = Enumerable.Empty<AssemblyWrapper>();
+        public IEnumerable<Runtime_IAssembly> ReferencedAssemblies { get; } = Enumerable.Empty<AssemblyWrapper>();
     }
 
     [GeneratedRegex("(?<key>\\w+)=(?<value>[^,]+)")]

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

@@ -1,27 +1,27 @@
 using System;
 using System.Collections.Immutable;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace NuGetUpdater.Core;
 
-internal static partial class DotNetToolsJsonUpdater
+internal static class DotNetToolsJsonUpdater
 {
-    public static async Task UpdateDependencyAsync(string repoRootPath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, Logger logger)
+    public static async Task UpdateDependencyAsync(string repoRootPath, string workspacePath, string dependencyName, string previousDependencyVersion, string newDependencyVersion,
+        Logger logger)
     {
-        var buildFiles = LoadBuildFiles(repoRootPath, logger);
+        var buildFiles = LoadBuildFiles(repoRootPath, workspacePath, logger);
         if (buildFiles.Length == 0)
         {
-            logger.Log($"  No dotnet-tools.json files found.");
+            logger.Log("  No dotnet-tools.json files found.");
             return;
         }
 
-        logger.Log($"  Updating dotnet-tools.json files.");
+        logger.Log("  Updating dotnet-tools.json files.");
 
 
         var filesToUpdate = buildFiles.Where(f =>
-            f.GetDependencies().Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase)))
+                f.GetDependencies().Any(d => d.Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase)))
             .ToImmutableArray();
         if (filesToUpdate.Length == 0)
         {
@@ -39,7 +39,7 @@ internal static partial class DotNetToolsJsonUpdater
             if (toolObject is not null &&
                 toolObject["version"]?.GetValue<string>() == previousDependencyVersion)
             {
-                buildFile.UpdateProperty(new[] { "tools", dependencyName, "version" }, newDependencyVersion);
+                buildFile.UpdateProperty(["tools", dependencyName, "version"], newDependencyVersion);
 
                 if (await buildFile.SaveAsync())
                 {
@@ -49,18 +49,11 @@ internal static partial class DotNetToolsJsonUpdater
         }
     }
 
-    private static ImmutableArray<DotNetToolsJsonBuildFile> LoadBuildFiles(string repoRootPath, Logger logger)
+    private static ImmutableArray<DotNetToolsJsonBuildFile> LoadBuildFiles(string repoRootPath, string workspacePath, Logger logger)
     {
-        var options = new EnumerationOptions()
-        {
-            RecurseSubdirectories = true,
-            MatchType = MatchType.Win32,
-            AttributesToSkip = 0,
-            IgnoreInaccessible = false,
-            MatchCasing = MatchCasing.CaseInsensitive,
-        };
-        return Directory.EnumerateFiles(repoRootPath, "dotnet-tools.json", options)
-            .Select(path => DotNetToolsJsonBuildFile.Open(repoRootPath, path, logger))
-            .ToImmutableArray();
+        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

@@ -5,9 +5,15 @@ using System.Threading.Tasks;
 
 namespace NuGetUpdater.Core;
 
-internal static partial class GlobalJsonUpdater
+internal static class GlobalJsonUpdater
 {
-    public static async Task UpdateDependencyAsync(string repoRootPath, string globalJsonPath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, Logger logger)
+    public static async Task UpdateDependencyAsync(
+        string repoRootPath,
+        string globalJsonPath,
+        string dependencyName,
+        string previousDependencyVersion,
+        string newDependencyVersion,
+        Logger logger)
     {
         if (!File.Exists(globalJsonPath))
         {
@@ -29,7 +35,7 @@ internal static partial class GlobalJsonUpdater
         if (globalJsonFile.MSBuildSdks?.TryGetPropertyValue(dependencyName, out var version) != true
             || version?.GetValue<string>() is not string versionString)
         {
-            logger.Log($"    Unable to determine dependency version.");
+            logger.Log("    Unable to determine dependency version.");
             return;
         }
 

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

@@ -4,15 +4,28 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 
 using Microsoft.Language.Xml;
 
+using NuGet.CommandLine;
+
+using NuGetUpdater.Core.Updater;
+
+using Console = System.Console;
+
 namespace NuGetUpdater.Core;
 
 internal static class PackagesConfigUpdater
 {
-    public static async Task UpdateDependencyAsync(string repoRootPath, string projectPath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTransitive, Logger logger)
+    public static async Task UpdateDependencyAsync(
+        string repoRootPath,
+        string projectPath,
+        string dependencyName,
+        string previousDependencyVersion,
+        string newDependencyVersion,
+        bool isTransitive,
+        Logger logger
+    )
     {
         logger.Log($"  Found {NuGetHelper.PackagesConfigFileName}; running with NuGet.exe");
 
@@ -35,18 +48,18 @@ internal static class PackagesConfigUpdater
         var packagesDirectory = PathHelper.JoinPath(projectDirectory, packagesSubDirectory);
         Directory.CreateDirectory(packagesDirectory);
 
-        var args = new List<string>()
-            {
-                "update",
-                packagesConfigPath,
-                "-Id",
-                dependencyName,
-                "-Version",
-                newDependencyVersion,
-                "-RepositoryPath",
-                packagesDirectory,
-                "-NonInteractive",
-            };
+        var args = new List<string>
+        {
+            "update",
+            packagesConfigPath,
+            "-Id",
+            dependencyName,
+            "-Version",
+            newDependencyVersion,
+            "-RepositoryPath",
+            packagesDirectory,
+            "-NonInteractive",
+        };
 
         logger.Log("    Finding MSBuild...");
         var msbuildDirectory = MSBuildHelper.MSBuildPath;
@@ -56,7 +69,10 @@ internal static class PackagesConfigUpdater
             args.Add(msbuildDirectory); // e.g., /usr/share/dotnet/sdk/7.0.203
         }
 
-        RunNuget(args, packagesDirectory, logger);
+        using (new WebApplicationTargetsConditionPatcher(projectPath))
+        {
+            RunNuget(args, packagesDirectory, logger);
+        }
 
         projectBuildFile = ProjectBuildFile.Open(repoRootPath, projectPath);
         projectBuildFile.NormalizeDirectorySeparatorsInProject();
@@ -84,7 +100,7 @@ internal static class PackagesConfigUpdater
             logger.Log($"    Running NuGet.exe with args: {string.Join(" ", args)}");
 
             Environment.CurrentDirectory = packagesDirectory;
-            var result = NuGet.CommandLine.Program.Main(args.ToArray());
+            var result = Program.Main(args.ToArray());
             var fullOutput = outputBuilder.ToString();
             logger.Log($"    Result: {result}");
             logger.Log($"    Output:\n{fullOutput}");

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

@@ -5,16 +5,23 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-using Microsoft.Build.Evaluation;
 using Microsoft.Language.Xml;
 
 using NuGet.Versioning;
 
 namespace NuGetUpdater.Core;
 
-internal static partial class SdkPackageUpdater
+internal static class SdkPackageUpdater
 {
-    public static async Task UpdateDependencyAsync(string repoRootPath, string projectPath, string dependencyName, string previousDependencyVersion, string newDependencyVersion, bool isTransitive, Logger logger)
+    public static async Task UpdateDependencyAsync(
+        string repoRootPath,
+        string projectPath,
+        string dependencyName,
+        string previousDependencyVersion,
+        string newDependencyVersion,
+        bool isTransitive,
+        Logger logger
+    )
     {
         // SDK-style project, modify the XML directly
         logger.Log("  Running for SDK-style project");
@@ -74,7 +81,7 @@ internal static partial class SdkPackageUpdater
         // stop update process if we find conflicting package versions
         var conflictingPackageVersionsFound = false;
         var packagesAndVersions = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        foreach (var (tfm, dependencies) in tfmsAndDependencies)
+        foreach (var (_, dependencies) in tfmsAndDependencies)
         {
             foreach (var (packageName, packageVersion, _, _, _, _) in dependencies)
             {
@@ -118,7 +125,7 @@ internal static partial class SdkPackageUpdater
         }
         else
         {
-            await UpdateTopLevelDepdendencyAsync(buildFiles, dependencyName, previousDependencyVersion, newDependencyVersion, packagesAndVersions, logger);
+            UpdateTopLevelDepdendency(buildFiles, dependencyName, previousDependencyVersion, newDependencyVersion, packagesAndVersions, logger);
         }
 
         var updatedTopLevelDependencies = MSBuildHelper.GetTopLevelPackageDependenyInfos(buildFiles);
@@ -239,7 +246,14 @@ internal static partial class SdkPackageUpdater
         }
     }
 
-    private static async Task UpdateTopLevelDepdendencyAsync(ImmutableArray<ProjectBuildFile> buildFiles, string dependencyName, string previousDependencyVersion, string newDependencyVersion, Dictionary<string, string> packagesAndVersions, Logger logger)
+    private static void UpdateTopLevelDepdendency(
+        ImmutableArray<ProjectBuildFile> buildFiles,
+        string dependencyName,
+        string previousDependencyVersion,
+        string newDependencyVersion,
+        IDictionary<string, string> packagesAndVersions,
+        Logger logger
+    )
     {
         var result = TryUpdateDependencyVersion(buildFiles, dependencyName, previousDependencyVersion, newDependencyVersion, logger);
         if (result == UpdateResult.NotFound)
@@ -254,7 +268,12 @@ internal static partial class SdkPackageUpdater
         }
     }
 
-    private static UpdateResult TryUpdateDependencyVersion(ImmutableArray<ProjectBuildFile> buildFiles, string dependencyName, string? previousDependencyVersion, string newDependencyVersion, Logger logger)
+    private static UpdateResult TryUpdateDependencyVersion(
+        ImmutableArray<ProjectBuildFile> buildFiles,
+        string dependencyName,
+        string? previousDependencyVersion,
+        string newDependencyVersion,
+        Logger logger)
     {
         var foundCorrect = false;
         var foundUnsupported = false;
@@ -275,9 +294,9 @@ internal static partial class SdkPackageUpdater
             foreach (var packageNode in packageNodes)
             {
                 var versionAttribute = packageNode.GetAttribute("Version", StringComparison.OrdinalIgnoreCase)
-                    ?? packageNode.GetAttribute("VersionOverride", StringComparison.OrdinalIgnoreCase);
+                                       ?? packageNode.GetAttribute("VersionOverride", StringComparison.OrdinalIgnoreCase);
                 var versionElement = packageNode.Elements.FirstOrDefault(e => e.Name.Equals("Version", StringComparison.OrdinalIgnoreCase))
-                    ?? packageNode.Elements.FirstOrDefault(e => e.Name.Equals("VersionOverride", StringComparison.OrdinalIgnoreCase));
+                                     ?? packageNode.Elements.FirstOrDefault(e => e.Name.Equals("VersionOverride", StringComparison.OrdinalIgnoreCase));
                 if (versionAttribute is not null)
                 {
                     // Is this the case where version is specified with property substitution?
@@ -373,31 +392,29 @@ internal static partial class SdkPackageUpdater
                 else
                 {
                     // We weren't able to find the version node. Central package management?
-                    logger.Log($"    Found package reference but was unable to locate version information.");
-                    continue;
+                    logger.Log("    Found package reference but was unable to locate version information.");
                 }
             }
 
             if (updateNodes.Count > 0)
             {
                 var updatedXml = buildFile.Contents
-                    .ReplaceNodes(updateNodes, (o, n) =>
+                    .ReplaceNodes(updateNodes, (_, n) =>
                     {
                         if (n is XmlAttributeSyntax attributeSyntax)
                         {
                             return attributeSyntax.WithValue(attributeSyntax.Value.Replace(previousPackageVersion!, newDependencyVersion));
                         }
-                        else if (n is XmlElementSyntax elementsSyntax)
+
+                        if (n is XmlElementSyntax elementsSyntax)
                         {
                             var modifiedContent = elementsSyntax.GetContentValue().Replace(previousPackageVersion!, newDependencyVersion);
 
                             var textSyntax = SyntaxFactory.XmlText(SyntaxFactory.Token(null, SyntaxKind.XmlTextLiteralToken, null, modifiedContent));
                             return elementsSyntax.WithContent(SyntaxFactory.SingletonList(textSyntax));
                         }
-                        else
-                        {
-                            throw new InvalidDataException($"Unsupported SyntaxType {n.GetType().Name} marked for update");
-                        }
+
+                        throw new InvalidDataException($"Unsupported SyntaxType {n.GetType().Name} marked for update");
                     });
                 buildFile.Update(updatedXml);
                 updateWasPerformed = true;
@@ -489,10 +506,13 @@ internal static partial class SdkPackageUpdater
                     : UpdateResult.NotFound;
     }
 
-    private static IEnumerable<IXmlElementSyntax> FindPackageNodes(ProjectBuildFile buildFile, string packageName)
-    {
-        return buildFile.PackageItemNodes.Where(e =>
-            string.Equals(e.GetAttributeOrSubElementValue("Include", StringComparison.OrdinalIgnoreCase) ?? e.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase), packageName, StringComparison.OrdinalIgnoreCase) &&
+    private static IEnumerable<IXmlElementSyntax> FindPackageNodes(
+        ProjectBuildFile buildFile,
+        string packageName)
+        => buildFile.PackageItemNodes.Where(e =>
+            string.Equals(
+                e.GetAttributeOrSubElementValue("Include", StringComparison.OrdinalIgnoreCase) ?? e.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase),
+                packageName,
+                StringComparison.OrdinalIgnoreCase) &&
             (e.GetAttributeOrSubElementValue("Version", StringComparison.OrdinalIgnoreCase) ?? e.GetAttributeOrSubElementValue("VersionOverride", StringComparison.OrdinalIgnoreCase)) is not null);
-    }
 }