Merge branch 'benaadams/build-issues' into dev

appveyor.yml

@@ -4,6 +4,4 @@ build_script:
   - build.cmd --quiet verify
 clone_depth: 1
 test: off
-deploy: off
-environment:
-  NO_PARALLEL_TEST_PROJECTS: Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
+deploy: off

src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs

@@ -331,7 +331,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure
         /// </remarks>
         /// <param name="begin">The iterator from which to start the known string lookup.</param>
         /// <param name="scan">If we found a valid method, then scan will be updated to new position</param>
-        /// <param name="knownMethod">A reference to a pre-allocated known string, if the input matches any.</param>
+        /// <param name="knownVersion">A reference to a pre-allocated known string, if the input matches any.</param>
         /// <returns><c>true</c> if the input matches a known string, <c>false</c> otherwise.</returns>
         public static bool GetKnownVersion(this MemoryPoolIterator2 begin, ref MemoryPoolIterator2 scan, out string knownVersion)
         {

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json

@@ -5,7 +5,6 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
-    "System.Net.Http": "4.0.1-*",
     "xunit": "2.1.0",
     "Microsoft.AspNetCore.Internal.libuv-Darwin": {
       "version": "1.0.0-*",
@@ -19,13 +18,17 @@
   "frameworks": {
     "dnxcore50": {
       "dependencies": {
-        "dotnet-test-xunit": "1.0.0-dev-*"
+        "dotnet-test-xunit": "1.0.0-dev-*",
+        "System.Net.Http": "4.0.1-*"
       },
       "imports": "portable-net451+win8"
     },
     "net451": {
       "dependencies": {
         "xunit.runner.console": "2.1.0"
+      },
+      "frameworkAssemblies": {
+        "System.Net.Http": "4.0.0.0"
       }
     }
   },

test/Microsoft.AspNetCore.Server.KestrelTests/project.json

@@ -5,7 +5,6 @@
     "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
-    "System.Net.Http": "4.0.1-*",
     "xunit": "2.1.0",
     "Microsoft.AspNetCore.Internal.libuv-Darwin": {
       "version": "1.0.0-*",
@@ -22,6 +21,7 @@
         "System.Diagnostics.TraceSource": "4.0.0-*",
         "System.Globalization.Extensions": "4.0.1-*",
         "System.IO": "4.1.0-*",
+        "System.Net.Http": "4.0.1-*",
         "System.Net.Http.WinHttpHandler": "4.0.0-*",
         "System.Net.Sockets": "4.1.0-*",
         "System.Runtime.Handles": "4.0.1-*",
@@ -32,6 +32,9 @@
     "net451": {
       "dependencies": {
         "xunit.runner.console": "2.1.0"
+      },
+      "frameworkAssemblies": {
+        "System.Net.Http": "4.0.0.0"
       }
     }
   },