Skip to content

Commit

Permalink
Detect sdk versions - fixes #2182
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Mar 14, 2017
1 parent 9bdc929 commit 05e9caf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#### 4.0.0-rc8 - 14.03.2017
#### 4.0.0-rc9 - 14.03.2017
* Make Paket compatible with DotNet SDK / MSBuild 15 / Visual Sudio 2017
* Tail Recursive Package Resolution - https://github.com/fsprojects/Paket/pull/2066
* Reorganized resolver - https://github.com/fsprojects/Paket/pull/2039
Expand Down
3 changes: 2 additions & 1 deletion src/Paket.Core/Files/ProjectFile.fs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ open System.Xml
open Paket.Xml
open Paket.Requirements
open Paket.PackageSources
open System.Globalization

[<RequireQualifiedAccess>]
type BuildAction =
Expand Down Expand Up @@ -1524,7 +1525,7 @@ type ProjectFile with
member this.GetToolsVersion () : float =
try
let v = this.ProjectNode.Attributes.["ToolsVersion"].Value
match Double.TryParse v with
match Double.TryParse(v, NumberStyles.Any, CultureInfo.InvariantCulture) with
| true , 15.0 ->
let sdkAttr = this.ProjectNode.Attributes.["Sdk"]
if isNull sdkAttr || String.IsNullOrWhiteSpace sdkAttr.Value
Expand Down

0 comments on commit 05e9caf

Please sign in to comment.