Include license.txt in nuget packages

This commit includes the license.txt file within each nuget package, since licenseUrl is deprecated.
Dependent nuget packages from Json.NET within NEST.nuspec are removed.
Lowercase properties in SdkVersion and GlobalJson record types, to align with global.json file conventions

Author: russcam

build/Elasticsearch.Net.nuspec

@@ -6,7 +6,7 @@
 		<title>Elasticsearch.Net - Elasticsearch .NET low level client</title>
 		<authors>Elastic and contributors</authors>
 		<owners>Elastic</owners>
-		<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
+		<license type="file">license.txt</license>
 		<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>
@@ -17,15 +17,16 @@
 		<tags>elasticsearch,elastic,search,lucene,nest</tags>
 		<dependencies>
 			<group targetFramework=".NETStandard2.0">
-				<dependency id="System.Buffers" version="[4.5.0, )"/>
-				<dependency id="System.Reflection.Emit" version="[4.3.0, )"/>
-				<dependency id="System.Reflection.Emit.Lightweight" version="[4.3.0, )"/>
-				<dependency id="System.Threading.Tasks.Extensions" version="[4.4.0, )"/>
-				<dependency id="System.ValueTuple" version="[4.4.0, )"/>
+				<dependency id="System.Buffers" version="[4.5.0,)"/>
+				<dependency id="System.Reflection.Emit" version="[4.3.0,)"/>
+				<dependency id="System.Reflection.Emit.Lightweight" version="[4.3.0,)"/>
+				<dependency id="System.Threading.Tasks.Extensions" version="[4.4.0,)"/>
+				<dependency id="System.ValueTuple" version="[4.4.0,)"/>
 			</group>
 		</dependencies>
 	</metadata>
 	<files>
+		<file src="..\license.txt" target="" />
 		<file src="output\Elasticsearch.Net\netstandard2.0\Elasticsearch.Net.dll" target="lib\netstandard2.0"/>
 		<file src="output\Elasticsearch.Net\netstandard2.0\Elasticsearch.Net.xml" target="lib\netstandard2.0"/>
 	</files>

build/NEST.JsonNetSerializer.nuspec

@@ -6,23 +6,24 @@
 		<title>NEST.JsonNetSerializer - Elasticsearch .NET custom Json.NET serializer</title>
 		<authors>Elastic and contributors</authors>
 		<owners>Elastic</owners>
-		<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
+		<license type="file">license.txt</license>
 		<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 serializer. This package enables serialization for your documents using your own custom Json.NET serializer</description>
+		<summary>NEST uses an internal 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>
 		<dependencies>
 			<group targetFramework=".NETStandard2.0">
-				<dependency id="NEST" version="[$version$, $nextMajorVersion$)" />
+				<dependency id="NEST" version="$version$" />
 				<dependency id="Newtonsoft.Json" version="$jsonDotNetCurrentVersion$" />
 			</group>
 		</dependencies>
 	</metadata>
 	<files>
+		<file src="..\license.txt" target="" />
 		<file src="output\Nest.JsonNetSerializer\netstandard2.0\Nest.JsonNetSerializer.dll" target="lib\netstandard2.0"/>
 		<file src="output\Nest.JsonNetSerializer\netstandard2.0\Nest.JsonNetSerializer.xml" target="lib\netstandard2.0"/>
 	</files>

build/NEST.nuspec

@@ -4,32 +4,25 @@
 		<id>NEST</id>
 		<version>$version$</version>
 		<title>NEST - Elasticsearch .NET high level client</title>
-		
 		<authors>Elastic and contributors</authors>
 		<owners>Elastic</owners>
 		<copyright>2014-$year$ Elasticsearch BV</copyright>
-
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
+		<license type="file">license.txt</license>
 		<projectUrl>https://github.com/elastic/elasticsearch-net</projectUrl>
 		<iconUrl>https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png</iconUrl>
-		
 		<description>Strongly typed interface to Elasticsearch. Fluent and classic object initializer mappings of requests and responses. Uses and exposes Elasticsearch.Net</description>
 		<summary>Strongly typed interface to Elasticsearch. Fluent and classic object initializer mappings of requests and responses. Uses and exposes Elasticsearch.Net</summary>
 		<releaseNotes>https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
 		<tags>elasticsearch,elastic,search,lucene,nest</tags>
-		
 		<dependencies>
 			<group targetFramework=".NETStandard2.0">
-				<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
-
-				<!-- since we no longer reference JSON.NET (internalized) we do need to ship with its System references -->
-				<dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )"/>
-				<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )"/>
+				<dependency id="Elasticsearch.Net" version="$version$" />
 			</group>
 		</dependencies>
 	</metadata>
 	<files>
+		<file src="..\license.txt" target="" />
 		<file src="output\Nest\netstandard2.0\Nest.dll" target="lib\netstandard2.0"/>
 		<file src="output\Nest\netstandard2.0\Nest.xml" target="lib\netstandard2.0"/>
 	</files>

build/scripts/Releasing.fs

@@ -7,6 +7,7 @@ open System.Text
 open System.Xml
 open System.Xml.Linq
 open System.Xml.XPath
+open Fake.Core;
 open Microsoft.FSharp.Quotations
 open Microsoft.FSharp.Quotations.Patterns
 
@@ -34,28 +35,20 @@ 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
-
+        
     let private currentMajorVersion version = sprintf "%i" <| version.Full.Major
     let private nextMajorVersion version = sprintf "%i" <| version.Full.Major + 1u
 
     let private props version =
         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 +133,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(); }
-        File.WriteAllText("global.json", JsonConvert.SerializeObject(newGlobalJson))
+        let newGlobalJson = { globalJson with version = version.ToString(); }
+        File.WriteAllText("global.json", JsonConvert.SerializeObject(newGlobalJson, Formatting.Indented))
         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 then 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