Merge branch 'develop' into abibell-patch-1

Author: Mpdreamz

.editorconfig

@@ -19,3 +19,7 @@ indent_size = 4
 [*.markdown]
 indent_style = spaces
 indent_size = 2
+
+[*.json]
+indent_style = spaces
+indent_size = 2

build.bat

@@ -20,22 +20,24 @@ if not exist build\tools\NUnit.Runners\tools\nunit-console.exe (
 
 REM we need wintersmith to build our documentation which in turn needs npm/node
 REM installing and calling this locally so that yours and CI's systems do not need to be configured prior to running build.bat
-if not exist build\tools\Node.js\node.exe (
-    ECHO Local node not found.. Installing..
-    "build\tools\nuget\nuget.exe" "install" "node.js" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
-)
-if not exist build\tools\Npm\node_modules\npm\cli.js (
-    ECHO Local npm not found.. Installing..
-    "build\tools\nuget\nuget.exe" "install" "npm" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
-)
-if not exist build\tools\node_modules\wintersmith\bin\wintersmith (
-    ECHO wintersmith not found.. Installing.. 
-    cd build\tools
 
-    "Node.js\node.exe" "Npm\node_modules\npm\cli.js" install wintersmith
 
-    cd ..\..
-)
+REM if not exist build\tools\Node.js\node.exe (
+REM    ECHO Local node not found.. Installing..
+REM    "build\tools\nuget\nuget.exe" "install" "node.js" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
+REM )
+REM if not exist build\tools\Npm\node_modules\npm\cli.js (
+REM    ECHO Local npm not found.. Installing..
+REM    "build\tools\nuget\nuget.exe" "install" "npm" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
+REM )
+REM if not exist build\tools\node_modules\wintersmith\bin\wintersmith (
+REM    ECHO wintersmith not found.. Installing.. 
+REM    cd build\tools
+REM
+REM    "Node.js\node.exe" "Npm\node_modules\npm\cli.js" install wintersmith
+REM
+REM    cd ..\..
+REM )
 
 
 SET TARGET="Build"
@@ -48,4 +50,4 @@ IF NOT [%2]==[] (set VERSION="%2")
 shift
 shift
 
-"build\tools\FAKE\tools\Fake.exe" "build\build.fsx" "target=%TARGET%" "version=%VERSION%"
+"build\tools\FAKE\tools\Fake.exe" "build\\build.fsx" "target=%TARGET%" "version=%VERSION%"

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.0.0-ci20140604105901</version>
+    <version>1.0.0-rc1</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.0.0-ci20140604105901"/>
+      <dependency id="Elasticsearch.Net" version="1.0.0-rc1"/>
       <dependency id="NetReflector" />
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>

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.0.0-ci20140604105901</version>
+    <version>1.0.0-rc1</version>
     <title>Elasticsearch.Net - official low level elasticsearch client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>

build/NEST.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>NEST</id>
-    <version>1.0.0-ci20140604105901</version>
+    <version>1.0.0-rc1</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.0.0-ci20140604105901"/>
+      <dependency id="Elasticsearch.Net" version="1.0.0-rc1"/>
       <dependency id="Newtonsoft.Json" version="6.0.1" />
     </dependencies>
     <tags>elasticsearch elastic search lucene nest</tags>

build/NESTBuild.proj

@@ -227,7 +227,6 @@ Target "Nightly" (fun _ ->
 
 
 "Build"
-  ==> "Docs"
   ==> "Release"
 
 "DocsPreview"

build/build.fsx

@@ -2,7 +2,6 @@
 <repositories>
   <repository path="..\src\CodeGeneration\CodeGeneration.LowLevelClient\packages.config" />
   <repository path="..\src\CodeGeneration\CodeGeneration.YamlTestsRunner\packages.config" />
-  <repository path="..\src\Connections\Elasticsearch.Net.Connection.HttpClient\packages.config" />
   <repository path="..\src\Connections\Elasticsearch.Net.Connection.Thrift\packages.config" />
   <repository path="..\src\Elasticsearch.Net\packages.config" />
   <repository path="..\src\Nest\packages.config" />