dependabot-nuget 0.323.0 → 0.325.1

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

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Linq;
+
+using Microsoft.Language.Xml;
 
 using NuGet.Versioning;
 
@@ -25,7 +25,7 @@ public class XmlFileWriter : IFileWriter
     private readonly ILogger _logger;
 
     // these file extensions are valid project entrypoints; everything else is ignored
-    private static readonly HashSet<string> SupportedProjectFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+    internal static readonly HashSet<string> SupportedProjectFileExtensions = new(StringComparer.OrdinalIgnoreCase)
     {
         ".csproj",
         ".vbproj",
@@ -33,7 +33,7 @@ public class XmlFileWriter : IFileWriter
     };
 
     // these file extensions are valid additional files and can be updated; everything else is ignored
-    private static readonly HashSet<string> SupportedAdditionalFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+    internal static readonly HashSet<string> SupportedAdditionalFileExtensions = new(StringComparer.OrdinalIgnoreCase)
     {
         ".props",
         ".targets",
@@ -71,8 +71,7 @@ public class XmlFileWriter : IFileWriter
             .Where(path => SupportedProjectFileExtensions.Contains(Path.GetExtension(path)) || SupportedAdditionalFileExtensions.Contains(Path.GetExtension(path)))
             .Select(async path =>
             {
-                var content = await ReadFileContentsAsync(repoContentsPath, path);
-                var document = XDocument.Parse(content, LoadOptions.PreserveWhitespace);
+                var document = await ReadFileContentsAsync(repoContentsPath, path);
                 return KeyValuePair.Create(path, document);
             })
             .ToArray();
@@ -102,17 +101,46 @@ public class XmlFileWriter : IFileWriter
             string? currentVersionString = null;
             Action<string>? updateVersionLocation = null;
 
-            var packageReferenceElements = filesAndContents.Values
-                .SelectMany(doc => doc.Descendants().Where(e => e.Name.LocalName == PackageReferenceElementName || e.Name.LocalName == GlobalPackageReferenceElementName))
-                .Where(e =>
+            var packageReferenceElementsAndPaths = filesAndContents
+                .SelectMany(kvp =>
+                {
+                    var path = kvp.Key;
+                    var doc = kvp.Value;
+                    var elements = doc.Descendants().Where(e => e.Name == PackageReferenceElementName || e.Name == GlobalPackageReferenceElementName);
+                    var pair = elements.Select(element => KeyValuePair.Create(element, path));
+                    return pair;
+                })
+                .Where(pair =>
                 {
-                    var attributeValue = e.Attribute(IncludeAttributeName)?.Value ?? e.Attribute(UpdateAttributeName)?.Value ?? string.Empty;
+                    var element = pair.Key;
+                    var attributeValue = element.GetAttributeValue(IncludeAttributeName) ?? element.GetAttributeValue(UpdateAttributeName) ?? string.Empty;
                     var packageNames = attributeValue.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
                     return packageNames.Any(name => name.Equals(requiredPackageVersion.Name, StringComparison.OrdinalIgnoreCase));
                 })
                 .ToArray();
 
-            if (packageReferenceElements.Length == 0)
+            SyntaxNode ReplaceNode(string filePath, SyntaxNode original, SyntaxNode replacement)
+            {
+                var doc = filesAndContents[filePath];
+
+#if DEBUG
+                if (!doc.DescendantNodes().OfType<XmlNodeSyntax>().Any(n => n == original))
+                {
+                    throw new NotSupportedException("original node was not found");
+                }
+#endif
+
+                var updatedDoc = doc.ReplaceNode(original, replacement);
+#if DEBUG
+                var docFullString = doc.ToFullString();
+                var updatedDocFullString = updatedDoc.ToFullString();
+#endif
+                filesAndContents[filePath] = updatedDoc;
+                var newlyAddedNode = updatedDoc.DescendantNodes().OfType<XmlNodeSyntax>().First(d => d.FullSpan.Start == original.FullSpan.Start);
+                return newlyAddedNode;
+            }
+
+            if (packageReferenceElementsAndPaths.Length == 0)
             {
                 // no matching `<PackageReference>` elements found; pin it as a transitive dependency
                 updatesPerformed[requiredPackageVersion.Name] = true; // all cases below add the dependency
@@ -120,51 +148,112 @@ public class XmlFileWriter : IFileWriter
                 // find last `<ItemGroup>` in the project...
                 Action addItemGroup = () => { }; // adding an ItemGroup to the project isn't always necessary, but it's much easier to prepare for it here
                 var projectDocument = filesAndContents[projectRelativePath];
-                var lastItemGroup = projectDocument.Root!.Elements()
-                    .LastOrDefault(e => e.Name.LocalName.Equals(ItemGroupElementName, StringComparison.OrdinalIgnoreCase));
+                var lastItemGroup = projectDocument.RootSyntax.Elements
+                    .LastOrDefault(e => e.Name.Equals(ItemGroupElementName, StringComparison.OrdinalIgnoreCase));
                 if (lastItemGroup is null)
                 {
                     _logger.Info($"No `<{ItemGroupElementName}>` element found in project; adding one.");
-                    lastItemGroup = new XElement(XName.Get(ItemGroupElementName, projectDocument.Root.Name.NamespaceName));
-                    addItemGroup = () => projectDocument.Root.Add(lastItemGroup);
+                    lastItemGroup = XmlExtensions.CreateOpenCloseXmlElementSyntax(ItemGroupElementName,
+                        new SyntaxList<SyntaxNode>([SyntaxFactory.EndOfLineTrivia("\n"), SyntaxFactory.WhitespaceTrivia("  ")]),
+                        insertIntermediateNewline: false);
+                    addItemGroup = () =>
+                    {
+                        // add the new element
+                        var updatedRootSyntax = projectDocument.RootSyntax.AddChild(lastItemGroup);
+                        var updatedProjectDocument = projectDocument.ReplaceNode(projectDocument.RootSyntax.AsNode, updatedRootSyntax.AsNode);
+
+                        // reset well-known variables
+                        projectDocument = updatedProjectDocument;
+                        filesAndContents[projectRelativePath] = updatedProjectDocument;
+                        lastItemGroup = updatedProjectDocument.RootSyntax.Elements.Last(e => e.Name.Equals(ItemGroupElementName, StringComparison.OrdinalIgnoreCase));
+                    };
                 }
 
                 // ...find where the new item should go...
-                var packageReferencesBeforeNew = lastItemGroup.Elements()
-                    .Where(e => e.Name.LocalName.Equals(PackageReferenceElementName, StringComparison.OrdinalIgnoreCase))
-                    .TakeWhile(e => (e.Attribute(IncludeAttributeName)?.Value ?? e.Attribute(UpdateAttributeName)?.Value ?? string.Empty).CompareTo(requiredPackageVersion.Name) < 0)
-                    .ToArray();
+                var elementsBeforeNew = GetOrderedElementsBeforeSpecified(lastItemGroup, PackageReferenceElementName, [IncludeAttributeName, UpdateAttributeName], requiredPackageVersion.Name);
 
                 // ...prepare a new `<PackageReference>` element...
-                var newElement = new XElement(
-                    XName.Get(PackageReferenceElementName, projectDocument.Root.Name.NamespaceName),
-                    new XAttribute(IncludeAttributeName, requiredPackageVersion.Name));
+                var newElement = XmlExtensions.CreateSingleLineXmlElementSyntax(PackageReferenceElementName, leadingTrivia: new SyntaxList<SyntaxNode>())
+                    .WithAttribute(IncludeAttributeName, requiredPackageVersion.Name);
 
                 // ...add the `<PackageReference>` element if and where appropriate...
                 if (addPackageReferenceElementForPinnedPackages)
                 {
                     addItemGroup();
-                    var lastPriorPackageReference = packageReferencesBeforeNew.LastOrDefault();
-                    if (lastPriorPackageReference is not null)
+                    var lastPriorElement = elementsBeforeNew.LastOrDefault();
+                    if (lastPriorElement is not null)
                     {
-                        AddAfterSiblingElement(lastPriorPackageReference, newElement);
+                        // find line number of last prior element
+                        // find the offset of the first token on each newline
+                        var firstOffsetForLine = new List<int>();
+                        foreach (var tr in filesAndContents[projectRelativePath].DescendantTrivia(descendIntoChildren: _ => true, descendIntoTrivia: true))
+                        {
+                            if (tr.Kind == SyntaxKind.EndOfLineTrivia)
+                            {
+                                firstOffsetForLine.Add(tr.SpanStart);
+                            }
+
+                            if (tr.SpanStart >= lastPriorElement.SpanStart)
+                            {
+                                break;
+                            }
+                        }
+
+                        var lastPriorElementLineNumber = firstOffsetForLine.Count(o => o < lastPriorElement.SpanStart);
+                        var lastElementAtStartOfLine = lastPriorElement.Parent.ChildNodes
+                            .First(n => firstOffsetForLine.Count(o => o < n.SpanStart) >= lastPriorElementLineNumber);
+                        var trivia = lastElementAtStartOfLine.GetLeadingTrivia().ToList();
+                        var priorEolIndex = trivia.FindLastIndex(t => t.Kind == SyntaxKind.EndOfLineTrivia);
+                        var indentTrivia = trivia
+                            .Skip(priorEolIndex + 1)
+                            .Select(t => SyntaxFactory.WhitespaceTrivia(t.ToFullString()))
+                            .ToArray();
+                        var newTrivia = new SyntaxTriviaList([SyntaxFactory.EndOfLineTrivia("\n"), .. indentTrivia]);
+                        newElement = (IXmlElementSyntax)newElement.AsNode.WithLeadingTrivia(newTrivia);
+                        var replacementParent = lastPriorElement.Parent.InsertNodesAfter(lastPriorElement, [newElement.AsNode]);
+                        var actualReplacementParent = ReplaceNode(projectRelativePath, lastPriorElement.Parent, replacementParent);
+                        var insertionIndex = elementsBeforeNew.Length;
+                        var actualNewElement = ((IXmlElementSyntax)actualReplacementParent).Content[insertionIndex];
+                        newElement = (IXmlElementSyntax)actualNewElement;
                     }
                     else
                     {
                         // no prior package references; add to the front
-                        var indent = GetIndentXTextFromElement(lastItemGroup, extraIndentationToAdd: "  ");
-                        lastItemGroup.AddFirst(indent, newElement);
+                        var itemGroupTrivia = lastItemGroup.AsNode.GetLeadingTrivia().ToList();
+                        var priorEolIndex = itemGroupTrivia.FindLastIndex(t => t.Kind == SyntaxKind.EndOfLineTrivia);
+                        var indentTrivia = itemGroupTrivia
+                            .Skip(priorEolIndex + 1)
+                            .Select(t => SyntaxFactory.WhitespaceTrivia(t.ToFullString()))
+                            .ToArray();
+                        var newTrivia = new SyntaxTriviaList([SyntaxFactory.EndOfLineTrivia("\n"), SyntaxFactory.WhitespaceTrivia("  "), .. indentTrivia]);
+                        newElement = (IXmlElementSyntax)newElement.AsNode.WithLeadingTrivia(newTrivia);
+                        var updatedItemGroup = (IXmlElementSyntax)ReplaceNode(
+                            projectRelativePath,
+                            lastItemGroup.AsNode,
+                            lastItemGroup.InsertChild(newElement, 0).AsNode
+                        );
+                        newElement = (IXmlElementSyntax)updatedItemGroup.Content[0];
                     }
                 }
 
                 // ...find the best place to add the version...
-                var matchingPackageVersionElement = filesAndContents.Values
-                    .SelectMany(doc => doc.Descendants().Where(e => e.Name.LocalName.Equals(PackageVersionElementName, StringComparison.OrdinalIgnoreCase)))
-                    .FirstOrDefault(e => (e.Attribute(IncludeAttributeName)?.Value ?? string.Empty).Trim().Equals(requiredPackageVersion.Name, StringComparison.OrdinalIgnoreCase));
-                if (matchingPackageVersionElement is not null)
+                var matchingPackageVersionElementsAndPaths = filesAndContents
+                    .SelectMany(kvp =>
+                    {
+                        var path = kvp.Key;
+                        var doc = kvp.Value;
+                        var packageVersionElements = doc.Descendants()
+                            .Where(e => e.Name.Equals(PackageVersionElementName, StringComparison.OrdinalIgnoreCase))
+                            .Where(element => (element.GetAttributeValue(IncludeAttributeName) ?? string.Empty).Trim().Equals(requiredPackageVersion.Name, StringComparison.OrdinalIgnoreCase))
+                            .ToArray();
+                        return packageVersionElements.Select(element => KeyValuePair.Create(element, path));
+                    })
+                    .ToArray();
+                if (matchingPackageVersionElementsAndPaths.Length > 0)
                 {
                     // found matching `<PackageVersion>` element; if `Version` attribute is appropriate we're done, otherwise set `VersionOverride` attribute on new element
-                    var versionAttribute = matchingPackageVersionElement.Attributes().FirstOrDefault(a => a.Name.LocalName.Equals(VersionMetadataName, StringComparison.OrdinalIgnoreCase));
+                    var (matchingPackageVersionElement, filePath) = matchingPackageVersionElementsAndPaths.First();
+                    var versionAttribute = matchingPackageVersionElement.GetAttributeCaseInsensitive(VersionMetadataName);
                     if (versionAttribute is not null &&
                         NuGetVersion.TryParse(versionAttribute.Value, out var existingVersion) &&
                         existingVersion == requiredVersion)
@@ -176,88 +265,152 @@ public class XmlFileWriter : IFileWriter
                     {
                         // version doesn't match; use `VersionOverride` attribute on new element
                         _logger.Info($"Dependency {requiredPackageVersion.Name} set to {requiredVersion}; using `{VersionOverrideMetadataName}` attribute on new element.");
-                        newElement.SetAttributeValue(VersionOverrideMetadataName, requiredVersion.ToString());
+                        newElement = (IXmlElementSyntax)ReplaceNode(
+                            projectRelativePath,
+                            newElement.AsNode,
+                            newElement.WithAttribute(VersionOverrideMetadataName, requiredVersion.ToString()).AsNode
+                        );
                     }
                 }
                 else
                 {
                     // no matching `<PackageVersion>` element; either add a new one, or directly set the `Version` attribute on the new element
-                    var allPackageVersionElements = filesAndContents.Values
-                        .SelectMany(doc => doc.Descendants().Where(e => e.Name.LocalName.Equals(PackageVersionElementName, StringComparison.OrdinalIgnoreCase)))
+                    var allPackageVersionElementsAndPaths = filesAndContents
+                        .SelectMany(kvp =>
+                        {
+                            var path = kvp.Key;
+                            var doc = kvp.Value;
+                            return doc.Descendants()
+                                .Where(e => e.Name.Equals(PackageVersionElementName, StringComparison.OrdinalIgnoreCase))
+                                .Select(element => KeyValuePair.Create(element, path));
+                        })
                         .ToArray();
-                    if (allPackageVersionElements.Length > 0)
+                    if (allPackageVersionElementsAndPaths.Length > 0)
                     {
                         // add a new `<PackageVersion>` element
-                        var newVersionElement = new XElement(XName.Get(PackageVersionElementName, projectDocument.Root.Name.NamespaceName),
-                            new XAttribute(IncludeAttributeName, requiredPackageVersion.Name),
-                            new XAttribute(VersionMetadataName, requiredVersion.ToString()));
-                        var lastPriorPackageVersionElement = allPackageVersionElements
-                            .TakeWhile(e => (e.Attribute(IncludeAttributeName)?.Value ?? string.Empty).Trim().CompareTo(requiredPackageVersion.Name) < 0)
-                            .LastOrDefault();
-                        if (lastPriorPackageVersionElement is not null)
+                        var newVersionElement = XmlExtensions.CreateSingleLineXmlElementSyntax(PackageVersionElementName)
+                            .WithAttribute(IncludeAttributeName, requiredPackageVersion.Name)
+                            .WithAttribute(VersionMetadataName, requiredVersion.ToString());
+                        var priorPackageVersionElementsAndPaths = allPackageVersionElementsAndPaths
+                            .TakeWhile(pair => (pair.Key.GetAttributeValue(IncludeAttributeName) ?? string.Empty).Trim().CompareTo(requiredPackageVersion.Name) < 0)
+                            .ToArray();
+                        if (priorPackageVersionElementsAndPaths.Length > 0)
                         {
                             _logger.Info($"Adding new `<{PackageVersionElementName}>` element for {requiredPackageVersion.Name} with version {requiredVersion}.");
-                            AddAfterSiblingElement(lastPriorPackageVersionElement, newVersionElement);
+                            var (lastPriorPackageVersionElement, filePath) = priorPackageVersionElementsAndPaths.Last();
+                            var trivia = lastPriorPackageVersionElement.AsNode.GetLeadingTrivia().ToList();
+                            var priorEolIndex = trivia.FindLastIndex(t => t.Kind == SyntaxKind.EndOfLineTrivia);
+                            var indentTrivia = trivia
+                                .Skip(priorEolIndex + 1)
+                                .Select(t => SyntaxFactory.WhitespaceTrivia(t.ToFullString()))
+                                .ToArray();
+                            var newTrivia = new SyntaxTriviaList([SyntaxFactory.EndOfLineTrivia("\n"), .. indentTrivia]);
+                            newVersionElement = (IXmlElementSyntax)newVersionElement.AsNode.WithLeadingTrivia(newTrivia).WithoutTrailingTrivia();
+                            var insertionIndex = lastPriorPackageVersionElement.Parent.Content.IndexOf(lastPriorPackageVersionElement.AsNode) + 1;
+                            var replacementParent = lastPriorPackageVersionElement.Parent
+                                .InsertChild(newVersionElement, insertionIndex);
+                            var actualReplacementParent = ReplaceNode(filePath, lastPriorPackageVersionElement.Parent.AsNode, replacementParent.AsNode);
+                            var actualNewElement = ((IXmlElementSyntax)actualReplacementParent).Content[insertionIndex];
+                            newVersionElement = (IXmlElementSyntax)actualNewElement;
                         }
                         else
                         {
                             // no prior package versions; add to the front of the document
                             _logger.Info($"Adding new `<{PackageVersionElementName}>` element for {requiredPackageVersion.Name} with version {requiredVersion} at the start of the document.");
-                            var packageVersionGroup = allPackageVersionElements.First().Parent!;
-                            var indent = GetIndentXTextFromElement(packageVersionGroup, extraIndentationToAdd: "  ");
-                            packageVersionGroup.AddFirst(indent, newVersionElement);
+                            var (packageVersionGroup, filePath) = allPackageVersionElementsAndPaths.First();
+                            packageVersionGroup = packageVersionGroup.Parent;
+                            var itemGroupTrivia = packageVersionGroup.AsNode.GetLeadingTrivia().ToList();
+                            var priorEolIndex = itemGroupTrivia.FindLastIndex(t => t.Kind == SyntaxKind.EndOfLineTrivia);
+                            var indentTrivia = itemGroupTrivia
+                                .Skip(priorEolIndex + 1)
+                                .Select(t => SyntaxFactory.WhitespaceTrivia(t.ToFullString()))
+                                .ToArray();
+                            var newTrivia = new SyntaxTriviaList([SyntaxFactory.EndOfLineTrivia("\n"), SyntaxFactory.WhitespaceTrivia("  "), .. indentTrivia]);
+                            newVersionElement = (IXmlElementSyntax)newVersionElement.AsNode.WithLeadingTrivia(newTrivia).WithoutTrailingTrivia();
+                            var insertionIndex = 0;
+                            var replacementPackageVersionGroup = packageVersionGroup
+                                .InsertChild(newVersionElement, insertionIndex);
+                            ReplaceNode(
+                                filePath,
+                                packageVersionGroup.AsNode,
+                                replacementPackageVersionGroup.AsNode
+                            );
                         }
                     }
                     else
                     {
                         // add a direct `Version` attribute
-                        newElement.SetAttributeValue(VersionMetadataName, requiredVersion.ToString());
+                        var newElementWithVersion = newElement.WithAttribute(VersionMetadataName, requiredVersion.ToString());
+                        newElement = (IXmlElementSyntax)ReplaceNode(projectRelativePath, newElement.AsNode, newElementWithVersion.AsNode);
                     }
                 }
             }
             else
             {
                 // found matching `<PackageReference>` elements to update
-                foreach (var packageReferenceElement in packageReferenceElements)
+                foreach (var (packageReferenceElement, filePath) in packageReferenceElementsAndPaths)
                 {
                     // first check for matching `Version` attribute
-                    var versionAttribute = packageReferenceElement.Attributes().FirstOrDefault(a => a.Name.LocalName.Equals(VersionMetadataName, StringComparison.OrdinalIgnoreCase));
+                    var versionAttribute = packageReferenceElement.GetAttribute(VersionMetadataName, StringComparison.OrdinalIgnoreCase);
                     if (versionAttribute is not null)
                     {
                         currentVersionString = versionAttribute.Value;
-                        updateVersionLocation = (version) => versionAttribute.Value = version;
+                        updateVersionLocation = version =>
+                        {
+                            var refoundVersionAttribute = filesAndContents[filePath]
+                                .DescendantNodes()
+                                .OfType<XmlAttributeSyntax>()
+                                .First(a => a.FullSpan.Start == versionAttribute.FullSpan.Start);
+                            ReplaceNode(filePath, refoundVersionAttribute, refoundVersionAttribute.WithValue(version));
+                        };
                         goto doVersionUpdate;
                     }
 
                     // next check for `Version` child element
-                    var versionElement = packageReferenceElement.Elements().FirstOrDefault(e => e.Name.LocalName.Equals(VersionMetadataName, StringComparison.OrdinalIgnoreCase));
+                    var versionElement = packageReferenceElement.Elements.FirstOrDefault(e => e.Name.Equals(VersionMetadataName, StringComparison.OrdinalIgnoreCase));
                     if (versionElement is not null)
                     {
-                        currentVersionString = versionElement.Value;
-                        updateVersionLocation = (version) => versionElement.Value = version;
+                        currentVersionString = versionElement.GetContentValue();
+                        updateVersionLocation = version =>
+                        {
+                            var refoundVersionElement = filesAndContents[filePath]
+                                .DescendantNodes()
+                                .OfType<IXmlElementSyntax>()
+                                .First(e => e.AsNode.FullSpan.Start == versionElement.AsNode.FullSpan.Start);
+                            ReplaceNode(filePath, refoundVersionElement.AsNode, refoundVersionElement.WithContent(version).AsNode);
+                        };
                         goto doVersionUpdate;
                     }
 
                     // check for matching `<PackageVersion>` element
-                    var packageVersionElement = filesAndContents.Values
-                        .SelectMany(doc => doc.Descendants().Where(e => e.Name.LocalName == PackageVersionElementName))
-                        .FirstOrDefault(e => (e.Attribute(IncludeAttributeName)?.Value ?? string.Empty).Trim().Equals(requiredPackageVersion.Name, StringComparison.OrdinalIgnoreCase));
-                    if (packageVersionElement is not null)
+                    var packageVersionElementsAndPaths = filesAndContents
+                        .SelectMany(kvp =>
+                        {
+                            var path = kvp.Key;
+                            var doc = kvp.Value;
+                            return doc.Descendants()
+                                .Where(e => e.Name.Equals(PackageVersionElementName, StringComparison.OrdinalIgnoreCase))
+                                .Where(e => (e.GetAttributeValue(IncludeAttributeName) ?? string.Empty).Trim().Equals(requiredPackageVersion.Name, StringComparison.OrdinalIgnoreCase))
+                                .Select(element => KeyValuePair.Create(element, path));
+                        })
+                        .ToArray();
+                    if (packageVersionElementsAndPaths.Length > 0)
                     {
-                        var packageVersionAttribute = packageVersionElement.Attributes().FirstOrDefault(a => a.Name.LocalName.Equals(VersionMetadataName, StringComparison.OrdinalIgnoreCase));
+                        var (packageVersionElement, packageVersionFilePath) = packageVersionElementsAndPaths.First();
+                        var packageVersionAttribute = packageVersionElement.GetAttributeCaseInsensitive(VersionMetadataName);
                         if (packageVersionAttribute is not null)
                         {
                             currentVersionString = packageVersionAttribute.Value;
-                            updateVersionLocation = (version) => packageVersionAttribute.Value = version;
+                            updateVersionLocation = version => ReplaceNode(packageVersionFilePath, packageVersionAttribute, packageVersionAttribute.WithValue(version));
                             goto doVersionUpdate;
                         }
                         else
                         {
-                            var cpmVersionElement = packageVersionElement.Elements().FirstOrDefault(e => e.Name.LocalName.Equals(VersionMetadataName, StringComparison.OrdinalIgnoreCase));
+                            var cpmVersionElement = packageVersionElement.GetElements(VersionMetadataName, StringComparison.OrdinalIgnoreCase).FirstOrDefault();
                             if (cpmVersionElement is not null)
                             {
-                                currentVersionString = cpmVersionElement.Value;
-                                updateVersionLocation = (version) => cpmVersionElement.Value = version;
+                                currentVersionString = cpmVersionElement.GetContentValue();
+                                updateVersionLocation = version => ReplaceNode(packageVersionFilePath, cpmVersionElement.AsNode, cpmVersionElement.WithContent(version).AsNode);
                                 goto doVersionUpdate;
                             }
                         }
@@ -345,13 +498,21 @@ public class XmlFileWriter : IFileWriter
                             {
                                 // this looks like a property; keep walking backwards with all possible elements
                                 var propertyName = propertyMatch.Groups["PropertyName"].Value;
-                                var propertyDefinitions = filesAndContents.Values
-                                    .SelectMany(doc => doc.Descendants().Where(e => e.Name.LocalName.Equals(propertyName, StringComparison.OrdinalIgnoreCase)))
-                                    .Where(e => e.Parent?.Name.LocalName.Equals(PropertyGroupElementName, StringComparison.OrdinalIgnoreCase) == true)
+                                var propertyDefinitionsAndPaths = filesAndContents
+                                    .SelectMany(kvp =>
+                                    {
+                                        var path = kvp.Key;
+                                        var doc = kvp.Value;
+                                        return doc.Descendants()
+                                            .Where(e => e.Name.Equals(propertyName, StringComparison.OrdinalIgnoreCase))
+                                            .Where(e => e.Parent?.Name.Equals(PropertyGroupElementName, StringComparison.OrdinalIgnoreCase) == true)
+                                            .Select(element => KeyValuePair.Create(element, path));
+                                    })
                                     .ToArray();
-                                foreach (var propertyDefinition in propertyDefinitions)
+                                foreach (var (propertyDefinition, propertyFilePath) in propertyDefinitionsAndPaths)
                                 {
-                                    candidateUpdateLocations.Enqueue((propertyDefinition.Value, (version) => propertyDefinition.Value = version));
+                                    var updateAction = new Action<string>(version => ReplaceNode(propertyFilePath, propertyDefinition.AsNode, propertyDefinition.WithContent(version).AsNode));
+                                    candidateUpdateLocations.Enqueue((propertyDefinition.GetContentValue(), updateAction));
                                 }
                             }
                         }
@@ -377,73 +538,32 @@ public class XmlFileWriter : IFileWriter
         return performedAllUpdates;
     }
 
-    private static XText? GetIndentXTextFromElement(XElement element, string extraIndentationToAdd = "")
-    {
-        var indentText = (element.PreviousNode as XText)?.Value;
-        var indent = indentText is not null
-            ? new XText(indentText + extraIndentationToAdd)
-            : null;
-        return indent;
-    }
-
-    private static void AddAfterSiblingElement(XElement siblingElement, XElement newElement, string extraIndentationToAdd = "")
+    private static ImmutableArray<SyntaxNode> GetOrderedElementsBeforeSpecified(IXmlElementSyntax parentElement, string elementName, IEnumerable<string> attributeNamesToCheck, string attributeValue)
     {
-        var indent = GetIndentXTextFromElement(siblingElement, extraIndentationToAdd);
-        XNode nodeToAddAfter = siblingElement;
-        var done = false;
-        while (!done && nodeToAddAfter.NextNode is not null)
-        {
-            // skip over XText and XComment nodes until we find a newline
-            switch (nodeToAddAfter.NextNode)
-            {
-                case XText text:
-                    if (text.Value.Contains('\n'))
-                    {
-                        done = true;
-                    }
-                    else
-                    {
-                        nodeToAddAfter = nodeToAddAfter.NextNode;
-                    }
-
-                    break;
-                case XComment comment:
-                    if (comment.Value.Contains('\n'))
-                    {
-                        done = true;
-                    }
-                    else
-                    {
-                        nodeToAddAfter = nodeToAddAfter.NextNode;
-                    }
-
-                    break;
-                default:
-                    done = true;
-                    break;
-            }
-        }
-
-        nodeToAddAfter.AddAfterSelf(indent, newElement);
+        var elementsBeforeNew = parentElement.Content
+            .TakeWhile(
+                e => e is XmlCommentSyntax ||
+                (e is IXmlElementSyntax element &&
+                    element.Name.Equals(elementName, StringComparison.OrdinalIgnoreCase) &&
+                    (attributeNamesToCheck.Select(attributeName => element.GetAttributeValue(attributeName)).FirstOrDefault(value => value is not null) ?? string.Empty)
+                    .CompareTo(attributeValue) < 0))
+            .ToImmutableArray();
+        return elementsBeforeNew;
     }
 
-    private static async Task<string> ReadFileContentsAsync(DirectoryInfo repoContentsPath, string path)
+    private static async Task<XmlDocumentSyntax> ReadFileContentsAsync(DirectoryInfo repoContentsPath, string path)
     {
         var fullPath = Path.Join(repoContentsPath.FullName, path);
         var contents = await File.ReadAllTextAsync(fullPath);
-        return contents;
+        var document = Parser.ParseText(contents);
+        return document;
     }
 
-    private static async Task WriteFileContentsAsync(DirectoryInfo repoContentsPath, string path, XDocument document)
+    private static async Task WriteFileContentsAsync(DirectoryInfo repoContentsPath, string path, XmlDocumentSyntax document)
     {
         var fullPath = Path.Join(repoContentsPath.FullName, path);
-        var writerSettings = new XmlWriterSettings()
-        {
-            Async = true,
-            OmitXmlDeclaration = document.Declaration is null,
-        };
-        using var writer = XmlWriter.Create(fullPath, writerSettings);
-        await document.SaveAsync(writer, CancellationToken.None);
+        var content = document.ToFullString();
+        await File.WriteAllTextAsync(fullPath, content);
     }
 
     public static string CreateUpdatedVersionRangeString(VersionRange existingRange, NuGetVersion existingVersion, NuGetVersion requiredVersion)

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

@@ -1,5 +1,3 @@
-using NuGetUpdater.Core.Updater;
-
 namespace NuGetUpdater.Core;
 
 internal static class LockFileUpdater
@@ -7,18 +5,13 @@ internal static class LockFileUpdater
     public static async Task UpdateLockFileAsync(
         string repoRootPath,
         string projectPath,
-        ExperimentsManager experimentsManager,
         ILogger logger)
     {
         var projectDirectory = Path.GetDirectoryName(projectPath)!;
-        await MSBuildHelper.HandleGlobalJsonAsync(projectDirectory, repoRootPath, experimentsManager, async () =>
+        var (exitCode, stdout, stderr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["restore", "--force-evaluate", "-p:EnableWindowsTargeting=true", projectPath], projectDirectory);
+        if (exitCode != 0)
         {
-            var (exitCode, stdout, stderr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["restore", "--force-evaluate", "-p:EnableWindowsTargeting=true", projectPath], projectDirectory, experimentsManager);
-            if (exitCode != 0)
-            {
-                logger.Error($"      Lock file update failed.\nSTDOUT:\n{stdout}\nSTDERR:\n{stderr}");
-            }
-            return (exitCode, stdout, stderr);
-        }, logger, retainMSBuildSdks: true);
+            logger.Error($"      Lock file update failed.\nSTDOUT:\n{stdout}\nSTDERR:\n{stderr}");
+        }
     }
 }

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

@@ -29,7 +29,6 @@ internal static class PackageReferenceUpdater
         ImmutableArray<Dependency> topLevelDependencies,
         ImmutableArray<Dependency> requestedUpdates,
         ImmutableArray<Dependency> resolvedDependencies,
-        ExperimentsManager experimentsManager,
         ILogger logger
     )
     {
@@ -41,7 +40,7 @@ internal static class PackageReferenceUpdater
             .Where(d => d.Item2)
             .ToDictionary(d => d.Item1, d => d.Item3!, StringComparer.OrdinalIgnoreCase);
 
-        var (packageParents, packageVersions) = await GetPackageGraphForDependencies(repoRoot, projectPath, targetFramework, resolvedDependencies, experimentsManager, logger);
+        var (packageParents, packageVersions) = await GetPackageGraphForDependencies(repoRoot, projectPath, targetFramework, resolvedDependencies, logger);
         var updateOperations = new List<UpdateOperationBase>();
         foreach (var (requestedDependencyName, requestedDependencyVersion) in requestedVersions)
         {
@@ -109,7 +108,7 @@ internal static class PackageReferenceUpdater
         return [.. updateOperations];
     }
 
-    private static async Task<(Dictionary<string, HashSet<string>> PackageParents, Dictionary<string, NuGetVersion> PackageVersions)> GetPackageGraphForDependencies(string repoRoot, string projectPath, string targetFramework, ImmutableArray<Dependency> topLevelDependencies, ExperimentsManager experimentsManager, ILogger logger)
+    private static async Task<(Dictionary<string, HashSet<string>> PackageParents, Dictionary<string, NuGetVersion> PackageVersions)> GetPackageGraphForDependencies(string repoRoot, string projectPath, string targetFramework, ImmutableArray<Dependency> topLevelDependencies, ILogger logger)
     {
         var packageParents = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
         var packageVersions = new Dictionary<string, NuGetVersion>(StringComparer.OrdinalIgnoreCase);
@@ -118,8 +117,8 @@ internal static class PackageReferenceUpdater
         {
             // generate project.assets.json
             var parsedTargetFramework = NuGetFramework.Parse(targetFramework);
-            var tempProject = await MSBuildHelper.CreateTempProjectAsync(tempDir, repoRoot, projectPath, targetFramework, topLevelDependencies, experimentsManager, logger, importDependencyTargets: false);
-            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["build", tempProject, "/t:_ReportDependencies"], tempDir.FullName, experimentsManager);
+            var tempProject = await MSBuildHelper.CreateTempProjectAsync(tempDir, repoRoot, projectPath, targetFramework, topLevelDependencies, logger, importDependencyTargets: false);
+            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["build", tempProject, "/t:_ReportDependencies"], tempDir.FullName);
             var assetsJsonPath = Path.Join(tempDir.FullName, "obj", "project.assets.json");
             var assetsJsonContent = await File.ReadAllTextAsync(assetsJsonPath);
 

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

@@ -77,7 +77,7 @@ public class UpdaterWorker : IUpdaterWorker
 
         var worker = new FileWriterWorker(
             new DiscoveryWorker(_jobId, _experimentsManager, _logger),
-            new MSBuildDependencySolver(new DirectoryInfo(repoRootPath), new FileInfo(workspacePath), _experimentsManager, _logger),
+            new MSBuildDependencySolver(new DirectoryInfo(repoRootPath), new FileInfo(workspacePath), _logger),
             new XmlFileWriter(_logger),
             _logger
         );

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

@@ -460,7 +460,7 @@ public class PackageManager
                             string currentVersionString = parent.CurrentVersion;
                             NuGetVersion currentVersionParent = NuGetVersion.Parse(currentVersionString);
 
-                            var result = await VersionFinder.GetVersionsAsync([projectFramework], parent.PackageName, currentVersionParent, nugetContext, logger, CancellationToken.None);
+                            var result = await VersionFinder.GetVersionsByNameAsync([projectFramework], parent.PackageName, currentVersionParent, nugetContext, logger, CancellationToken.None);
                             var versions = result.GetVersions();
                             NuGetVersion latestVersion = versions.Where(v => !v.IsPrerelease).Max();
 
@@ -550,7 +550,7 @@ public class PackageManager
         NuGetContext nugetContext = new NuGetContext(Path.GetDirectoryName(projectPath));
         var projectFramework = NuGetFramework.Parse(targetFramework);
 
-        var result = await VersionFinder.GetVersionsAsync([projectFramework], possibleParent.PackageName, CurrentVersion, nugetContext, logger, CancellationToken.None);
+        var result = await VersionFinder.GetVersionsByNameAsync([projectFramework], possibleParent.PackageName, CurrentVersion, nugetContext, logger, CancellationToken.None);
         var versions = result.GetVersions();
 
         // If there are no versions