Skip to content

Commit fab9eec

Browse files
gmarzgmarz
committed
Merge tag '1.1.1'
1.1.1
2 parents 3a57b78 + 92b5ea1 commit fab9eec

File tree

20 files changed

+39
-39
lines changed

20 files changed

+39
-39
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.HttpClient</id>
5-
<version>1.1.0</version>
5+
<version>1.1.1</version>
66
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -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.1.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.1.1"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.Thrift</id>
5-
<version>1.1.0</version>
5+
<version>1.1.1</version>
66
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -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.1.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.1.1"/>
1717
<dependency id="NetReflector" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>

‎build/Elasticsearch.Net.JsonNET.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.JsonNET</id>
5-
<version>1.1.0</version>
5+
<version>1.1.1</version>
66
<title>Elasticsearch.Net.JsonNET - Json.NET serializer for the low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -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.1.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.1.1"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

‎build/Elasticsearch.Net.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net</id>
5-
<version>1.1.0</version>
5+
<version>1.1.1</version>
66
<title>Elasticsearch.Net - official low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>

‎build/NEST.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>NEST</id>
5-
<version>1.1.0</version>
5+
<version>1.1.1</version>
66
<title>NEST - Elasticsearch Client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -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.1.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.1.1"/>
1717
<dependency id="Newtonsoft.Json" version="6.0.1" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.1.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.1.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.1.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.1.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur
126126
else if (!string.IsNullOrWhiteSpace(DefaultContentType))
127127
request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(DefaultContentType));
128128

129-
if (!string.IsNullOrWhiteSpace(DefaultContentType))
130-
request.Content.Headers.ContentType = new MediaTypeHeaderValue(DefaultContentType);
131129

132130
if (!string.IsNullOrEmpty(uri.UserInfo))
133131
{
@@ -137,6 +135,8 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur
137135
if (method != HttpMethod.Get && method != HttpMethod.Head && data != null && data.Length > 0)
138136
{
139137
request.Content = new ByteArrayContent(data);
138+
if (!string.IsNullOrWhiteSpace(DefaultContentType) && request.Content != null && request.Content.Headers != null)
139+
request.Content.Headers.ContentType = new MediaTypeHeaderValue(DefaultContentType);
140140
}
141141

142142
var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);

‎src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.1.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.1.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.1.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.1.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

0 commit comments

Comments
 (0)