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

Updating to netcoreapp1.1

This commit is contained in:
Pranav K 2016-10-12 13:46:55 -07:00
parent 35cae5da7d
commit 09802d1ded
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/EchoApp/project.json
View File

@ -15,7 +15,7 @@
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.1": {
"imports": [ "imports": [
"dotnet5.6", "dotnet5.6",
"portable-net45+win8" "portable-net45+win8"

2
test/AutobahnTestApp/project.json
View File

@ -17,7 +17,7 @@
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.1": {
"imports": [ "imports": [
"dotnet5.6", "dotnet5.6",
"portable-net45+win8" "portable-net45+win8"

2
test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json
View File

@ -11,7 +11,7 @@
}, },
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",

6
test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. See License.txt in the project root for license information. // Copyright (c) .NET Foundation. All rights reserved. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
@ -152,7 +152,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
} }
} }
#if !NETCOREAPP1_0 #if !NETCOREAPP1_1
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.
@ -245,7 +245,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
} }
} }
#if !NETCOREAPP1_0 #if !NETCOREAPP1_1
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);

6
test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. See License.txt in the project root for license information. // Copyright (c) .NET Foundation. All rights reserved. See License.txt in the project root for license information.
using System; using System;
using System.IO; using System.IO;
@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
return ReadStream.Read(buffer, offset, count); return ReadStream.Read(buffer, offset, count);
} }
#if !NETCOREAPP1_0 #if !NETCOREAPP1_1
public override int ReadByte() public override int ReadByte()
{ {
return ReadStream.ReadByte(); return ReadStream.ReadByte();
@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
WriteStream.Write(buffer, offset, count); WriteStream.Write(buffer, offset, count);
} }
#if !NETCOREAPP1_0 #if !NETCOREAPP1_1
public override void WriteByte(byte value) public override void WriteByte(byte value)
{ {
WriteStream.WriteByte(value); WriteStream.WriteByte(value);

2
test/Microsoft.AspNetCore.WebSockets.Test/project.json
View File

@ -9,7 +9,7 @@
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",