diff --git a/src/Microsoft.OData.Extensions.Client.Abstractions/Microsoft.OData.Extensions.Client.Abstractions.csproj b/src/Microsoft.OData.Extensions.Client.Abstractions/Microsoft.OData.Extensions.Client.Abstractions.csproj index 2d087ad..25c6bf3 100644 --- a/src/Microsoft.OData.Extensions.Client.Abstractions/Microsoft.OData.Extensions.Client.Abstractions.csproj +++ b/src/Microsoft.OData.Extensions.Client.Abstractions/Microsoft.OData.Extensions.Client.Abstractions.csproj @@ -9,7 +9,7 @@ ProductRoot=$(productBinPath);version=$(VERSION_SEMANITCS_CLIENT_ABSTRACTIONS) - $(NuspecProperties);ODataClientPackageDependency=7.6.0 + $(NuspecProperties);ODataClientPackageDependency=7.7.0 @@ -18,6 +18,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - \ No newline at end of file + diff --git a/src/Microsoft.OData.Extensions.Client/Internals/Handlers/HttpClientRequestMessage.cs b/src/Microsoft.OData.Extensions.Client/Internals/Handlers/HttpClientRequestMessage.cs index c3a9d84..898f8c5 100644 --- a/src/Microsoft.OData.Extensions.Client/Internals/Handlers/HttpClientRequestMessage.cs +++ b/src/Microsoft.OData.Extensions.Client/Internals/Handlers/HttpClientRequestMessage.cs @@ -1,4 +1,4 @@ -//--------------------------------------------------------------------- +//--------------------------------------------------------------------- // // Copyright (c) .NET Foundation and Contributors. All rights reserved. See License.txt in the project root for license information. // @@ -150,6 +150,51 @@ public override ICredentials Credentials this.requestMessage.Properties[typeof(ICredentials).FullName] = value; } } + + /// + /// Gets or sets the timeout (in seconds) for this request. + /// + public override int Timeout + { + get + { + return (int)this.client.Timeout.TotalSeconds; + } + set + { + this.client.Timeout = new TimeSpan(0, 0, value); + } + } + + public override int ReadWriteTimeout + { + get + { + return (int)this.client.Timeout.TotalSeconds; + } + set + { + this.client.Timeout = new TimeSpan(0, 0, value); + } + } + +#if !(NETCOREAPP1_0 || NETCOREAPP2_0) + /// + /// Gets or sets a value that indicates whether to send data in segments to the Internet resource. + /// + public override bool SendChunked + { + get + { + bool? transferEncodingChunked = this.requestMessage.Headers.TransferEncodingChunked; + return transferEncodingChunked.HasValue && transferEncodingChunked.Value; + } + set + { + this.requestMessage.Headers.TransferEncodingChunked = value; + } + } +#endif /// /// Returns the value of the header with the given name. @@ -254,6 +299,18 @@ public override IODataResponseMessage EndGetResponse(IAsyncResult asyncResult) { return UnwrapAggregateException(() => new HttpClientResponseMessage(((Task)asyncResult).Result, this.config)); } + +#if !(NETCOREAPP1_0 || NETCOREAPP2_0) + public override IODataResponseMessage GetResponse() + { + return UnwrapAggregateException(() => + { + var send = CreateSendTask(); + send.Wait(); + return new HttpClientResponseMessage(send.Result, this.config); + }); + } +#endif /// /// Dispose the object. @@ -313,4 +370,4 @@ private static DataServiceTransportException ConvertToDataServiceWebException(We return new DataServiceTransportException(errorResponseMessage, webException); } } -} \ No newline at end of file +} diff --git a/test/EndToEndTests/GeneratedClient/ODataVerificationClient/ODataVerificationClient.csproj b/test/EndToEndTests/GeneratedClient/ODataVerificationClient/ODataVerificationClient.csproj index 53caa52..9a0a8f2 100644 --- a/test/EndToEndTests/GeneratedClient/ODataVerificationClient/ODataVerificationClient.csproj +++ b/test/EndToEndTests/GeneratedClient/ODataVerificationClient/ODataVerificationClient.csproj @@ -5,7 +5,8 @@ - + + diff --git a/test/EndToEndTests/Tests/Microsoft.OData.Extensions.Client.E2ETests/OData.Client.E2ETests.csproj b/test/EndToEndTests/Tests/Microsoft.OData.Extensions.Client.E2ETests/OData.Client.E2ETests.csproj index 4b334b7..74599bf 100644 --- a/test/EndToEndTests/Tests/Microsoft.OData.Extensions.Client.E2ETests/OData.Client.E2ETests.csproj +++ b/test/EndToEndTests/Tests/Microsoft.OData.Extensions.Client.E2ETests/OData.Client.E2ETests.csproj @@ -13,7 +13,7 @@ - + @@ -35,4 +35,4 @@ - \ No newline at end of file +