From 924258a1521bbe867cffbaf56c583b4d5ec0cdb5 Mon Sep 17 00:00:00 2001
From: Lukas Rieger <lr@live.de>
Date: Tue, 11 Apr 2017 21:40:04 +0200
Subject: [PATCH 1/2] import .props/.targets better fixes
 https://github.com/fsprojects/Paket/issues/2227

* differentiate between global targets/props, and framework specific targets/props
* fw-specifc targets/props continue to be imported in the the middle with a condition (no change to before)
* global props are imported at the top of the file (same as nuget does)
* global targets are imported at the end of the file (same as nuget)

The reason is that many props depend on being imported at the top, so do that for the files where it is actually possible.
---
 .../MyClassLibrary.csprojtemplate             |  12 +-
 .../xUnitTests.expected.csprojtemplate        |   9 +-
 src/Paket.Core/Files/ProjectFile.fs           | 175 ++++++++++++------
 src/Paket/Paket.fsproj                        |   4 +-
 .../InstallModel/Xml/CodeCracker.fs           |  12 +-
 .../Paket.Tests/InstallModel/Xml/EmptyLibs.fs |   4 +-
 .../InstallModel/Xml/FSharp.Data.SqlClient.fs |   4 +-
 .../Paket.Tests/InstallModel/Xml/Fantomas.fs  |   7 +-
 .../InstallModel/Xml/FantomasLib.fs           |   4 +-
 tests/Paket.Tests/InstallModel/Xml/Fuchu.fs   |   4 +-
 .../InstallModel/Xml/GitInfoPlanter.fs        |  14 +-
 .../InstallModel/Xml/LibGit2Sharp.fs          |  14 +-
 .../InstallModel/Xml/Microsoft.Bcl.Build.fs   |   7 +-
 .../Xml/Microsoft.CodeAnalysis.Analyzers.fs   |  12 +-
 tests/Paket.Tests/InstallModel/Xml/Plossum.fs |   4 +-
 .../InstallModel/Xml/RefactoringEssentials.fs |   8 +-
 tests/Paket.Tests/InstallModel/Xml/RxXaml.fs  |   4 +-
 tests/Paket.Tests/InstallModel/Xml/SQLite.fs  |  14 +-
 .../InstallModel/Xml/StyleCop.MSBuild.fs      |  13 +-
 ...System.Security.Cryptography.Algorithms.fs |   4 +-
 .../InstallModel/Xml/System.Spatial.fs        |   4 +-
 .../InstallModel/Xml/SystemNetHttp.fs         |   4 +-
 .../InstallModel/Xml/SystemNetHttpForNet4.fs  |   4 +-
 ...mNetHttpWithExistingFrameworkReferences.fs |   4 +-
 .../SystemNetHttpWithFrameworkReferences.fs   |   4 +-
 .../InstallModel/Xml/xunit.runner.fs          |  24 +--
 26 files changed, 219 insertions(+), 154 deletions(-)

diff --git a/integrationtests/scenarios/i001487-stable-props/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate b/integrationtests/scenarios/i001487-stable-props/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
index 9c1303686e..8111003afd 100644
--- a/integrationtests/scenarios/i001487-stable-props/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
+++ b/integrationtests/scenarios/i001487-stable-props/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\MultiTarget\build\MultiTarget.props" Condition="Exists('..\..\packages\MultiTarget\build\MultiTarget.props')" Label="Paket" />
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -69,15 +70,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.6')">
-      <PropertyGroup>
-        <__paket__MultiTarget_props>MultiTarget</__paket__MultiTarget_props>
-        <__paket__MultiTarget_targets>MultiTarget</__paket__MultiTarget_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <Import Project="..\..\packages\MultiTarget\build\$(__paket__MultiTarget_props).props" Condition="Exists('..\..\packages\MultiTarget\build\$(__paket__MultiTarget_props).props')" Label="Paket" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -120,5 +112,5 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\..\packages\MultiTarget\build\$(__paket__MultiTarget_targets).targets" Condition="Exists('..\..\packages\MultiTarget\build\$(__paket__MultiTarget_targets).targets')" Label="Paket" />
+  <Import Project="..\..\packages\MultiTarget\build\MultiTarget.targets" Condition="Exists('..\..\packages\MultiTarget\build\MultiTarget.targets')" Label="Paket" />
 </Project>
\ No newline at end of file
diff --git a/integrationtests/scenarios/i001585-websharper-props/before/xUnitTests/xUnitTests.expected.csprojtemplate b/integrationtests/scenarios/i001585-websharper-props/before/xUnitTests/xUnitTests.expected.csprojtemplate
index 24350c7245..7607e03584 100644
--- a/integrationtests/scenarios/i001585-websharper-props/before/xUnitTests/xUnitTests.expected.csprojtemplate
+++ b/integrationtests/scenarios/i001585-websharper-props/before/xUnitTests/xUnitTests.expected.csprojtemplate
@@ -56,13 +56,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
-      <PropertyGroup>
-        <__paket__WebSharper_targets>WebSharper</__paket__WebSharper_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -126,5 +119,5 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\packages\WebSharper\build\$(__paket__WebSharper_targets).targets" Condition="Exists('..\packages\WebSharper\build\$(__paket__WebSharper_targets).targets')" Label="Paket" />
+  <Import Project="..\packages\WebSharper\build\WebSharper.targets" Condition="Exists('..\packages\WebSharper\build\WebSharper.targets')" Label="Paket" />
 </Project>
\ No newline at end of file
diff --git a/src/Paket.Core/Files/ProjectFile.fs b/src/Paket.Core/Files/ProjectFile.fs
index 32c885b2e0..52fc0458c1 100644
--- a/src/Paket.Core/Files/ProjectFile.fs
+++ b/src/Paket.Core/Files/ProjectFile.fs
@@ -654,7 +654,17 @@ module ProjectFile =
         |> List.sortBy (fun lib -> lib.Path)
         |> createAnalyzersNode
 
-    let generateXml (model:InstallModel) (usedFrameworkLibs:HashSet<TargetProfile*string>) (aliases:Map<string,string>) (copyLocal:bool option) (importTargets:bool) (referenceCondition:string option) (project:ProjectFile) =
+    type XmlContext = {
+        GlobalPropsNodes : XmlElement list
+        GlobalTargetsNodes : XmlElement list
+        FrameworkSpecificPropsNodes : XmlElement list
+        FrameworkSpecificTargetsNodes : XmlElement list
+        ChooseNodes : XmlElement list
+        FrameworkSpecificPropertyChooseNode : XmlElement
+        AnalyzersNode : XmlElement
+    }
+
+    let generateXml (model:InstallModel) (usedFrameworkLibs:HashSet<TargetProfile*string>) (aliases:Map<string,string>) (copyLocal:bool option) (importTargets:bool) (referenceCondition:string option) (allTargetProfiles:Set<TargetProfile>) (project:ProjectFile) : XmlContext =
         let references = 
             getCustomReferenceAndFrameworkNodes project
             |> List.map (fun node -> node.Attributes.["Include"].InnerText.Split(',').[0])
@@ -711,7 +721,6 @@ module ProjectFile =
             let propertyNames =
                 references
                 |> Seq.choose (fun lib ->
-                    if not importTargets then None else
                     match lib with
                     | Reference.Library _ -> None
                     | Reference.FrameworkAssemblyReference _ -> None
@@ -779,10 +788,18 @@ module ProjectFile =
                                 [lowerCondition,createItemGroup !assemblyTargets frameworkAssemblies,true
                                  condition,createItemGroup libFolder.Targets rest,false]
                         )
-
-        let targetsFileConditions =
-            model.TargetsFileFolders
-            |> List.sortBy (fun lib -> lib.Name)
+                        
+        // global targets are targets, that are either directly in the /build folder,
+        // or, if there is a framework-restriction, specific to the framework(s).
+        // (ref https://docs.microsoft.com/en-us/nuget/create-packages/creating-a-package#including-msbuild-props-and-targets-in-a-package). 
+        let globalTargets, frameworkSpecificTargets =
+            if not importTargets then List.empty, List.empty else
+            let sortedTargets = model.TargetsFileFolders |> List.sortBy (fun lib -> lib.Name)
+            sortedTargets
+            |> List.partition (fun lib -> allTargetProfiles = set lib.Targets )
+        
+        let frameworkSpecificTargetsFileConditions =
+            frameworkSpecificTargets
             |> List.map (fun lib -> PlatformMatching.getCondition referenceCondition allTargets lib.Targets,createPropertyGroup lib.Files.References)
 
         let chooseNodes =
@@ -827,8 +844,8 @@ module ProjectFile =
                 | false,true -> [chooseNode2]
                 | false,false -> [createNode "Choose" project]
 
-        let propertyNames,propertyChooseNode =
-            match targetsFileConditions with
+        let frameworkSpecificPropertyNames,frameworkSpecificPropertyChooseNode =
+            match frameworkSpecificTargetsFileConditions with
             |  ["$(TargetFrameworkIdentifier) == 'true'",(propertyNames,propertyGroup)] ->
                 [propertyNames], createNode "Choose" project
             |  ["true",(propertyNames,propertyGroup)] ->
@@ -837,7 +854,7 @@ module ProjectFile =
                 let propertyChooseNode = createNode "Choose" project
 
                 let containsProperties = ref false
-                targetsFileConditions
+                frameworkSpecificTargetsFileConditions
                 |> List.map (fun (condition,(propertyNames,propertyGroup)) ->
                     let finalCondition = if condition = "" || condition.Length > 3000 || condition = "$(TargetFrameworkIdentifier) == 'true'" then "1 == 1" else condition
                     let whenNode = 
@@ -849,19 +866,19 @@ module ProjectFile =
                     whenNode)
                 |> List.iter(fun node -> propertyChooseNode.AppendChild node |> ignore)
                 
-                (targetsFileConditions |> List.map (fun (_,(propertyNames,_)) -> propertyNames)),
+                (frameworkSpecificTargetsFileConditions |> List.map (fun (_,(propertyNames,_)) -> propertyNames)),
                 (if !containsProperties then propertyChooseNode else createNode "Choose" project)
                 
 
-        let propsNodes = 
-            propertyNames
+        let frameworkSpecificPropsNodes = 
+            frameworkSpecificPropertyNames
             |> Seq.concat
             |> Seq.distinctBy (fun (x,_,_) -> x)
             |> Seq.filter (fun (propertyName,path,buildPath) -> String.endsWithIgnoreCase "props" propertyName)
             |> Seq.map (fun (propertyName,path,buildPath) -> 
                 let fileName = 
                     match propertyName with
-                    | _ when propertyChooseNode.ChildNodes.Count = 0 -> path
+                    | _ when frameworkSpecificPropertyChooseNode.ChildNodes.Count = 0 -> path
                     | name when String.endsWithIgnoreCase "props" name  -> sprintf "%s$(%s).props" buildPath propertyName 
                     | _ -> failwithf "Unknown .props filename %s" propertyName
 
@@ -871,15 +888,15 @@ module ProjectFile =
                 |> addAttribute "Label" "Paket")
             |> Seq.toList
 
-        let targetsNodes = 
-            propertyNames
+        let frameworkSpecificTargetsNodes = 
+            frameworkSpecificPropertyNames
             |> Seq.concat
             |> Seq.distinctBy (fun (x,_,_) -> x)
             |> Seq.filter (fun (propertyName,path,buildPath) -> String.endsWithIgnoreCase "props" propertyName  |> not)
             |> Seq.map (fun (propertyName,path,buildPath) -> 
                 let fileName = 
                     match propertyName with
-                    | _ when propertyChooseNode.ChildNodes.Count = 0 -> path
+                    | _ when frameworkSpecificPropertyChooseNode.ChildNodes.Count = 0 -> path
                     | name when String.endsWithIgnoreCase  "targets" name ->
                         sprintf "%s$(%s).targets" buildPath propertyName
                     | _ -> failwithf "Unknown .targets filename %s" propertyName
@@ -890,9 +907,45 @@ module ProjectFile =
                 |> addAttribute "Label" "Paket")
             |> Seq.toList
         
+        let globalPropsNodes =
+            globalTargets
+            |> Seq.collect (fun t -> t.Files.References)
+            |> Seq.map (fun t -> t.Path)
+            |> Seq.distinct
+            |> Seq.filter (fun t -> String.endsWithIgnoreCase ".props" t)
+            |> Seq.map (createRelativePath project.FileName)
+            |> Seq.map (fun fileName ->
+                createNode "Import" project
+                |> addAttribute "Project" fileName
+                |> addAttribute "Condition" (sprintf "Exists('%s')" fileName)
+                |> addAttribute "Label" "Paket")
+            |> Seq.toList
+        
+        let globalTargetsNodes =
+            globalTargets
+            |> Seq.collect (fun t -> t.Files.References)
+            |> Seq.map (fun t -> t.Path)
+            |> Seq.distinct
+            |> Seq.filter (fun t -> String.endsWithIgnoreCase ".targets" t)
+            |> Seq.map (createRelativePath project.FileName)
+            |> Seq.map (fun fileName ->
+                createNode "Import" project
+                |> addAttribute "Project" fileName
+                |> addAttribute "Condition" (sprintf "Exists('%s')" fileName)
+                |> addAttribute "Label" "Paket")
+            |> Seq.toList
+
         let analyzersNode = generateAnalyzersXml model project
 
-        propsNodes,targetsNodes,chooseNodes,propertyChooseNode,analyzersNode
+        {
+            GlobalTargetsNodes = globalTargetsNodes
+            GlobalPropsNodes = globalPropsNodes
+            FrameworkSpecificPropsNodes = frameworkSpecificPropsNodes
+            FrameworkSpecificTargetsNodes = frameworkSpecificTargetsNodes
+            ChooseNodes = chooseNodes
+            FrameworkSpecificPropertyChooseNode = frameworkSpecificPropertyChooseNode
+            AnalyzersNode = analyzersNode
+        } : XmlContext
 
     let removePaketNodes (project:ProjectFile) = 
         deletePaketNodes "Analyzer" project
@@ -968,29 +1021,31 @@ module ProjectFile =
 
 
         let findInsertSpot() =
-            let j = ref 0
-            while !j < project.ProjectNode.ChildNodes.Count && String.startsWithIgnoreCase  "<import" (project.ProjectNode.ChildNodes.[!j].OuterXml.ToString()) do
-                incr j
-
-            let k = ref !j
-            while !k < project.ProjectNode.ChildNodes.Count &&
-                (String.startsWithIgnoreCase  "<PropertyGroup" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString()) ||
-                 (String.startsWithIgnoreCase  "<import" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString()) &&
-                  not (String.containsIgnoreCase "label" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString()) &&
-                       String.containsIgnoreCase "paket" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString())))) do
-                incr k
-
-            let l = ref !k
-            while !l < project.ProjectNode.ChildNodes.Count do
-                let node = project.ProjectNode.ChildNodes.[!l].OuterXml.ToString()
+            // nuget inserts properties directly at the top, and targets directly at the end.
+            // our inserts depend on $(TargetFrameworkVersion), which may be set either from another import, or directly in the project file.
+            let mutable iProp = 0
+            while iProp < project.ProjectNode.ChildNodes.Count && String.startsWithIgnoreCase  "<import" (project.ProjectNode.ChildNodes.[iProp].OuterXml.ToString()) do
+                iProp <- iProp + 1
+
+            let mutable iTarget = iProp
+            while iTarget < project.ProjectNode.ChildNodes.Count &&
+                (String.startsWithIgnoreCase  "<PropertyGroup" (project.ProjectNode.ChildNodes.[iTarget].OuterXml.ToString()) ||
+                 (String.startsWithIgnoreCase  "<import" (project.ProjectNode.ChildNodes.[iTarget].OuterXml.ToString()) &&
+                  not (String.containsIgnoreCase "label" (project.ProjectNode.ChildNodes.[iTarget].OuterXml.ToString()) &&
+                       String.containsIgnoreCase "paket" (project.ProjectNode.ChildNodes.[iTarget].OuterXml.ToString())))) do
+                iTarget <- iTarget + 1
+
+            let mutable l = iTarget
+            while l < project.ProjectNode.ChildNodes.Count do
+                let node = project.ProjectNode.ChildNodes.[l].OuterXml.ToString()
                 if String.startsWithIgnoreCase  "<import" node && 
                    (String.containsIgnoreCase "microsoft.csharp.targets" node || 
                      String.containsIgnoreCase "microsoft.fsharp.targets" node ||
                      String.containsIgnoreCase "fsharptargetspath" node)
                 then
-                    k := !l + 1
-                incr l
-            !j,!k
+                    iTarget <- l + 1
+                l <- l + 1
+            iProp,iTarget
 
         let usedFrameworkLibs = HashSet<TargetProfile*string>()
 
@@ -1023,10 +1078,11 @@ module ProjectFile =
                 | _ -> ()
 
             let importTargets = defaultArg installSettings.ImportTargets true
-
-            generateXml projectModel usedFrameworkLibs installSettings.Aliases installSettings.CopyLocal importTargets installSettings.ReferenceCondition project)
-        |> Seq.iter (fun (propsNodes,targetsNodes,chooseNodes,propertyChooseNode, analyzersNode) ->
-            for chooseNode in chooseNodes do
+            
+            let allFrameworks = applyRestrictionsToTargets restrictionList KnownTargetProfiles.AllProfiles
+            generateXml projectModel usedFrameworkLibs installSettings.Aliases installSettings.CopyLocal importTargets installSettings.ReferenceCondition (set allFrameworks) project)
+        |> Seq.iter (fun ctx ->
+            for chooseNode in ctx.ChooseNodes do
                 let i = ref (project.ProjectNode.ChildNodes.Count-1)
                 while 
                   !i >= 0 && 
@@ -1043,37 +1099,46 @@ module ProjectFile =
                     if chooseNode.ChildNodes.Count > 0 then
                         project.ProjectNode.InsertAfter(chooseNode,node) |> ignore
 
-                let j,k = findInsertSpot()
+                // global props are inserted at the top of the file
+                ctx.GlobalPropsNodes
+                |> Seq.iter (project.ProjectNode.PrependChild >> ignore)
+
+                // global targets are just inserted at the end of the file
+                ctx.GlobalTargetsNodes
+                |> Seq.iter (project.ProjectNode.AppendChild >> ignore)
+
+                // framework specific props/targets reference specific msbuild properties, so they need to be inserted later
+                let iProp,iTarget = findInsertSpot()
 
                 let addProps() =
-                    if j = 0 then
-                        propsNodes
+                    if iProp = 0 then
+                        ctx.FrameworkSpecificPropsNodes
                         |> Seq.iter (project.ProjectNode.PrependChild >> ignore)
                     else
-                        propsNodes
-                        |> Seq.iter (fun n -> project.ProjectNode.InsertAfter(n,project.ProjectNode.ChildNodes.[j-1]) |> ignore)
+                        ctx.FrameworkSpecificPropsNodes
+                        |> Seq.iter (fun n -> project.ProjectNode.InsertAfter(n,project.ProjectNode.ChildNodes.[iProp-1]) |> ignore)
             
-                if propertyChooseNode.ChildNodes.Count > 0 then
-                    if k = 0 then
-                        project.ProjectNode.AppendChild propertyChooseNode |> ignore
+                if ctx.FrameworkSpecificPropertyChooseNode.ChildNodes.Count > 0 then
+                    if iTarget = 0 then
+                        project.ProjectNode.AppendChild ctx.FrameworkSpecificPropertyChooseNode |> ignore
 
-                        propsNodes
+                        ctx.FrameworkSpecificPropsNodes
                         |> Seq.iter (project.ProjectNode.AppendChild >> ignore)
                     else
-                        let node = project.ProjectNode.ChildNodes.[k-1]
+                        let node = project.ProjectNode.ChildNodes.[iTarget-1]
                     
-                        propsNodes
+                        ctx.FrameworkSpecificPropsNodes
                         |> Seq.iter (fun n -> project.ProjectNode.InsertAfter(n,node) |> ignore)
 
-                        project.ProjectNode.InsertAfter(propertyChooseNode,node) |> ignore
+                        project.ProjectNode.InsertAfter(ctx.FrameworkSpecificPropertyChooseNode,node) |> ignore
                 else
                    addProps()
 
-                targetsNodes
+                ctx.FrameworkSpecificTargetsNodes
                 |> Seq.iter (project.ProjectNode.AppendChild >> ignore)
 
-                if analyzersNode.ChildNodes.Count > 0 then
-                    project.ProjectNode.AppendChild analyzersNode |> ignore
+                if ctx.AnalyzersNode.ChildNodes.Count > 0 then
+                    project.ProjectNode.AppendChild ctx.AnalyzersNode |> ignore
             )
 
 
@@ -1418,7 +1483,7 @@ type ProjectFile with
 
     member this.DeleteCustomModelNodes(model:InstallModel) = ProjectFile.deleteCustomModelNodes model this
 
-    member this.GenerateXml(model, usedFrameworkLibs:HashSet<TargetProfile*string>, aliases, copyLocal, importTargets, referenceCondition) = ProjectFile.generateXml model usedFrameworkLibs aliases copyLocal importTargets referenceCondition this
+    member this.GenerateXml(model, usedFrameworkLibs:HashSet<TargetProfile*string>, aliases, copyLocal, importTargets, allTargetProfiles:#seq<TargetProfile>, referenceCondition) = ProjectFile.generateXml model usedFrameworkLibs aliases copyLocal importTargets referenceCondition (set allTargetProfiles) this
 
     member this.RemovePaketNodes () = ProjectFile.removePaketNodes this 
 
diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
index 48b5e807d5..ff9857a61a 100644
--- a/src/Paket/Paket.fsproj
+++ b/src/Paket/Paket.fsproj
@@ -37,8 +37,8 @@
     <StartWorkingDirectory>D:\temp\coreclrtest</StartWorkingDirectory>
     <StartArguments>install</StartArguments>
     <StartWorkingDirectory>C:\dev\src\Paket\integrationtests\scenarios\loading-scripts\dependencies-file-flag\temp</StartWorkingDirectory>
-    <StartArguments>install</StartArguments>
-    <StartWorkingDirectory>C:\PROJ\FAKE\</StartWorkingDirectory>
+    <StartArguments>convert-from-nuget</StartArguments>
+    <StartWorkingDirectory>c:\users\lr\documents\visual studio 2017\Projects\PaketTest</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs b/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs
index 763b86f655..73b73c4142 100644
--- a/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs
@@ -34,8 +34,8 @@ let ``should generate Xml for codecracker.CSharp``() =
     
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>() ,Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>() ,Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedCsharp)
@@ -55,8 +55,8 @@ let ``should generate Xml for codecracker.CSharp in VisualBasic project``() =
     
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedEmpty)
@@ -86,8 +86,8 @@ let ``should generate Xml for codecracker.VisualBasic``() =
     
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedVb)
diff --git a/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs b/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs
index c7c5b59503..2ad26d9af3 100644
--- a/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs
@@ -23,7 +23,7 @@ let ``should generate Xml for framework references and empty libs``() =
               [],
               Nuspec.Load("Nuspec/EmptyLibs.nuspec"))
     
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs b/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs
index bb33dae511..58618bcdef 100644
--- a/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs
@@ -40,7 +40,7 @@ let ``should generate Xml for FSharp.Data.SqlClient 1.4.4``() =
               [],
               Nuspec.Load("Nuspec/FSharp.Data.SqlClient.nuspec"))
     
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    let currentXML = chooseNode.Head.OuterXml |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml
     currentXML
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs b/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs
index e5b3a17fbd..14b6599b11 100644
--- a/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs
@@ -27,12 +27,13 @@ let ``should generate Xml for Fantomas 1.5``() =
               [],
               Nuspec.Explicit ["FantomasLib.dll"])
     
-    let propertyNodes,targetsNodes,chooseNode,additionalNode, _ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expected)
     
-    propertyNodes |> Seq.length |> shouldEqual 0
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalPropsNodes |> Seq.length |> shouldEqual 0
 
 
 let emptyDoc = """<?xml version="1.0" encoding="utf-8"?>
diff --git a/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs b/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs
index 2f69d19475..2cdb4cb151 100644
--- a/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs
@@ -27,7 +27,7 @@ let ``should generate Xml for Fantomas 1.5``() =
               [],
               Nuspec.Explicit ["FantomasLib.dll"])
     
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some false,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some false,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs b/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs
index 5ec55111c0..0ebfff959a 100644
--- a/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs
@@ -28,7 +28,7 @@ let ``should generate Xml for Fuchu 0.4``() =
               [],
               Nuspec.All)
     
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs b/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs
index 83fa97004c..ab0bc0eedf 100644
--- a/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs
@@ -25,18 +25,20 @@ let ``should generate Xml for GitInfoPlanter2.0.0``() =
             [],
               Nuspec.All)
 
-    let propsNodes,targetsNodes,chooseNode,propertyChooseNode,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml emptyReferences)
 
-    propertyChooseNode.OuterXml
+    ctx.FrameworkSpecificPropertyChooseNode.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml emptyPropertyDefinitionNodes)
 
-    propsNodes |> Seq.length |> shouldEqual 0
-    targetsNodes |> Seq.length |> shouldEqual 1
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.FrameworkSpecificTargetsNodes |> Seq.length |> shouldEqual 1
+    ctx.GlobalTargetsNodes |> Seq.length |> shouldEqual 0
 
-    (targetsNodes |> Seq.head).OuterXml
+    (ctx.FrameworkSpecificTargetsNodes |> Seq.head).OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedPropertyNodes)
\ No newline at end of file
diff --git a/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs b/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs
index 071afac71d..9a63e278ee 100644
--- a/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs
@@ -44,18 +44,20 @@ let ``should generate Xml for LibGit2Sharp 2.0.0``() =
     
     model.GetLibReferences(SinglePlatform (DotNetFramework FrameworkVersion.V4_Client)) |> shouldContain @"..\LibGit2Sharp\lib\net40\LibGit2Sharp.dll"
 
-    let propertyNodes,targetsNodes,chooseNode,propertyChooseNode,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedReferenceNodes)
 
-    propertyChooseNode.OuterXml
+    ctx.FrameworkSpecificPropertyChooseNode.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedPropertyDefinitionNodes)
 
-    propertyNodes |> Seq.length |> shouldEqual 1
-    targetsNodes |> Seq.length |> shouldEqual 0
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 1
+    ctx.FrameworkSpecificTargetsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalTargetsNodes |> Seq.length |> shouldEqual 0
 
-    (propertyNodes |> Seq.head).OuterXml
+    (ctx.FrameworkSpecificPropsNodes |> Seq.head).OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedPropertyNodes)
\ No newline at end of file
diff --git a/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs b/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs
index 2009b42798..c4b1f57172 100644
--- a/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs
@@ -16,6 +16,9 @@ let ``should not install targets node for Microsoft.Bcl.Build``() =
     
     model.GetTargetsFiles(SinglePlatform (DotNetFramework FrameworkVersion.V4)) |> shouldContain @"..\Microsoft.Bcl.Build\build\Microsoft.Bcl.Build.targets"
 
-    let propertyNodes,_,_,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,false,None)
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,false,KnownTargetProfiles.AllProfiles,None)
 
-    propertyNodes |> Seq.length |> shouldEqual 0
\ No newline at end of file
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.FrameworkSpecificTargetsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalTargetsNodes |> Seq.length |> shouldEqual 0
diff --git a/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs b/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs
index 9320362b2c..c66f99d8f3 100644
--- a/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs
@@ -36,8 +36,8 @@ let ``should generate Xml for Microsoft.CodeAnalysis.Analyzers in CSharp project
     ensureDir()
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedCs)
@@ -57,8 +57,8 @@ let ``should generate Xml for RefactoringEssentials in VisualBasic project``() =
     ensureDir()
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedVb)
@@ -77,8 +77,8 @@ let ``should generate Xml for Microsoft.CodeAnalysis.Analyzers 1.0.0-rc2``() =
     ensureDir()
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(oldModel, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(oldModel, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedEmpty)
diff --git a/tests/Paket.Tests/InstallModel/Xml/Plossum.fs b/tests/Paket.Tests/InstallModel/Xml/Plossum.fs
index 05348fb8a6..a63c5ca43c 100644
--- a/tests/Paket.Tests/InstallModel/Xml/Plossum.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/Plossum.fs
@@ -30,7 +30,7 @@ let ``should generate Xml for Plossum``() =
               [],
               Nuspec.All)
     
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expected)
\ No newline at end of file
diff --git a/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs b/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs
index b9466d5021..87999d9e55 100644
--- a/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs
@@ -27,8 +27,8 @@ let ``should generate Xml for RefactoringEssentials in CSharp project``() =
     
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expected)
@@ -47,8 +47,8 @@ let ``should generate Xml for RefactoringEssentials in VisualBasic project``() =
     
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,_,_,analyzerNodes = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    analyzerNodes
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.AnalyzersNode
     |> (fun n -> n.OuterXml)
     |> normalizeXml
     |> shouldEqual (normalizeXml expected)
\ No newline at end of file
diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs
index e993341c49..07cf87f911 100644
--- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs
@@ -112,7 +112,7 @@ let ``should generate Xml for Rx-XAML 2.2.4 with correct framework assembly refe
                   { AssemblyName = "System.Windows"; FrameworkRestrictions = FrameworkRestrictionList [FrameworkRestriction.Exactly(Silverlight "v5.0")] }
                   { AssemblyName = "System.Windows"; FrameworkRestrictions = FrameworkRestrictionList [FrameworkRestriction.Exactly(WindowsPhoneSilverlight "v7.1")] }]})
 
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    let currentXml = chooseNode.Head.OuterXml  |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    let currentXml = ctx.ChooseNodes.Head.OuterXml  |> normalizeXml
     currentXml
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/SQLite.fs b/tests/Paket.Tests/InstallModel/Xml/SQLite.fs
index 389467acf6..2da40e73f7 100644
--- a/tests/Paket.Tests/InstallModel/Xml/SQLite.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/SQLite.fs
@@ -164,17 +164,19 @@ let ``should generate Xml for SQLite``() =
                 Nuspec.All)
 
 
-    let propsNodes,targetsNodes,chooseNode,propertyDefinitionNodes,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    let currentXML = chooseNode.Head.OuterXml |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml
     currentXML |> shouldEqual (normalizeXml expectedReferenceNodes)
 
-    let currentPropertyXML = propertyDefinitionNodes.OuterXml |> normalizeXml
+    let currentPropertyXML = ctx.FrameworkSpecificPropertyChooseNode.OuterXml |> normalizeXml
     currentPropertyXML
     |> shouldEqual (normalizeXml expectedPropertyDefinitionNodes)
 
-    propsNodes |> Seq.length |> shouldEqual 0
-    targetsNodes |> Seq.length |> shouldEqual 1
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.FrameworkSpecificTargetsNodes |> Seq.length |> shouldEqual 1
+    ctx.GlobalPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalTargetsNodes |> Seq.length |> shouldEqual 0
 
-    let currentTargetsXML = (targetsNodes |> Seq.head).OuterXml |> normalizeXml
+    let currentTargetsXML = (ctx.FrameworkSpecificTargetsNodes |> Seq.head).OuterXml |> normalizeXml
     currentTargetsXML
     |> shouldEqual (normalizeXml expectedPropertyNodes)
diff --git a/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs b/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs
index b6d0381c9a..24c2a539ae 100644
--- a/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs
@@ -23,15 +23,18 @@ let ``should generate Xml for StyleCop.MSBuild``() =
 
     model.GetTargetsFiles(SinglePlatform (DotNetFramework FrameworkVersion.V2)) |> shouldContain @"..\StyleCop.MSBuild\build\StyleCop.MSBuild.Targets" 
     
-    let propsNodes,targetsNodes,chooseNode,propertyChooseNode,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
     
-    propertyChooseNode.OuterXml
+    ctx.FrameworkSpecificPropertyChooseNode.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml emptyPropertyNameNodes)
         
-    propsNodes |> Seq.length |> shouldEqual 0
-    targetsNodes |> Seq.length |> shouldEqual 1
 
-    (targetsNodes |> Seq.head).OuterXml
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.FrameworkSpecificTargetsNodes |> Seq.length |> shouldEqual 1
+    ctx.GlobalPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalTargetsNodes |> Seq.length |> shouldEqual 0
+
+    (ctx.FrameworkSpecificTargetsNodes |> Seq.head).OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedPropertyNodes)
\ No newline at end of file
diff --git a/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs b/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs
index 92fa7d18ff..655a5aa405 100644
--- a/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs
@@ -91,9 +91,9 @@ let ``should generate Xml for System.Security.Cryptography.Algorithms in CSharp
     
     let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest")
     Assert.IsTrue(project.IsSome)
-    let _,_,chooseNode,_,_ = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,true,None)
+    let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,true,KnownTargetProfiles.AllProfiles,None)
     let result =
-      chooseNode
+      ctx.ChooseNodes
       |> (fun n -> n.Head.OuterXml)
       |> normalizeXml
     result |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs b/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs
index e7a585d770..6ca3de913c 100644
--- a/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs
@@ -45,7 +45,7 @@ let ``should generate Xml for System.Spatial``() =
               @"..\System.Spatial\lib\sl4\zh-Hans\System.Spatial.resources.dll" 
             ],[],[],Nuspec.All)
     
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    let currentXML = chooseNode.Head.OuterXml |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml
     currentXML
     |> shouldEqual (normalizeXml expected)
\ No newline at end of file
diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs
index 897da979fc..35c80283e4 100644
--- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs
@@ -192,7 +192,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() =
               [],
               Nuspec.All)
 
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    let currentXML = chooseNode.Head.OuterXml |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml
     currentXML
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs
index a48a935753..1e4bf8e14f 100644
--- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs
@@ -69,7 +69,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() =
               [],
               Nuspec.All)
 
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None) 
-    let currentXML = chooseNode.Head.OuterXml |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None) 
+    let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml
     currentXML
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs
index 30197476c6..344cc21e0a 100644
--- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs
@@ -71,7 +71,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() =
                  [{ AssemblyName = "System.Net.Http"; FrameworkRestrictions = FrameworkRestrictionList [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] }
                   { AssemblyName = "System.Net.Http.WebRequest"; FrameworkRestrictions = FrameworkRestrictionList [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] }]})
 
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/FrameworkAssemblies.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    let currentXML = chooseNode.Head.OuterXml |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/FrameworkAssemblies.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml
     currentXML
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs
index 7df30c1e28..c3c336a86c 100644
--- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs
@@ -79,7 +79,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() =
                  [{ AssemblyName = "System.Net.Http"; FrameworkRestrictions = FrameworkRestrictionList [FrameworkRestriction.AtLeast(DotNetFramework(FrameworkVersion.V4_5))] }
                   { AssemblyName = "System.Net.Http.WebRequest"; FrameworkRestrictions = FrameworkRestrictionList [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] }]})
 
-    let _,targetsNodes,chooseNode,_,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    let currentXML = chooseNode.Head.OuterXml |> normalizeXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml
     currentXML
     |> shouldEqual (normalizeXml expected)
diff --git a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs
index 249510d90d..b2304a3bb6 100644
--- a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs
@@ -37,19 +37,21 @@ let ``should generate Xml for xunit.runner.visualstudio 2.0.0``() =
             [],
               Nuspec.All)
     
-    let propsNodes,targetsNodes,chooseNode,propertyChooseNode,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,true,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml emptyReferenceNodes)
 
-    let currentXML = propertyChooseNode.OuterXml |> normalizeXml
+    let currentXML = ctx.FrameworkSpecificPropertyChooseNode.OuterXml |> normalizeXml
     currentXML
     |> shouldEqual (normalizeXml expectedPropertyDefinitionNodes)
-    
-    propsNodes |> Seq.length |> shouldEqual 1
-    targetsNodes |> Seq.length |> shouldEqual 0
 
-    (propsNodes |> Seq.head).OuterXml
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 1
+    ctx.FrameworkSpecificTargetsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalPropsNodes |> Seq.length |> shouldEqual 0
+    ctx.GlobalTargetsNodes |> Seq.length |> shouldEqual 0
+
+    (ctx.FrameworkSpecificPropsNodes |> Seq.head).OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml expectedPropertyNodes)
 
@@ -65,13 +67,13 @@ let ``should not generate Xml for xunit.runner.visualstudio 2.0.0 if import is d
               [],
               Nuspec.All)
     
-    let propertyNodes,targetsNodes,chooseNode,propertyChooseNode,_ = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,false,None)
-    chooseNode.Head.OuterXml
+    let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,false,KnownTargetProfiles.AllProfiles,None)
+    ctx.ChooseNodes.Head.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml emptyReferenceNodes)
 
-    propertyChooseNode.OuterXml
+    ctx.FrameworkSpecificPropertyChooseNode.OuterXml
     |> normalizeXml
     |> shouldEqual (normalizeXml disabledChooseNode)
     
-    propertyNodes |> Seq.length |> shouldEqual 0
\ No newline at end of file
+    ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 0
\ No newline at end of file

From 45cefaf990f13a027b008d01323a26a487ed591b Mon Sep 17 00:00:00 2001
From: Lukas Rieger <lr@live.de>
Date: Tue, 11 Apr 2017 23:29:17 +0200
Subject: [PATCH 2/2] make tests debuggable again - add missing 
 ``ensureDir()``

---
 tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs            | 1 +
 tests/Paket.Tests/InstallModel/Xml/Fantomas.fs             | 5 +++++
 tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs          | 1 +
 tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs       | 1 +
 tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs  | 2 ++
 tests/Paket.Tests/InstallModel/Xml/RemovesOldNodes.fs      | 1 +
 tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs     | 1 +
 tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs | 1 +
 tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs         | 1 +
 tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs      | 2 ++
 10 files changed, 16 insertions(+)

diff --git a/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs b/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs
index 2ad26d9af3..636cca2e08 100644
--- a/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs
@@ -16,6 +16,7 @@ let expected = """
 
 [<Test>]
 let ``should generate Xml for framework references and empty libs``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "TempPkg", SemVer.Parse "0.1", [],
             [  ],
diff --git a/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs b/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs
index 14b6599b11..8350039fb7 100644
--- a/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs
@@ -18,6 +18,7 @@ let expected = """
 
 [<Test>]
 let ``should generate Xml for Fantomas 1.5``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "Fantomas", SemVer.Parse "1.5.0", [],
             [ @"..\Fantomas\lib\FantomasLib.dll" 
@@ -55,6 +56,7 @@ let fullDoc = """<?xml version="1.0" encoding="utf-8"?>
 
 [<Test>]
 let ``should generate full Xml for Fantomas 1.5``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "Fantomas", SemVer.Parse "1.5.0", [],
             [ @"..\Fantomas\lib\FantomasLib.dll" 
@@ -76,6 +78,7 @@ let ``should generate full Xml for Fantomas 1.5``() =
 
 [<Test>]
 let ``should not generate full Xml for Fantomas 1.5 if not referenced``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "Fantomas", SemVer.Parse "1.5.0", [],
             [ @"..\Fantomas\lib\FantomasLib.dll" 
@@ -112,6 +115,7 @@ let fullDocWithRefernceCondition = """<?xml version="1.0" encoding="utf-8"?>
 
 [<Test>]
 let ``should generate full Xml with reference condition for Fantomas 1.5``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "Fantomas", SemVer.Parse "1.5.0", [],
             [ @"..\Fantomas\lib\FantomasLib.dll" 
@@ -153,6 +157,7 @@ let fullDocWithRefernceConditionAndFrameworkRestriction = """<?xml version="1.0"
 let ``should generate full Xml with reference condition and framework restrictions without msbuild warning``() =
     // msbuild triggers a warning MSB4130 when we leave out the quotes around $(LEGACY) and add the condition at the end
     // It seems like the warning is triggered when there is an "Or" without parentheses somewhere
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "Fantomas", SemVer.Parse "1.5.0",
             [ FrameworkRestriction.Exactly (FrameworkIdentifier.XamariniOS)
diff --git a/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs b/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs
index 2cdb4cb151..63ed5dccbc 100644
--- a/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs
@@ -18,6 +18,7 @@ let expected = """
 
 [<Test>]
 let ``should generate Xml for Fantomas 1.5``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "Fantomas", SemVer.Parse "1.5.0", [],
             [ @"..\Fantomas\Lib\FantomasLib.dll" 
diff --git a/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs b/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs
index ab0bc0eedf..173e69ea7b 100644
--- a/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs
@@ -18,6 +18,7 @@ let expectedPropertyNodes = """<?xml version="1.0" encoding="utf-16"?>
 
 [<Test>]
 let ``should generate Xml for GitInfoPlanter2.0.0``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "GitInfoPlanter", SemVer.Parse "0.21", [],
             [ ],
diff --git a/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs b/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs
index c4b1f57172..ed3f7143e7 100644
--- a/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs
@@ -4,9 +4,11 @@ open Paket
 open NUnit.Framework
 open FsUnit
 open Paket.Domain
+open Paket.TestHelpers
 
 [<Test>]
 let ``should not install targets node for Microsoft.Bcl.Build``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "Microsoft.Bcl.Build", SemVer.Parse "1.0.21", [],
             [ ],
diff --git a/tests/Paket.Tests/InstallModel/Xml/RemovesOldNodes.fs b/tests/Paket.Tests/InstallModel/Xml/RemovesOldNodes.fs
index 8f107c0a56..028ac70dcf 100644
--- a/tests/Paket.Tests/InstallModel/Xml/RemovesOldNodes.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/RemovesOldNodes.fs
@@ -9,6 +9,7 @@ open Paket.Requirements
 
 [<Test>]
 let ``should generate Xml for Fuchu 0.4``() = 
+    ensureDir()
     let p = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyWithOldStuff.fsprojtest").Value
     let empty = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value
     p.RemovePaketNodes()
diff --git a/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs b/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs
index 24c2a539ae..e328f4b366 100644
--- a/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs
@@ -15,6 +15,7 @@ let expectedPropertyNodes = """<?xml version="1.0" encoding="utf-16"?>
 
 [<Test>]
 let ``should generate Xml for StyleCop.MSBuild``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "StyleCop.MSBuild", SemVer.Parse "4.7.49.1", [],[],
             [ @"..\StyleCop.MSBuild\build\StyleCop.MSBuild.Targets" ],
diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs
index 1e4bf8e14f..e2e208f50d 100644
--- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs
@@ -37,6 +37,7 @@ let expected = """
 
 [<Test>]
 let ``should generate Xml for System.Net.Http 2.2.8``() = 
+    ensureDir()
     let model =     
         InstallModel.CreateFromLibs(PackageName "System.Net.Http", SemVer.Parse "2.2.8", [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4))],
             [ @"..\Microsoft.Net.Http\lib\monoandroid\System.Net.Http.Extensions.dll" 
diff --git a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs
index b2304a3bb6..6cae69e2bb 100644
--- a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs
+++ b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs
@@ -60,6 +60,7 @@ let disabledChooseNode = """<?xml version="1.0" encoding="utf-16"?>
 
 [<Test>]
 let ``should not generate Xml for xunit.runner.visualstudio 2.0.0 if import is disabled``() = 
+    ensureDir()
     let model =
         InstallModel.CreateFromLibs(PackageName "xunit.runner.visualstudio", SemVer.Parse "2.50.0", [],[],
             [ @"..\xunit.runner.visualstudio\build\net20\xunit.runner.visualstudio.props" 
diff --git a/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs b/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs
index 524286e588..d11024a365 100644
--- a/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs
+++ b/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs
@@ -3,6 +3,7 @@
 open Paket
 open NUnit.Framework
 open FsUnit
+open Paket.TestHelpers
 
 let TestData: obj[][] = 
     [|
@@ -31,6 +32,7 @@ let TestData: obj[][] =
 [<Test>]
 [<TestCaseSource("TestData")>]
 let ``should detect the correct framework on test projects`` projectFile expectedProfile expectedProfileString expectedTargetFramework =
+    ensureDir()
     let p = ProjectFile.TryLoad("./ProjectFile/TestData/" + projectFile).Value
     p.GetTargetProfile() |> shouldEqual expectedProfile
     p.GetTargetProfile().ToString() |> shouldEqual expectedProfileString