Skip to content

Commit cc201d8

Browse files
committed
Merge pull request #798 from elasticsearch/feature/nuget-httpclient-connection
Feature/nuget httpclient connection
2 parents d2c5002 + c3e8349 commit cc201d8

File tree

4 files changed

+40
-0
lines changed

4 files changed

+40
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>Elasticsearch.Net.Connection.HttpClient</id>
5+
<version>1.0.0-rc2</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.0.0-rc2"/>
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>
25+
</package>

build/build.fsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Target "Version" (fun _ ->
172172
| f when f = "elasticsearch.net" -> "Elasticsearch.Net - oficial low level elasticsearch client"
173173
| f when f = "nest" -> "NEST - oficial high level elasticsearch client"
174174
| f when f = "elasticsearch.net.connection.thrift" -> "Elasticsearc.Net.Connection.Thrift - Add thrift support to elasticsearch."
175+
| f when f = "elasticsearch.net.connection.httpclient" -> "Elasticsearc.Net.Connection.HttpClient - IConnection implementation that uses HttpClient (.NET 4.5 only)"
175176
| _ -> sprintf "%s" name
176177

177178
!! "src/**/AssemblyInfo.cs"
@@ -197,10 +198,12 @@ Target "Release" (fun _ ->
197198

198199
nugetPack("Elasticsearch.Net")
199200
nugetPack("Elasticsearch.Net.Connection.Thrift")
201+
nugetPack("Elasticsearch.Net.Connection.HttpClient")
200202
nugetPack("Nest")
201203

202204
validateSignedAssembly("Elasticsearch.Net")
203205
validateSignedAssembly("Elasticsearch.Net.Connection.Thrift")
206+
validateSignedAssembly("Elasticsearch.Net.Connection.HttpClient")
204207
validateSignedAssembly("Nest")
205208
)
206209

src/Connections/Elasticsearch.Net.Connection.HttpClient/Elasticsearch.Net.Connection.HttpClient.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
<WarningLevel>4</WarningLevel>
3333
<Prefer32Bit>false</Prefer32Bit>
3434
<NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
35+
<DocumentationFile>bin\Release\Elasticsearch.Net.Connection.HttpClient.XML</DocumentationFile>
36+
</PropertyGroup>
37+
<PropertyGroup>
38+
<SignAssembly>true</SignAssembly>
39+
</PropertyGroup>
40+
<PropertyGroup>
41+
<AssemblyOriginatorKeyFile>..\..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
3542
</PropertyGroup>
3643
<ItemGroup>
3744
<Reference Include="System" />
@@ -56,6 +63,10 @@
5663
</ProjectReference>
5764
</ItemGroup>
5865
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
66+
<PropertyGroup>
67+
<PreBuildEvent Condition=" '$(OS)' != 'Unix' ">IF NOT EXIST "$(SolutionDir)..\build\keys\keypair.snk" (CD "$(SolutionDir).." &amp;&amp; "build.bat" CreateKeysIfAbsent &amp;&amp; CD %25~dp0)
68+
</PreBuildEvent>
69+
</PropertyGroup>
5970
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6071
Other similar extension points exist, see Microsoft.Common.targets.
6172
<Target Name="BeforeBuild">

src/Elasticsearch.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D55
2727
..\build.bat = ..\build.bat
2828
..\build\build.fsx = ..\build\build.fsx
2929
..\build\download-nuget.ps1 = ..\build\download-nuget.ps1
30+
..\build\Elasticsearch.Net.Connection.HttpClient.nuspec = ..\build\Elasticsearch.Net.Connection.HttpClient.nuspec
3031
..\build\Elasticsearch.Net.Connection.Thrift.nuspec = ..\build\Elasticsearch.Net.Connection.Thrift.nuspec
3132
..\build\Elasticsearch.Net.nuspec = ..\build\Elasticsearch.Net.nuspec
3233
..\build\InheritDoc.fsx = ..\build\InheritDoc.fsx

0 commit comments

Comments
 (0)