Fixing #47

skazantsev · Feb 15, 2020 · 8c2c058 · 8c2c058
1 parent 862b15e
commit 8c2c058
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/WebDav.Client.Tests/Methods/ProppatchTests.cs b/src/WebDav.Client.Tests/Methods/ProppatchTests.cs
@@ -90,8 +90,6 @@ public async void When_SetProperties_Should_IncludeThemInSetTag()
   <D:set>
     <D:prop>
       <prop1>value1</prop1>
-    </D:prop>
-    <D:prop>
       <prop2>value2</prop2>
     </D:prop>
   </D:set>
@@ -118,8 +116,6 @@ public async void When_SetPropertiesWithNamespaces_Should_IncludeXmlnsTagAndUseP
   <D:set>
     <D:prop>
       <X:prop1>value1</X:prop1>
-    </D:prop>
-    <D:prop>
       <prop2>value2</prop2>
     </D:prop>
   </D:set>
@@ -151,8 +147,6 @@ public async void When_RemoveProperties_Should_IncludeThemInRemoveTag()
   <D:remove>
     <D:prop>
       <prop1 />
-    </D:prop>
-    <D:prop>
       <prop2 />
     </D:prop>
   </D:remove>
@@ -174,8 +168,6 @@ public async void When_RemovePropertiesWithNamespaces_Should_IncludeXmlnsTagAndU
   <D:remove>
     <D:prop>
       <X:prop1 />
-    </D:prop>
-    <D:prop>
       <prop2 />
     </D:prop>
   </D:remove>

diff --git a/src/WebDav.Client/Request/ProppatchRequestBuilder.cs b/src/WebDav.Client/Request/ProppatchRequestBuilder.cs
@@ -20,24 +20,26 @@ internal static class ProppatchRequestBuilder
             if (propertiesToSet.Any())
             {
                 var setEl = new XElement("{DAV:}set");
+                var propEl = new XElement("{DAV:}prop");
                 foreach (var prop in propertiesToSet)
                 {
                     var el = new XElement(prop.Key);
                     el.SetInnerXml(prop.Value);
-                    setEl.Add(new XElement(XName.Get("prop", "DAV:"), el));
+                    propEl.Add(el);
                 }
+                setEl.Add(propEl);
                 propertyupdate.Add(setEl);
             }
 
             if (propertiesToRemove.Any())
             {
                 var removeEl = new XElement("{DAV:}remove");
+                var propEl = new XElement("{DAV:}prop");
                 foreach (var prop in propertiesToRemove)
                 {
-                    removeEl.Add(
-                        new XElement(XName.Get("prop", "DAV:"),
-                            new XElement(prop)));
+                    propEl.Add(new XElement(prop));
                 }
+                removeEl.Add(propEl);
                 propertyupdate.Add(removeEl);
             }