diff --git a/build/dependencies.props b/build/dependencies.props index f70aa4bbfb..a1bdba8b21 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,76 +5,76 @@ 0.10.11 2.1.0-preview2-15694 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 5.2.4-preview1 2.6.1 2.6.1 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 2.1.0-preview2-25711-01 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 - 2.1.0-preview2-30020 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 + 2.1.0-preview2-30045 2.0.0 2.1.0-preview2-26130-04 - 2.1.0-preview2-30020 + 2.1.0-preview2-30045 15.3.0 4.7.49 1.0.1 diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs index 8201e07634..cc21792d71 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs @@ -9,7 +9,7 @@ using System.Runtime.ExceptionServices; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.WebUtilities; @@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters ObjectPoolProvider objectPoolProvider) : this(logger, serializerSettings, charPool, objectPoolProvider, suppressInputFormatterBuffering: false) { - // This constructor by default buffers the request body as its the most secure setting + // This constructor by default buffers the request body as its the most secure setting } /// @@ -240,9 +240,9 @@ namespace Microsoft.AspNetCore.Mvc.Formatters if (!request.Body.CanSeek && !suppressInputFormatterBuffering) { - // JSON.Net does synchronous reads. In order to avoid blocking on the stream, we asynchronously - // read everything into a buffer, and then seek back to the beginning. - BufferingHelper.EnableRewind(request); + // JSON.Net does synchronous reads. In order to avoid blocking on the stream, we asynchronously + // read everything into a buffer, and then seek back to the beginning. + request.EnableBuffering(); Debug.Assert(request.Body.CanSeek); await request.Body.DrainAsync(CancellationToken.None); diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs index 204e2a661f..7916715002 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Xml; -using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Formatters.Xml; using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal; using Microsoft.AspNetCore.Mvc.Internal; @@ -144,9 +144,9 @@ namespace Microsoft.AspNetCore.Mvc.Formatters if (!request.Body.CanSeek && !suppressInputFormatterBuffering) { - // XmlDataContractSerializer does synchronous reads. In order to avoid blocking on the stream, we asynchronously - // read everything into a buffer, and then seek back to the beginning. - BufferingHelper.EnableRewind(request); + // XmlDataContractSerializer does synchronous reads. In order to avoid blocking on the stream, we asynchronously + // read everything into a buffer, and then seek back to the beginning. + request.EnableBuffering(); Debug.Assert(request.Body.CanSeek); await request.Body.DrainAsync(CancellationToken.None); @@ -278,4 +278,4 @@ namespace Microsoft.AspNetCore.Mvc.Formatters return (DataContractSerializer)serializer; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs index b4ada28b05..6708c81257 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Xml; using System.Xml.Serialization; -using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Formatters.Xml; using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal; using Microsoft.AspNetCore.Mvc.Internal; @@ -125,9 +125,9 @@ namespace Microsoft.AspNetCore.Mvc.Formatters if (!request.Body.CanSeek && !suppressInputFormatterBuffering) { - // XmlSerializer does synchronous reads. In order to avoid blocking on the stream, we asynchronously - // read everything into a buffer, and then seek back to the beginning. - BufferingHelper.EnableRewind(request); + // XmlSerializer does synchronous reads. In order to avoid blocking on the stream, we asynchronously + // read everything into a buffer, and then seek back to the beginning. + request.EnableBuffering(); Debug.Assert(request.Body.CanSeek); await request.Body.DrainAsync(CancellationToken.None); @@ -256,4 +256,4 @@ namespace Microsoft.AspNetCore.Mvc.Formatters return (XmlSerializer)serializer; } } -} \ No newline at end of file +}