Be more robust with custom namespaces in app.config - fixes #1607

fsprojects · Feb 20, 2018 · 1e74dfc · 1e74dfc
1 parent f096117
commit 1e74dfc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 5.138.3 - 2018-02-20
+* BUGFIX: Be more robust with custom namespaces in app.config - https://github.com/fsprojects/Paket/issues/1607
+
 #### 5.138.2 - 2018-02-20
 * BUGFIX: Fix prerelease selection when having multiple prereleases - https://github.com/fsprojects/Paket/pull/3058
 

diff --git a/src/Paket.Core/Common/Xml.fs b/src/Paket.Core/Common/Xml.fs
@@ -98,7 +98,10 @@ module Linq =
             let node,ns = splitNode node
             match parent |> tryGetElement ns node with
             | None ->
-                let node = XElement(XName.Get(node, defaultArg ns ""))
-                parent.Add node
-                node :> XContainer
+                match parent.Nodes() |> Seq.tryFind (fun e -> match e with | :? XElement as e -> e.Name.LocalName = node | _ -> false) with
+                | Some existingNode -> existingNode :?> XContainer
+                | None ->
+                    let node = XElement(XName.Get(node, defaultArg ns ""))
+                    parent.Add node
+                    node :> XContainer
             | Some existingNode -> existingNode :> XContainer)
diff --git a/src/Paket.Core/Installation/BindingRedirects.fs b/src/Paket.Core/Installation/BindingRedirects.fs
@@ -145,7 +145,7 @@ let private applyBindingRedirects isFirstGroup cleanBindingRedirects (allKnownLi
             let needle = (sprintf "name=\"%s\"" b).ToLower()
             haystack.Contains needle)
 
-    let nsManager = XmlNamespaceManager(NameTable());
+    let nsManager = XmlNamespaceManager(NameTable())
     nsManager.AddNamespace("bindings", bindingNs)
     config.XPathSelectElements("//bindings:assemblyBinding", nsManager)
     |> Seq.collect (fun e -> e.Elements(XName.Get("dependentAssembly", bindingNs)))