Skip to content

Commit c0093b9

Browse files
MpdreamzMpdreamz
committed
Merge branch 'develop'
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/Connection/Configuration/ConnectionConfiguration.cs src/Elasticsearch.Net/Connection/Configuration/IConnectionConfigurationValues.cs src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs src/Elasticsearch.Net/Connection/Transport.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/Elasticsearch.Net.Tests.Unit.csproj 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
2 parents 4bbeae2 + ce2faf2 commit c0093b9

File tree

1,053 files changed

+34427
-210812
lines changed

Some content is hidden

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

1,053 files changed

+34427
-210812
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ indent_style = tab
99
indent_size = 4
1010

1111
[*.js]
12-
indent_style = spaces
12+
indent_style = space
1313
indent_size = 2
1414

1515
[*.fsx]
16-
indent_style = spaces
16+
indent_style = space
1717
indent_size = 4
1818

1919
[*.markdown]
20-
indent_style = spaces
20+
indent_style = space
2121
indent_size = 2
2222

2323
[*.json]
24-
indent_style = spaces
24+
indent_style = space
2525
indent_size = 2

‎.gitignore‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ _ReSharper*/
3434
_NCrunch*/
3535
[Tt]est[Rr]esult*
3636

37-
keypair.snk
38-
private.snk
39-
*.snk
40-
build/keys/private.snk
41-
build/keys/keypair.snk
4237
build/*
4338
!build/tools
39+
!build/keys
4440
build/tools/*
4541
!build/tools/sn
4642
!build/tools/sn/*
@@ -49,6 +45,8 @@ build/tools/*
4945
!build/*.fsx
5046
!build/*.ps1
5147
!build/*.nuspec
48+
!build/scripts
49+
!.paket/*.exe
5250

5351
/dep/Newtonsoft.Json.4.0.2
5452
!docs/build

‎.paket/paket.bootstrapper.exe‎

13 KB
Binary file not shown.

‎.paket/paket.exe‎

3.4 MB
Binary file not shown.

‎.paket/paket.targets‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Enable the restore command to run before builds -->
5+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6+
<!-- Download Paket.exe if it does not already exist -->
7+
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
8+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
9+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
</PropertyGroup>
11+
<PropertyGroup>
12+
<!-- Paket command -->
13+
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
14+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
15+
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
16+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketExePath)</PaketCommand>
17+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
18+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
19+
<!-- Commands -->
20+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
21+
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
22+
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
23+
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
24+
<!-- We need to ensure packages are restored prior to assembly resolve -->
25+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
26+
</PropertyGroup>
27+
<Target Name="CheckPrerequisites">
28+
<!-- Raise an error if we're unable to locate paket.exe -->
29+
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
30+
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
31+
</Target>
32+
<Target Name="DownloadPaket">
33+
<Exec Command="$(DownloadPaketCommand)" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
34+
</Target>
35+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
36+
<Exec Command="$(RestoreCommand)" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" />
37+
</Target>
38+
</Project>

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
language: csharp
2+
solution: src/Elasticsearch.sln
3+
script: ./build.sh

‎build.bat‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ if not exist build\tools\FAKE\tools\Fake.exe (
1212
"build\tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
1313
)
1414

15-
"build\tools\nuget\nuget.exe" "install" "gitlink" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
15+
if not exist build\tools\gitlink\lib\net45\gitlink.exe (
16+
ECHO Local node not found.. Installing..
17+
"build\tools\nuget\nuget.exe" "install" "gitlink" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
18+
)
1619

1720
REM we need nunit-console to run our tests
1821
if not exist build\tools\NUnit.Runners\tools\nunit-console.exe (
@@ -50,4 +53,4 @@ IF NOT [%2]==[] (set VERSION="%2")
5053
shift
5154
shift
5255

53-
"build\tools\FAKE\tools\Fake.exe" "build\\build.fsx" "target=%TARGET%" "version=%VERSION%"
56+
"build\tools\FAKE\tools\Fake.exe" "build\\scripts\\build.fsx" "target=%TARGET%" "version=%VERSION%"

‎build.sh‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NUGET="build/tools/nuget/nuget.exe"
2-
FAKE="build/tools/FAKE/tools/Fake.exe"
2+
FAKE="build/tools/FAKE/tools/FAKE.exe"
33
NUNIT="build/tools/NUnit.Runners/tools/nunit-console.exe"
44
FSHARPCLI="build/tools/Fsharp.Formatting.CommandTool/Fsharp.Formatting.CommandTool.nupkg"
55
SOURCELINK="build/tools/SourceLink.Fake/SourceLink.Fake.nupkg"
@@ -8,7 +8,7 @@ SOURCELINK="build/tools/SourceLink.Fake/SourceLink.Fake.nupkg"
88
if [[ ! -f "$NUGET" ]]; then
99
echo NUGET not found.. Download...
1010
mkdir -p build/tools/nuget
11-
curl -o $NUGET http://build.nuget.org/drops/client/master/NuGet.exe
11+
curl -o $NUGET https://nugetbuild.cloudapp.net/drops/client/master/NuGet.exe
1212
fi
1313

1414
#we need FAKE to process our build scripts
@@ -40,6 +40,9 @@ libdir=$PWD/build/tools/FAKE/tools/
4040
$FSHARPI --lib:$libdir $@
4141
EOF
4242
chmod +x fsharpi
43-
mono --runtime=v4.0 "$FAKE" build/build.fsx $@
43+
mono --runtime=v4.0 "$FAKE" build/scripts/build.fsx "skiptests=1" $@
44+
MONOEXIT=$?
4445
rm fsharpi
45-
#"build\tools\FAKE\tools\Fake.exe" "build\build.fsx" "target=%TARGET%" "version=%VERSION%"
46+
#FORCE exit code to be that of calling fake not the last rm action
47+
exit $MONOEXIT
48+
#"build\tools\FAKE\tools\Fake.exe" "build\build.fsx" "target=%TARGET%" "version=%VERSION%" "skiptests=1"

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3-
<metadata>
4-
<id>Elasticsearch.Net.Connection.HttpClient</id>
5-
<version>1.3.1</version>
6-
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
7-
<authors>Elasticsearch Inc. and contributors</authors>
8-
<owners>Elasticsearch Inc.</owners>
9-
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10-
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11-
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
12-
<summary>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</summary>
13-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14-
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
15-
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.3.1"/>
17-
</dependencies>
18-
<tags>elasticsearch elastic search lucene thrift nest</tags>
19-
</metadata>
20-
<files>
21-
<file src="output\Elasticsearch.Net.Connection.HttpClient\Elasticsearch.Net.Connection.HttpClient.dll" target="lib\net45"/>
22-
<file src="output\Elasticsearch.Net.Connection.HttpClient\Elasticsearch.Net.Connection.HttpClient.pdb" target="lib\net45"/>
23-
<file src="output\Elasticsearch.Net.Connection.HttpClient\Elasticsearch.Net.Connection.HttpClient.XML" target="lib\net45"/>
24-
</files>
3+
<metadata>
4+
<id>Elasticsearch.Net.Connection.HttpClient</id>
5+
<version>1.4.2</version>
6+
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
7+
<authors>Elasticsearch Inc. and contributors</authors>
8+
<owners>Elasticsearch Inc.</owners>
9+
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10+
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
12+
<summary>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</summary>
13+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14+
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
15+
<dependencies>
16+
<dependency id="Elasticsearch.Net" version="1.4.2"/>
17+
</dependencies>
18+
<tags>elasticsearch elastic search lucene thrift nest</tags>
19+
</metadata>
20+
<files>
21+
<file src="output\Elasticsearch.Net.Connection.HttpClient\net45\Elasticsearch.Net.Connection.HttpClient.dll" target="lib\net45"/>
22+
<file src="output\Elasticsearch.Net.Connection.HttpClient\net45\Elasticsearch.Net.Connection.HttpClient.pdb" target="lib\net45"/>
23+
<file src="output\Elasticsearch.Net.Connection.HttpClient\net45\Elasticsearch.Net.Connection.HttpClient.XML" target="lib\net45"/>
24+
</files>
2525
</package>

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

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3-
<metadata>
4-
<id>Elasticsearch.Net.Connection.Thrift</id>
5-
<version>1.3.1</version>
6-
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
7-
<authors>Elasticsearch Inc. and contributors</authors>
8-
<owners>Elasticsearch Inc.</owners>
9-
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10-
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11-
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
12-
<summary>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</summary>
13-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14-
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
15-
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.3.1"/>
17-
</dependencies>
18-
<tags>elasticsearch elastic search lucene thrift nest</tags>
19-
</metadata>
20-
<files>
21-
<file src="output\Elasticsearch.Net.Connection.Thrift\Elasticsearch.Net.Connection.Thrift.dll" target="lib"/>
22-
<file src="output\Elasticsearch.Net.Connection.Thrift\Elasticsearch.Net.Connection.Thrift.pdb" target="lib"/>
23-
<file src="output\Elasticsearch.Net.Connection.Thrift\Elasticsearch.Net.Connection.Thrift.XML" target="lib"/>
24-
</files>
3+
<metadata>
4+
<id>Elasticsearch.Net.Connection.Thrift</id>
5+
<version>1.4.2</version>
6+
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
7+
<authors>Elasticsearch Inc. and contributors</authors>
8+
<owners>Elasticsearch Inc.</owners>
9+
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10+
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
12+
<summary>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</summary>
13+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14+
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
15+
<dependencies>
16+
<dependency id="Elasticsearch.Net" version="1.4.2"/>
17+
</dependencies>
18+
<tags>elasticsearch elastic search lucene thrift nest</tags>
19+
</metadata>
20+
<files>
21+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.dll" target="lib"/>
22+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.pdb" target="lib"/>
23+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.XML" target="lib"/>
24+
25+
<file src="output\Elasticsearch.Net.Connection.Thrift\net45\Elasticsearch.Net.Connection.Thrift.dll" target="lib\net45"/>
26+
<file src="output\Elasticsearch.Net.Connection.Thrift\net45\Elasticsearch.Net.Connection.Thrift.pdb" target="lib\net45"/>
27+
<file src="output\Elasticsearch.Net.Connection.Thrift\net45\Elasticsearch.Net.Connection.Thrift.XML" target="lib\net45"/>
28+
29+
</files>
2530
</package>

0 commit comments

Comments
 (0)