Merge remote-tracking branch 'origin/master' into refactor/aggs-metadata

Author: gmarz

build.bat

@@ -32,30 +32,26 @@ IF /I "%1"=="skiptests" (set SKIPTESTS="1")
 IF NOT [%1]==[] (set TARGET="%1")
 
 IF /I "%1"=="version" (
-    IF NOT [%2]==[] (set VERSION="%2")
+	IF NOT [%2]==[] (set VERSION="%2")
 	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
 )
 IF /I "%1"=="release" (
-    IF NOT [%2]==[] (set VERSION="%2")
+	IF NOT [%2]==[] (set VERSION="%2")
 	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
 )
 
 IF /I "%1%"=="integrate" (
-    IF NOT [%2]==[] (set ESVERSIONS="%2")
+	IF NOT [%2]==[] (set ESVERSIONS="%2")
 	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
 )
 
 IF /I "%1%"=="canary" (
-    IF NOT [%2]==[] (set APIKEY="%2")
+	IF NOT [%2]==[] (set APIKEY="%2")
 	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
-	IF [%2]==[] (
-		ECHO When running build canary APIKEY the apikey is mandatory
-		EXIT /B 1
-	)
 )
 
 "packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%"

build/scripts/Releasing.fsx

@@ -103,7 +103,20 @@ type Release() =
             if (projectName.Equals("Nest", StringComparison.InvariantCultureIgnoreCase) = true)
             then
                 let nuspec = sprintf "%s/Nest.nuspec" unzippedDir
-                FileHelper.RegexReplaceInFileWithEncoding "<id>Nest</id>" "<id>NEST</id>" System.Text.Encoding.UTF8 nuspec
+                FileHelper.RegexReplaceInFileWithEncoding 
+                    "<id>Nest</id>" 
+                    "<id>NEST</id>" 
+                    System.Text.Encoding.UTF8 
+                    nuspec
+
+                // TODO: Make this more generic in limiting to major version based
+                // on the major version of the version specified.
+                FileHelper.RegexReplaceInFileWithEncoding 
+                    "<dependency id=\"Newtonsoft.Json\" version=\".*\" />" 
+                    "<dependency id=\"Newtonsoft.Json\" version=\"[8,9)\" />"  
+                    System.Text.Encoding.UTF8 
+                    nuspec
+
 
             // Include PDB for each target framework
             let frameworkDirs = (sprintf "%s/lib" unzippedDir |> directoryInfo).GetDirectories()

build/scripts/Targets.fsx

@@ -72,7 +72,8 @@ Target "Release" <| fun _ ->
 
 Target "Canary" <| fun _ -> 
     trace "Running canary build" 
-    Release.PublishCanaryBuild (getBuildParam "apikey")
+    let apiKey = (getBuildParam "apikey");
+    if (not (String.IsNullOrWhiteSpace apiKey) || apiKey = "ignore") then Release.PublishCanaryBuild apiKey
 
 BuildFailureTarget "NotifyTestFailures" <| fun _ -> Tests.Notify() |> ignore
 

src/Benchmarking/Properties/AssemblyInfo.cs

@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.0-alpha2")]
+[assembly: AssemblyFileVersionAttribute("2.1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.1.0-ci20160129160552")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";

src/Benchmarking/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-*",
+  "version": "2.0.0-ci20160129160552",
   "compilationOptions": {
     "warningsAsErrors": false,
     "define": [ "LINQ", "NDESK_OPTIONS" ],