diff --git a/WebListener.sln b/WebListener.sln index fc4110ba94..e2a7a67d0b 100644 --- a/WebListener.sln +++ b/WebListener.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E183C826-1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3A1E31E3-2794-4CA3-B8E2-253E96BDE514}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.WebListener", "src\Microsoft.AspNet.Server.WebListener\Microsoft.AspNet.Server.WebListener.kproj", "{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Server", "src\Microsoft.Net.Server\Microsoft.Net.Server.kproj", "{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HelloWorld", "samples\HelloWorld\HelloWorld.kproj", "{6DAF3E6B-8E1B-4E6E-B9FE-7B1E5FDB7DB4}" EndProject @@ -23,6 +23,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.WebListener.FunctionalTests", "test\Microsoft.AspNet.Server.WebListener.FunctionalTests\Microsoft.AspNet.Server.WebListener.FunctionalTests.kproj", "{4492FF4C-9032-411D-853F-46B01755E504}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.WebListener", "src\Microsoft.AspNet.Server.WebListener\Microsoft.AspNet.Server.WebListener.kproj", "{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -103,6 +105,16 @@ Global {4492FF4C-9032-411D-853F-46B01755E504}.Release|Mixed Platforms.Build.0 = Release|x86 {4492FF4C-9032-411D-853F-46B01755E504}.Release|x86.ActiveCfg = Release|x86 {4492FF4C-9032-411D-853F-46B01755E504}.Release|x86.Build.0 = Release|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|Any CPU.ActiveCfg = Debug|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|x86.ActiveCfg = Debug|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|x86.Build.0 = Debug|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Any CPU.ActiveCfg = Release|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Mixed Platforms.Build.0 = Release|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|x86.ActiveCfg = Release|x86 + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -115,5 +127,6 @@ Global {EFC7538F-7AEB-4A3E-A1E6-6BDCCBD272BF} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} {E788AEAE-2CB4-4BFA-8746-D0BB7E93A1BB} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} {4492FF4C-9032-411D-853F-46B01755E504} = {E183C826-1360-4DFF-9994-F33CED5C8525} + {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} EndGlobalSection EndGlobal diff --git a/samples/HelloWorld/Program.cs b/samples/HelloWorld/Program.cs index 829908c001..6c44c812dd 100644 --- a/samples/HelloWorld/Program.cs +++ b/samples/HelloWorld/Program.cs @@ -1,7 +1,7 @@ using System; using System.Text; -using Microsoft.AspNet.Server.WebListener; +using Microsoft.Net.Server; namespace HelloWorld { @@ -9,7 +9,7 @@ namespace HelloWorld { public static void Main(string[] args) { - using (OwinWebListener listener = new OwinWebListener()) + using (WebListener listener = new WebListener()) { listener.UrlPrefixes.Add(UrlPrefix.Create("http://localhost:8080")); listener.Start(); diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index 123a203698..5dd850e16e 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -1,7 +1,7 @@ { "version" : "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Server.WebListener" : "" + "Microsoft.Net.Server" : "" }, "configurations": { "net45": { }, diff --git a/samples/SelfHostServer/Startup.cs b/samples/SelfHostServer/Startup.cs index 163ce335a6..b76a42a74f 100644 --- a/samples/SelfHostServer/Startup.cs +++ b/samples/SelfHostServer/Startup.cs @@ -1,5 +1,6 @@ using Microsoft.AspNet.Abstractions; using Microsoft.AspNet.Server.WebListener; +using Microsoft.Net.Server; namespace SelfHostServer { diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index cb620bf621..3bf4abed6e 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -3,6 +3,7 @@ "dependencies": { "Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.Hosting": "0.1-alpha-*", + "Microsoft.Net.Server": "", "Microsoft.AspNet.Server.WebListener": "" }, "commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" }, diff --git a/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj b/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj index 99d381529a..8f9815d39d 100644 --- a/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj +++ b/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj @@ -66,7 +66,6 @@ - diff --git a/src/Microsoft.AspNet.Security.Windows/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Security.Windows/Properties/AssemblyInfo.cs deleted file mode 100644 index 501727a48a..0000000000 --- a/src/Microsoft.AspNet.Security.Windows/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,42 +0,0 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microsoft.AspNet.Security.Windows")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.AspNet.Security.Windows")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1f471909-581f-4060-a147-430891e9c3c1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.5")] -[assembly: AssemblyVersion("0.5")] -[assembly: AssemblyFileVersion("0.5.40117.0")] diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/AssemblyNeutralAttribute.cs b/src/Microsoft.AspNet.Server.WebListener/AssemblyNeutralAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/AssemblyNeutralAttribute.cs rename to src/Microsoft.AspNet.Server.WebListener/AssemblyNeutralAttribute.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/FeatureContext.cs rename to src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs index b52beb029f..727fff3423 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/FeatureContext.cs +++ b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; +using Microsoft.Net.Server; namespace Microsoft.AspNet.Server.WebListener { diff --git a/src/Microsoft.AspNet.Server.WebListener/WebListenerWrapper.cs b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs similarity index 92% rename from src/Microsoft.AspNet.Server.WebListener/WebListenerWrapper.cs rename to src/Microsoft.AspNet.Server.WebListener/MessagePump.cs index e274221a13..dcde3d3e8e 100644 --- a/src/Microsoft.AspNet.Server.WebListener/WebListenerWrapper.cs +++ b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs @@ -3,16 +3,17 @@ using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Logging; +using Microsoft.Net.Server; namespace Microsoft.AspNet.Server.WebListener { using AppFunc = Func; - internal class WebListenerWrapper : IDisposable + internal class MessagePump : IDisposable { private static readonly int DefaultMaxAccepts = 5 * Environment.ProcessorCount; - private readonly OwinWebListener _listener; + private readonly Microsoft.Net.Server.WebListener _listener; private readonly ILogger _logger; private AppFunc _appFunc; @@ -23,17 +24,17 @@ namespace Microsoft.AspNet.Server.WebListener // TODO: private IDictionary _capabilities; - internal WebListenerWrapper(OwinWebListener listener, ILoggerFactory loggerFactory) + internal MessagePump(Microsoft.Net.Server.WebListener listener, ILoggerFactory loggerFactory) { Contract.Assert(listener != null); _listener = listener; - _logger = LogHelper.CreateLogger(loggerFactory, typeof(WebListenerWrapper)); + _logger = LogHelper.CreateLogger(loggerFactory, typeof(MessagePump)); _processRequest = new Action(ProcessRequestAsync); _maxAccepts = DefaultMaxAccepts; } - internal OwinWebListener Listener + internal Microsoft.Net.Server.WebListener Listener { get { return _listener; } } @@ -127,7 +128,7 @@ namespace Microsoft.AspNet.Server.WebListener { FeatureContext featureContext = new FeatureContext(requestContext); await _appFunc(featureContext.Features).SupressContext(); - await requestContext.ProcessResponseAsync().SupressContext(); + // TODO: WebSocket/Opaque upgrade - await requestContext.ProcessResponseAsync().SupressContext(); } catch (Exception ex) { diff --git a/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj b/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj index 0547c1e84c..2114c166fd 100644 --- a/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj +++ b/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj @@ -6,9 +6,8 @@ - 3f5212aa-e287-49dd-8cec-44bf0a2ac9a1 + b9f45f9d-d206-47f0-8e5f-54ce2f0bdf92 Library - net45 @@ -18,78 +17,16 @@ 2.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs index b0d1b819c4..f6447300cd 100644 --- a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs +++ b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs @@ -25,6 +25,7 @@ using Microsoft.AspNet.Abstractions; using Microsoft.AspNet.ConfigurationModel; using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Logging; +using Microsoft.Net.Server; namespace Microsoft.AspNet.Server.WebListener { @@ -49,9 +50,9 @@ namespace Microsoft.AspNet.Server.WebListener [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Disposed by caller")] public IServerInformation Initialize(IConfiguration configuration) { - OwinWebListener listener = new OwinWebListener(); + Microsoft.Net.Server.WebListener listener = new Microsoft.Net.Server.WebListener(); ParseAddresses(configuration, listener); - return new ServerInformation(new WebListenerWrapper(listener, _loggerFactory)); + return new ServerInformation(new MessagePump(listener, _loggerFactory)); } /// @@ -78,11 +79,11 @@ namespace Microsoft.AspNet.Server.WebListener // TODO: var capabilities = new Dictionary(); - serverInfo.Wrapper.Start(app); - return serverInfo.Wrapper; + serverInfo.MessagePump.Start(app); + return serverInfo.MessagePump; } - private void ParseAddresses(IConfiguration config, OwinWebListener listener) + private void ParseAddresses(IConfiguration config, Microsoft.Net.Server.WebListener listener) { // TODO: Key format? string urls; diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs b/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs index 6e514819c4..b3e4d9bfca 100644 --- a/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs +++ b/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs @@ -5,16 +5,16 @@ namespace Microsoft.AspNet.Server.WebListener { public class ServerInformation : IServerInformation { - private WebListenerWrapper _webListenerWrapper; + private MessagePump _messagePump; - internal ServerInformation(WebListenerWrapper webListenerWrapper) + internal ServerInformation(MessagePump messagePump) { - _webListenerWrapper = webListenerWrapper; + _messagePump = messagePump; } - internal WebListenerWrapper Wrapper + internal MessagePump MessagePump { - get { return _webListenerWrapper; } + get { return _messagePump; } } // Microsoft.AspNet.Server.WebListener @@ -23,15 +23,15 @@ namespace Microsoft.AspNet.Server.WebListener get { return GetType().GetTypeInfo().Assembly.GetName().Name; } } - public OwinWebListener Listener + public Microsoft.Net.Server.WebListener Listener { - get { return _webListenerWrapper.Listener; } + get { return _messagePump.Listener; } } public int MaxAccepts { - get { return _webListenerWrapper.MaxAccepts; } - set { _webListenerWrapper.MaxAccepts = value; } + get { return _messagePump.MaxAccepts; } + set { _messagePump.MaxAccepts = value; } } } } diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/IServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/fx/IServerFactory.cs deleted file mode 100644 index d428778aad..0000000000 --- a/src/Microsoft.AspNet.Server.WebListener/fx/IServerFactory.cs +++ /dev/null @@ -1,16 +0,0 @@ -/* TODO: Take a temp dependency on Ms.Aspnet.Hosting until AssemblyNeutral gets fixed. -using System; -using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.ConfigurationModel; - -namespace Microsoft.AspNet.Hosting.Server -{ - // TODO: [AssemblyNeutral] - public interface IServerFactory - { - IServerInformation Initialize(IConfiguration configuration); - IDisposable Start(IServerInformation serverInformation, Func application); - } -} -*/ \ No newline at end of file diff --git a/src/Microsoft.AspNet.Server.WebListener/project.json b/src/Microsoft.AspNet.Server.WebListener/project.json index 82efe0ab48..ddf651ba54 100644 --- a/src/Microsoft.AspNet.Server.WebListener/project.json +++ b/src/Microsoft.AspNet.Server.WebListener/project.json @@ -1,6 +1,7 @@ -{ +{ "version": "0.1-alpha-*", "dependencies": { + "Microsoft.Net.Server" : "", "Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-*", "Microsoft.AspNet.HttpFeature": "0.1-alpha-*", diff --git a/src/Microsoft.AspNet.Server.WebListener/AsyncAcceptContext.cs b/src/Microsoft.Net.Server/AsyncAcceptContext.cs similarity index 96% rename from src/Microsoft.AspNet.Server.WebListener/AsyncAcceptContext.cs rename to src/Microsoft.Net.Server/AsyncAcceptContext.cs index a929f8a854..c21725ff3b 100644 --- a/src/Microsoft.AspNet.Server.WebListener/AsyncAcceptContext.cs +++ b/src/Microsoft.Net.Server/AsyncAcceptContext.cs @@ -10,17 +10,17 @@ using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal unsafe class AsyncAcceptContext : IAsyncResult, IDisposable { internal static readonly IOCompletionCallback IOCallback = new IOCompletionCallback(IOWaitCallback); private TaskCompletionSource _tcs; - private OwinWebListener _server; + private WebListener _server; private NativeRequestContext _nativeRequestContext; - internal AsyncAcceptContext(OwinWebListener server) + internal AsyncAcceptContext(WebListener server) { _server = server; _tcs = new TaskCompletionSource(); @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Server.WebListener } } - private OwinWebListener Server + private WebListener Server { get { @@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Server.WebListener } else { - OwinWebListener server = asyncResult.Server; + WebListener server = asyncResult.Server; if (errorCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS) { // at this point we have received an unmanaged HTTP_REQUEST and memoryBlob @@ -174,7 +174,7 @@ namespace Microsoft.AspNet.Server.WebListener retry = true; } else if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS - && OwinWebListener.SkipIOCPCallbackOnSuccess) + && WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. IOCompleted(this, statusCode, bytesTransferred); diff --git a/src/Microsoft.AspNet.Server.WebListener/AuthenticationManager.cs b/src/Microsoft.Net.Server/AuthenticationManager.cs similarity index 96% rename from src/Microsoft.AspNet.Server.WebListener/AuthenticationManager.cs rename to src/Microsoft.Net.Server/AuthenticationManager.cs index 9fa737049a..396dc6ec4c 100644 --- a/src/Microsoft.AspNet.Server.WebListener/AuthenticationManager.cs +++ b/src/Microsoft.Net.Server/AuthenticationManager.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // See the native HTTP_SERVER_AUTHENTICATION_INFO structure documentation for additional information. // http://msdn.microsoft.com/en-us/library/windows/desktop/aa364638(v=vs.85).aspx @@ -27,12 +27,12 @@ namespace Microsoft.AspNet.Server.WebListener Marshal.SizeOf(); #endif - private OwinWebListener _server; + private WebListener _server; AuthenticationType _authTypes; - internal AuthenticationManager(OwinWebListener context) + internal AuthenticationManager(WebListener listener) { - _server = context; + _server = listener; _authTypes = AuthenticationType.None; } diff --git a/src/Microsoft.AspNet.Server.WebListener/AuthenticationTypes.cs b/src/Microsoft.Net.Server/AuthenticationTypes.cs similarity index 87% rename from src/Microsoft.AspNet.Server.WebListener/AuthenticationTypes.cs rename to src/Microsoft.Net.Server/AuthenticationTypes.cs index 2e47212706..3d27938324 100644 --- a/src/Microsoft.AspNet.Server.WebListener/AuthenticationTypes.cs +++ b/src/Microsoft.Net.Server/AuthenticationTypes.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { [Flags] public enum AuthenticationType diff --git a/src/Microsoft.AspNet.Server.WebListener/Constants.cs b/src/Microsoft.Net.Server/Constants.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/Constants.cs rename to src/Microsoft.Net.Server/Constants.cs index 53e3325471..0c0ec42840 100644 --- a/src/Microsoft.AspNet.Server.WebListener/Constants.cs +++ b/src/Microsoft.Net.Server/Constants.cs @@ -6,7 +6,7 @@ using System; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class Constants { diff --git a/src/Microsoft.AspNet.Server.WebListener/CustomDictionary.xml b/src/Microsoft.Net.Server/CustomDictionary.xml similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/CustomDictionary.xml rename to src/Microsoft.Net.Server/CustomDictionary.xml diff --git a/src/Microsoft.AspNet.Server.WebListener/DictionaryExtensions.cs b/src/Microsoft.Net.Server/DictionaryExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/DictionaryExtensions.cs rename to src/Microsoft.Net.Server/DictionaryExtensions.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/GlobalSuppressions.cs b/src/Microsoft.Net.Server/GlobalSuppressions.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/GlobalSuppressions.cs rename to src/Microsoft.Net.Server/GlobalSuppressions.cs diff --git a/src/Microsoft.Net.Server/Helpers.cs b/src/Microsoft.Net.Server/Helpers.cs new file mode 100644 index 0000000000..2331998246 --- /dev/null +++ b/src/Microsoft.Net.Server/Helpers.cs @@ -0,0 +1,29 @@ +// ----------------------------------------------------------------------- +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// ----------------------------------------------------------------------- + +using System.Runtime.CompilerServices; +using System.Threading.Tasks; + +namespace Microsoft.Net.Server +{ + internal static class Helpers + { + internal static Task CompletedTask() + { + return Task.FromResult(null); + } + + internal static ConfiguredTaskAwaitable SupressContext(this Task task) + { + return task.ConfigureAwait(continueOnCapturedContext: false); + } + + internal static ConfiguredTaskAwaitable SupressContext(this Task task) + { + return task.ConfigureAwait(continueOnCapturedContext: false); + } + } +} diff --git a/src/Microsoft.Net.Server/LogHelper.cs b/src/Microsoft.Net.Server/LogHelper.cs new file mode 100644 index 0000000000..611317e3d5 --- /dev/null +++ b/src/Microsoft.Net.Server/LogHelper.cs @@ -0,0 +1,74 @@ +//------------------------------------------------------------------------------ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +//------------------------------------------------------------------------------ + +using System; +using System.Diagnostics; +using System.Globalization; +using Microsoft.AspNet.Logging; + +namespace Microsoft.Net.Server +{ + internal static class LogHelper + { + internal static ILogger CreateLogger(ILoggerFactory factory, Type type) + { + if (factory == null) + { + return null; + } + + return factory.Create(type.FullName); + } + + internal static void LogInfo(ILogger logger, string data) + { + if (logger == null) + { + Debug.WriteLine(data); + } + else + { + logger.WriteInformation(data); + } + } + + internal static void LogVerbose(ILogger logger, string data) + { + if (logger == null) + { + Debug.WriteLine(data); + } + else + { + logger.WriteVerbose(data); + } + } + + internal static void LogException(ILogger logger, string location, Exception exception) + { + if (logger == null) + { + Debug.WriteLine(exception); + } + else + { + logger.WriteError(location, exception); + } + } + + internal static void LogError(ILogger logger, string location, string message) + { + if (logger == null) + { + Debug.WriteLine(message); + } + else + { + logger.WriteError(location + "; " + message); + } + } + } +} diff --git a/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj b/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj new file mode 100644 index 0000000000..1599915ded --- /dev/null +++ b/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj @@ -0,0 +1,89 @@ + + + + 12.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 3f5212aa-e287-49dd-8cec-44bf0a2ac9a1 + Library + net45 + + + + + + + 2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/AddressFamily.cs b/src/Microsoft.Net.Server/NativeInterop/AddressFamily.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/AddressFamily.cs rename to src/Microsoft.Net.Server/NativeInterop/AddressFamily.cs index 5f78516900..5bb16bcb69 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/AddressFamily.cs +++ b/src/Microsoft.Net.Server/NativeInterop/AddressFamily.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { /// /// diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/ComNetOS.cs b/src/Microsoft.Net.Server/NativeInterop/ComNetOS.cs similarity index 93% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/ComNetOS.cs rename to src/Microsoft.Net.Server/NativeInterop/ComNetOS.cs index 80e2719065..ff134adfb4 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/ComNetOS.cs +++ b/src/Microsoft.Net.Server/NativeInterop/ComNetOS.cs @@ -6,7 +6,7 @@ using System; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class ComNetOS { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/ContextAttribute.cs b/src/Microsoft.Net.Server/NativeInterop/ContextAttribute.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/ContextAttribute.cs rename to src/Microsoft.Net.Server/NativeInterop/ContextAttribute.cs index a3440bc7a3..7dac25d72a 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/ContextAttribute.cs +++ b/src/Microsoft.Net.Server/NativeInterop/ContextAttribute.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal enum ContextAttribute { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpRequestQueueV2Handle.cs b/src/Microsoft.Net.Server/NativeInterop/HttpRequestQueueV2Handle.cs similarity index 94% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpRequestQueueV2Handle.cs rename to src/Microsoft.Net.Server/NativeInterop/HttpRequestQueueV2Handle.cs index ad9ae1d391..8538bf8989 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpRequestQueueV2Handle.cs +++ b/src/Microsoft.Net.Server/NativeInterop/HttpRequestQueueV2Handle.cs @@ -6,7 +6,7 @@ using Microsoft.Win32.SafeHandles; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // This class is a wrapper for Http.sys V2 request queue handle. internal sealed class HttpRequestQueueV2Handle : SafeHandleZeroOrMinusOneIsInvalid diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpServerSessionHandle.cs b/src/Microsoft.Net.Server/NativeInterop/HttpServerSessionHandle.cs similarity index 97% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpServerSessionHandle.cs rename to src/Microsoft.Net.Server/NativeInterop/HttpServerSessionHandle.cs index 65c0506f5c..ccec530d0b 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpServerSessionHandle.cs +++ b/src/Microsoft.Net.Server/NativeInterop/HttpServerSessionHandle.cs @@ -8,7 +8,7 @@ using System; using System.Threading; using Microsoft.Win32.SafeHandles; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal sealed class HttpServerSessionHandle : CriticalHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysRequestHeader.cs b/src/Microsoft.Net.Server/NativeInterop/HttpSysRequestHeader.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysRequestHeader.cs rename to src/Microsoft.Net.Server/NativeInterop/HttpSysRequestHeader.cs index 1202ab2c80..5779ffcbb5 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysRequestHeader.cs +++ b/src/Microsoft.Net.Server/NativeInterop/HttpSysRequestHeader.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal enum HttpSysRequestHeader { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysResponseHeader.cs b/src/Microsoft.Net.Server/NativeInterop/HttpSysResponseHeader.cs similarity index 97% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysResponseHeader.cs rename to src/Microsoft.Net.Server/NativeInterop/HttpSysResponseHeader.cs index 0c7707e943..a48727e520 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysResponseHeader.cs +++ b/src/Microsoft.Net.Server/NativeInterop/HttpSysResponseHeader.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal enum HttpSysResponseHeader { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysSettings.cs b/src/Microsoft.Net.Server/NativeInterop/HttpSysSettings.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysSettings.cs rename to src/Microsoft.Net.Server/NativeInterop/HttpSysSettings.cs index 98067e6fd6..1b7fa89c13 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/HttpSysSettings.cs +++ b/src/Microsoft.Net.Server/NativeInterop/HttpSysSettings.cs @@ -13,7 +13,7 @@ using System.Security; using Microsoft.Win32; #endif -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class HttpSysSettings { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/IntPtrHelper.cs b/src/Microsoft.Net.Server/NativeInterop/IntPtrHelper.cs similarity index 92% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/IntPtrHelper.cs rename to src/Microsoft.Net.Server/NativeInterop/IntPtrHelper.cs index 87ee72ce34..a319d629fd 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/IntPtrHelper.cs +++ b/src/Microsoft.Net.Server/NativeInterop/IntPtrHelper.cs @@ -6,7 +6,7 @@ using System; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class IntPtrHelper { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/NclUtilities.cs b/src/Microsoft.Net.Server/NativeInterop/NclUtilities.cs similarity index 93% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/NclUtilities.cs rename to src/Microsoft.Net.Server/NativeInterop/NclUtilities.cs index 4e74a95560..c91d2f341d 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/NclUtilities.cs +++ b/src/Microsoft.Net.Server/NativeInterop/NclUtilities.cs @@ -6,7 +6,7 @@ using System; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class NclUtilities { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SSPIHandle.cs b/src/Microsoft.Net.Server/NativeInterop/SSPIHandle.cs similarity index 95% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SSPIHandle.cs rename to src/Microsoft.Net.Server/NativeInterop/SSPIHandle.cs index 6089860776..3e9d3bb063 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SSPIHandle.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SSPIHandle.cs @@ -7,7 +7,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { [StructLayout(LayoutKind.Sequential, Pack = 1)] internal struct SSPIHandle diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLoadLibrary.cs b/src/Microsoft.Net.Server/NativeInterop/SafeLoadLibrary.cs similarity index 96% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLoadLibrary.cs rename to src/Microsoft.Net.Server/NativeInterop/SafeLoadLibrary.cs index 998fbe014a..fa057da396 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLoadLibrary.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SafeLoadLibrary.cs @@ -6,7 +6,7 @@ using Microsoft.Win32.SafeHandles; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal sealed class SafeLoadLibrary : SafeHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalFree.cs b/src/Microsoft.Net.Server/NativeInterop/SafeLocalFree.cs similarity index 96% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalFree.cs rename to src/Microsoft.Net.Server/NativeInterop/SafeLocalFree.cs index ad35b83ff0..91e9e953c3 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalFree.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SafeLocalFree.cs @@ -7,7 +7,7 @@ using System; using Microsoft.Win32.SafeHandles; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal sealed class SafeLocalFree : SafeHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalFreeChannelBinding.cs b/src/Microsoft.Net.Server/NativeInterop/SafeLocalFreeChannelBinding.cs similarity index 96% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalFreeChannelBinding.cs rename to src/Microsoft.Net.Server/NativeInterop/SafeLocalFreeChannelBinding.cs index 66124161ca..cfa8b494fb 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalFreeChannelBinding.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SafeLocalFreeChannelBinding.cs @@ -7,7 +7,7 @@ using System; using System.Security.Authentication.ExtendedProtection; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal class SafeLocalFreeChannelBinding : ChannelBinding { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalMemHandle.cs b/src/Microsoft.Net.Server/NativeInterop/SafeLocalMemHandle.cs similarity index 94% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalMemHandle.cs rename to src/Microsoft.Net.Server/NativeInterop/SafeLocalMemHandle.cs index 6bc76f512f..0a183236b5 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeLocalMemHandle.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SafeLocalMemHandle.cs @@ -7,7 +7,7 @@ using System; using Microsoft.Win32.SafeHandles; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal sealed class SafeLocalMemHandle : SafeHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeNativeOverlapped.cs b/src/Microsoft.Net.Server/NativeInterop/SafeNativeOverlapped.cs similarity index 97% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeNativeOverlapped.cs rename to src/Microsoft.Net.Server/NativeInterop/SafeNativeOverlapped.cs index c36466ec84..4341285b03 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SafeNativeOverlapped.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SafeNativeOverlapped.cs @@ -8,7 +8,7 @@ using System; using System.Runtime.InteropServices; using System.Threading; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal class SafeNativeOverlapped : SafeHandle { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SchProtocols.cs b/src/Microsoft.Net.Server/NativeInterop/SchProtocols.cs similarity index 97% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SchProtocols.cs rename to src/Microsoft.Net.Server/NativeInterop/SchProtocols.cs index be1d240cd2..f02fd764fd 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SchProtocols.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SchProtocols.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { using System; using System.Globalization; diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SecurityStatus.cs b/src/Microsoft.Net.Server/NativeInterop/SecurityStatus.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SecurityStatus.cs rename to src/Microsoft.Net.Server/NativeInterop/SecurityStatus.cs index 294fa1d863..f614cbf150 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SecurityStatus.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SecurityStatus.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal enum SecurityStatus { diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SocketAddress.cs b/src/Microsoft.Net.Server/NativeInterop/SocketAddress.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/SocketAddress.cs rename to src/Microsoft.Net.Server/NativeInterop/SocketAddress.cs index 78b52c13c7..51d3f9474e 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/SocketAddress.cs +++ b/src/Microsoft.Net.Server/NativeInterop/SocketAddress.cs @@ -11,7 +11,7 @@ using System.Globalization; using System.Net; using System.Text; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // a little perf app measured these times when comparing the internal // buffer implemented as a managed byte[] or unmanaged memory IntPtr diff --git a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/UnsafeNativeMethods.cs b/src/Microsoft.Net.Server/NativeInterop/UnsafeNativeMethods.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/NativeInterop/UnsafeNativeMethods.cs rename to src/Microsoft.Net.Server/NativeInterop/UnsafeNativeMethods.cs index 5591fd2068..eccaf869b0 100644 --- a/src/Microsoft.AspNet.Server.WebListener/NativeInterop/UnsafeNativeMethods.cs +++ b/src/Microsoft.Net.Server/NativeInterop/UnsafeNativeMethods.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class UnsafeNclNativeMethods { @@ -63,7 +63,7 @@ namespace Microsoft.AspNet.Server.WebListener [DllImport(HTTPAPI, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, SetLastError = true)] internal static extern unsafe uint HttpCreateRequestQueue(HttpApi.HTTPAPI_VERSION version, string pName, - Microsoft.AspNet.Server.WebListener.UnsafeNclNativeMethods.SECURITY_ATTRIBUTES pSecurityAttributes, uint flags, out HttpRequestQueueV2Handle pReqQueueHandle); + Microsoft.Net.Server.UnsafeNclNativeMethods.SECURITY_ATTRIBUTES pSecurityAttributes, uint flags, out HttpRequestQueueV2Handle pReqQueueHandle); [DllImport(HTTPAPI, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] internal static extern unsafe uint HttpCloseRequestQueue(IntPtr pReqQueueHandle); diff --git a/src/Microsoft.Net.Server/Project.json b/src/Microsoft.Net.Server/Project.json new file mode 100644 index 0000000000..9eb34075ee --- /dev/null +++ b/src/Microsoft.Net.Server/Project.json @@ -0,0 +1,40 @@ +{ + "version": "0.1-alpha-*", + "dependencies": { + "Microsoft.AspNet.Logging": "0.1-alpha-*" + }, + "compilationOptions": { + "allowUnsafe": true + }, + "configurations": { + "net45": {}, + "k10": { + "dependencies": { + "System.Collections": "4.0.0.0", + "System.Collections.Concurrent": "4.0.0.0", + "System.Diagnostics.Contracts": "4.0.0.0", + "System.Diagnostics.Debug": "4.0.10.0", + "System.Diagnostics.Tools": "4.0.0.0", + "System.Globalization": "4.0.10.0", + "System.IO": "4.0.0.0", + "System.IO.FileSystem": "4.0.0.0", + "System.IO.FileSystem.Primitives": "4.0.0.0", + "System.Linq": "4.0.0.0", + "System.Reflection": "4.0.10.0", + "System.Resources.ResourceManager": "4.0.0.0", + "System.Runtime": "4.0.20.0", + "System.Runtime.Extensions": "4.0.10.0", + "System.Runtime.InteropServices": "4.0.20.0", + "System.Runtime.Handles": "4.0.0.0", + "System.Security.Principal": "4.0.0.0", + "System.Text.Encoding": "4.0.20.0", + "System.Text.Encoding.Extensions": "4.0.10.0", + "System.Threading": "4.0.0.0", + "System.Threading.Overlapped": "4.0.0.0", + "System.Threading.Tasks": "4.0.10.0", + "System.Threading.ThreadPool": "4.0.10.0", + "Microsoft.Win32.Primitives": "4.0.0.0" + } + } + } +} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Server.WebListener/Properties/AssemblyInfo.cs b/src/Microsoft.Net.Server/Properties/AssemblyInfo.cs similarity index 92% rename from src/Microsoft.AspNet.Server.WebListener/Properties/AssemblyInfo.cs rename to src/Microsoft.Net.Server/Properties/AssemblyInfo.cs index ed361b4f1c..5713f21df4 100644 --- a/src/Microsoft.AspNet.Server.WebListener/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Net.Server/Properties/AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Microsoft.AspNet.Server.WebListener")] +[assembly: AssemblyTitle("Microsoft.Net.Server")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.AspNet.Server.WebListener")] +[assembly: AssemblyProduct("Microsoft.Net.Server")] [assembly: AssemblyCopyright("Copyright © 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/BoundaryType.cs b/src/Microsoft.Net.Server/RequestProcessing/BoundaryType.cs similarity index 91% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/BoundaryType.cs rename to src/Microsoft.Net.Server/RequestProcessing/BoundaryType.cs index d6f4fd2007..31357ce6b6 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/BoundaryType.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/BoundaryType.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal enum BoundaryType { diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ClientCertLoader.cs b/src/Microsoft.Net.Server/RequestProcessing/ClientCertLoader.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ClientCertLoader.cs rename to src/Microsoft.Net.Server/RequestProcessing/ClientCertLoader.cs index d5efd0b12e..0600ad3454 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ClientCertLoader.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/ClientCertLoader.cs @@ -14,7 +14,7 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // This class is used to load the client certificate on-demand. Because client certs are optional, all // failures are handled internally and reported via ClientCertException or ClientCertError. @@ -177,7 +177,7 @@ namespace Microsoft.AspNet.Server.WebListener Complete(0, null); } else if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && - OwinWebListener.SkipIOCPCallbackOnSuccess) + WebListener.SkipIOCPCallbackOnSuccess) { IOCompleted(statusCode, bytesReceived); } @@ -243,7 +243,7 @@ namespace Microsoft.AspNet.Server.WebListener asyncResult._overlapped); if (errorCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_IO_PENDING || - (errorCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && !OwinWebListener.SkipIOCPCallbackOnSuccess)) + (errorCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && !WebListener.SkipIOCPCallbackOnSuccess)) { return; } diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HeaderEncoding.cs b/src/Microsoft.Net.Server/RequestProcessing/HeaderEncoding.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HeaderEncoding.cs rename to src/Microsoft.Net.Server/RequestProcessing/HeaderEncoding.cs index 24a8df80ff..148985426a 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HeaderEncoding.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/HeaderEncoding.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // we use this static class as a helper class to encode/decode HTTP headers. // what we need is a 1-1 correspondence between a char in the range U+0000-U+00FF diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpKnownHeaderNames.cs b/src/Microsoft.Net.Server/RequestProcessing/HttpKnownHeaderNames.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpKnownHeaderNames.cs rename to src/Microsoft.Net.Server/RequestProcessing/HttpKnownHeaderNames.cs index 9885de2fcd..788477f478 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpKnownHeaderNames.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/HttpKnownHeaderNames.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class HttpKnownHeaderNames { diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpReasonPhrase.cs b/src/Microsoft.Net.Server/RequestProcessing/HttpReasonPhrase.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpReasonPhrase.cs rename to src/Microsoft.Net.Server/RequestProcessing/HttpReasonPhrase.cs index 27370832ff..40836a36ea 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpReasonPhrase.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/HttpReasonPhrase.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class HttpReasonPhrase { diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpStatusCode.cs b/src/Microsoft.Net.Server/RequestProcessing/HttpStatusCode.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpStatusCode.cs rename to src/Microsoft.Net.Server/RequestProcessing/HttpStatusCode.cs index 88e6fe4b18..83993f3065 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/HttpStatusCode.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/HttpStatusCode.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // Redirect Status code numbers that need to be defined. diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/NativeRequestContext.cs b/src/Microsoft.Net.Server/RequestProcessing/NativeRequestContext.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/NativeRequestContext.cs rename to src/Microsoft.Net.Server/RequestProcessing/NativeRequestContext.cs index 8ab4f029cb..15e99f7343 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/NativeRequestContext.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/NativeRequestContext.cs @@ -9,7 +9,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Threading; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal unsafe class NativeRequestContext : IDisposable { diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/OpaqueStream.cs b/src/Microsoft.Net.Server/RequestProcessing/OpaqueStream.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/OpaqueStream.cs rename to src/Microsoft.Net.Server/RequestProcessing/OpaqueStream.cs index 6238d9185d..2016976aa0 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/OpaqueStream.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/OpaqueStream.cs @@ -9,7 +9,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // A duplex wrapper around RequestStream and ResponseStream. // TODO: Consider merging RequestStream and ResponseStream instead. diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/Request.cs b/src/Microsoft.Net.Server/RequestProcessing/Request.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/Request.cs rename to src/Microsoft.Net.Server/RequestProcessing/Request.cs index 5b7875cd08..67471d70d5 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/Request.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/Request.cs @@ -15,7 +15,7 @@ using System.Security.Principal; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { public sealed class Request { diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestContext.cs b/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs similarity index 97% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestContext.cs rename to src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs index 1325eaed14..0546cf349a 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestContext.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs @@ -13,13 +13,13 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Logging; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { using OpaqueFunc = Func, Task>; public sealed class RequestContext : IDisposable { - private OwinWebListener _server; + private WebListener _server; private Request _request; private Response _response; private NativeRequestContext _memoryBlob; @@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Server.WebListener private CancellationTokenRegistration? _disconnectRegistration; private CancellationToken? _disconnectToken; - internal RequestContext(OwinWebListener httpListener, NativeRequestContext memoryBlob) + internal RequestContext(WebListener httpListener, NativeRequestContext memoryBlob) { // TODO: Verbose log _server = httpListener; @@ -81,7 +81,7 @@ namespace Microsoft.AspNet.Server.WebListener context.Abort(); } - internal OwinWebListener Server + internal WebListener Server { get { @@ -194,7 +194,7 @@ namespace Microsoft.AspNet.Server.WebListener // RequestQueueHandle may have been closed } } - + /* internal void OpaqueUpgrade(IDictionary parameters, OpaqueFunc callback) { // Parameters are ignored for now @@ -245,5 +245,6 @@ namespace Microsoft.AspNet.Server.WebListener return opaqueEnv; } + */ } } diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.Generated.cs b/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.Generated.cs rename to src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.cs index 2e2df172c3..4ec5271c51 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.Generated.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.cs @@ -13,7 +13,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { [GeneratedCode("TextTemplatingFileGenerator", "")] internal partial class RequestHeaders diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.Generated.tt b/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.tt similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.Generated.tt rename to src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.tt index 2b339e4640..6545fffe44 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.Generated.tt +++ b/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.tt @@ -69,7 +69,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Owin.Host.WebListener +namespace Microsoft.Net.Server { [GeneratedCode("TextTemplatingFileGenerator", "")] internal partial class RequestHeaders diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.cs b/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.cs rename to src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.cs index 9e43ab86e5..43b9fb1e7f 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestHeaders.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal partial class RequestHeaders : IDictionary { diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestStream.cs b/src/Microsoft.Net.Server/RequestProcessing/RequestStream.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestStream.cs rename to src/Microsoft.Net.Server/RequestProcessing/RequestStream.cs index e39f146c67..312dde4152 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestStream.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/RequestStream.cs @@ -11,7 +11,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal class RequestStream : Stream { @@ -258,7 +258,7 @@ namespace Microsoft.AspNet.Server.WebListener } } else if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && - OwinWebListener.SkipIOCPCallbackOnSuccess) + WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. asyncResult.IOCompleted(statusCode, bytesReturned); @@ -374,7 +374,7 @@ namespace Microsoft.AspNet.Server.WebListener } } else if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && - OwinWebListener.SkipIOCPCallbackOnSuccess) + WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. asyncResult.Dispose(); diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestUriBuilder.cs b/src/Microsoft.Net.Server/RequestProcessing/RequestUriBuilder.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestUriBuilder.cs rename to src/Microsoft.Net.Server/RequestProcessing/RequestUriBuilder.cs index 697934fc93..4a9bb518de 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/RequestUriBuilder.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/RequestUriBuilder.cs @@ -10,7 +10,7 @@ using System.Diagnostics; using System.Globalization; using System.Text; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // We don't use the cooked URL because http.sys unescapes all percent-encoded values. However, // we also can't just use the raw Uri, since http.sys supports not only Utf-8, but also ANSI/DBCS and diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/Response.cs b/src/Microsoft.Net.Server/RequestProcessing/Response.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/Response.cs rename to src/Microsoft.Net.Server/RequestProcessing/Response.cs index 2364e2a777..dd9738e443 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/Response.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/Response.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { public sealed unsafe class Response { @@ -288,7 +288,7 @@ namespace Microsoft.AspNet.Server.WebListener } } - internal bool SentHeaders + public bool SentHeaders { get { @@ -404,7 +404,7 @@ namespace Microsoft.AspNet.Server.WebListener if (asyncResult != null && statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && - OwinWebListener.SkipIOCPCallbackOnSuccess) + WebListener.SkipIOCPCallbackOnSuccess) { asyncResult.BytesSent = bytesSent; // The caller will invoke IOCompleted @@ -431,7 +431,7 @@ namespace Microsoft.AspNet.Server.WebListener if (asyncResult != null && statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && - OwinWebListener.SkipIOCPCallbackOnSuccess) + WebListener.SkipIOCPCallbackOnSuccess) { asyncResult.BytesSent = bytesSent; // The caller will invoke IOCompleted diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ResponseStream.cs b/src/Microsoft.Net.Server/RequestProcessing/ResponseStream.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ResponseStream.cs rename to src/Microsoft.Net.Server/RequestProcessing/ResponseStream.cs index 8d49f85ca3..21b38033e9 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ResponseStream.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/ResponseStream.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal class ResponseStream : Stream { @@ -133,7 +133,7 @@ namespace Microsoft.AspNet.Server.WebListener statusCode = _requestContext.Response.SendHeaders(null, asyncResult, flags, false); } - if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && OwinWebListener.SkipIOCPCallbackOnSuccess) + if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. asyncResult.IOCompleted(statusCode); @@ -425,7 +425,7 @@ namespace Microsoft.AspNet.Server.WebListener } } - if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && OwinWebListener.SkipIOCPCallbackOnSuccess) + if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. asyncResult.IOCompleted(statusCode, bytesSent); @@ -565,7 +565,7 @@ namespace Microsoft.AspNet.Server.WebListener } } - if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && OwinWebListener.SkipIOCPCallbackOnSuccess) + if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. asyncResult.IOCompleted(statusCode, bytesSent); @@ -680,7 +680,7 @@ namespace Microsoft.AspNet.Server.WebListener } } - if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && OwinWebListener.SkipIOCPCallbackOnSuccess) + if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. asyncResult.IOCompleted(statusCode, bytesSent); diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ResponseStreamAsyncResult.cs b/src/Microsoft.Net.Server/RequestProcessing/ResponseStreamAsyncResult.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ResponseStreamAsyncResult.cs rename to src/Microsoft.Net.Server/RequestProcessing/ResponseStreamAsyncResult.cs index 42b81228f8..a6c45b27f4 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/ResponseStreamAsyncResult.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/ResponseStreamAsyncResult.cs @@ -11,7 +11,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal unsafe class ResponseStreamAsyncResult : IAsyncResult, IDisposable { diff --git a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/SslStatus.cs b/src/Microsoft.Net.Server/RequestProcessing/SslStatus.cs similarity index 89% rename from src/Microsoft.AspNet.Server.WebListener/RequestProcessing/SslStatus.cs rename to src/Microsoft.Net.Server/RequestProcessing/SslStatus.cs index 72118c2d46..cc4debcdaa 100644 --- a/src/Microsoft.AspNet.Server.WebListener/RequestProcessing/SslStatus.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/SslStatus.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal enum SslStatus : byte { diff --git a/src/Microsoft.AspNet.Server.WebListener/Resources.Designer.cs b/src/Microsoft.Net.Server/Resources.Designer.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/Resources.Designer.cs rename to src/Microsoft.Net.Server/Resources.Designer.cs index aafe87fb8d..e0db3bdfbc 100644 --- a/src/Microsoft.AspNet.Server.WebListener/Resources.Designer.cs +++ b/src/Microsoft.Net.Server/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNet.Server.WebListener { +namespace Microsoft.Net.Server { using System; diff --git a/src/Microsoft.AspNet.Server.WebListener/Resources.resx b/src/Microsoft.Net.Server/Resources.resx similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/Resources.resx rename to src/Microsoft.Net.Server/Resources.resx diff --git a/src/Microsoft.AspNet.Server.WebListener/TimeoutManager.cs b/src/Microsoft.Net.Server/TimeoutManager.cs similarity index 98% rename from src/Microsoft.AspNet.Server.WebListener/TimeoutManager.cs rename to src/Microsoft.Net.Server/TimeoutManager.cs index 9e74f6563a..b90c212758 100644 --- a/src/Microsoft.AspNet.Server.WebListener/TimeoutManager.cs +++ b/src/Microsoft.Net.Server/TimeoutManager.cs @@ -8,7 +8,7 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { // See the native HTTP_TIMEOUT_LIMIT_INFO structure documentation for additional information. // http://msdn.microsoft.com/en-us/library/aa364661.aspx @@ -25,13 +25,13 @@ namespace Microsoft.AspNet.Server.WebListener private static readonly int TimeoutLimitSize = Marshal.SizeOf(); #endif - private OwinWebListener _server; + private WebListener _server; private int[] _timeouts; private uint _minSendBytesPerSecond; - internal TimeoutManager(OwinWebListener context) + internal TimeoutManager(WebListener listener) { - _server = context; + _server = listener; // We have to maintain local state since we allow applications to set individual timeouts. Native Http // API for setting timeouts expects all timeout values in every call so we have remember timeout values diff --git a/src/Microsoft.AspNet.Server.WebListener/UrlPrefix.cs b/src/Microsoft.Net.Server/UrlPrefix.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/UrlPrefix.cs rename to src/Microsoft.Net.Server/UrlPrefix.cs index 7a6e36e1ee..96046033c8 100644 --- a/src/Microsoft.AspNet.Server.WebListener/UrlPrefix.cs +++ b/src/Microsoft.Net.Server/UrlPrefix.cs @@ -7,7 +7,7 @@ using System; using System.Globalization; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { public class UrlPrefix { diff --git a/src/Microsoft.AspNet.Server.WebListener/ValidationHelper.cs b/src/Microsoft.Net.Server/ValidationHelper.cs similarity index 97% rename from src/Microsoft.AspNet.Server.WebListener/ValidationHelper.cs rename to src/Microsoft.Net.Server/ValidationHelper.cs index 104e49e320..5e17218855 100644 --- a/src/Microsoft.AspNet.Server.WebListener/ValidationHelper.cs +++ b/src/Microsoft.Net.Server/ValidationHelper.cs @@ -7,7 +7,7 @@ using System; using System.Globalization; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { internal static class ValidationHelper { diff --git a/src/Microsoft.AspNet.Server.WebListener/OwinWebListener.cs b/src/Microsoft.Net.Server/WebListener.cs similarity index 99% rename from src/Microsoft.AspNet.Server.WebListener/OwinWebListener.cs rename to src/Microsoft.Net.Server/WebListener.cs index bdb7a0ba83..1d72a75db7 100644 --- a/src/Microsoft.AspNet.Server.WebListener/OwinWebListener.cs +++ b/src/Microsoft.Net.Server/WebListener.cs @@ -17,14 +17,14 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Logging; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { using AppFunc = Func; /// /// An HTTP server wrapping the Http.Sys APIs that accepts requests and passes them on to the given OWIN application. /// - public sealed class OwinWebListener : IDisposable + public sealed class WebListener : IDisposable { private const long DefaultRequestQueueLength = 1000; // Http.sys default. #if NET45 @@ -75,7 +75,7 @@ namespace Microsoft.AspNet.Server.WebListener // The native request queue private long? _requestQueueLength; - public OwinWebListener() + public WebListener() { if (!UnsafeNclNativeMethods.HttpApi.Supported) { @@ -754,7 +754,7 @@ namespace Microsoft.AspNet.Server.WebListener return CancellationToken.None; } - if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && OwinWebListener.SkipIOCPCallbackOnSuccess) + if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_SUCCESS && WebListener.SkipIOCPCallbackOnSuccess) { // IO operation completed synchronously - callback won't be called to signal completion. // TODO: return a canceled token? @@ -920,11 +920,11 @@ namespace Microsoft.AspNet.Server.WebListener private class ConnectionCancellation { - private readonly OwinWebListener _parent; + private readonly WebListener _parent; private volatile bool _initialized; // Must be volatile because initialization is synchronized private CancellationToken _cancellationToken; - public ConnectionCancellation(OwinWebListener parent) + public ConnectionCancellation(WebListener parent) { _parent = parent; } diff --git a/src/Microsoft.AspNet.Server.WebListener/WebListenerException.cs b/src/Microsoft.Net.Server/WebListenerException.cs similarity index 96% rename from src/Microsoft.AspNet.Server.WebListener/WebListenerException.cs rename to src/Microsoft.Net.Server/WebListenerException.cs index 63c5f1713e..11a5a2daed 100644 --- a/src/Microsoft.AspNet.Server.WebListener/WebListenerException.cs +++ b/src/Microsoft.Net.Server/WebListenerException.cs @@ -9,7 +9,7 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.Net.Server { [SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable")] public class WebListenerException : Win32Exception diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs b/src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs rename to src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs b/src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs rename to src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/System/Diagnostics/TraceEventType.cs b/src/Microsoft.Net.Server/fx/System/Diagnostics/TraceEventType.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/System/Diagnostics/TraceEventType.cs rename to src/Microsoft.Net.Server/fx/System/Diagnostics/TraceEventType.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/System/ExternDll.cs b/src/Microsoft.Net.Server/fx/System/ExternDll.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/System/ExternDll.cs rename to src/Microsoft.Net.Server/fx/System/ExternDll.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/System/Runtime/InteropServices/ExternalException.cs b/src/Microsoft.Net.Server/fx/System/Runtime/InteropServices/ExternalException.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/System/Runtime/InteropServices/ExternalException.cs rename to src/Microsoft.Net.Server/fx/System/Runtime/InteropServices/ExternalException.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/System/SafeNativeMethods.cs b/src/Microsoft.Net.Server/fx/System/SafeNativeMethods.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/System/SafeNativeMethods.cs rename to src/Microsoft.Net.Server/fx/System/SafeNativeMethods.cs diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/System/Security/Authentication/ExtendedProtection/ChannelBinding.cs b/src/Microsoft.Net.Server/fx/System/Security/Authentication/ExtendedProtection/ChannelBinding.cs similarity index 100% rename from src/Microsoft.AspNet.Server.WebListener/fx/System/Security/Authentication/ExtendedProtection/ChannelBinding.cs rename to src/Microsoft.Net.Server/fx/System/Security/Authentication/ExtendedProtection/ChannelBinding.cs diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs index 893fc4c941..760a21c556 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs @@ -6,6 +6,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.PipelineCore; +using Microsoft.Net.Server; using Xunit; namespace Microsoft.AspNet.Server.WebListener diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs index 041665d0bb..fbbc621d3f 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; +using Microsoft.Net.Server; using Xunit; namespace Microsoft.AspNet.Server.WebListener diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs index 5b8b79d68f..d6233e5c6d 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.PipelineCore; +using Microsoft.Net.Server; using Xunit; namespace Microsoft.AspNet.Server.WebListener diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs index 57dab56d0c..d96ef5d45d 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; +using Microsoft.Net.Server; namespace Microsoft.AspNet.Server.WebListener { diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json index 76202da8df..4f6ab2edbd 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json @@ -10,6 +10,7 @@ "xunit.core": "2.0.0-aspnet-*", "xunit.execution": "2.0.0-aspnet-*", "Microsoft.AspNet.Server.WebListener" : "", + "Microsoft.Net.Server" : "", "Microsoft.AspNet.Abstractions" : "0.1-alpha-*", "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-*", "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*",