Skip to content

Commit 27fc39d

Browse files
author
moran
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3c3876f + 512fc56 commit 27fc39d

File tree

935 files changed

+52230
-51130
lines changed

Some content is hidden

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

935 files changed

+52230
-51130
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
root=true
22

33
[*]
4-
end_of_line = LF
5-
6-
[*.cs]
74
indent_style = tab
85
indent_size = 4
96

10-
[*.cpp]
11-
indent_style = space
7+
[*.js]
8+
indent_style = spaces
129
indent_size = 2
1310

14-
[*.h]
15-
indent_style = space
11+
[*.markdown]
12+
indent_style = spaces
1613
indent_size = 2

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*.nupkg
2222
[Bb]in
2323
[Dd]ebug*/
24+
test-results
25+
test-results/*
2426
*.lib
2527
*.sbr
2628
*.DotSettings
@@ -32,4 +34,4 @@ _NCrunch*/
3234
build/tmp
3335
build/tmp/*
3436
!build/NuGet.exe
35-
/dep/Newtonsoft.Json.4.0.2
37+
/dep/Newtonsoft.Json.4.0.2

‎README.markdown‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Searching is fluent:
2525
.Query(q=>q.Term(f=>f.Name, "NEST", Boost: 2.0))
2626
);
2727

28-
#[Read the documentation here](http://mpdreamz.github.com/NEST)
28+
#[Read the documentation here](http://nest.azurewebsites.net/)
2929

3030
additionally [@joelabrahamsson](http://twitter.com/joelabrahamsson) wrote a great [intro into elasticsearch on .NET](http://joelabrahamsson.com/entry/extending-aspnet-mvc-music-store-with-elasticsearch)
3131
using NEST.
@@ -41,18 +41,29 @@ Nest can be installed through NuGet:
4141

4242
Or searching for "elasticsearch" will get you to nest as well.
4343

44+
#Who's using NEST?
45+
* [stackoverflow.com](http://www.stackoverflow.com) (and the rest of the stackexchange family).
46+
* [7digital.com](http://www.7digital.com) (run NEST on mono).
47+
* [rijksmuseum.nl](https://www.rijksmuseum.nl/en) (elasticsearch is the only datastorage hit for each page).
48+
* [Kiln](http://www.fogcreek.com/kiln/) FogCreek's version control & code review tooling.
49+
They are so pleased with elasticsearch that [they made a video about how pleased they are!](http://blog.fogcreek.com/kiln-powered-by-elasticsearch/)
50+
51+
Always keen to hear and list more uses ! hit me on [@Mpdreamz](https://twitter.com/Mpdreamz)
52+
4453
## Questions, bugs, comments, requests
4554

4655
All of these are more then welcome on the github issues pages! I try to to at least reply within the same day.
4756

4857
## Copyright
4958

50-
Copyright (c) 2010 Martijn Laarman and everyone wonderful enough to contribute to [NEST](https://github.com/Mpdreamz/NEST)
59+
Copyright (c) 2010 Martijn Laarman and everyone wonderful enough to contribute to [NEST](http://nest.azurewebsites.net/)
5160

5261
A special shoutout to [@stephenpope](http://github.com/stephenpope) for allowing his port
5362
of the java factory based dsl [Rubber](http://github.com/stephenpope/Rubber) to be merged into NEST.
5463
NEST now has **two types of query dsl's** (lambda and factory based)!
5564

65+
Many thanks to my employer [Q42](http://www.q42.nl) for supporting the development of NEST by donating 20% of my contract hours for NEST's development. That means I get a full paid day to work on NEST a week, whoohoo! If you are in the netherlands (The Hague/Amsterdam area) and looking for a great place to work: [we're hiring!](http://q42.nl/blog/tagged/vacature)
66+
5667
Some of the other wonderful features in NEST were pushed by these wonderful folks:
5768

5869
* [@nordbergm](https://github.com/nordbergm/NEST)

‎build/NEST.nuspec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>NEST - Elasticsearch Client</title>
77
<authors>Martijn Laarman and contributors</authors>
88
<owners>Martijn Laarman</owners>
9-
<iconUrl>http://mpdreamz.github.com/NEST/images/nuget-icon.png</iconUrl>
9+
<iconUrl>http://nest.azurewebsites.net/images/nuget-icon.png</iconUrl>
1010
<licenseUrl>http://mpdreamz.mit-license.org/</licenseUrl>
1111
<projectUrl>https://github.com/Mpdreamz/NEST</projectUrl>
1212
<summary>Elasticsearch client, focuses on a strongly typed interface to elasticsearch but works well with dynamic use cases too.</summary>
@@ -18,6 +18,8 @@
1818
<tags>elasticsearch elastic search lucene nest</tags>
1919
</metadata>
2020
<files>
21-
<file src="lib\**\Nest.*" target="lib"/>
21+
<file src="lib\**\Nest.dll" target="lib"/>
22+
<file src="lib\**\Nest.pdb" target="lib"/>
23+
<file src="lib\**\Nest.XML" target="lib"/>
2224
</files>
2325
</package>

‎build/NESTBuild.proj‎

Lines changed: 91 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
2-
<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
3-
<PropertyGroup>
4-
<SrcDir>$(MSBuildProjectDirectory)\..\src</SrcDir>
5-
<SlnDir>$(MSBuildProjectDirectory)\..</SlnDir>
6-
</PropertyGroup>
7-
8-
<PropertyGroup>
9-
<Version Condition="$(BUILD_NUMBER) != ''">$(BUILD_NUMBER)</Version>
10-
<Version Condition="$(BUILD_NUMBER) == ''">1.0.0.0</Version>
11-
</PropertyGroup>
12-
13-
<PropertyGroup>
14-
<Configuration Condition="'$(Configuration)'==''" >Release</Configuration>
15-
<BuildDir>$(MSBuildProjectDirectory)\tmp</BuildDir>
16-
<SolutionFile>$(SrcDir)\Nest.sln</SolutionFile>
17-
</PropertyGroup>
18-
19-
<Target Name="Compile">
20-
<AssemblyInfo CodeLanguage="CS"
21-
OutputFile="$(SrcDir)\NEST\Properties\AssemblyInfo.cs"
22-
AssemblyTitle="NEST"
23-
AssemblyDescription="Strongly typed ElasticSearch client."
24-
AssemblyCompany=""
25-
AssemblyProduct="NEST"
26-
AssemblyCopyright="Martijn Laarman MIT LICENSED"
27-
ComVisible="false"
28-
CLSCompliant="true"
29-
Guid="07E5CFA3-CF5F-4D17-874C-8D5CC6FA3E73"
2+
<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
3+
<PropertyGroup>
4+
<SrcDir>$(MSBuildProjectDirectory)\..\src</SrcDir>
5+
<SlnDir>$(MSBuildProjectDirectory)\..</SlnDir>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<Version Condition="$(BUILD_NUMBER) != ''">$(BUILD_NUMBER)</Version>
10+
<Version Condition="$(BUILD_NUMBER) == ''">1.0.0.0</Version>
11+
</PropertyGroup>
12+
13+
<PropertyGroup>
14+
<Configuration Condition="'$(Configuration)'==''" >Release</Configuration>
15+
<BuildDir>$(MSBuildProjectDirectory)\tmp</BuildDir>
16+
<SolutionFile>$(SrcDir)\Nest.sln</SolutionFile>
17+
</PropertyGroup>
18+
19+
<Target Name="Compile">
20+
<AssemblyInfo CodeLanguage="CS"
21+
OutputFile="$(SrcDir)\NEST\Properties\AssemblyInfo.cs"
22+
AssemblyTitle="NEST"
23+
AssemblyDescription="Strongly typed ElasticSearch client."
24+
AssemblyCompany=""
25+
AssemblyProduct="NEST"
26+
AssemblyCopyright="Martijn Laarman MIT LICENSED"
27+
ComVisible="false"
28+
CLSCompliant="true"
29+
Guid="07E5CFA3-CF5F-4D17-874C-8D5CC6FA3E73"
3030

31-
AssemblyVersion="$(Version)"
32-
AssemblyFileVersion="$(Version)"/>
31+
AssemblyVersion="$(Version)"
32+
AssemblyFileVersion="$(Version)"/>
3333
<AssemblyInfo CodeLanguage="CS"
3434
OutputFile="$(SrcDir)\Nest.Connection.Thrift\Properties\AssemblyInfo.cs"
3535
AssemblyTitle="Nest.Connection.Thrift"
@@ -43,39 +43,55 @@
4343

4444
AssemblyVersion="$(Version)"
4545
AssemblyFileVersion="$(Version)"/>
46+
<AssemblyInfo CodeLanguage="CS"
47+
OutputFile="$(SrcDir)\Nest.Dsl.Factory\Properties\AssemblyInfo.cs"
48+
AssemblyTitle="Nest.Dsl.Factory"
49+
AssemblyDescription="Nest already has a complete lambda DSL, this package introduces a second DSL that's a port of the Java DSL"
50+
AssemblyCompany=""
51+
AssemblyProduct="Nest.Dsl.Factory"
52+
AssemblyCopyright="Martijn Laarman MIT LICENSED"
53+
ComVisible="false"
54+
CLSCompliant="true"
55+
Guid="665cc582-c91f-4f6c-924a-614289fa9449"
56+
57+
AssemblyVersion="$(Version)"
58+
AssemblyFileVersion="$(Version)"/>
4659

47-
<MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(Configuration)" />
48-
</Target>
49-
50-
<Target Name="NuGetPackage" DependsOnTargets="Compile">
51-
<ItemGroup>
52-
<MainBinaries Include="$(SrcDir)\**\Nest\bin\$(Configuration)\**\*.*" />
60+
<MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(Configuration)" />
61+
</Target>
62+
63+
<Target Name="NuGetPackage" DependsOnTargets="Compile">
64+
<ItemGroup>
65+
<MainBinaries Include="$(SrcDir)\**\Nest\bin\$(Configuration)\**\*.*" />
5366
<ThriftBinaries Include="$(SrcDir)\**\Nest.Connection.Thrift\bin\$(Configuration)\**\*.*" />
54-
</ItemGroup>
55-
56-
<!-- First copy the nuspec template files to the build dir -->
57-
<Copy SourceFiles="..\build\NEST.nuspec" DestinationFolder="$(BuildDir)" />
67+
<FactoryDslBinaries Include="$(SrcDir)\**\Nest.Dsl.Factory\bin\$(Configuration)\**\*.*" />
68+
</ItemGroup>
69+
70+
<!-- First copy the nuspec template files to the build dir -->
71+
<Copy SourceFiles="..\build\NEST.nuspec" DestinationFolder="$(BuildDir)" />
5872
<Copy SourceFiles="..\build\Nest.Connection.Thrift.nuspec" DestinationFolder="$(BuildDir)" />
59-
60-
<!-- Copy the source files to the package dir -->
61-
<Copy SourceFiles="@(MainBinaries)" DestinationFolder="$(BuildDir)\lib\NET4\" />
73+
<Copy SourceFiles="..\build\Nest.Dsl.Factory.nuspec" DestinationFolder="$(BuildDir)" />
74+
75+
<!-- Copy the source files to the package dir -->
76+
<Copy SourceFiles="@(MainBinaries)" DestinationFolder="$(BuildDir)\lib\NET4\" />
6277
<Copy SourceFiles="@(ThriftBinaries)" DestinationFolder="$(BuildDir)\lib\NET4\" />
63-
64-
<!-- Get the version number of the main FV assembly to insert into the nuspec files -->
65-
<GetAssemblyIdentity AssemblyFiles="$(BuildDir)\lib\NET4\Nest.dll">
66-
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
67-
</GetAssemblyIdentity>
68-
69-
<!-- insert the version number into the nuspec files -->
70-
<XmlUpdate
71-
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
72-
Prefix="n"
73-
XmlFileName="$(BuildDir)\NEST.nuspec"
74-
XPath="/n:package/n:metadata/n:version"
75-
Value="%(AsmInfo.Version)" />
76-
77-
<Exec WorkingDirectory="$(BuildDir)"
78-
Command="$(MSBuildProjectDirectory)\nuget.exe pack $(BuildDir)\NEST.nuspec" />
78+
<Copy SourceFiles="@(FactoryDslBinaries)" DestinationFolder="$(BuildDir)\lib\NET4\" />
79+
80+
<!-- Get the version number of the main FV assembly to insert into the nuspec files -->
81+
<GetAssemblyIdentity AssemblyFiles="$(BuildDir)\lib\NET4\Nest.dll">
82+
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
83+
</GetAssemblyIdentity>
84+
85+
<!-- insert the version number into the nuspec files -->
86+
<XmlUpdate
87+
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
88+
Prefix="n"
89+
XmlFileName="$(BuildDir)\NEST.nuspec"
90+
XPath="/n:package/n:metadata/n:version"
91+
Value="%(AsmInfo.Version)" />
92+
93+
<Exec WorkingDirectory="$(BuildDir)"
94+
Command="$(MSBuildProjectDirectory)\nuget.exe pack $(BuildDir)\NEST.nuspec" />
7995

8096
<XmlUpdate
8197
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
@@ -86,12 +102,22 @@
86102

87103
<Exec WorkingDirectory="$(BuildDir)"
88104
Command="$(MSBuildProjectDirectory)\nuget.exe pack $(BuildDir)\Nest.Connection.Thrift.nuspec" />
89-
105+
106+
<XmlUpdate
107+
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
108+
Prefix="n"
109+
XmlFileName="$(BuildDir)\Nest.Dsl.Factory.nuspec"
110+
XPath="/n:package/n:metadata/n:version"
111+
Value="%(AsmInfo.Version)" />
112+
113+
<Exec WorkingDirectory="$(BuildDir)"
114+
Command="$(MSBuildProjectDirectory)\nuget.exe pack $(BuildDir)\Nest.Dsl.Factory.nuspec" />
115+
90116
<ItemGroup>
91-
<Packages Include="$(BuildDir)\*.nupkg" />
92-
</ItemGroup>
93-
<Copy SourceFiles="@(Packages)" DestinationFolder="$(BuildDir)\..\" />
117+
<Packages Include="$(BuildDir)\*.nupkg" />
118+
</ItemGroup>
119+
<Copy SourceFiles="@(Packages)" DestinationFolder="$(BuildDir)\..\" />
94120

95-
<RemoveDir Directories="$(BuildDir)" />
96-
</Target>
121+
<RemoveDir Directories="$(BuildDir)" />
122+
</Target>
97123
</Project>

‎build/Nest.Connection.Thrift.nuspec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>Nest.Connection.Thrift - Thrift support for NEST</title>
77
<authors>Martijn Laarman and contributors</authors>
88
<owners>Martijn Laarman</owners>
9-
<iconUrl>http://mpdreamz.github.com/NEST/images/nuget-icon.png</iconUrl>
9+
<iconUrl>http://nest.azurewebsites.net/images/nuget-icon.png</iconUrl>
1010
<licenseUrl>http://mpdreamz.mit-license.org/</licenseUrl>
1111
<projectUrl>https://github.com/Mpdreamz/NEST</projectUrl>
1212
<summary>Thrift connection support for NEST Elasticsearch client</summary>
@@ -15,10 +15,13 @@
1515
<dependencies>
1616
<dependency id="NEST" />
1717
<dependency id="Newtonsoft.Json" />
18+
<dependency id="NetReflector" />
1819
</dependencies>
1920
<tags>elasticsearch elastic search lucene nest</tags>
2021
</metadata>
2122
<files>
22-
<file src="lib\**\Nest.Connection.Thrift.*" target="lib"/>
23+
<file src="lib\**\Nest.Connection.Thrift.dll" target="lib"/>
24+
<file src="lib\**\Nest.Connection.Thrift.pdb" target="lib"/>
25+
<file src="lib\**\Nest.Connection.Thrift.XML" target="lib"/>
2326
</files>
2427
</package>

‎build/Nest.Dsl.Factory.nuspec‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>Nest.Dsl.Factory</id>
5+
<version>0.9.0.0</version>
6+
<title>Nest.Dsl.Factory - A port of the java DSL</title>
7+
<authors>Martijn Laarman and contributors</authors>
8+
<owners>Martijn Laarman</owners>
9+
<iconUrl>http://nest.azurewebsites.net/images/nuget-icon.png</iconUrl>
10+
<licenseUrl>http://mpdreamz.mit-license.org/</licenseUrl>
11+
<projectUrl>https://github.com/Mpdreamz/NEST</projectUrl>
12+
<summary>Nest already has a complete lambda DSL, this package introduces a second DSL that's a port of the Java DSL</summary>
13+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14+
<description>Nest already has a complete lambda DSL, this package introduces a second DSL that's a port of the Java DSL</description>
15+
<dependencies>
16+
<dependency id="NEST" />
17+
<dependency id="Newtonsoft.Json" />
18+
</dependencies>
19+
<tags>elasticsearch elastic search lucene nest</tags>
20+
</metadata>
21+
<files>
22+
<file src="lib\**\Nest.Dsl.Factory.dll" target="lib"/>
23+
<file src="lib\**\Nest.Dsl.Factory.pdb" target="lib"/>
24+
<file src="lib\**\Nest.Dsl.Factory.XML" target="lib"/>
25+
</files>
26+
</package>

‎dep/AutoPoco.1.0.0.0/AutoPoco.1.0.0.0.nuspec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id>AutoPoco</id>
5+
<version>1.0.0.0</version>
6+
<title>AutoPoco</title>
7+
<authors>Rob Ashton</authors>
8+
<owners>Rob Ashton</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<description>AutoPoco is a convention-based and fluent test-object generation framework built to aid the creation of objects for unit tests or for test-data population into databases. Minimum configuration is required to get up and started, and manual configuration is supported as well as conventions.</description>
11+
<summary>AutoPoco is a convention-based and fluent test-object generation framework built to aid the creation of objects for unit tests or for test-data population into databases</summary>
12+
<releaseNotes />
13+
<copyright />
14+
<language />
15+
<references>
16+
<reference file="AutoPoco.dll" />
17+
</references>
18+
</metadata>
19+
</package>

‎dep/AutoPoco.1.0.0.0/lib/AutoPoco.dll‎

54.5 KB
Binary file not shown.

‎dep/NetReflector.1.1.2009/NetReflector.1.1.2009.nuspec‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id>NetReflector</id>
5+
<version>1.1.2009</version>
6+
<title>NetReflector</title>
7+
<authors>Owen Rogers and Contributors</authors>
8+
<owners>Owen Rogers and Contributors</owners>
9+
<licenseUrl>https://github.com/ccnet/NetReflector/blob/master/LICENSE.txt</licenseUrl>
10+
<projectUrl>https://github.com/ccnet/NetReflector</projectUrl>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>NetReflector is a dynamic reflective populator for the .NET platform.
13+
It uses C# attributes to dynamically construct an object model from a configuration file.
14+
It greatly simplifies building configurable, pluggable applications by handling the mapping.
15+
16+
NetReflector is released under LGPL v3. See the the License URL for more details.
17+
18+
NetReflector is used for instance in CruiseControl.NET (http://www.cruisecontrolnet.org/).</description>
19+
<summary>NetReflector</summary>
20+
<releaseNotes />
21+
<copyright>Copyright © 2004 - 2009 R. Owen Rogers and Contributors</copyright>
22+
<tags>NetReflector</tags>
23+
<references>
24+
<reference file="NetReflector.dll" />
25+
</references>
26+
</metadata>
27+
</package>

0 commit comments

Comments
 (0)