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-13 11:26:43 -07:00
parent cf75df802d
commit 49300ac5f7
7 changed files with 12 additions and 12 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-*"
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": [
"dotnet5.6",
"portable-net45+win8"

2
test/AutobahnTestApp/project.json
View File

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

4
test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn
{
ApplicationBaseUriHint = baseUrl,
ApplicationType = ApplicationType.Portable,
TargetFramework = "netcoreapp1.0",
TargetFramework = "netcoreapp1.1",
EnvironmentName = environment
};

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

@ -11,7 +11,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"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.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)
{
// 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)
{
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.IO;
@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
return ReadStream.Read(buffer, offset, count);
}
#if !NETCOREAPP1_0
#if !NETCOREAPP1_1
public override int ReadByte()
{
return ReadStream.ReadByte();
@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
WriteStream.Write(buffer, offset, count);
}
#if !NETCOREAPP1_0
#if !NETCOREAPP1_1
public override void WriteByte(byte value)
{
WriteStream.WriteByte(value);

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

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