Skip to content

Commit d11a1d6

Browse files
gmarzgmarz
committed
Merge tag '1.3.0'
1.3.0 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/IElasticsearchClient.Generated.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/Properties/AssemblyInfo.cs src/Tests/Nest.Tests.MockData/Properties/AssemblyInfo.cs src/Tests/Nest.Tests.Unit/Properties/AssemblyInfo.cs
2 parents 78e0b02 + 9bd70c8 commit d11a1d6

File tree

375 files changed

+6621
-4306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

375 files changed

+6621
-4306
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ Cache
6161
YamlCache
6262

6363
*.DS_Store
64+
*.sln.ide

‎build.bat‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,20 @@ REM we need wintersmith to build our documentation which in turn needs npm/node
2424
REM installing and calling this locally so that yours and CI's systems do not need to be configured prior to running build.bat
2525

2626

27-
REM if not exist build\tools\Node.js\node.exe (
28-
REM ECHO Local node not found.. Installing..
29-
REM "build\tools\nuget\nuget.exe" "install" "node.js" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
30-
REM )
31-
REM if not exist build\tools\Npm\node_modules\npm\cli.js (
32-
REM ECHO Local npm not found.. Installing..
33-
REM "build\tools\nuget\nuget.exe" "install" "npm" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
34-
REM )
35-
REM if not exist build\tools\node_modules\wintersmith\bin\wintersmith (
36-
REM ECHO wintersmith not found.. Installing..
37-
REM cd build\tools
38-
REM
39-
REM "Node.js\node.exe" "Npm\node_modules\npm\cli.js" install wintersmith
40-
REM
41-
REM cd ..\..
42-
REM )
27+
if not exist build\tools\Node.js\node.exe (
28+
ECHO Local node not found.. Installing..
29+
"build\tools\nuget\nuget.exe" "install" "node.js" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
30+
)
31+
if not exist build\tools\Npm\node_modules\npm\cli.js (
32+
ECHO Local npm not found.. Installing..
33+
"build\tools\nuget\nuget.exe" "install" "npm" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
34+
)
35+
if not exist build\tools\node_modules\wintersmith\bin\wintersmith (
36+
ECHO wintersmith not found.. Installing..
37+
cd build\tools
38+
"Node.js\node.exe" "Npm\node_modules\npm\cli.js" install wintersmith
39+
cd ..\..
40+
)
4341

4442

4543
SET TARGET="Build"

‎build/Elasticsearch.Net.Connection.HttpClient.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.HttpClient</id>
5-
<version>1.2.3</version>
5+
<version>1.3.0</version>
66
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.2.3"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.0"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

‎build/Elasticsearch.Net.Connection.Thrift.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.Thrift</id>
5-
<version>1.2.3</version>
5+
<version>1.3.0</version>
66
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.2.3"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.0"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

‎build/Elasticsearch.Net.JsonNET.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.JsonNET</id>
5-
<version>1.2.3</version>
5+
<version>1.3.0</version>
66
<title>Elasticsearch.Net.JsonNET - Json.NET serializer for the low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
99
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
1010
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
1111
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
12-
<summary>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</summary>
12+
<summary>IElasticsearchSerializer implementation that allows you to use Json.NET with the lowlevel client</summary>
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<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>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.2.3"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.0"/>
17+
<dependency id="Newtonsoft.Json" version="6.0.1"/>
1718
</dependencies>
1819
<tags>elasticsearch elastic search lucene thrift nest</tags>
1920
</metadata>

‎build/Elasticsearch.Net.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net</id>
5-
<version>1.2.3</version>
5+
<version>1.3.0</version>
66
<title>Elasticsearch.Net - official low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>

‎build/NEST.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>NEST</id>
5-
<version>1.2.3</version>
5+
<version>1.3.0</version>
66
<title>NEST - Elasticsearch Client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.2.3"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.0"/>
1717
<dependency id="Newtonsoft.Json" version="6.0.1" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>

‎build/build.fsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,16 @@ let nugetPack = fun name ->
133133
WriteStringToFile false package replacedContents
134134

135135
let dir = sprintf "%s/%s/" buildDir name
136+
let nugetOutFile = buildDir + (sprintf "%s/%s.%s.nupkg" name name patchedFileVersion);
136137
NuGetPack (fun p ->
137138
{p with
138139
Version = patchedFileVersion
139-
WorkingDir = dir
140+
WorkingDir = "build"
140141
OutputPath = dir
141142
})
142143
package
143144

144-
MoveFile nugetOutDir (buildDir + (sprintf "%s/%s.%s.nupkg" name name patchedFileVersion))
145+
MoveFile nugetOutDir nugetOutFile
145146

146147
let buildDocs = fun action ->
147148
let node = @"build\tools\Node.js\node.exe"
@@ -178,8 +179,9 @@ Target "Version" (fun _ ->
178179
match f.ToLowerInvariant() with
179180
| f when f = "elasticsearch.net" -> "Elasticsearch.Net - oficial low level elasticsearch client"
180181
| f when f = "nest" -> "NEST - oficial high level elasticsearch client"
181-
| f when f = "elasticsearch.net.connection.thrift" -> "Elasticsearc.Net.Connection.Thrift - Add thrift support to elasticsearch."
182-
| f when f = "elasticsearch.net.connection.httpclient" -> "Elasticsearc.Net.Connection.HttpClient - IConnection implementation that uses HttpClient (.NET 4.5 only)"
182+
| f when f = "elasticsearch.net.connection.thrift" -> "Add thrift support to elasticsearch."
183+
| f when f = "elasticsearch.net.connection.httpclient" -> "IConnection implementation that uses HttpClient (.NET 4.5 only)"
184+
| f when f = "elasticsearch.net.jsonnet" -> "IElasticsearchSerializer implementation that allows you to use Json.NET with the lowlevel client"
183185
| _ -> sprintf "%s" name
184186

185187
!! "src/**/AssemblyInfo.cs"

‎dep/repositories.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<repository path="../src/Nest/packages.config" />
88
<repository path="../src/Profiling/Profiling.Indexing/packages.config" />
99
<repository path="../src/Profiling/Profiling.InMemoryConnection/packages.config" />
10-
<repository path="../src/Serialization/Elasticsearch.Net.JsonNET/packages.config" />
1110
<repository path="../src/Tests/Elasticsearch.Net.Integration.Yaml/packages.config" />
1211
<repository path="../src/Tests/Elasticsearch.Net.Tests.Unit/packages.config" />
1312
<repository path="../src/Tests/Nest.Tests.Integration/packages.config" />

‎docs/build/cluster/health.html‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)