Resolve JSON.Net version and next major version from Nest.csproj (#2865)

Resolve JSON.Net version and major version from <project>.csproj

Author: russcam

build/scripts/Paths.fsx

@@ -34,6 +34,15 @@ module Paths =
     let Output(folder) = sprintf "%s/%s" BuildOutput folder
     let Source(folder) = sprintf "%s/%s" SourceFolder folder
     let Build(folder) = sprintf "%s/%s" BuildFolder folder
+    
+    let ProjFile(project:DotNetProject) =
+        match project with 
+        | Project p -> sprintf "%s/%s/%s.csproj" SourceFolder project.Name project.Name
+        | PrivateProject p ->
+            match p with
+            | Tests -> sprintf "%s/%s/%s.csproj" SourceFolder project.Name project.Name
+            | DocGenerator -> sprintf "%s/CodeGeneration/%s/%s.csproj" SourceFolder project.Name project.Name
+            
 
     let BinFolder(folder) = 
         let f = replace @"\" "/" folder

build/scripts/Releasing.fsx

@@ -8,7 +8,10 @@
 #load @"Versioning.fsx"
 
 open System
+open System.IO
+open System.Linq
 open System.Text
+open System.Xml.Linq
 open Microsoft.FSharp.Quotations
 open Microsoft.FSharp.Quotations.Patterns
 open Fake
@@ -34,10 +37,22 @@ module Release =
 
             let year = sprintf "%i" DateTime.UtcNow.Year
 
-            let jsonDotNetVersion = 10
-
-            let jsonDotNetCurrentVersion = sprintf "%i" jsonDotNetVersion
-            let jsonDotNetNextVersion = sprintf "%i" (jsonDotNetVersion + 1)
+            let jsonDotNetCurrentVersion = 
+                let xName n = XName.op_Implicit n
+                use stream = File.OpenRead <| Paths.ProjFile p
+                let doc = XDocument.Load(stream)
+                let packageReference = 
+                    doc.Descendants(xName "PackageReference")
+                       .FirstOrDefault(fun e -> e.Attribute(xName "Include").Value = "Newtonsoft.Json")
+                if (packageReference <> null) then packageReference.Attribute(xName "Version").Value
+                else String.Empty
+                
+            let jsonDotNetNextVersion = 
+                match jsonDotNetCurrentVersion with
+                | "" -> String.Empty
+                | version -> 
+                    let semanticVersion = SemVerHelper.parse version
+                    sprintf "%i" (semanticVersion.Major + 1) 
 
             let properties =
                 let addKeyValue (e:Expr<string>) (builder:StringBuilder) =
@@ -48,7 +63,9 @@ module Release =
                         | PropertyGet (eo, pi, li) -> (pi.Name, (pi.GetValue(e) |> string))
                         | ValueWithName (obj,ty,nm) -> ((obj |> string), nm)
                         | _ -> failwith (sprintf "%A is not a let-bound value. %A" e (e.GetType()))
-                    builder.AppendFormat("{0}=\"{1}\";", key, value);
+                        
+                    if (isNotNullOrEmpty value) then builder.AppendFormat("{0}=\"{1}\";", key, value)
+                    else builder
                 new StringBuilder()
                 |> addKeyValue <@nextMajorVersion@>
                 |> addKeyValue <@year@>
@@ -73,4 +90,4 @@ module Release =
             match success with
             | 0 -> traceFAKE "publish to myget succeeded" |> ignore
             | _ -> failwith "publish to myget failed" |> ignore
-        )
+        )