Don't create duplicate framework assembly references - fixes #297

fsprojects · Oct 27, 2014 · 035edbb · 035edbb
1 parent 96fea4c
commit 035edbb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 0.10.1 - 27.10.2014
+* Don't create duplicate framework assembly references - https://github.com/fsprojects/Paket/issues/297
+
 #### 0.10.0 - 24.10.2014
 * Initial version of `paket remove` command - http://fsprojects.github.io/Paket/paket-remove.html
 * Paket add doesn't fail on second attempt - https://github.com/fsprojects/Paket/issues/295

diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -142,6 +142,14 @@ type ProjectFile =
 
         !hasCustom
 
+    member this.HasFrameworkAssemblyNode(assemblyName) =        
+        let found = ref false
+        for node in this.Document.SelectNodes("//ns:Reference", this.Namespaces) do
+            if node.Attributes.["Include"].InnerText.Split(',').[0] = assemblyName then
+                found := true
+
+        !found
+
     member this.DeleteCustomNodes(model:InstallModel) =
         let nodesToDelete = List<_>()
 
@@ -161,22 +169,25 @@ type ProjectFile =
             let itemGroup = createNode(this.Document,"ItemGroup")
 
             for lib in references do
-                let reference = 
-                    match lib with
-                    | Reference.Library lib ->
-                        let fi = new FileInfo(normalizePath lib)
+                match lib with
+                | Reference.Library lib ->
+                    let fi = new FileInfo(normalizePath lib)
 
-                        createNode(this.Document,"Reference")
-                        |> addAttribute "Include" (fi.Name.Replace(fi.Extension,""))
-                        |> addChild (createNodeWithText(this.Document,"HintPath",createRelativePath this.FileName fi.FullName))
-                        |> addChild (createNodeWithText(this.Document,"Private","True"))
-                        |> addChild (createNodeWithText(this.Document,"Paket","True"))
-                    | Reference.FrameworkAssemblyReference frameworkAssembly ->                    
+                    createNode(this.Document,"Reference")
+                    |> addAttribute "Include" (fi.Name.Replace(fi.Extension,""))
+                    |> addChild (createNodeWithText(this.Document,"HintPath",createRelativePath this.FileName fi.FullName))
+                    |> addChild (createNodeWithText(this.Document,"Private","True"))
+                    |> addChild (createNodeWithText(this.Document,"Paket","True"))
+                    |> itemGroup.AppendChild
+                    |> ignore
+                | Reference.FrameworkAssemblyReference frameworkAssembly -> 
+                    if not <| this.HasFrameworkAssemblyNode(frameworkAssembly) then
                         createNode(this.Document,"Reference")
                         |> addAttribute "Include" frameworkAssembly
                         |> addChild (createNodeWithText(this.Document,"Paket","True"))
-
-                itemGroup.AppendChild(reference) |> ignore
+                        |> itemGroup.AppendChild
+                        |> ignore
+
             itemGroup
 
         let groupChooseNode = this.Document.CreateElement("Choose", Constants.ProjectDefaultNameSpace)

diff --git a/tests/Paket.Tests/InstallModel/Xml/ManualNodes.fs b/tests/Paket.Tests/InstallModel/Xml/ManualNodes.fs
@@ -3,7 +3,6 @@
 open Paket
 open NUnit.Framework
 open FsUnit
-open System.Xml
 
 [<Test>]
 let ``should find custom nodes in doc``() =