diff --git a/appveyor.yml b/appveyor.yml
index 265df8f1f5..636a7618d3 100644
--- a/appveyor.yml
+++ b/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
\ No newline at end of file
+deploy: off
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs
index 70dc2cf8fc..7581ff35f2 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs
@@ -331,7 +331,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure
///
/// The iterator from which to start the known string lookup.
/// If we found a valid method, then scan will be updated to new position
- /// A reference to a pre-allocated known string, if the input matches any.
+ /// A reference to a pre-allocated known string, if the input matches any.
/// true if the input matches a known string, false otherwise.
public static bool GetKnownVersion(this MemoryPoolIterator2 begin, ref MemoryPoolIterator2 scan, out string knownVersion)
{
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
index 5a2e28ed55..cf00be722c 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
+++ b/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"
}
}
},
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
index 5dd70ca224..aca952eb04 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
+++ b/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"
}
}
},