react to aspnet/HttpAbstractions#146 changes

src/Microsoft.AspNet.Mvc.Core/AntiForgery/AntiForgeryTokenStore.cs

@@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc
 
         public async Task<AntiForgeryToken> GetFormTokenAsync(HttpContext httpContext)
         {
-            var form = await httpContext.Request.GetFormAsync();
+            var form = await httpContext.Request.ReadFormAsync();
             var value = form[_config.FormFieldName];
             if (string.IsNullOrEmpty(value))
             {

src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/FormValueProviderFactory.cs

@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             {
                 var culture = GetCultureInfo(request);
                 return new ReadableStringCollectionValueProvider<IFormDataValueProviderMetadata>(
-                    () => request.GetFormAsync(),
+                    async () => await request.ReadFormAsync(),
                     culture);
             }
 

test/Microsoft.AspNet.Mvc.Core.Test/AntiXsrf/AntiForgeryTokenStoreTest.cs

@@ -164,13 +164,12 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             // Arrange
             var mockHttpContext = new Mock<HttpContext>();
             var requestContext = new Mock<HttpRequest>();
-            IReadableStringCollection formsCollection =
+            var formCollection = new Mock<IFormCollection>();
-                new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", string.Empty } });
+            formCollection.Setup(f => f["form-field-name"]).Returns(string.Empty);
-            requestContext.Setup(o => o.GetFormAsync(CancellationToken.None))
+            requestContext.Setup(o => o.ReadFormAsync(CancellationToken.None))
-                          .Returns(Task.FromResult(formsCollection));
+                          .Returns(Task.FromResult(formCollection.Object));
             mockHttpContext.Setup(o => o.Request)
                            .Returns(requestContext.Object);
-
             var config = new AntiForgeryOptions()
             {
                 FormFieldName = "form-field-name"
@@ -191,12 +190,12 @@ namespace Microsoft.AspNet.Mvc.Core.Test
         public async Task GetFormToken_FormFieldIsInvalid_PropagatesException()
         {
             // Arrange
-            IReadableStringCollection formsCollection =
+            var formCollection = new Mock<IFormCollection>();
-                new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", "invalid-value" } });
+            formCollection.Setup(f => f["form-field-name"]).Returns("invalid-value");
 
             var requestContext = new Mock<HttpRequest>();
-            requestContext.Setup(o => o.GetFormAsync(CancellationToken.None))
+            requestContext.Setup(o => o.ReadFormAsync(CancellationToken.None))
-                          .Returns(Task.FromResult(formsCollection));
+                          .Returns(Task.FromResult(formCollection.Object));
 
             var mockHttpContext = new Mock<HttpContext>();
             mockHttpContext.Setup(o => o.Request)
@@ -233,10 +232,10 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             // Arrange
             var mockHttpContext = new Mock<HttpContext>();
             var requestContext = new Mock<HttpRequest>();
-            IReadableStringCollection formsCollection =
+            var formCollection = new Mock<IFormCollection>();
-                new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", "valid-value" } });
+            formCollection.Setup(f => f["form-field-name"]).Returns("valid-value");
-            requestContext.Setup(o => o.GetFormAsync(CancellationToken.None))
+            requestContext.Setup(o => o.ReadFormAsync(CancellationToken.None))
-                          .Returns(Task.FromResult(formsCollection));
+                          .Returns(Task.FromResult(formCollection.Object));
             mockHttpContext.Setup(o => o.Request)
                            .Returns(requestContext.Object);
 

test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingExtensions.cs

@@ -155,7 +155,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         {
             var queryString = QueryHelpers.ParseQuery(query);
 
-            return queryString[key];
+            return queryString[key].FirstOrDefault();
         }
     }
 }

test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/FormValueProviderFactoryTests.cs

@@ -48,9 +48,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
 
         private static ValueProviderFactoryContext CreateContext(string contentType)
         {
-            var collection = Mock.Of<IReadableStringCollection>();
+            var collection = Mock.Of<IFormCollection>();
             var request = new Mock<HttpRequest>();
-            request.Setup(f => f.GetFormAsync(CancellationToken.None)).Returns(Task.FromResult(collection));
+            request.Setup(f => f.ReadFormAsync(CancellationToken.None)).Returns(Task.FromResult(collection));
             request.SetupGet(r => r.ContentType).Returns(contentType);
 
             var context = new Mock<HttpContext>();

test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/ReadableStringCollectionValueProviderTest.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.WebUtilities.Collections;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding.Test