Skip to content
This repository was archived by the owner on Mar 19, 2019. It is now read-only.

Commit c292abb

Browse files
TratcherTratcher
committed
#283 Merge packages, namespaces, test projects, and samples
1 parent 3489cf8 commit c292abb

File tree

146 files changed

+467
-1157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+467
-1157
lines changed

‎WebListener.sln

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E183C826-1
1010
EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3A1E31E3-2794-4CA3-B8E2-253E96BDE514}"
1212
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Server", "src\Microsoft.Net.Http.Server\Microsoft.Net.Http.Server.xproj", "{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}"
14-
EndProject
15-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HelloWorld", "samples\HelloWorld\HelloWorld.xproj", "{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}"
16-
EndProject
1713
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SelfHostServer", "samples\SelfHostServer\SelfHostServer.xproj", "{1236F93A-AC5C-4A77-9477-C88F040151CA}"
1814
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.WebListener.FunctionalTests", "test\Microsoft.AspNetCore.Server.WebListener.FunctionalTests\Microsoft.AspNetCore.Server.WebListener.FunctionalTests.xproj", "{4492FF4C-9032-411D-853F-46B01755E504}"
20-
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.WebListener", "src\Microsoft.AspNetCore.Server.WebListener\Microsoft.AspNetCore.Server.WebListener.xproj", "{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}"
15+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.HttpSys.FunctionalTests", "test\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.xproj", "{4492FF4C-9032-411D-853F-46B01755E504}"
2216
EndProject
23-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Server.FunctionalTests", "test\Microsoft.Net.Http.Server.FunctionalTests\Microsoft.Net.Http.Server.FunctionalTests.xproj", "{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}"
17+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.HttpSys", "src\Microsoft.AspNetCore.Server.HttpSys\Microsoft.AspNetCore.Server.HttpSys.xproj", "{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}"
2418
EndProject
2519
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5E9B546C-17AC-4BDF-BCB3-5955D4755ED8}"
2620
ProjectSection(SolutionItems) = preProject
@@ -29,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2923
EndProject
3024
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HotAddSample", "samples\HotAddSample\HotAddSample.xproj", "{8BFA392A-8B67-4454-916B-67C545EDFAEF}"
3125
EndProject
32-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Server.Tests", "test\Microsoft.Net.Http.Server.Tests\Microsoft.Net.Http.Server.Tests.xproj", "{E837249E-E666-4DF2-AFC3-7A4D70234F9F}"
26+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.HttpSys.Tests", "test\Microsoft.AspNetCore.Server.HttpSys.Tests\Microsoft.AspNetCore.Server.HttpSys.Tests.xproj", "{E837249E-E666-4DF2-AFC3-7A4D70234F9F}"
3327
EndProject
3428
Global
3529
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,26 +45,6 @@ Global
5145
{8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
5246
{8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Mixed Platforms.Build.0 = Release|Any CPU
5347
{8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|x86.ActiveCfg = Release|Any CPU
54-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
56-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
57-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
58-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Debug|x86.ActiveCfg = Debug|Any CPU
59-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Release|Any CPU.Build.0 = Release|Any CPU
61-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
62-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
63-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}.Release|x86.ActiveCfg = Release|Any CPU
64-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
66-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
67-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
68-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Debug|x86.ActiveCfg = Debug|Any CPU
69-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
70-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Release|Any CPU.Build.0 = Release|Any CPU
71-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
72-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
73-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}.Release|x86.ActiveCfg = Release|Any CPU
7448
{1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7549
{1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
7650
{1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -101,16 +75,6 @@ Global
10175
{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
10276
{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Mixed Platforms.Build.0 = Release|Any CPU
10377
{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|x86.ActiveCfg = Release|Any CPU
104-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
106-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
107-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
108-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Debug|x86.ActiveCfg = Debug|Any CPU
109-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
110-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Release|Any CPU.Build.0 = Release|Any CPU
111-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
112-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
113-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}.Release|x86.ActiveCfg = Release|Any CPU
11478
{8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11579
{8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
11680
{8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -141,12 +105,9 @@ Global
141105
EndGlobalSection
142106
GlobalSection(NestedProjects) = preSolution
143107
{8B828433-B333-4C19-96AE-00BFFF9D8841} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514}
144-
{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09}
145-
{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514}
146108
{1236F93A-AC5C-4A77-9477-C88F040151CA} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514}
147109
{4492FF4C-9032-411D-853F-46B01755E504} = {E183C826-1360-4DFF-9994-F33CED5C8525}
148110
{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09}
149-
{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1} = {E183C826-1360-4DFF-9994-F33CED5C8525}
150111
{8BFA392A-8B67-4454-916B-67C545EDFAEF} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514}
151112
{E837249E-E666-4DF2-AFC3-7A4D70234F9F} = {E183C826-1360-4DFF-9994-F33CED5C8525}
152113
EndGlobalSection

‎samples/HelloWorld/HelloWorld.xproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎samples/HelloWorld/Program.cs

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎samples/HelloWorld/Properties/launchSettings.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎samples/HelloWorld/project.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎samples/HotAddSample/Startup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
using Microsoft.AspNetCore.Builder;
33
using Microsoft.AspNetCore.Hosting;
44
using Microsoft.AspNetCore.Http;
5-
using Microsoft.AspNetCore.Server.WebListener;
5+
using Microsoft.AspNetCore.Server.HttpSys;
66
using Microsoft.Extensions.DependencyInjection;
77
using Microsoft.Extensions.Logging;
8-
using Microsoft.Net.Http.Server;
98

109
namespace HotAddSample
1110
{

‎samples/HotAddSample/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"Microsoft.AspNetCore.Server.WebListener": "1.2.0-*",
3+
"Microsoft.AspNetCore.Server.HttpSys": "1.2.0-*",
44
"Microsoft.Extensions.Logging.Console": "1.2.0-*"
55
},
66
"buildOptions": {

‎samples/SelfHostServer/Startup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
using Microsoft.AspNetCore.Builder;
66
using Microsoft.AspNetCore.Hosting;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Server.WebListener;
8+
using Microsoft.AspNetCore.Server.HttpSys;
99
using Microsoft.Extensions.DependencyInjection;
1010
using Microsoft.Extensions.Logging;
11-
using Microsoft.Net.Http.Server;
1211

1312
namespace SelfHostServer
1413
{

‎samples/SelfHostServer/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"Microsoft.AspNetCore.Server.WebListener": "1.2.0-*",
3+
"Microsoft.AspNetCore.Server.HttpSys": "1.2.0-*",
44
"Microsoft.Extensions.Logging.Console": "1.2.0-*"
55
},
66
"buildOptions": {

‎src/Microsoft.Net.Http.Server/AsyncAcceptContext.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/AsyncAcceptContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading;
88
using System.Threading.Tasks;
99

10-
namespace Microsoft.Net.Http.Server
10+
namespace Microsoft.AspNetCore.Server.HttpSys
1111
{
1212
internal unsafe class AsyncAcceptContext : IAsyncResult, IDisposable
1313
{

‎src/Microsoft.AspNetCore.Server.WebListener/AuthenticationHandler.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/AuthenticationHandler.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
using System.Threading.Tasks;
88
using Microsoft.AspNetCore.Http.Features.Authentication;
99
using Microsoft.Extensions.Internal;
10-
using Microsoft.Net.Http.Server;
1110

12-
namespace Microsoft.AspNetCore.Server.WebListener
11+
namespace Microsoft.AspNetCore.Server.HttpSys
1312
{
1413
internal class AuthenticationHandler : IAuthenticationHandler
1514
{

‎src/Microsoft.Net.Http.Server/AuthenticationManager.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/AuthenticationManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Security.Principal;
1111
using Microsoft.Extensions.Primitives;
1212

13-
namespace Microsoft.Net.Http.Server
13+
namespace Microsoft.AspNetCore.Server.HttpSys
1414
{
1515
// See the native HTTP_SERVER_AUTHENTICATION_INFO structure documentation for additional information.
1616
// http://msdn.microsoft.com/en-us/library/windows/desktop/aa364638(v=vs.85).aspx

‎src/Microsoft.Net.Http.Server/AuthenticationSchemes.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/AuthenticationSchemes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System;
55

6-
namespace Microsoft.Net.Http.Server
6+
namespace Microsoft.AspNetCore.Server.HttpSys
77
{
88
// REVIEW: this appears to be very similar to System.Net.AuthenticationSchemes
99
[Flags]

‎src/Microsoft.Net.Http.Server/Constants.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/Constants.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System;
55

6-
namespace Microsoft.Net.Http.Server
6+
namespace Microsoft.AspNetCore.Server.HttpSys
77
{
88
internal static class Constants
99
{
@@ -13,6 +13,7 @@ internal static class Constants
1313
internal const string Close = "close";
1414
internal const string Zero = "0";
1515
internal const string SchemeDelimiter = "://";
16+
internal const int Status101SwitchingProtocols = 101;
1617

1718
internal static Version V1_0 = new Version(1, 0);
1819
internal static Version V1_1 = new Version(1, 1);

‎src/Microsoft.Net.Http.Server/CustomDictionary.xml renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/CustomDictionary.xml

File renamed without changes.

‎src/Microsoft.AspNetCore.Server.WebListener/FeatureContext.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
using Microsoft.AspNetCore.Http.Features.Authentication;
1717
using Microsoft.Extensions.Internal;
1818
using Microsoft.Net.Http.Headers;
19-
using Microsoft.Net.Http.Server;
2019

21-
namespace Microsoft.AspNetCore.Server.WebListener
20+
namespace Microsoft.AspNetCore.Server.HttpSys
2221
{
2322
internal class FeatureContext :
2423
IHttpRequestFeature,

‎src/Microsoft.AspNetCore.Server.WebListener/HeaderDictionary.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/HeaderDictionary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.AspNetCore.Http;
88
using Microsoft.Extensions.Primitives;
99

10-
namespace Microsoft.AspNetCore.Server.WebListener
10+
namespace Microsoft.AspNetCore.Server.HttpSys
1111
{
1212
/// <summary>
1313
/// Represents a wrapper for RequestHeaders and ResponseHeaders.

‎src/Microsoft.Net.Http.Server/Helpers.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/Helpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading;
88
using System.Threading.Tasks;
99

10-
namespace Microsoft.Net.Http.Server
10+
namespace Microsoft.AspNetCore.Server.HttpSys
1111
{
1212
internal static class Helpers
1313
{

‎src/Microsoft.AspNetCore.Server.WebListener/Internal/WebListenerOptionsSetup.cs renamed to ‎src/Microsoft.AspNetCore.Server.HttpSys/Internal/WebListenerOptionsSetup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Microsoft.Extensions.Logging;
55
using Microsoft.Extensions.Options;
66

7-
namespace Microsoft.AspNetCore.Server.WebListener.Internal
7+
namespace Microsoft.AspNetCore.Server.HttpSys.Internal
88
{
99
public class WebListenerOptionsSetup : IConfigureOptions<WebListenerOptions>
1010
{
@@ -17,7 +17,7 @@ public WebListenerOptionsSetup(ILoggerFactory loggerFactory)
1717

1818
public void Configure(WebListenerOptions options)
1919
{
20-
options.ListenerSettings.Logger = _loggerFactory.CreateLogger<Microsoft.Net.Http.Server.WebListener>();
20+
options.ListenerSettings.Logger = _loggerFactory.CreateLogger<WebListener>();
2121
}
2222
}
2323
}

0 commit comments

Comments
 (0)