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

Merge branch 'release' into dev

This commit is contained in:
Pavel Krymets 2016-04-15 11:57:43 -07:00
parent 730a23e5ca 86befd91de
commit fffde66627
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/AutobahnTestClient/project.json
View File

@ -6,6 +6,6 @@
"Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*" "Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": {} "net451": {}
} }
} }

9
test/AutobahnTestServer/project.json
View File

@ -8,10 +8,13 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"imports": [ "imports": [
@ -19,7 +22,7 @@
"portable-net451+win8" "portable-net451+win8"
] ]
}, },
"dnx451": {} "net451": {}
}, },
"content": [ "content": [
"hosting.json" "hosting.json"

4
test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs
View File

@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
} }
} }
#if !NETSTANDARDAPP1_5 #if !NETCOREAPP1_0
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
// TODO: This option doesn't preserve the state object. // TODO: This option doesn't preserve the state object.
@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
} }
} }
#if !NETSTANDARDAPP1_5 #if !NETCOREAPP1_0
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
Write(buffer, offset, count); Write(buffer, offset, count);

4
test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs
View File

@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
return _readStream.Read(buffer, offset, count); return _readStream.Read(buffer, offset, count);
} }
#if !NETSTANDARDAPP1_5 #if !NETCOREAPP1_0
public override int ReadByte() public override int ReadByte()
{ {
return _readStream.ReadByte(); return _readStream.ReadByte();
@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
_writeStream.Write(buffer, offset, count); _writeStream.Write(buffer, offset, count);
} }
#if !NETSTANDARDAPP1_5 #if !NETCOREAPP1_0
public override void WriteByte(byte value) public override void WriteByte(byte value)
{ {
_writeStream.WriteByte(value); _writeStream.WriteByte(value);

7
test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
View File

@ -5,10 +5,13 @@
}, },
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"imports": [ "imports": [

2
test/TestClient/project.json
View File

@ -4,6 +4,6 @@
"Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*" "Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": {} "net451": {}
} }
} }