Skip to content

Make DeepCopyFrom (for ProjectElementContainers) copy all descendants instead of just the direct children #7454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 24, 2022
Merged

Make DeepCopyFrom (for ProjectElementContainers) copy all descendants instead of just the direct children #7454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef9de6e
Add rainersigwald's test
Forgind Mar 5, 2022
f42abf4
Make tests pass
Forgind Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions src/Build.OM.UnitTests/Construction/ProjectItemGroupElement_tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Xml;

using Microsoft.Build.Construction;
using Shouldly;
using Xunit;

#nullable disable
Expand Down Expand Up @@ -70,6 +71,49 @@ public void ReadItemGroupTwoItems()
Assert.Equal("i2", items[1].Include);
}

[Fact]
public void DeepCopyFromItemGroupWithMetadata()
{
string content = @"
<Project>
<ItemGroup>
<i Include='i1'>
<M>metadataValue</M>
</i>
<i Include='i2'>
<M>
<Some>
<Xml With='Nesting' />
</Some>
</M>
</i>
</ItemGroup>
</Project>
";

ProjectRootElement project = ProjectRootElement.Create(XmlReader.Create(new StringReader(content)));
ProjectItemGroupElement group = (ProjectItemGroupElement)Helpers.GetFirst(project.Children);

ProjectRootElement newProject = ProjectRootElement.Create();
ProjectItemGroupElement newItemGroup = project.AddItemGroup();

newItemGroup.DeepCopyFrom(group);

var items = Helpers.MakeList(newItemGroup.Items);

items.Count.ShouldBe(2);

items[0].Include.ShouldBe("i1");
ProjectMetadataElement metadataElement = items[0].Metadata.ShouldHaveSingleItem();
metadataElement.Name.ShouldBe("M");
metadataElement.Value.ShouldBe("metadataValue");

items[1].Include.ShouldBe("i2");
metadataElement = items[1].Metadata.ShouldHaveSingleItem();
metadataElement.Name.ShouldBe("M");
metadataElement.Value.ShouldBe("<Some><Xml With=\"Nesting\" /></Some>");
}

/// <summary>
/// Set the condition value
/// </summary>
Expand Down
35 changes: 34 additions & 1 deletion src/Build/Construction/ProjectElementContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,46 @@ protected internal virtual ProjectElementContainer DeepClone(ProjectRootElement
}
else
{
clone.AppendChild(child.Clone(clone.ContainingProject));
ProjectElement childClone = child.Clone(clone.ContainingProject);
clone.AppendChild(childClone);
if (childClone.XmlElement is not null)
{
AppendAttributesAndChildren(childClone.XmlElement, child.XmlElement);
}
}
}

return clone;
}

private void AppendAttributesAndChildren(XmlNode appendTo, XmlNode appendFrom)
{
appendTo.RemoveAll();
// Copy over the attributes from the template element.
if (appendFrom.Attributes is not null)
{
foreach (XmlAttribute attribute in appendFrom.Attributes)
{
XmlAttribute attr = appendTo.OwnerDocument.CreateAttribute(attribute.LocalName, attribute.NamespaceURI);
attr.Value = attribute.Value;
appendTo.Attributes.Append(attr);
}
}

// If this element has pure text content, copy that over.
if (appendFrom.ChildNodes.Count == 1 && appendFrom.FirstChild.NodeType == XmlNodeType.Text)
{
appendTo.AppendChild(appendTo.OwnerDocument.CreateTextNode(appendFrom.FirstChild.Value));
}

foreach (XmlNode child in appendFrom.ChildNodes)
{
XmlNode childClone = appendTo.OwnerDocument.CreateNode(child.NodeType, child.Prefix, child.Name, child.NamespaceURI);
appendTo.AppendChild(childClone);
AppendAttributesAndChildren(childClone, child);
}
}

internal static ProjectElementContainer DeepClone(ProjectElementContainer xml, ProjectRootElement factory, ProjectElementContainer parent)
{
return xml.DeepClone(factory, parent);
Expand Down