Update release process (#3736)

Author: russcam

build/NEST.JsonNetSerializer.nuspec

@@ -10,8 +10,8 @@
 		<projectUrl>https://github.com/elastic/elasticsearch-net</projectUrl>
 		<iconUrl>https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png</iconUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>NEST 6.x uses an internalized Json.NET serializer. This package enables serialization using your own custom Json.NET serializer</description>
-		<summary>NEST 6.x uses an internalized Json.NET serializer. This package enables serialization using your own custom Json.NET serializer</summary>
+		<description>NEST uses an internal Json.NET serializer. This package enables serialization for your documents using your own custom Json.NET serializer</description>
+		<summary>NEST uses an internal Json.NET serializer. This package enables serialization for your documents using your own custom Json.NET serializer</summary>
 		<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
 		<copyright>2017-$year$ Elasticsearch BV</copyright>
 		<tags>elasticsearch,elastic,search,lucene,nest,serializer,json</tags>

build/scripts/Releasing.fs

@@ -7,8 +7,7 @@ open System.Text
 open System.Xml
 open System.Xml.Linq
 open System.Xml.XPath
-open Microsoft.FSharp.Quotations
-open Microsoft.FSharp.Quotations.Patterns
+open Fake.Core
 
 open Projects
 open Versioning
@@ -34,15 +33,7 @@ module Release =
             let semanticVersion = parse version
             sprintf "%i" (semanticVersion.Major + 1u)
 
-    let private addKeyValue (e:Expr<string>) (builder:StringBuilder) =
-        // the binding for this tuple looks like key/value should 
-        // be round the other way (but it's correct as is)...
-        let (value,key) = 
-            match e with
-            | 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()))
-            
+    let private addKeyValue key value (builder:StringBuilder) =
         if (not (String.IsNullOrEmpty value)) then builder.AppendFormat("{0}=\"{1}\";", key, value)
         else builder
 
@@ -53,9 +44,9 @@ module Release =
         let currentMajorVersion = currentMajorVersion version
         let nextMajorVersion = nextMajorVersion version
         new StringBuilder()
-        |> addKeyValue <@currentMajorVersion@>
-        |> addKeyValue <@nextMajorVersion@>
-        |> addKeyValue <@year@>
+        |> addKeyValue "currentMajorVersion" currentMajorVersion
+        |> addKeyValue "nextMajorVersion" nextMajorVersion
+        |> addKeyValue "year" year
 
     let pack file n properties version  = 
         Tooling.Nuget.Exec [ "pack"; file; 
@@ -140,9 +131,9 @@ module Release =
 
             let properties =
                 props version
-                |> addKeyValue <@jsonDotNetCurrentVersion@>
-                |> addKeyValue <@jsonDotNetNextVersion@>
-            let properties = properties.ToString()
+                |> addKeyValue "jsonDotNetCurrentVersion" jsonDotNetCurrentVersion
+                |> addKeyValue "jsonDotNetNextVersion" jsonDotNetNextVersion
+                |> StringBuilder.toText
 
             let nugetId = p.NugetId 
             let nuspec = (sprintf @"build/%s.nuspec" nugetId)

build/scripts/Versioning.fs

@@ -19,20 +19,20 @@ module Versioning =
     let parse (v:string) = SemVer.parse(v)
 
     //Versions in form of e.g 6.1.0 is inferred as datetime so we bake the json shape into the provider like this
-    type SdkVersion = { Version:string;  }
-    type GlobalJson = { Sdk: SdkVersion; Version:string; }
+    type SdkVersion = { version:string;  }
+    type GlobalJson = { sdk: SdkVersion; version:string; }
 
     let private globalJson () =
         let jsonString = File.ReadAllText "global.json"
         JsonConvert.DeserializeObject<GlobalJson>(jsonString)
 
     let writeVersionIntoGlobalJson version =
         let globalJson = globalJson ()
-        let newGlobalJson = { globalJson with Version = version.ToString(); }
+        let newGlobalJson = { globalJson with version = version.ToString(); }
         File.WriteAllText("global.json", JsonConvert.SerializeObject(newGlobalJson))
         printfn "Written (%s) to global.json as the current version will use this version from now on as current in the build" (version.ToString()) 
 
-    let GlobalJsonVersion = parse <| globalJson().Version
+    let GlobalJsonVersion = parse <| globalJson().version
 
     let private getVersion (args:Commandline.PassedArguments) =
         match (args.Target, args.CommandArguments) with
@@ -73,9 +73,9 @@ module Versioning =
             match version with
             | NoChange _ -> failwithf "cannot run release because no explicit version number was passed on the command line"
             | Update (newVersion, currentVersion) -> 
-                // fail if current is greater or equal to the new version
-                if (currentVersion >= newVersion) then
-                    failwithf "Can not release %O its lower then current %O" newVersion.Full currentVersion.Full
+                // fail if current is greater than the new version
+                if (currentVersion > newVersion) then
+                    failwithf "Can not release %O as it's lower than current %O" newVersion.Full currentVersion.Full
                 writeVersionIntoGlobalJson newVersion.Full
         | _ -> ignore()
 
@@ -103,7 +103,7 @@ module Versioning =
                 | Some sn -> sn
                 | None -> failwithf "Could not locate sn.exe"
 
-    let private oficialToken = "96c599bbe3e70f5d"
+    let private officialToken = "96c599bbe3e70f5d"
 
     let private validate dll name =
         let sn = sn ()
@@ -122,8 +122,8 @@ module Versioning =
 
         let valid = (out.ExitCode, token)
         match valid with
-        | (Some 0, t) when t = oficialToken  -> printfn "%s was signed with official key token %s" name t
-        | (_, t) -> printfn "%s was not signed with the official token: %s but %s" name oficialToken t
+        | (Some 0, t) when t = officialToken  -> printfn "%s was signed with official key token %s" name t
+        | (_, t) -> printfn "%s was not signed with the official token: %s but %s" name officialToken t
 
     let private validateDllStrongName dll name =
         match File.Exists dll with