Skip to content

Commit aff99fb

Browse files
committed
fix #1861 limit Elasticsearch.NET dependency to < 2
1 parent 7484b99 commit aff99fb

5 files changed

+11
-5
lines changed

Diff for: build/Elasticsearch.Net.Connection.HttpClient.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -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.7.1"/>
16+
<dependency id="Elasticsearch.Net" version="[1.7.1,2)"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

Diff for: build/Elasticsearch.Net.Connection.Thrift.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -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.7.1"/>
16+
<dependency id="Elasticsearch.Net" version="[1.7.1,2)"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

Diff for: build/Elasticsearch.Net.JsonNET.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
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.7.1"/>
16+
<dependency id="Elasticsearch.Net" version="[1.7.1,2)"/>
1717
<dependency id="Newtonsoft.Json" version="[7,8)"/>
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>

Diff for: build/NEST.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -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.7.1"/>
16+
<dependency id="Elasticsearch.Net" version="[1.7.1,2)"/>
1717
<dependency id="Newtonsoft.Json" version="[7,8)" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>

Diff for: build/scripts/Releasing.fsx

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@ type Release() =
1515
CreateDir Paths.NugetOutput
1616
let package = (sprintf @"build\%s.nuspec" name)
1717
let packageContents = ReadFileAsString package
18-
let re = @"(?<start>\<version\>|""(Elasticsearch.Net|Nest)"" version="")[^""><]+(?<end>\<\/version\>|"")"
18+
//patch version itself
19+
let re = @"(?<start>\<version\>)[^""><]+(?<end>\<\/version\>)"
1920
let replacedContents = regex_replace re (sprintf "${start}%s${end}" Versioning.FileVersion) packageContents
2021
WriteStringToFile false package replacedContents
22+
23+
//patch dependency
24+
let re = @"(?<start>""(Elasticsearch.Net|Nest)"" version="")[^""><]+(?<end>"")"
25+
let replacedContents = regex_replace re (sprintf "${start}[%s,2)${end}" Versioning.FileVersion) packageContents
26+
WriteStringToFile false package replacedContents
2127

2228
let dir = sprintf "%s/%s/" Paths.BuildOutput name
2329
let nugetOutFile = Paths.Output(sprintf "%s/%s.%s.nupkg" name name Versioning.FileVersion);

0 commit comments

Comments
 (0)