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

Rename AspNet 5 file contents. 

See https://github.com/aspnet/Announcements/issues/144 for more information.
This commit is contained in:
N. Taylor Mullen 2016-01-22 12:24:49 -08:00
parent 5227607c58
commit e28aa5f568
32 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NuGetPackageVerifier.json
View File

@ -9,9 +9,9 @@
"StrictSemanticVersionValidationRule"
],
"packages": {
"Microsoft.AspNet.WebSockets.Client": { },
"Microsoft.AspNet.WebSockets.Protocol": { },
"Microsoft.AspNet.WebSockets.Server": { }
"Microsoft.AspNetCore.WebSockets.Client": { },
"Microsoft.AspNetCore.WebSockets.Protocol": { },
"Microsoft.AspNetCore.WebSockets.Server": { }
}
},
"Default": { // Ru les to run for packages not listed in any other set.

12
WebSockets.sln
View File

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22216.0
@ -11,17 +11,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C45106D0-7
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9E55FC5B-FD9C-4266-AB24-F3AA649D7C8B}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Protocol", "src\Microsoft.AspNet.WebSockets.Protocol\Microsoft.AspNet.WebSockets.Protocol.xproj", "{E0C10DEC-3339-4A47-85BC-3100C5D34AD4}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Protocol", "src\Microsoft.AspNetCore.WebSockets.Protocol\Microsoft.AspNetCore.WebSockets.Protocol.xproj", "{E0C10DEC-3339-4A47-85BC-3100C5D34AD4}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Protocol.Test", "test\Microsoft.AspNet.WebSockets.Protocol.Test\Microsoft.AspNet.WebSockets.Protocol.Test.xproj", "{62A07A24-4D06-4DDA-B6BF-02D0C9CB7D32}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Protocol.Test", "test\Microsoft.AspNetCore.WebSockets.Protocol.Test\Microsoft.AspNetCore.WebSockets.Protocol.Test.xproj", "{62A07A24-4D06-4DDA-B6BF-02D0C9CB7D32}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestClient", "test\TestClient\TestClient.xproj", "{8C8EAC01-DC49-4C5E-B348-E4E46FE675F9}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Client", "src\Microsoft.AspNet.WebSockets.Client\Microsoft.AspNet.WebSockets.Client.xproj", "{4A1C4875-AE21-4A78-979A-F0E4DF5EB518}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Client", "src\Microsoft.AspNetCore.WebSockets.Client\Microsoft.AspNetCore.WebSockets.Client.xproj", "{4A1C4875-AE21-4A78-979A-F0E4DF5EB518}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Client.Test", "test\Microsoft.AspNet.WebSockets.Client.Test\Microsoft.AspNet.WebSockets.Client.Test.xproj", "{6604D154-817F-4BC5-BE95-FF7E851179D9}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Client.Test", "test\Microsoft.AspNetCore.WebSockets.Client.Test\Microsoft.AspNetCore.WebSockets.Client.Test.xproj", "{6604D154-817F-4BC5-BE95-FF7E851179D9}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Server", "src\Microsoft.AspNet.WebSockets.Server\Microsoft.AspNet.WebSockets.Server.xproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Server", "src\Microsoft.AspNetCore.WebSockets.Server\Microsoft.AspNetCore.WebSockets.Server.xproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86E1ADA2-631C-484F-906C-2D0BCF628E65}"
ProjectSection(SolutionItems) = preProject

2
src/Microsoft.AspNetCore.WebSockets.Client/Constants.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNet.WebSockets.Client
namespace Microsoft.AspNetCore.WebSockets.Client
{
public static class Constants
{

4
src/Microsoft.AspNetCore.WebSockets.Client/WebSocketClient.cs
View File

@ -9,9 +9,9 @@ using System.Net;
using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.WebSockets.Protocol;
using Microsoft.AspNetCore.WebSockets.Protocol;
namespace Microsoft.AspNet.WebSockets.Client
namespace Microsoft.AspNetCore.WebSockets.Client
{
public class WebSocketClient
{

2
src/Microsoft.AspNetCore.WebSockets.Client/project.json
View File

@ -10,7 +10,7 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*"
"Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*"
},
"frameworks": {
"net451": { }

2
src/Microsoft.AspNetCore.WebSockets.Protocol/CommonWebSocket.cs
View File

@ -11,7 +11,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.WebSockets.Protocol
namespace Microsoft.AspNetCore.WebSockets.Protocol
{
// https://tools.ietf.org/html/rfc6455
public class CommonWebSocket : WebSocket

2
src/Microsoft.AspNetCore.WebSockets.Protocol/Constants.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNet.WebSockets.Protocol
namespace Microsoft.AspNetCore.WebSockets.Protocol
{
public static class Constants
{

2
src/Microsoft.AspNetCore.WebSockets.Protocol/FrameHeader.cs
View File

@ -8,7 +8,7 @@ using System.Net.WebSockets;
using System.Text;
using System.Threading.Tasks;
namespace Microsoft.AspNet.WebSockets.Protocol
namespace Microsoft.AspNetCore.WebSockets.Protocol
{
public class FrameHeader
{

2
src/Microsoft.AspNetCore.WebSockets.Protocol/HandshakeHelpers.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Security.Cryptography;
using System.Text;
namespace Microsoft.AspNet.WebSockets.Protocol
namespace Microsoft.AspNetCore.WebSockets.Protocol
{
public static class HandshakeHelpers
{

2
src/Microsoft.AspNetCore.WebSockets.Protocol/Utilities.cs
View File

@ -4,7 +4,7 @@
using System;
using System.Net.WebSockets;
namespace Microsoft.AspNet.WebSockets.Protocol
namespace Microsoft.AspNetCore.WebSockets.Protocol
{
public static class Utilities
{

4
src/Microsoft.AspNetCore.WebSockets.Server/ExtendedWebSocketAcceptContext.cs
View File

@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.WebSockets.Server
namespace Microsoft.AspNetCore.WebSockets.Server
{
public class ExtendedWebSocketAcceptContext : WebSocketAcceptContext
{

10
src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddleware.cs
View File

@ -6,13 +6,13 @@ using System.Collections.Generic;
using System.IO;
using System.Net.WebSockets;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.WebSockets.Protocol;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.WebSockets.Protocol;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.WebSockets.Server
namespace Microsoft.AspNetCore.WebSockets.Server
{
public class WebSocketMiddleware
{

4
src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddlewareExtensions.cs
View File

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.WebSockets.Server;
using Microsoft.AspNetCore.WebSockets.Server;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder
namespace Microsoft.AspNetCore.Builder
{
public static class WebSocketMiddlewareExtensions
{

2
src/Microsoft.AspNetCore.WebSockets.Server/WebSocketOptions.cs
View File

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Builder
namespace Microsoft.AspNetCore.Builder
{
/// <summary>
/// Configuration options for the WebSocketMiddleware

4
src/Microsoft.AspNetCore.WebSockets.Server/project.json
View File

@ -10,8 +10,8 @@
"url": "git://github.com/aspnet/websockets"
},
"dependencies": {
"Microsoft.AspNet.Http.Extensions": "1.0.0-*",
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
"Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
"Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
"Microsoft.Extensions.Options": "1.0.0-*"
},
"frameworks": {

2
test/AutobahnTestClient/Program.cs
View File

@ -6,7 +6,7 @@ using System.Net.WebSockets;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.WebSockets.Client;
using Microsoft.AspNetCore.WebSockets.Client;
namespace AutobahnTestClient
{

2
test/AutobahnTestClient/Project.json
View File

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.AspNet.WebSockets.Client": "1.0.0-*"
"Microsoft.AspNetCore.WebSockets.Client": "1.0.0-*"
},
"commands": {
"run" : "run"

4
test/AutobahnTestClient/ReadMe.txt
View File

@ -1,5 +1,5 @@
This test server is for use in testing client side implementations of the WebSocekt protocol. It is currently implemented to test
Microsoft.AspNet.WebSockets.Client.WebSocketClient and System.Net.WebSockets.ClientWebSocket.
This test server is for use in testing client side implementations of the WebSocekt protocol. It is currently implemented to test
Microsoft.AspNetCore.WebSockets.Client.WebSocketClient and System.Net.WebSockets.ClientWebSocket.
See http://autobahn.ws/ to download and install the test framework.

4
test/AutobahnTestServer/Project.json
View File

@ -1,8 +1,8 @@
{
"exclude": "wwwroot/**/*",
"dependencies": {
"Microsoft.AspNet.WebSockets.Server": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
"Microsoft.AspNetCore.WebSockets.Server": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"compilationOptions": {
"emitEntryPoint": true

6
test/AutobahnTestServer/Startup.cs
View File

@ -5,9 +5,9 @@ using System;
using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
namespace AutobahnTestServer
{

4
test/AutobahnTestServer/hosting.json
View File

@ -1,3 +1,3 @@
{
"server": "Microsoft.AspNet.Server.Kestrel"
{
"server": "Microsoft.AspNetCore.Server.Kestrel"
}

10
test/Microsoft.AspNetCore.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
View File

@ -3,12 +3,12 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
namespace Microsoft.AspNet.WebSockets.Client.Test
namespace Microsoft.AspNetCore.WebSockets.Client.Test
{
public class KestrelWebSocketHelpers
{
@ -47,7 +47,7 @@ namespace Microsoft.AspNet.WebSockets.Client.Test
var host = new WebHostBuilder()
.UseConfiguration(config)
.UseServer("Microsoft.AspNet.Server.Kestrel")
.UseServer("Microsoft.AspNetCore.Server.Kestrel")
.Configure(startup)
.Build();

4
test/Microsoft.AspNetCore.WebSockets.Client.Test/WebSocketClientTests.cs
View File

@ -6,10 +6,10 @@ using System.Net.WebSockets;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
namespace Microsoft.AspNet.WebSockets.Client.Test
namespace Microsoft.AspNetCore.WebSockets.Client.Test
{
public class WebSocketClientTests
{

10
test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json
View File

@ -1,10 +1,10 @@
{
"dependencies": {
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
"Microsoft.AspNet.WebSockets.Client": "1.0.0-*",
"Microsoft.AspNet.WebSockets.Server": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNet.Testing": "1.0.0-*",
"Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
"Microsoft.AspNetCore.WebSockets.Client": "1.0.0-*",
"Microsoft.AspNetCore.WebSockets.Server": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {

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

@ -8,7 +8,7 @@ using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.WebSockets.Protocol.Test
namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
{
// This steam accepts writes from one side, buffers them internally, and returns the data via Reads
// when requested on the other side.

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

@ -5,7 +5,7 @@ using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.WebSockets.Protocol.Test
namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
{
// A duplex wrapper around a read and write stream.
public class DuplexStream : Stream

2
test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexTests.cs
View File

@ -8,7 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using Xunit;
namespace Microsoft.AspNet.WebSockets.Protocol.Test
namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
{
public class DuplexTests
{

2
test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Utf8ValidationTests.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Text;
using Xunit;
namespace Microsoft.AspNet.WebSockets.Protocol.Test
namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
{
public class Utf8ValidationTests
{

2
test/Microsoft.AspNetCore.WebSockets.Protocol.Test/UtilitiesTests.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Text;
using Xunit;
namespace Microsoft.AspNet.WebSockets.Protocol.Test
namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
{
public class UtilitiesTests
{

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

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
"Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {

4
test/TestClient/Program.cs
View File

@ -1,9 +1,9 @@
using System;
using System;
using System.Net.WebSockets;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.WebSockets.Client;
using Microsoft.AspNetCore.WebSockets.Client;
namespace TestClient
{

4
test/TestClient/project.json
View File

@ -3,8 +3,8 @@
"TestClient": "TestClient"
},
"dependencies": {
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
"Microsoft.AspNet.WebSockets.Client": "1.0.0-*"
"Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
"Microsoft.AspNetCore.WebSockets.Client": "1.0.0-*"
},
"frameworks": {
"dnx451": { }