From aa63e445dd5b09d9b21a6a98fcad7c72a5049077 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 22 Jun 2016 12:57:11 +0200 Subject: [PATCH] fixes #1746 --- RELEASE_NOTES.md | 3 +++ .../SilverlightClassLibrary1.csprojtemplate | 1 + src/Paket.Core/ProjectFile.fs | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3b5eae6939..b0dbb9fbc4 100644 --- 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/integrationtests/scenarios/i001746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate b/integrationtests/scenarios/i001746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate index 7bc5c101b4..04eb324530 100644 --- a/integrationtests/scenarios/i001746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate +++ b/integrationtests/scenarios/i001746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate @@ -55,6 +55,7 @@ True + False diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs index 46db7a2881..e40a8d8b2a 100644 --- 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