XDT changes

Ensuring xdt classes are public
chocolatey · Jan 20, 2016 · e364bb8 · e364bb8
1 parent e22839d
commit e364bb8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/Core/Extensions/XElementExtensions.cs b/src/Core/Extensions/XElementExtensions.cs
@@ -159,14 +159,17 @@ public static XElement MergeWith(this XElement source, XElement target, IDiction
                         }
                         else
                         {
-                            // If that element is null then add that node
-                            source.Add(targetChild);
+                            if (sourceChild == null)
+                            {
+                                // If that element is null then add that node
+                                source.Add(targetChild);
 
-                            var newlyAddedElement = source.Elements().Last();
-                            Debug.Assert(newlyAddedElement.Name == targetChild.Name);
+                                var newlyAddedElement = source.Elements().Last();
+                                Debug.Assert(newlyAddedElement.Name == targetChild.Name);
 
-                            // when we see an element, add all the previous comments before the child element
-                            AddContents(pendingComments, newlyAddedElement.AddBeforeSelf);
+                                // when we see an element, add all the previous comments before the child element
+                                AddContents(pendingComments, newlyAddedElement.AddBeforeSelf);
+                            }
                         }
                     }
                 }

diff --git a/src/Core/FileModifiers/XdtTransformer.cs b/src/Core/FileModifiers/XdtTransformer.cs
@@ -7,7 +7,7 @@
 
 namespace NuGet
 {
-    internal class XdtTransformer : IPackageFileTransformer
+    public class XdtTransformer : IPackageFileTransformer
     {
         public XdtTransformer()
         {

diff --git a/src/Core/FileModifiers/XmlTransfomer.cs b/src/Core/FileModifiers/XmlTransfomer.cs
@@ -6,7 +6,7 @@
 
 namespace NuGet
 {
-    internal class XmlTransformer : IPackageFileTransformer
+    public class XmlTransformer : IPackageFileTransformer
     {
         private readonly IDictionary<XName, Action<XElement, XElement>> _nodeActions;