diff --git a/WebListener.sln b/WebListener.sln index 3846c0df71..a27e04c6b7 100644 --- a/WebListener.sln +++ b/WebListener.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.21730.1 +VisualStudioVersion = 14.0.21916.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "samples\TestClient\TestClient.csproj", "{8B828433-B333-4C19-96AE-00BFFF9D8841}" EndProject @@ -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.Net.Server", "src\Microsoft.Net.Server\Microsoft.Net.Server.kproj", "{3F5212AA-E287-49DD-8CEC-44BF0A2AC9A1}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Server", "src\Microsoft.Net.Http.Server\Microsoft.Net.Http.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 @@ -25,7 +25,12 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Web 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 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Server.FunctionalTests", "test\Microsoft.Net.Server.FunctionalTests\Microsoft.Net.Server.FunctionalTests.kproj", "{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Server.FunctionalTests", "test\Microsoft.Net.Http.Server.FunctionalTests\Microsoft.Net.Http.Server.FunctionalTests.kproj", "{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5E9B546C-17AC-4BDF-BCB3-5955D4755ED8}" + ProjectSection(SolutionItems) = preProject + global.json = global.json + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/HelloWorld/Program.cs b/samples/HelloWorld/Program.cs index 243af9a49d..e693458753 100644 --- a/samples/HelloWorld/Program.cs +++ b/samples/HelloWorld/Program.cs @@ -20,7 +20,7 @@ using System.Net.WebSockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.Net.Server; +using Microsoft.Net.Http.Server; namespace HelloWorld { diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index 8bf9217d36..3a1514068e 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.Net.Server" : "" + "Microsoft.Net.Http.Server" : "" }, "frameworks": { "net45": { }, diff --git a/samples/SelfHostServer/Startup.cs b/samples/SelfHostServer/Startup.cs index 917c06a5b7..1956abba60 100644 --- a/samples/SelfHostServer/Startup.cs +++ b/samples/SelfHostServer/Startup.cs @@ -23,7 +23,7 @@ using Microsoft.AspNet; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Server.WebListener; -using Microsoft.Net.Server; +using Microsoft.Net.Http.Server; namespace SelfHostServer { diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index bee846ffc4..6bab457b0b 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -3,7 +3,7 @@ "Microsoft.AspNet.Hosting": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "", - "Microsoft.Net.Server": "" + "Microsoft.Net.Http.Server": "" }, "commands": { "web": "Microsoft.AspNet.Hosting --server=Microsoft.AspNet.Server.WebListener --server.urls=http://localhost:8080" }, "frameworks": { diff --git a/src/Microsoft.AspNet.Server.WebListener/AuthenticationHandler.cs b/src/Microsoft.AspNet.Server.WebListener/AuthenticationHandler.cs index e86419c1c5..272134c0fe 100644 --- a/src/Microsoft.AspNet.Server.WebListener/AuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Server.WebListener/AuthenticationHandler.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNet.HttpFeature.Security; -using Microsoft.Net.Server; +using Microsoft.Net.Http.Server; namespace Microsoft.AspNet.Server.WebListener { diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs index 9a5023f9b2..d27fb974da 100644 --- a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs +++ b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs @@ -28,7 +28,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.HttpFeature.Security; -using Microsoft.Net.Server; +using Microsoft.Net.Http.Server; using Microsoft.Net.WebSockets; namespace Microsoft.AspNet.Server.WebListener diff --git a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs index f1de9d6423..c02513be2f 100644 --- a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs +++ b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs @@ -20,7 +20,7 @@ using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks; using Microsoft.Framework.Logging; -using Microsoft.Net.Server; +using Microsoft.Net.Http.Server; namespace Microsoft.AspNet.Server.WebListener { @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Server.WebListener { private static readonly int DefaultMaxAccepts = 5 * Environment.ProcessorCount; - private readonly Microsoft.Net.Server.WebListener _listener; + private readonly Microsoft.Net.Http.Server.WebListener _listener; private readonly ILogger _logger; private AppFunc _appFunc; @@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Server.WebListener // TODO: private IDictionary _capabilities; - internal MessagePump(Microsoft.Net.Server.WebListener listener, ILoggerFactory loggerFactory) + internal MessagePump(Microsoft.Net.Http.Server.WebListener listener, ILoggerFactory loggerFactory) { Contract.Assert(listener != null); _listener = listener; @@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Server.WebListener _shutdownSignal = new ManualResetEvent(false); } - internal Microsoft.Net.Server.WebListener Listener + internal Microsoft.Net.Http.Server.WebListener Listener { get { return _listener; } } diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs index a5a80ecce4..803beae3af 100644 --- a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs +++ b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs @@ -43,7 +43,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Hosting.Server; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.Logging; -using Microsoft.Net.Server; +using Microsoft.Net.Http.Server; namespace Microsoft.AspNet.Server.WebListener { @@ -68,7 +68,7 @@ namespace Microsoft.AspNet.Server.WebListener [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Disposed by caller")] public IServerInformation Initialize(IConfiguration configuration) { - Microsoft.Net.Server.WebListener listener = new Microsoft.Net.Server.WebListener(); + Microsoft.Net.Http.Server.WebListener listener = new Microsoft.Net.Http.Server.WebListener(); ParseAddresses(configuration, listener); return new ServerInformation(new MessagePump(listener, _loggerFactory)); } @@ -101,7 +101,7 @@ namespace Microsoft.AspNet.Server.WebListener return serverInfo.MessagePump; } - private void ParseAddresses(IConfiguration config, Microsoft.Net.Server.WebListener listener) + private void ParseAddresses(IConfiguration config, Microsoft.Net.Http.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 ef9e0bdda1..314b60e336 100644 --- a/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs +++ b/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs @@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Server.WebListener get { return GetType().GetTypeInfo().Assembly.GetName().Name; } } - public Microsoft.Net.Server.WebListener Listener + public Microsoft.Net.Http.Server.WebListener Listener { get { return _messagePump.Listener; } } diff --git a/src/Microsoft.AspNet.Server.WebListener/project.json b/src/Microsoft.AspNet.Server.WebListener/project.json index d7c511301b..2ee44e51cb 100644 --- a/src/Microsoft.AspNet.Server.WebListener/project.json +++ b/src/Microsoft.AspNet.Server.WebListener/project.json @@ -6,7 +6,7 @@ "Microsoft.AspNet.HttpFeature": "1.0.0-*", "Microsoft.Framework.ConfigurationModel": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", - "Microsoft.Net.Server" : "", + "Microsoft.Net.Http.Server" : "", "Microsoft.Net.WebSocketAbstractions": "1.0.0-*" }, "compilationOptions": { diff --git a/src/Microsoft.Net.Server/AsyncAcceptContext.cs b/src/Microsoft.Net.Http.Server/AsyncAcceptContext.cs similarity index 99% rename from src/Microsoft.Net.Server/AsyncAcceptContext.cs rename to src/Microsoft.Net.Http.Server/AsyncAcceptContext.cs index f1df0bbbad..08edc569ac 100644 --- a/src/Microsoft.Net.Server/AsyncAcceptContext.cs +++ b/src/Microsoft.Net.Http.Server/AsyncAcceptContext.cs @@ -27,7 +27,7 @@ using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal unsafe class AsyncAcceptContext : IAsyncResult, IDisposable { diff --git a/src/Microsoft.Net.Server/AuthenticationManager.cs b/src/Microsoft.Net.Http.Server/AuthenticationManager.cs similarity index 99% rename from src/Microsoft.Net.Server/AuthenticationManager.cs rename to src/Microsoft.Net.Http.Server/AuthenticationManager.cs index 458b46261d..4d88e5716a 100644 --- a/src/Microsoft.Net.Server/AuthenticationManager.cs +++ b/src/Microsoft.Net.Http.Server/AuthenticationManager.cs @@ -29,7 +29,7 @@ using System.Runtime.InteropServices; using System.Security.Claims; using System.Security.Principal; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.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 diff --git a/src/Microsoft.Net.Server/AuthenticationTypes.cs b/src/Microsoft.Net.Http.Server/AuthenticationTypes.cs similarity index 96% rename from src/Microsoft.Net.Server/AuthenticationTypes.cs rename to src/Microsoft.Net.Http.Server/AuthenticationTypes.cs index 9906ba2053..a7c39ab7c2 100644 --- a/src/Microsoft.Net.Server/AuthenticationTypes.cs +++ b/src/Microsoft.Net.Http.Server/AuthenticationTypes.cs @@ -17,7 +17,7 @@ using System; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { [Flags] public enum AuthenticationTypes diff --git a/src/Microsoft.Net.Server/Constants.cs b/src/Microsoft.Net.Http.Server/Constants.cs similarity index 99% rename from src/Microsoft.Net.Server/Constants.cs rename to src/Microsoft.Net.Http.Server/Constants.cs index a85d13c4ae..2d8ae594ab 100644 --- a/src/Microsoft.Net.Server/Constants.cs +++ b/src/Microsoft.Net.Http.Server/Constants.cs @@ -23,7 +23,7 @@ using System; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class Constants { diff --git a/src/Microsoft.Net.Server/CustomDictionary.xml b/src/Microsoft.Net.Http.Server/CustomDictionary.xml similarity index 100% rename from src/Microsoft.Net.Server/CustomDictionary.xml rename to src/Microsoft.Net.Http.Server/CustomDictionary.xml diff --git a/src/Microsoft.Net.Server/GlobalSuppressions.cs b/src/Microsoft.Net.Http.Server/GlobalSuppressions.cs similarity index 100% rename from src/Microsoft.Net.Server/GlobalSuppressions.cs rename to src/Microsoft.Net.Http.Server/GlobalSuppressions.cs diff --git a/src/Microsoft.Net.Server/Helpers.cs b/src/Microsoft.Net.Http.Server/Helpers.cs similarity index 97% rename from src/Microsoft.Net.Server/Helpers.cs rename to src/Microsoft.Net.Http.Server/Helpers.cs index 754acbda8c..60dad126ec 100644 --- a/src/Microsoft.Net.Server/Helpers.cs +++ b/src/Microsoft.Net.Http.Server/Helpers.cs @@ -24,7 +24,7 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class Helpers { diff --git a/src/Microsoft.Net.Server/LogHelper.cs b/src/Microsoft.Net.Http.Server/LogHelper.cs similarity index 98% rename from src/Microsoft.Net.Server/LogHelper.cs rename to src/Microsoft.Net.Http.Server/LogHelper.cs index 5b7efd1830..01501b4607 100644 --- a/src/Microsoft.Net.Server/LogHelper.cs +++ b/src/Microsoft.Net.Http.Server/LogHelper.cs @@ -26,7 +26,7 @@ using System.Diagnostics; using System.Globalization; using Microsoft.Framework.Logging; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class LogHelper { diff --git a/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj b/src/Microsoft.Net.Http.Server/Microsoft.Net.Http.Server.kproj similarity index 100% rename from src/Microsoft.Net.Server/Microsoft.Net.Server.kproj rename to src/Microsoft.Net.Http.Server/Microsoft.Net.Http.Server.kproj diff --git a/src/Microsoft.Net.Server/NativeInterop/AddressFamily.cs b/src/Microsoft.Net.Http.Server/NativeInterop/AddressFamily.cs similarity index 99% rename from src/Microsoft.Net.Server/NativeInterop/AddressFamily.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/AddressFamily.cs index 1b501e5cad..c1c6def0cf 100644 --- a/src/Microsoft.Net.Server/NativeInterop/AddressFamily.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/AddressFamily.cs @@ -21,7 +21,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { /// /// diff --git a/src/Microsoft.Net.Server/NativeInterop/ComNetOS.cs b/src/Microsoft.Net.Http.Server/NativeInterop/ComNetOS.cs similarity index 97% rename from src/Microsoft.Net.Server/NativeInterop/ComNetOS.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/ComNetOS.cs index 7d99de7dcf..5d78b9a498 100644 --- a/src/Microsoft.Net.Server/NativeInterop/ComNetOS.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/ComNetOS.cs @@ -23,7 +23,7 @@ using System; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class ComNetOS { diff --git a/src/Microsoft.Net.Server/NativeInterop/ContextAttribute.cs b/src/Microsoft.Net.Http.Server/NativeInterop/ContextAttribute.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/ContextAttribute.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/ContextAttribute.cs index 6ee9ea9742..2964b40da6 100644 --- a/src/Microsoft.Net.Server/NativeInterop/ContextAttribute.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/ContextAttribute.cs @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal enum ContextAttribute { diff --git a/src/Microsoft.Net.Server/NativeInterop/HttpRequestQueueV2Handle.cs b/src/Microsoft.Net.Http.Server/NativeInterop/HttpRequestQueueV2Handle.cs similarity index 97% rename from src/Microsoft.Net.Server/NativeInterop/HttpRequestQueueV2Handle.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/HttpRequestQueueV2Handle.cs index b2ffd71a52..bcf8890704 100644 --- a/src/Microsoft.Net.Server/NativeInterop/HttpRequestQueueV2Handle.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/HttpRequestQueueV2Handle.cs @@ -23,7 +23,7 @@ using Microsoft.Win32.SafeHandles; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { // This class is a wrapper for Http.sys V2 request queue handle. internal sealed class HttpRequestQueueV2Handle : SafeHandleZeroOrMinusOneIsInvalid diff --git a/src/Microsoft.Net.Server/NativeInterop/HttpServerSessionHandle.cs b/src/Microsoft.Net.Http.Server/NativeInterop/HttpServerSessionHandle.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/HttpServerSessionHandle.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/HttpServerSessionHandle.cs index 203785315e..6300ef684b 100644 --- a/src/Microsoft.Net.Server/NativeInterop/HttpServerSessionHandle.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/HttpServerSessionHandle.cs @@ -25,7 +25,7 @@ using System; using System.Threading; using Microsoft.Win32.SafeHandles; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal sealed class HttpServerSessionHandle : CriticalHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.Net.Server/NativeInterop/HttpSysRequestHeader.cs b/src/Microsoft.Net.Http.Server/NativeInterop/HttpSysRequestHeader.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/HttpSysRequestHeader.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/HttpSysRequestHeader.cs index bb8ddc3848..436a993cfd 100644 --- a/src/Microsoft.Net.Server/NativeInterop/HttpSysRequestHeader.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/HttpSysRequestHeader.cs @@ -21,7 +21,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal enum HttpSysRequestHeader { diff --git a/src/Microsoft.Net.Server/NativeInterop/HttpSysResponseHeader.cs b/src/Microsoft.Net.Http.Server/NativeInterop/HttpSysResponseHeader.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/HttpSysResponseHeader.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/HttpSysResponseHeader.cs index b996342215..570a7928ea 100644 --- a/src/Microsoft.Net.Server/NativeInterop/HttpSysResponseHeader.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/HttpSysResponseHeader.cs @@ -21,7 +21,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal enum HttpSysResponseHeader { diff --git a/src/Microsoft.Net.Server/NativeInterop/HttpSysSettings.cs b/src/Microsoft.Net.Http.Server/NativeInterop/HttpSysSettings.cs similarity index 99% rename from src/Microsoft.Net.Server/NativeInterop/HttpSysSettings.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/HttpSysSettings.cs index 549c63ecb0..94d60a3abb 100644 --- a/src/Microsoft.Net.Server/NativeInterop/HttpSysSettings.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/HttpSysSettings.cs @@ -30,7 +30,7 @@ using System.Security; using Microsoft.Win32; #endif -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class HttpSysSettings { diff --git a/src/Microsoft.Net.Server/NativeInterop/IntPtrHelper.cs b/src/Microsoft.Net.Http.Server/NativeInterop/IntPtrHelper.cs similarity index 97% rename from src/Microsoft.Net.Server/NativeInterop/IntPtrHelper.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/IntPtrHelper.cs index bf752ab2e2..d3594b3deb 100644 --- a/src/Microsoft.Net.Server/NativeInterop/IntPtrHelper.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/IntPtrHelper.cs @@ -23,7 +23,7 @@ using System; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class IntPtrHelper { diff --git a/src/Microsoft.Net.Server/NativeInterop/NclUtilities.cs b/src/Microsoft.Net.Http.Server/NativeInterop/NclUtilities.cs similarity index 97% rename from src/Microsoft.Net.Server/NativeInterop/NclUtilities.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/NclUtilities.cs index f0adc64e05..e5934498d9 100644 --- a/src/Microsoft.Net.Server/NativeInterop/NclUtilities.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/NclUtilities.cs @@ -23,7 +23,7 @@ using System; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class NclUtilities { diff --git a/src/Microsoft.Net.Server/NativeInterop/SSPIHandle.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SSPIHandle.cs similarity index 97% rename from src/Microsoft.Net.Server/NativeInterop/SSPIHandle.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SSPIHandle.cs index 1dac268c56..3c9bf9d67f 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SSPIHandle.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SSPIHandle.cs @@ -24,7 +24,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { [StructLayout(LayoutKind.Sequential, Pack = 1)] internal struct SSPIHandle diff --git a/src/Microsoft.Net.Server/NativeInterop/SafeLoadLibrary.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLoadLibrary.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/SafeLoadLibrary.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SafeLoadLibrary.cs index 7a24acf6dd..7b996d37fa 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SafeLoadLibrary.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLoadLibrary.cs @@ -23,7 +23,7 @@ using Microsoft.Win32.SafeHandles; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal sealed class SafeLoadLibrary : SafeHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.Net.Server/NativeInterop/SafeLocalFree.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalFree.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/SafeLocalFree.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalFree.cs index eea727e5fb..886381465b 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SafeLocalFree.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalFree.cs @@ -24,7 +24,7 @@ using System; using Microsoft.Win32.SafeHandles; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal sealed class SafeLocalFree : SafeHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.Net.Server/NativeInterop/SafeLocalFreeChannelBinding.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalFreeChannelBinding.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/SafeLocalFreeChannelBinding.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalFreeChannelBinding.cs index be210bbdf1..8a08e20b85 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SafeLocalFreeChannelBinding.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalFreeChannelBinding.cs @@ -24,7 +24,7 @@ using System; using System.Security.Authentication.ExtendedProtection; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal class SafeLocalFreeChannelBinding : ChannelBinding { diff --git a/src/Microsoft.Net.Server/NativeInterop/SafeLocalMemHandle.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalMemHandle.cs similarity index 97% rename from src/Microsoft.Net.Server/NativeInterop/SafeLocalMemHandle.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalMemHandle.cs index daa501bbc1..d961d1d38b 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SafeLocalMemHandle.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SafeLocalMemHandle.cs @@ -24,7 +24,7 @@ using System; using Microsoft.Win32.SafeHandles; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal sealed class SafeLocalMemHandle : SafeHandleZeroOrMinusOneIsInvalid { diff --git a/src/Microsoft.Net.Server/NativeInterop/SafeNativeOverlapped.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SafeNativeOverlapped.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/SafeNativeOverlapped.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SafeNativeOverlapped.cs index fb4f32484b..cf8d1f38e4 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SafeNativeOverlapped.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SafeNativeOverlapped.cs @@ -25,7 +25,7 @@ using System; using System.Runtime.InteropServices; using System.Threading; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal class SafeNativeOverlapped : SafeHandle { diff --git a/src/Microsoft.Net.Server/NativeInterop/SchProtocols.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SchProtocols.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/SchProtocols.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SchProtocols.cs index 8b2acabade..9787a24066 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SchProtocols.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SchProtocols.cs @@ -21,7 +21,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { using System; using System.Globalization; diff --git a/src/Microsoft.Net.Server/NativeInterop/SecurityStatus.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SecurityStatus.cs similarity index 98% rename from src/Microsoft.Net.Server/NativeInterop/SecurityStatus.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SecurityStatus.cs index 59ea71a2ea..aaafb59294 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SecurityStatus.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SecurityStatus.cs @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal enum SecurityStatus { diff --git a/src/Microsoft.Net.Server/NativeInterop/SocketAddress.cs b/src/Microsoft.Net.Http.Server/NativeInterop/SocketAddress.cs similarity index 99% rename from src/Microsoft.Net.Server/NativeInterop/SocketAddress.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/SocketAddress.cs index 0a59d72f45..4d633452ac 100644 --- a/src/Microsoft.Net.Server/NativeInterop/SocketAddress.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/SocketAddress.cs @@ -28,7 +28,7 @@ using System.Globalization; using System.Net; using System.Text; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.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.Net.Server/NativeInterop/UnsafeNativeMethods.cs b/src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.cs similarity index 99% rename from src/Microsoft.Net.Server/NativeInterop/UnsafeNativeMethods.cs rename to src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.cs index acf409ed44..641b25e963 100644 --- a/src/Microsoft.Net.Server/NativeInterop/UnsafeNativeMethods.cs +++ b/src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.cs @@ -26,7 +26,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class UnsafeNclNativeMethods { @@ -80,7 +80,7 @@ namespace Microsoft.Net.Server [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.Net.Server.UnsafeNclNativeMethods.SECURITY_ATTRIBUTES pSecurityAttributes, uint flags, out HttpRequestQueueV2Handle pReqQueueHandle); + Microsoft.Net.Http.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/RequestProcessing/BoundaryType.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/BoundaryType.cs similarity index 97% rename from src/Microsoft.Net.Server/RequestProcessing/BoundaryType.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/BoundaryType.cs index a398747bba..b45b24b658 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/BoundaryType.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/BoundaryType.cs @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal enum BoundaryType { diff --git a/src/Microsoft.Net.Server/RequestProcessing/ClientCertLoader.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/ClientCertLoader.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/ClientCertLoader.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/ClientCertLoader.cs index 3f6228db45..5e9d078df6 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/ClientCertLoader.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/ClientCertLoader.cs @@ -31,7 +31,7 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.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. diff --git a/src/Microsoft.Net.Server/RequestProcessing/HeaderCollection.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderCollection.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/HeaderCollection.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/HeaderCollection.cs index 62a800cd71..52eaa6e33b 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/HeaderCollection.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderCollection.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class HeaderCollection : IDictionary { diff --git a/src/Microsoft.Net.Server/RequestProcessing/HeaderEncoding.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderEncoding.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/HeaderEncoding.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/HeaderEncoding.cs index 4cc96769b7..9b3726be86 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/HeaderEncoding.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderEncoding.cs @@ -26,7 +26,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.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.Net.Server/RequestProcessing/HeaderParser.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderParser.cs similarity index 98% rename from src/Microsoft.Net.Server/RequestProcessing/HeaderParser.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/HeaderParser.cs index fb217f06b1..ebc77b8203 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/HeaderParser.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderParser.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class HeaderParser { diff --git a/src/Microsoft.Net.Server/RequestProcessing/HttpKnownHeaderNames.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HttpKnownHeaderNames.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/HttpKnownHeaderNames.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/HttpKnownHeaderNames.cs index 3aaa743291..0da9062d6e 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/HttpKnownHeaderNames.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/HttpKnownHeaderNames.cs @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class HttpKnownHeaderNames { diff --git a/src/Microsoft.Net.Server/RequestProcessing/HttpReasonPhrase.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HttpReasonPhrase.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/HttpReasonPhrase.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/HttpReasonPhrase.cs index 5b9596603f..a31b24985d 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/HttpReasonPhrase.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/HttpReasonPhrase.cs @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class HttpReasonPhrase { diff --git a/src/Microsoft.Net.Server/RequestProcessing/HttpStatusCode.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HttpStatusCode.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/HttpStatusCode.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/HttpStatusCode.cs index a8535a1951..3a84ed8f22 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/HttpStatusCode.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/HttpStatusCode.cs @@ -21,7 +21,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { // Redirect Status code numbers that need to be defined. diff --git a/src/Microsoft.Net.Server/RequestProcessing/NativeRequestContext.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/NativeRequestContext.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/NativeRequestContext.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/NativeRequestContext.cs index 74afb31713..61f81ebe8c 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/NativeRequestContext.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/NativeRequestContext.cs @@ -26,7 +26,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Threading; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal unsafe class NativeRequestContext : IDisposable { diff --git a/src/Microsoft.Net.Server/RequestProcessing/OpaqueStream.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/OpaqueStream.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/OpaqueStream.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/OpaqueStream.cs index 6f33ea51d8..8c66cbca9a 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/OpaqueStream.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/OpaqueStream.cs @@ -26,7 +26,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { // A duplex wrapper around RequestStream and ResponseStream. // TODO: Consider merging RequestStream and ResponseStream instead. diff --git a/src/Microsoft.Net.Server/RequestProcessing/Request.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/Request.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs index 4e05202106..daf92329ed 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/Request.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs @@ -35,7 +35,7 @@ using System.Security.Principal; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public sealed class Request { diff --git a/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestContext.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/RequestContext.cs index 98b9c99cb6..5a47b0498c 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestContext.cs @@ -33,7 +33,7 @@ using System.Threading.Tasks; using Microsoft.Framework.Logging; using Microsoft.Net.WebSockets; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public sealed class RequestContext : IDisposable { diff --git a/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.cs index bacf8811a7..66019a500e 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.cs @@ -30,7 +30,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { [GeneratedCode("TextTemplatingFileGenerator", "")] internal partial class RequestHeaders diff --git a/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.tt b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.tt similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.tt rename to src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.tt index 6545fffe44..931380b1fd 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.Generated.tt +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.tt @@ -69,7 +69,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { [GeneratedCode("TextTemplatingFileGenerator", "")] internal partial class RequestHeaders diff --git a/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.cs index 113f5bc3fd..95e754870a 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/RequestHeaders.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.cs @@ -40,7 +40,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal partial class RequestHeaders : IDictionary { diff --git a/src/Microsoft.Net.Server/RequestProcessing/RequestStream.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestStream.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/RequestStream.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/RequestStream.cs index 40f6e507f3..fb93d95eb3 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/RequestStream.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestStream.cs @@ -28,7 +28,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal class RequestStream : Stream { diff --git a/src/Microsoft.Net.Server/RequestProcessing/RequestUriBuilder.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestUriBuilder.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/RequestUriBuilder.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/RequestUriBuilder.cs index 5127f81281..6fd6467468 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/RequestUriBuilder.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestUriBuilder.cs @@ -27,7 +27,7 @@ using System.Diagnostics; using System.Globalization; using System.Text; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.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.Net.Server/RequestProcessing/Response.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/Response.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs index ec5eeecbf4..95193ca2bb 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/Response.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs @@ -31,7 +31,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public sealed unsafe class Response { diff --git a/src/Microsoft.Net.Server/RequestProcessing/ResponseStream.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStream.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/ResponseStream.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStream.cs index 5f13a2aaf8..61825d7d73 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/ResponseStream.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStream.cs @@ -29,7 +29,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal class ResponseStream : Stream { diff --git a/src/Microsoft.Net.Server/RequestProcessing/ResponseStreamAsyncResult.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStreamAsyncResult.cs similarity index 99% rename from src/Microsoft.Net.Server/RequestProcessing/ResponseStreamAsyncResult.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStreamAsyncResult.cs index b771b7b88d..883459d132 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/ResponseStreamAsyncResult.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStreamAsyncResult.cs @@ -28,7 +28,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal unsafe class ResponseStreamAsyncResult : IAsyncResult, IDisposable { diff --git a/src/Microsoft.Net.Server/RequestProcessing/SslStatus.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/SslStatus.cs similarity index 96% rename from src/Microsoft.Net.Server/RequestProcessing/SslStatus.cs rename to src/Microsoft.Net.Http.Server/RequestProcessing/SslStatus.cs index 056c9e61cb..a974c723e5 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/SslStatus.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/SslStatus.cs @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------- -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal enum SslStatus : byte { diff --git a/src/Microsoft.Net.Server/Resources.Designer.cs b/src/Microsoft.Net.Http.Server/Resources.Designer.cs similarity index 97% rename from src/Microsoft.Net.Server/Resources.Designer.cs rename to src/Microsoft.Net.Http.Server/Resources.Designer.cs index 9fdfa80837..0d5dffd0c3 100644 --- a/src/Microsoft.Net.Server/Resources.Designer.cs +++ b/src/Microsoft.Net.Http.Server/Resources.Designer.cs @@ -25,7 +25,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.Net.Server { +namespace Microsoft.Net.Http.Server { using System; @@ -56,7 +56,7 @@ namespace Microsoft.Net.Server { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Net.Server.Resources", System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(Resources)).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Net.Http.Server.Resources", System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(Resources)).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Microsoft.Net.Server/Resources.resx b/src/Microsoft.Net.Http.Server/Resources.resx similarity index 100% rename from src/Microsoft.Net.Server/Resources.resx rename to src/Microsoft.Net.Http.Server/Resources.resx diff --git a/src/Microsoft.Net.Server/TimeoutManager.cs b/src/Microsoft.Net.Http.Server/TimeoutManager.cs similarity index 99% rename from src/Microsoft.Net.Server/TimeoutManager.cs rename to src/Microsoft.Net.Http.Server/TimeoutManager.cs index 6789328c1f..e7bd3b2236 100644 --- a/src/Microsoft.Net.Server/TimeoutManager.cs +++ b/src/Microsoft.Net.Http.Server/TimeoutManager.cs @@ -25,7 +25,7 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { // See the native HTTP_TIMEOUT_LIMIT_INFO structure documentation for additional information. // http://msdn.microsoft.com/en-us/library/aa364661.aspx diff --git a/src/Microsoft.Net.Server/UrlPrefix.cs b/src/Microsoft.Net.Http.Server/UrlPrefix.cs similarity index 99% rename from src/Microsoft.Net.Server/UrlPrefix.cs rename to src/Microsoft.Net.Http.Server/UrlPrefix.cs index 0d1e732bef..24cf55fd0e 100644 --- a/src/Microsoft.Net.Server/UrlPrefix.cs +++ b/src/Microsoft.Net.Http.Server/UrlPrefix.cs @@ -24,7 +24,7 @@ using System; using System.Globalization; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class UrlPrefix { diff --git a/src/Microsoft.Net.Server/ValidationHelper.cs b/src/Microsoft.Net.Http.Server/ValidationHelper.cs similarity index 98% rename from src/Microsoft.Net.Server/ValidationHelper.cs rename to src/Microsoft.Net.Http.Server/ValidationHelper.cs index ad5ab47d99..fc84aa1ecd 100644 --- a/src/Microsoft.Net.Server/ValidationHelper.cs +++ b/src/Microsoft.Net.Http.Server/ValidationHelper.cs @@ -24,7 +24,7 @@ using System; using System.Globalization; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class ValidationHelper { diff --git a/src/Microsoft.Net.Server/WebListener.cs b/src/Microsoft.Net.Http.Server/WebListener.cs similarity index 99% rename from src/Microsoft.Net.Server/WebListener.cs rename to src/Microsoft.Net.Http.Server/WebListener.cs index 66a38efdfc..d8d80772dc 100644 --- a/src/Microsoft.Net.Server/WebListener.cs +++ b/src/Microsoft.Net.Http.Server/WebListener.cs @@ -34,7 +34,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Framework.Logging; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { using AppFunc = Func; diff --git a/src/Microsoft.Net.Server/WebListenerException.cs b/src/Microsoft.Net.Http.Server/WebListenerException.cs similarity index 98% rename from src/Microsoft.Net.Server/WebListenerException.cs rename to src/Microsoft.Net.Http.Server/WebListenerException.cs index c9d17fca6b..a47346c509 100644 --- a/src/Microsoft.Net.Server/WebListenerException.cs +++ b/src/Microsoft.Net.Http.Server/WebListenerException.cs @@ -26,7 +26,7 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { [SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable")] public class WebListenerException : Win32Exception diff --git a/src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs b/src/Microsoft.Net.Http.Server/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs similarity index 100% rename from src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs rename to src/Microsoft.Net.Http.Server/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs diff --git a/src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs b/src/Microsoft.Net.Http.Server/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs similarity index 100% rename from src/Microsoft.Net.Server/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs rename to src/Microsoft.Net.Http.Server/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs diff --git a/src/Microsoft.Net.Server/fx/System/Diagnostics/TraceEventType.cs b/src/Microsoft.Net.Http.Server/fx/System/Diagnostics/TraceEventType.cs similarity index 100% rename from src/Microsoft.Net.Server/fx/System/Diagnostics/TraceEventType.cs rename to src/Microsoft.Net.Http.Server/fx/System/Diagnostics/TraceEventType.cs diff --git a/src/Microsoft.Net.Server/fx/System/ExternDll.cs b/src/Microsoft.Net.Http.Server/fx/System/ExternDll.cs similarity index 100% rename from src/Microsoft.Net.Server/fx/System/ExternDll.cs rename to src/Microsoft.Net.Http.Server/fx/System/ExternDll.cs diff --git a/src/Microsoft.Net.Server/fx/System/Runtime/InteropServices/ExternalException.cs b/src/Microsoft.Net.Http.Server/fx/System/Runtime/InteropServices/ExternalException.cs similarity index 100% rename from src/Microsoft.Net.Server/fx/System/Runtime/InteropServices/ExternalException.cs rename to src/Microsoft.Net.Http.Server/fx/System/Runtime/InteropServices/ExternalException.cs diff --git a/src/Microsoft.Net.Server/fx/System/SafeNativeMethods.cs b/src/Microsoft.Net.Http.Server/fx/System/SafeNativeMethods.cs similarity index 100% rename from src/Microsoft.Net.Server/fx/System/SafeNativeMethods.cs rename to src/Microsoft.Net.Http.Server/fx/System/SafeNativeMethods.cs diff --git a/src/Microsoft.Net.Server/project.json b/src/Microsoft.Net.Http.Server/project.json similarity index 100% rename from src/Microsoft.Net.Server/project.json rename to src/Microsoft.Net.Http.Server/project.json diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs index acb4313ea1..3f40f1cbdc 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs @@ -22,7 +22,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.PipelineCore; -using Microsoft.Net.Server; +using Microsoft.Net.Http.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 1cd71e5a03..8a4efdc974 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs @@ -23,7 +23,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; -using Microsoft.Net.Server; +using Microsoft.Net.Http.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 16c9cfa70a..337b2359d4 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs @@ -27,7 +27,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http; using Microsoft.AspNet.PipelineCore; -using Microsoft.Net.Server; +using Microsoft.Net.Http.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 3181a39875..5315a6952f 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs @@ -17,7 +17,7 @@ using System; using System.Threading.Tasks; -using Microsoft.Net.Server; +using Microsoft.Net.Http.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 e93d53e995..cd4dec25c2 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json @@ -11,7 +11,7 @@ "Microsoft.AspNet.Server.WebListener" : "", "Microsoft.Framework.ConfigurationModel": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", - "Microsoft.Net.Server" : "", + "Microsoft.Net.Http.Server" : "", "Xunit.KRunner": "1.0.0-*" }, "frameworks": { diff --git a/test/Microsoft.Net.Server.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/AuthenticationTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/AuthenticationTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/AuthenticationTests.cs index 6c7474f234..09f501fa24 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/AuthenticationTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/AuthenticationTests.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class AuthenticationTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/HttpsTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/HttpsTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/HttpsTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/HttpsTests.cs index cf7aa0296a..4822827bd6 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/HttpsTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/HttpsTests.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class HttpsTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/Microsoft.Net.Server.FunctionalTests.kproj b/test/Microsoft.Net.Http.Server.FunctionalTests/Microsoft.Net.Http.Server.FunctionalTests.kproj similarity index 100% rename from test/Microsoft.Net.Server.FunctionalTests/Microsoft.Net.Server.FunctionalTests.kproj rename to test/Microsoft.Net.Http.Server.FunctionalTests/Microsoft.Net.Http.Server.FunctionalTests.kproj diff --git a/test/Microsoft.Net.Server.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/OpaqueUpgradeTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs index 48bcc03ba2..e3076cff0f 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/OpaqueUpgradeTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class OpaqueUpgradeTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/RequestBodyTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/RequestBodyTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/RequestBodyTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/RequestBodyTests.cs index 89e24a90c1..eddb4388d4 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/RequestBodyTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/RequestBodyTests.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class RequestBodyTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/RequestHeaderTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/RequestHeaderTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/RequestHeaderTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/RequestHeaderTests.cs index 3fb03df524..73eb3d152e 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/RequestHeaderTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/RequestHeaderTests.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class RequestHeaderTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/RequestTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/RequestTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/RequestTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/RequestTests.cs index cf8205c18e..de9616280b 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/RequestTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/RequestTests.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class RequestTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/ResponseBodyTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/ResponseBodyTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs index 299f719f5c..bd9ab9bf0f 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/ResponseBodyTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class ResponseBodyTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/ResponseHeaderTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseHeaderTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/ResponseHeaderTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/ResponseHeaderTests.cs index ab12512b17..8b0dad5460 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/ResponseHeaderTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseHeaderTests.cs @@ -7,7 +7,7 @@ using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class ResponseHeaderTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/ResponseSendFileTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseSendFileTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/ResponseSendFileTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/ResponseSendFileTests.cs index 5139d9ad40..f13af46cf1 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/ResponseSendFileTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseSendFileTests.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class ResponseSendFileTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/ResponseTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/ResponseTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/ResponseTests.cs index f5d5c2146c..4e46f19ef7 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/ResponseTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseTests.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class ResponseTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/ServerTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/ServerTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs index af97555358..50b325c003 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/ServerTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class ServerTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/Utilities.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/Utilities.cs similarity index 98% rename from test/Microsoft.Net.Server.FunctionalTests/Utilities.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/Utilities.cs index 18c3d31987..8e8fdf16d7 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/Utilities.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/Utilities.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { internal static class Utilities { diff --git a/test/Microsoft.Net.Server.FunctionalTests/WebSocketTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/WebSocketTests.cs similarity index 99% rename from test/Microsoft.Net.Server.FunctionalTests/WebSocketTests.cs rename to test/Microsoft.Net.Http.Server.FunctionalTests/WebSocketTests.cs index e54c94740f..54e5a2a16c 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/WebSocketTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/WebSocketTests.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.Net.Server +namespace Microsoft.Net.Http.Server { public class WebSocketTests { diff --git a/test/Microsoft.Net.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json similarity index 89% rename from test/Microsoft.Net.Server.FunctionalTests/project.json rename to test/Microsoft.Net.Http.Server.FunctionalTests/project.json index 1c3855abb0..31d057271a 100644 --- a/test/Microsoft.Net.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -3,7 +3,7 @@ "test": "Xunit.KRunner" }, "dependencies": { - "Microsoft.Net.Server" : "", + "Microsoft.Net.Http.Server" : "", "Xunit.KRunner": "1.0.0-*" }, "frameworks": {