Basic TargetFrameworkSpecs

fsprojects · Apr 7, 2015 · 5876ffa · 5876ffa
1 parent 482d25a
commit 5876ffa
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -475,13 +475,15 @@ type ProjectFile =
         |> Seq.head
 
     member this.GetTargetFramework() =
-        seq {for outputType in this.Document |> getDescendants "TargetFrameworkVersion" ->
-                outputType.InnerText  }
-        |> Seq.map (fun s -> // TODO make this a separate function
-                        s.Replace("v","net")
-                        |> FrameworkDetection.Extract)                        
-        |> Seq.map (fun o -> o.Value)
-        |> Seq.head
+        let framework =
+            seq {for outputType in this.Document |> getDescendants "TargetFrameworkVersion" ->
+                    outputType.InnerText  }
+            |> Seq.map (fun s -> // TODO make this a separate function
+                            s.Replace("v","net")
+                            |> FrameworkDetection.Extract)
+            |> Seq.map (fun o -> o.Value)
+            |> Seq.firstOrDefault
+        defaultArg framework (DotNetFramework(FrameworkVersion.V4))
 
     member this.AddImportForPaketTargets(relativeTargetsPath) =
         match this.Document 

diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -222,6 +222,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <Compile Include="ProjectFile\ConditionSpecs.fs" />
+    <Compile Include="ProjectFile\TargetFrameworkSpecs.fs" />
     <Compile Include="ProjectFile\FileBuildActionSpecs.fs" />
     <Compile Include="ProjectFile\InterProjectDependencySpecs.fs" />
     <Compile Include="ProjectFile\FrameworkReferencesSpecs.fs" />

diff --git a/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs b/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs
@@ -0,0 +1,20 @@
+module Paket.ProjectFile.TargetFrameworkSpecs
+
+open Paket
+open NUnit.Framework
+open FsUnit
+
+let element x = 
+    match x with 
+    | Some y -> y
+    | None -> failwith "not found"
+
+[<Test>]
+let ``should detect TargetFramework in Project2 proj file``() =
+    ProjectFile.Load("./ProjectFile/TestData/Project2.fsprojtest").Value.GetTargetFramework().ToString()
+    |> shouldEqual "net40"
+
+[<Test>]
+let ``should detect Pnet40 in empty proj file``() =
+    ProjectFile.Load("./ProjectFile/TestData/Empty.fsprojtest").Value.GetTargetFramework().ToString()
+    |> shouldEqual "net40"