From 4f6585741d58ccc9b286c1fa30cf2dfc12bf126c Mon Sep 17 00:00:00 2001 From: russcam Date: Thu, 21 Mar 2019 15:08:58 +1000 Subject: [PATCH] Bump JSON version in preparation for release --- build/Elasticsearch.Net.nuspec | 4 +++- build/NEST.JsonNetSerializer.nuspec | 4 +++- build/NEST.nuspec | 4 +++- build/scripts/Releasing.fsx | 23 +++++++---------------- build/scripts/Versioning.fsx | 8 ++++---- global.json | 2 +- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/build/Elasticsearch.Net.nuspec b/build/Elasticsearch.Net.nuspec index 6e396a6e2ec..2c4516b9ada 100644 --- a/build/Elasticsearch.Net.nuspec +++ b/build/Elasticsearch.Net.nuspec @@ -6,7 +6,7 @@ Elasticsearch.Net - Elasticsearch .NET low level client Elastic and contributors Elastic - https://github.com/elastic/elasticsearch-net/blob/master/license.txt + license.txt https://github.com/elastic/elasticsearch-net https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png false @@ -21,6 +21,8 @@ + + diff --git a/build/NEST.JsonNetSerializer.nuspec b/build/NEST.JsonNetSerializer.nuspec index 6c4f7b03c61..defefa88b51 100644 --- a/build/NEST.JsonNetSerializer.nuspec +++ b/build/NEST.JsonNetSerializer.nuspec @@ -6,7 +6,7 @@ NEST.JsonNetSerializer - Elasticsearch .NET custom Json.NET serializer Elastic and contributors Elastic - https://github.com/elastic/elasticsearch-net/blob/master/license.txt + license.txt https://github.com/elastic/elasticsearch-net https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png false @@ -23,6 +23,8 @@ + + diff --git a/build/NEST.nuspec b/build/NEST.nuspec index e59984440e9..47208ff0b20 100644 --- a/build/NEST.nuspec +++ b/build/NEST.nuspec @@ -10,7 +10,7 @@ 2014-$year$ Elasticsearch BV false - https://github.com/elastic/elasticsearch-net/blob/master/license.txt + license.txt https://github.com/elastic/elasticsearch-net https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png @@ -29,6 +29,8 @@ + + diff --git a/build/scripts/Releasing.fsx b/build/scripts/Releasing.fsx index a2d33742cb4..d527b8c64ce 100644 --- a/build/scripts/Releasing.fsx +++ b/build/scripts/Releasing.fsx @@ -45,17 +45,8 @@ module Release = let semanticVersion = SemVerHelper.parse version sprintf "%i" (semanticVersion.Major + 1) - let private addKeyValue (e:Expr) (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())) - - if (isNotNullOrEmpty value) then builder.AppendFormat("{0}=\"{1}\";", key, value) - else builder + let private addKeyValue (key:string) (value:string) (builder:StringBuilder) = + builder.AppendFormat("{0}=\"{1}\";", key, value) let private currentVersion = sprintf "%O" <| Versioning.CurrentVersion let private currentMajorVersion = sprintf "%i" <| Versioning.CurrentVersion.Major @@ -64,9 +55,9 @@ module Release = let private props() = new StringBuilder() - |> addKeyValue <@currentMajorVersion@> - |> addKeyValue <@nextMajorVersion@> - |> addKeyValue <@year@> + |> addKeyValue "currentMajorVersion" currentMajorVersion + |> addKeyValue "nextMajorVersion" nextMajorVersion + |> addKeyValue "year" year let pack file n properties = Tooling.Nuget.Exec [ "pack"; file; @@ -147,8 +138,8 @@ module Release = let properties = props() - |> addKeyValue <@jsonDotNetCurrentVersion@> - |> addKeyValue <@jsonDotNetNextVersion@> + |> addKeyValue "jsonDotNetCurrentVersion" jsonDotNetCurrentVersion + |> addKeyValue "jsonDotNetNextVersion" jsonDotNetNextVersion |> toText let nugetId = p.NugetId let nuspec = (sprintf @"build/%s.nuspec" nugetId) diff --git a/build/scripts/Versioning.fsx b/build/scripts/Versioning.fsx index e8558c45137..f168137cac2 100644 --- a/build/scripts/Versioning.fsx +++ b/build/scripts/Versioning.fsx @@ -61,7 +61,7 @@ module Versioning = let CurrentAssemblyFileVersion = parse (sprintf "%s.%s.%s.0" (CurrentVersion.Major.ToString()) (CurrentVersion.Minor.ToString()) (CurrentVersion.Patch.ToString())) let private sn = if isMono then "sn" else Paths.CheckedInTool("sn/sn.exe") - let private oficialToken = "96c599bbe3e70f5d" + let private officialToken = "96c599bbe3e70f5d" let private validate dll name = let out = (ExecProcessAndReturnMessages(fun p -> @@ -72,7 +72,7 @@ module Versioning = let valid = (out.ExitCode, out.Messages.FindIndex(fun s -> s.Contains("is valid"))) match valid with | (0, i) when i >= 0 -> trace (sprintf "%s was signed correctly" name) - | (_, _) -> failwithf "{0} was not validly signed" + | (_, _) -> failwithf "%s was not validly signed" name let out = (ExecProcessAndReturnMessages(fun p -> p.FileName <- sn @@ -84,9 +84,9 @@ module Versioning = let valid = (out.ExitCode, token) match valid with - | (0, t) when t = oficialToken -> + | (0, t) when t = officialToken -> trace (sprintf "%s was signed with official key token %s" name t) - | (_, t) -> traceFAKE "%s was not signed with the official token: %s but %s" name oficialToken t + | (_, t) -> traceFAKE "%s was not signed with the official token: %s but %s" name officialToken t let private validateDllStrongName dll name = match fileExists dll with diff --git a/global.json b/global.json index 3672321c967..235b0e7339a 100644 --- a/global.json +++ b/global.json @@ -2,5 +2,5 @@ "sdk": { "version": "2.1.300" }, - "version": "6.5.1" + "version": "6.6.0" } \ No newline at end of file