fixes #1746

fsprojects · Jun 22, 2016 · aa63e44 · aa63e44
1 parent 1b7bf73
commit aa63e44
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 3.1.9 - 22.06.2016
+* BUGFIX: Do not take over control over manual nodes - https://github.com/fsprojects/Paket/issues/1746
+
 #### 3.1.8 - 21.06.2016
 * BUGFIX: Better error message when log file is missing - https://github.com/fsprojects/Paket/issues/1743
 

diff --git a/...01746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate b/...01746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate
@@ -55,6 +55,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Net" >
       <Private>True</Private>
+      <Paket>False</Paket>
     </Reference>
     <Reference Include="System.Windows.Browser" />
   </ItemGroup>

diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -570,11 +570,13 @@ module ProjectFile =
             getCustomModelNodes model project
             |> List.filter (fun node ->
                 let isFrameworkNode = ref true
+                let isManualNode = ref false
                 for child in node.ChildNodes do
                     if child.Name = "HintPath" then isFrameworkNode := false
-                    if child.Name = "Private" then isFrameworkNode := false
+                    if child.Name = "Paket" && String.equalsIgnoreCase child.InnerText "false" then 
+                        isManualNode := true
 
-                not !isFrameworkNode)
+                not !isFrameworkNode && not !isManualNode)
 
         if nodesToDelete <> [] then
             verbosefn "    - Deleting custom projects nodes for %O" model.PackageName