huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'benaadams/build-issues' into dev

This commit is contained in:
Stephen Halter 2016-02-26 12:18:15 -08:00
parent 37055517ee e579745f93
commit 4bcc44faed
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -5,5 +5,3 @@ build_script:
clone_depth: 1 clone_depth: 1
test: off test: off
deploy: off deploy: off
environment:
NO_PARALLEL_TEST_PROJECTS: Microsoft.AspNetCore.Server.Kestrel.FunctionalTests

2
src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs
View File

@ -331,7 +331,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure
/// </remarks> /// </remarks>
/// <param name="begin">The iterator from which to start the known string lookup.</param> /// <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="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> /// <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) public static bool GetKnownVersion(this MemoryPoolIterator2 begin, ref MemoryPoolIterator2 scan, out string knownVersion)
{ {

7
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
View File

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

5
test/Microsoft.AspNetCore.Server.KestrelTests/project.json
View File

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