Merge tag '1.2.2'

1.2.2

Conflicts:
	build/Elasticsearch.Net.Connection.HttpClient.nuspec
	build/Elasticsearch.Net.Connection.Thrift.nuspec
	build/Elasticsearch.Net.JsonNET.nuspec
	build/Elasticsearch.Net.nuspec
	build/NEST.nuspec
	src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs
	src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs
	src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs
	src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs
	src/Elasticsearch.Net/Properties/AssemblyInfo.cs
	src/Nest/Properties/AssemblyInfo.cs
	src/Profiling/Profiling.InMemoryConnection/Properties/AssemblyInfo.cs
	src/Profiling/Profiling.Indexing/Properties/AssemblyInfo.cs
	src/Serialization/Elasticsearch.Net.JsonNET/Properties/AssemblyInfo.cs
	src/Tests/Elasticsearch.Net.Integration.Yaml/Properties/AssemblyInfo.cs
	src/Tests/Elasticsearch.Net.Tests.Unit/Properties/AssemblyInfo.cs
	src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj
	src/Tests/Nest.Tests.Integration/Properties/AssemblyInfo.cs
	src/Tests/Nest.Tests.MockData/Properties/AssemblyInfo.cs
	src/Tests/Nest.Tests.Unit/Properties/AssemblyInfo.cs

Author: gmarz

build.bat

@@ -12,6 +12,8 @@ if not exist build\tools\FAKE\tools\Fake.exe (
     "build\tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
 )
 
+"build\tools\nuget\nuget.exe" "install" "gitlink" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
+
 REM we need nunit-console to run our tests
 if not exist build\tools\NUnit.Runners\tools\nunit-console.exe (
     ECHO Nunit not found.. Installing

build/Elasticsearch.Net.Connection.HttpClient.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net.Connection.HttpClient</id>
-    <version>1.1.2</version>
+    <version>1.2.2</version>
     <title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.2"/>
+      <dependency id="Elasticsearch.Net" version="1.2.2"/>
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>
   </metadata>

build/Elasticsearch.Net.Connection.Thrift.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net.Connection.Thrift</id>
-    <version>1.1.2</version>
+    <version>1.2.2</version>
     <title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.2"/>
+      <dependency id="Elasticsearch.Net" version="1.2.2"/>
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>
   </metadata>

build/Elasticsearch.Net.JsonNET.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net.JsonNET</id>
-    <version>1.1.2</version>
+    <version>1.2.2</version>
     <title>Elasticsearch.Net.JsonNET - Json.NET serializer for the low level elasticsearch client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>This package is only useful if you use the low level client ONLY and do not use NEST but would like to use JSON.NET as your serializer</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.2"/>
+      <dependency id="Elasticsearch.Net" version="1.2.2"/>
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>
   </metadata>

build/Elasticsearch.Net.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net</id>
-    <version>1.1.2</version>
+    <version>1.2.2</version>
     <title>Elasticsearch.Net - official low level elasticsearch client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -20,6 +20,5 @@
     <file src="output\Elasticsearch.Net\Elasticsearch.Net.dll" target="lib"/> 
     <file src="output\Elasticsearch.Net\Elasticsearch.Net.pdb" target="lib"/> 
     <file src="output\Elasticsearch.Net\Elasticsearch.Net.XML" target="lib"/> 
-    <file src="output\Elasticsearch.Net\install.ps1" target="tools"/> 
   </files>
 </package>

build/NEST.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>NEST</id>
-    <version>1.1.2</version>
+    <version>1.2.2</version>
     <title>NEST - Elasticsearch Client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.2"/>
+      <dependency id="Elasticsearch.Net" version="1.2.2"/>
       <dependency id="Newtonsoft.Json" version="6.0.1" />
     </dependencies>
     <tags>elasticsearch elastic search lucene nest</tags>

build/build.fsx

@@ -42,9 +42,6 @@ Target "BuildApp" (fun _ ->
     //Scan for xml docs and patch them to replace <inheritdoc /> with the documentation
     //from their interfaces
     //!! "build/output/Nest/Nest.xml" |> Seq.iter(fun f -> PatchXmlDoc f)
-
-    CopyFile "build/output/Elasticsearch.Net/install.ps1" "build/elasticsearch-init.ps1"
-
 )
 
 Target "Test" (fun _ ->
@@ -77,7 +74,7 @@ Target "CreateKeysIfAbsent" (fun _ ->
 
 let getFileVersion = fun _ ->
     let assemblyFileContents = ReadFileAsString @"src\NEST\Properties\AssemblyInfo.cs"
-    let re = @"\[assembly\: AssemblyVersionAttribute\(""([^""]+)""\)\]"
+    let re = @"\[assembly\: AssemblyFileVersionAttribute\(""([^""]+)""\)\]"
     let matches = Regex.Matches(assemblyFileContents,re)
     let defaultVersion = regex_replace re "$1" (matches.Item(0).Captures.Item(0).Value)
     let timestampedVersion = (sprintf "%s-ci%s" defaultVersion (DateTime.UtcNow.ToString("yyyyMMddHHmmss")))
@@ -89,6 +86,16 @@ let getFileVersion = fun _ ->
 
 let fileVersion = getFileVersion()
 
+//CI builds need to be one minor ahead of the whatever we find in our develop branch
+let patchedFileVersion = 
+    match fileVersion with
+    | f when f.Contains("-ci") ->
+        let v = regex_replace "-ci.+$" "" f
+        let prerelease = regex_replace "^.+-(ci.+)$" "$1" f
+        let version = SemVerHelper.parse v
+        sprintf "%d.%d.0-%s" version.Major (version.Minor + 1) prerelease
+    | _ -> fileVersion
+
 let validateSignedAssembly = fun name ->
     let sn = if isMono then "sn" else "build/tools/sn/sn.exe"
     let out = (ExecProcessAndReturnMessages(fun p ->
@@ -122,19 +129,19 @@ let nugetPack = fun name ->
     let package = (sprintf @"build\%s.nuspec" name)
     let packageContents = ReadFileAsString package
     let re = @"(?<start>\<version\>|""(Elasticsearch.Net|Nest)"" version="")[^""><]+(?<end>\<\/version\>|"")"
-    let replacedContents = regex_replace re (sprintf "${start}%s${end}" fileVersion) packageContents
+    let replacedContents = regex_replace re (sprintf "${start}%s${end}" patchedFileVersion) packageContents
     WriteStringToFile false package replacedContents
 
     let dir = sprintf "%s/%s/" buildDir name
     NuGetPack (fun p ->
       {p with 
-        Version = fileVersion
+        Version = patchedFileVersion
         WorkingDir = dir 
         OutputPath = dir
       })
       package
 
-    MoveFile nugetOutDir (buildDir + (sprintf "%s/%s.%s.nupkg" name name fileVersion)) 
+    MoveFile nugetOutDir (buildDir + (sprintf "%s/%s.%s.nupkg" name name patchedFileVersion)) 
 
 let buildDocs = fun action ->
     let node = @"build\tools\Node.js\node.exe"
@@ -146,25 +153,25 @@ let buildDocs = fun action ->
       ) 
       (TimeSpan.FromMinutes (if action = "preview" then 300.0 else 5.0))
 
+let suffix = fun (prerelease: PreRelease) -> sprintf "-%s%i" prerelease.Name prerelease.Number.Value
 let getAssemblyVersion = (fun _ ->
-    let version = SemVerHelper.parse fileVersion
+    let fv = if fileVersion.Contains("-ci") then (regex_replace "-ci.+$" "" fileVersion) else fileVersion
+    traceFAKE "patched fileVersion %s" fv
+    let version = SemVerHelper.parse fv
 
-    let suffix = fun (prerelease: PreRelease) -> sprintf "-%s%i" prerelease.Name prerelease.Number.Value
     let assemblySuffix = if version.PreRelease.IsSome then suffix version.PreRelease.Value else "";
     let assemblyVersion = sprintf "%i.0.0%s" version.Major assemblySuffix
 
     match (assemblySuffix, version.Minor, version.Patch) with
-    | (s, m, p) when s <> "" && (m <> 0 || p <> 0)  -> failwithf "Cannot create prereleases for minor or major builds!"
+    | (s, m, p) when s <> "" && s <> "ci" && (m <> 0 || p <> 0)  -> failwithf "Cannot create prereleases for minor or major builds!"
     | ("", _, _) -> traceFAKE "Building fileversion %s for asssembly version %s" fileVersion assemblyVersion
     | _ -> traceFAKE "Building prerelease %s for major assembly version %s " fileVersion assemblyVersion
 
     assemblyVersion
 )
 
-
 Target "Version" (fun _ ->
-  trace fileVersion
-  let assemblyVersion = if fileVersion.Contains("-ci") then fileVersion else getAssemblyVersion()
+  let assemblyVersion = getAssemblyVersion()
 
   let assemblyDescription = fun (f: string) ->
     let name = f 
@@ -185,8 +192,8 @@ Target "Version" (fun _ ->
         Attribute.Company "Elasticsearch"
         Attribute.Configuration "Release"
         Attribute.Version assemblyVersion
-        Attribute.FileVersion fileVersion
-        Attribute.InformationalVersion fileVersion
+        Attribute.FileVersion patchedFileVersion
+        Attribute.InformationalVersion patchedFileVersion
       ]
     )
 )

build/elasticsearch-init.ps1

@@ -1,5 +1,10 @@
 Repository for both **Elasticsearch.Net** and **NEST**, the two official [elasticsearch](https://github.com/elasticsearch/elasticsearch) .NET clients.
 
+[![install from nuget](http://img.shields.io/nuget/v/NEST.svg?style=flat-square)](https://www.nuget.org/packages/NEST)[![downloads](http://img.shields.io/nuget/dt/NEST.svg?style=flat-square)](https://www.nuget.org/packages/NEST)    
+Bleeding edge package:    
+[![download](http://img.shields.io/myget/elasticsearch-net/v/NEST.svg?style=flat-square)](https://www.myget.org/gallery/elasticsearch-net)[![downloads](http://img.shields.io/myget/elasticsearch-net/dt/NEST.svg?style=flat-square)](https://www.myget.org/gallery/elasticsearch-net)    
+Builds:    
+[![teamcity](http://img.shields.io/teamcity/http/teamcity.codebetter.com/e/bt993.svg?style=flat-square)](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt993)[![elasticsearch-net MyGet Build Status](https://www.myget.org/BuildSource/Badge/elasticsearch-net?identifier=624cebb3-a461-466f-9bac-7026c8ba615a)](https://www.myget.org/gallery/elasticsearch-net)
 
 #[Elasticsearch.Net](src/Elasticsearch.Net)
 
@@ -22,8 +27,4 @@ Repository for both **Elasticsearch.Net** and **NEST**, the two official [elasti
 
 [Read more here](https://github.com/elasticsearch/elasticsearch-net/tree/master/src/Nest#nest-)
 
-###Build Statuses
 
-[![Build Status](http://teamcity.codebetter.com/app/rest/builds/buildType:%28id:bt993%29/statusIcon)](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt993&guest=1)
-
-[![elasticsearch-net MyGet Build Status](https://www.myget.org/BuildSource/Badge/elasticsearch-net?identifier=624cebb3-a461-466f-9bac-7026c8ba615a)](https://www.myget.org/)

readme.md

@@ -17,7 +17,8 @@ public static class ApiEndpointsThatAllow404
 			"AliasExists",
 			"TemplateExists",
 			"TypeExists",
-			"Exists"
+			"Exists",
+			"Get"
 		};
 	}
 }