Merge pull request #1437 from pms1969/config-replacement

fix convert-from-nuget
fsprojects · Jan 28, 2016 · e06b8e3 · e06b8e3
2 parents 8fe6a08 + 40e3bef
commit e06b8e3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/integrationtests/Paket.IntegrationTests/ConvertFromNuGetSpecs.fs b/integrationtests/Paket.IntegrationTests/ConvertFromNuGetSpecs.fs
@@ -50,4 +50,11 @@ let ``#1225 should convert simple C# project with non-matching framework restric
     requirement2.Name |> shouldEqual (PackageName "Newtonsoft.Json")
     requirement2.VersionRequirement.ToString() |> shouldEqual "7.0.1"
     requirement2.ResolverStrategy |> shouldEqual None
-    requirement2.Settings.FrameworkRestrictions |> shouldEqual [FrameworkRestriction.AtLeast(FrameworkIdentifier.DotNetFramework(FrameworkVersion.V4_Client))]
+    requirement2.Settings.FrameworkRestrictions |> shouldEqual [FrameworkRestriction.AtLeast(FrameworkIdentifier.DotNetFramework(FrameworkVersion.V4_Client))]
+
+[<Test>]
+let ``#1217 should replace packages.config files in project``() = 
+    paket "convert-from-nuget" "i001217-convert-simple-project" |> ignore
+    let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001217-convert-simple-project","paket.lock"))
+    let projectFile = ProjectFile.loadFromFile(Path.Combine(scenarioTempPath "i001217-convert-simple-project", "ClassLibrary1", "ClassLibrary1.csproj"))
+    projectFile.Document.OuterXml.Contains("packages.config") |> shouldEqual false
diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -966,7 +966,7 @@ module ProjectFile =
         let noneAndContentNodes = 
             (project.Document |> getDescendants "None") @ 
             (project.Document |> getDescendants "Content")
-
+        
         match noneAndContentNodes |> List.tryFind (withAttributeValue "Include" Constants.PackagesConfigFile) with
         | None -> ()
         | Some nugetNode ->
@@ -1296,7 +1296,7 @@ type ProjectFile with
 
     member this.GetAllInterProjectDependenciesWithProjectTemplates = ProjectFile.getAllReferencedProjects this |> ProjectFile.projectsWithTemplates this
 
-    member this.ReplaceNuGetPackagesFile () = ProjectFile.removeNuGetTargetsEntries this
+    member this.ReplaceNuGetPackagesFile () = ProjectFile.replaceNuGetPackagesFile this
 
     member this.RemoveNuGetTargetsEntries () =  ProjectFile.removeNuGetTargetsEntries this