Skip to content

Feature/nuget httpclient connection #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2014
Merged

Feature/nuget httpclient connection #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1c7de8
HttpClient connection now also signs its output and the release build…
Mpdreamz Jul 16, 2014
c3e8349
added new nuspec file to solution
Mpdreamz Jul 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions build/Elasticsearch.Net.Connection.HttpClient.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Elasticsearch.Net.Connection.HttpClient</id>
<version>1.0.0-rc2</version>
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
<authors>Elasticsearch Inc. and contributors</authors>
<owners>Elasticsearch Inc.</owners>
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
<summary>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</summary>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
<dependencies>
<dependency id="Elasticsearch.Net" version="1.0.0-rc2"/>
</dependencies>
<tags>elasticsearch elastic search lucene thrift nest</tags>
</metadata>
<files>
<file src="output\Elasticsearch.Net.Connection.HttpClient\Elasticsearch.Net.Connection.HttpClient.dll" target="lib\net45"/>
<file src="output\Elasticsearch.Net.Connection.HttpClient\Elasticsearch.Net.Connection.HttpClient.pdb" target="lib\net45"/>
<file src="output\Elasticsearch.Net.Connection.HttpClient\Elasticsearch.Net.Connection.HttpClient.XML" target="lib\net45"/>
</files>
</package>
3 changes: 3 additions & 0 deletions build/build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Target "Version" (fun _ ->
| f when f = "elasticsearch.net" -> "Elasticsearch.Net - oficial low level elasticsearch client"
| f when f = "nest" -> "NEST - oficial high level elasticsearch client"
| f when f = "elasticsearch.net.connection.thrift" -> "Elasticsearc.Net.Connection.Thrift - Add thrift support to elasticsearch."
| f when f = "elasticsearch.net.connection.httpclient" -> "Elasticsearc.Net.Connection.HttpClient - IConnection implementation that uses HttpClient (.NET 4.5 only)"
| _ -> sprintf "%s" name

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

nugetPack("Elasticsearch.Net")
nugetPack("Elasticsearch.Net.Connection.Thrift")
nugetPack("Elasticsearch.Net.Connection.HttpClient")
nugetPack("Nest")

validateSignedAssembly("Elasticsearch.Net")
validateSignedAssembly("Elasticsearch.Net.Connection.Thrift")
validateSignedAssembly("Elasticsearch.Net.Connection.HttpClient")
validateSignedAssembly("Nest")
)

Expand Down
11 changes: 11 additions & 0 deletions ...ns/Elasticsearch.Net.Connection.HttpClient/Elasticsearch.Net.Connection.HttpClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
<DocumentationFile>bin\Release\Elasticsearch.Net.Connection.HttpClient.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -56,6 +63,10 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Unix' ">IF NOT EXIST "$(SolutionDir)..\build\keys\keypair.snk" (CD "$(SolutionDir).." &amp;&amp; "build.bat" CreateKeysIfAbsent &amp;&amp; CD %25~dp0)
</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
1 change: 1 addition & 0 deletions src/Elasticsearch.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D55
..\build.bat = ..\build.bat
..\build\build.fsx = ..\build\build.fsx
..\build\download-nuget.ps1 = ..\build\download-nuget.ps1
..\build\Elasticsearch.Net.Connection.HttpClient.nuspec = ..\build\Elasticsearch.Net.Connection.HttpClient.nuspec
..\build\Elasticsearch.Net.Connection.Thrift.nuspec = ..\build\Elasticsearch.Net.Connection.Thrift.nuspec
..\build\Elasticsearch.Net.nuspec = ..\build\Elasticsearch.Net.nuspec
..\build\InheritDoc.fsx = ..\build\InheritDoc.fsx
Expand Down