diff --git a/corefxlab.sln b/corefxlab.sln index b591ef52577..67554bdf733 100644 --- a/corefxlab.sln +++ b/corefxlab.sln @@ -74,10 +74,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Primitives", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Primitives.Tests", "tests\System.Buffers.Primitives.Tests\System.Buffers.Primitives.Tests.csproj", "{5E04C824-5961-445E-85E2-8AC27C9AA761}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Http.Parser", "src\System.Text.Http.Parser\System.Text.Http.Parser.csproj", "{C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Http.Parser.Tests", "tests\System.Text.Http.Parser.Tests\System.Text.Http.Parser.Tests.csproj", "{793E4C5F-33B9-44AA-BE44-54EE624E79CB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Utf8String", "src\System.Text.Utf8String\System.Text.Utf8String.csproj", "{07CC9F28-FC67-453B-9057-AC9025E5CA67}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Utf8String.Tests", "tests\System.Text.Utf8String.Tests\System.Text.Utf8String.Tests.csproj", "{C6F061D6-18D6-41E3-A692-C0603A994F30}" @@ -464,30 +460,6 @@ Global {5E04C824-5961-445E-85E2-8AC27C9AA761}.Release|x64.Build.0 = Release|Any CPU {5E04C824-5961-445E-85E2-8AC27C9AA761}.Release|x86.ActiveCfg = Release|Any CPU {5E04C824-5961-445E-85E2-8AC27C9AA761}.Release|x86.Build.0 = Release|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Debug|x64.ActiveCfg = Debug|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Debug|x64.Build.0 = Debug|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Debug|x86.ActiveCfg = Debug|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Debug|x86.Build.0 = Debug|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Release|Any CPU.Build.0 = Release|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Release|x64.ActiveCfg = Release|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Release|x64.Build.0 = Release|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Release|x86.ActiveCfg = Release|Any CPU - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA}.Release|x86.Build.0 = Release|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Debug|x64.ActiveCfg = Debug|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Debug|x64.Build.0 = Debug|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Debug|x86.ActiveCfg = Debug|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Debug|x86.Build.0 = Debug|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Release|Any CPU.Build.0 = Release|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Release|x64.ActiveCfg = Release|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Release|x64.Build.0 = Release|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Release|x86.ActiveCfg = Release|Any CPU - {793E4C5F-33B9-44AA-BE44-54EE624E79CB}.Release|x86.Build.0 = Release|Any CPU {07CC9F28-FC67-453B-9057-AC9025E5CA67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {07CC9F28-FC67-453B-9057-AC9025E5CA67}.Debug|Any CPU.Build.0 = Debug|Any CPU {07CC9F28-FC67-453B-9057-AC9025E5CA67}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -619,8 +591,6 @@ Global {1ED92192-6C2A-44A5-9098-F9CBABB0292D} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA} {AABC47B4-F133-4B16-920B-9BDCE22F7E97} = {4B000021-5278-4F2A-B734-DE49F55D4024} {5E04C824-5961-445E-85E2-8AC27C9AA761} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA} - {C5BFA7A3-A2BC-42A9-BCDF-0CD16D5903AA} = {4B000021-5278-4F2A-B734-DE49F55D4024} - {793E4C5F-33B9-44AA-BE44-54EE624E79CB} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA} {07CC9F28-FC67-453B-9057-AC9025E5CA67} = {4B000021-5278-4F2A-B734-DE49F55D4024} {C6F061D6-18D6-41E3-A692-C0603A994F30} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA} {662968A7-5BCC-467B-A814-38584D0184CD} = {4B000021-5278-4F2A-B734-DE49F55D4024} diff --git a/samples/LowAllocationWebServer/LowAllocationWebServer.csproj b/samples/LowAllocationWebServer/LowAllocationWebServer.csproj index 70f1fbfa4c2..87d35a31380 100644 --- a/samples/LowAllocationWebServer/LowAllocationWebServer.csproj +++ b/samples/LowAllocationWebServer/LowAllocationWebServer.csproj @@ -14,7 +14,6 @@ - diff --git a/src/System.Text.Http.Parser/System.Text.Http.Parser.csproj b/src/System.Text.Http.Parser/System.Text.Http.Parser.csproj deleted file mode 100644 index 33014cc4cf6..00000000000 --- a/src/System.Text.Http.Parser/System.Text.Http.Parser.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - HTTP Parser - netstandard1.3 - true - HTTP Parser - http://go.microsoft.com/fwlink/?linkid=833199 - - - - - - diff --git a/src/System.Text.Http/System.Text.Http.csproj b/src/System.Text.Http/System.Text.Http.csproj index 650a158a3d8..92cbe3713dd 100644 --- a/src/System.Text.Http/System.Text.Http.csproj +++ b/src/System.Text.Http/System.Text.Http.csproj @@ -4,13 +4,11 @@ Non-allocating HTTP parser netstandard1.3 HTTP parser parsing .NET non-allocating corefxlab - - 7.2 + true - diff --git a/src/System.Text.Http.Parser/AsciiUtilities.cs b/src/System.Text.Http/System/Text/Http/Parser/AsciiUtilities.cs similarity index 100% rename from src/System.Text.Http.Parser/AsciiUtilities.cs rename to src/System.Text.Http/System/Text/Http/Parser/AsciiUtilities.cs diff --git a/src/System.Text.Http.Parser/BadHttpRequestException.cs b/src/System.Text.Http/System/Text/Http/Parser/BadHttpRequestException.cs similarity index 100% rename from src/System.Text.Http.Parser/BadHttpRequestException.cs rename to src/System.Text.Http/System/Text/Http/Parser/BadHttpRequestException.cs diff --git a/src/System.Text.Http.Parser/Constants.cs b/src/System.Text.Http/System/Text/Http/Parser/Constants.cs similarity index 100% rename from src/System.Text.Http.Parser/Constants.cs rename to src/System.Text.Http/System/Text/Http/Parser/Constants.cs diff --git a/src/System.Text.Http.Parser/HttpMethod.cs b/src/System.Text.Http/System/Text/Http/Parser/HttpMethod.cs similarity index 100% rename from src/System.Text.Http.Parser/HttpMethod.cs rename to src/System.Text.Http/System/Text/Http/Parser/HttpMethod.cs diff --git a/src/System.Text.Http.Parser/HttpParser.cs b/src/System.Text.Http/System/Text/Http/Parser/HttpParser.cs similarity index 100% rename from src/System.Text.Http.Parser/HttpParser.cs rename to src/System.Text.Http/System/Text/Http/Parser/HttpParser.cs diff --git a/src/System.Text.Http.Parser/HttpScheme.cs b/src/System.Text.Http/System/Text/Http/Parser/HttpScheme.cs similarity index 100% rename from src/System.Text.Http.Parser/HttpScheme.cs rename to src/System.Text.Http/System/Text/Http/Parser/HttpScheme.cs diff --git a/src/System.Text.Http.Parser/HttpUtilities.cs b/src/System.Text.Http/System/Text/Http/Parser/HttpUtilities.cs similarity index 100% rename from src/System.Text.Http.Parser/HttpUtilities.cs rename to src/System.Text.Http/System/Text/Http/Parser/HttpUtilities.cs diff --git a/src/System.Text.Http.Parser/HttpVersion.cs b/src/System.Text.Http/System/Text/Http/Parser/HttpVersion.cs similarity index 100% rename from src/System.Text.Http.Parser/HttpVersion.cs rename to src/System.Text.Http/System/Text/Http/Parser/HttpVersion.cs diff --git a/src/System.Text.Http.Parser/IHttpHeadersHandler.cs b/src/System.Text.Http/System/Text/Http/Parser/IHttpHeadersHandler.cs similarity index 100% rename from src/System.Text.Http.Parser/IHttpHeadersHandler.cs rename to src/System.Text.Http/System/Text/Http/Parser/IHttpHeadersHandler.cs diff --git a/src/System.Text.Http.Parser/IHttpParser.cs b/src/System.Text.Http/System/Text/Http/Parser/IHttpParser.cs similarity index 100% rename from src/System.Text.Http.Parser/IHttpParser.cs rename to src/System.Text.Http/System/Text/Http/Parser/IHttpParser.cs diff --git a/src/System.Text.Http.Parser/IHttpRequestLineHandler.cs b/src/System.Text.Http/System/Text/Http/Parser/IHttpRequestLineHandler.cs similarity index 100% rename from src/System.Text.Http.Parser/IHttpRequestLineHandler.cs rename to src/System.Text.Http/System/Text/Http/Parser/IHttpRequestLineHandler.cs diff --git a/src/System.Text.Http.Parser/IHttpResponseLineHandler.cs b/src/System.Text.Http/System/Text/Http/Parser/IHttpResponseLineHandler.cs similarity index 100% rename from src/System.Text.Http.Parser/IHttpResponseLineHandler.cs rename to src/System.Text.Http/System/Text/Http/Parser/IHttpResponseLineHandler.cs diff --git a/src/System.Text.Http.Parser/PipelineExtensions.cs b/src/System.Text.Http/System/Text/Http/Parser/PipelineExtensions.cs similarity index 100% rename from src/System.Text.Http.Parser/PipelineExtensions.cs rename to src/System.Text.Http/System/Text/Http/Parser/PipelineExtensions.cs diff --git a/src/System.Text.Http.Parser/RequestRejectionReason.cs b/src/System.Text.Http/System/Text/Http/Parser/RequestRejectionReason.cs similarity index 100% rename from src/System.Text.Http.Parser/RequestRejectionReason.cs rename to src/System.Text.Http/System/Text/Http/Parser/RequestRejectionReason.cs diff --git a/src/System.Text.Http/System/Text/Http/BufferWriterHttpExtensions.cs b/src/System.Text.Http/System/Text/Http/Writer/BufferWriterHttpExtensions.cs similarity index 100% rename from src/System.Text.Http/System/Text/Http/BufferWriterHttpExtensions.cs rename to src/System.Text.Http/System/Text/Http/Writer/BufferWriterHttpExtensions.cs diff --git a/src/System.Text.Http/System/Text/Http/IFormatterHttpExtensions.cs b/src/System.Text.Http/System/Text/Http/Writer/IFormatterHttpExtensions.cs similarity index 100% rename from src/System.Text.Http/System/Text/Http/IFormatterHttpExtensions.cs rename to src/System.Text.Http/System/Text/Http/Writer/IFormatterHttpExtensions.cs diff --git a/tests/Benchmarks/Benchmarks.csproj b/tests/Benchmarks/Benchmarks.csproj index 3b0bc958313..ec18a703c2e 100644 --- a/tests/Benchmarks/Benchmarks.csproj +++ b/tests/Benchmarks/Benchmarks.csproj @@ -23,7 +23,6 @@ - diff --git a/tests/System.Buffers.Experimental.Tests/BufferExtensionsTests.cs b/tests/System.Buffers.Experimental.Tests/BufferExtensionsTests.cs index 9f4ab2adcbb..611a1d4fd85 100644 --- a/tests/System.Buffers.Experimental.Tests/BufferExtensionsTests.cs +++ b/tests/System.Buffers.Experimental.Tests/BufferExtensionsTests.cs @@ -1,4 +1,8 @@ -using System.IO.Pipelines.Testing; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Buffers.Testing; using Xunit; namespace System.Buffers.Tests diff --git a/tests/System.Buffers.Primitives.Tests/BufferSegment.cs b/tests/System.Buffers.Primitives.Tests/BufferSegment.cs index 361bc840e0e..faecd155cba 100644 --- a/tests/System.Buffers.Primitives.Tests/BufferSegment.cs +++ b/tests/System.Buffers.Primitives.Tests/BufferSegment.cs @@ -1,8 +1,11 @@ -using System.Buffers; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using System.Diagnostics; using System.Text; -namespace System.IO.Pipelines.Testing +namespace System.Buffers.Testing { internal class BufferSegment : ReadOnlySequenceSegment { diff --git a/tests/System.Buffers.Primitives.Tests/BufferUtilities.cs b/tests/System.Buffers.Primitives.Tests/BufferUtilities.cs index 4fbb61e30b1..ffc51f35870 100644 --- a/tests/System.Buffers.Primitives.Tests/BufferUtilities.cs +++ b/tests/System.Buffers.Primitives.Tests/BufferUtilities.cs @@ -2,10 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Buffers; using System.Text; -namespace System.IO.Pipelines.Testing +namespace System.Buffers.Testing { public class BufferUtilities { diff --git a/tests/System.Buffers.Primitives.Tests/ReadOnlyBufferFactory.cs b/tests/System.Buffers.Primitives.Tests/ReadOnlyBufferFactory.cs index af3bbc9d4b7..8561507157d 100644 --- a/tests/System.Buffers.Primitives.Tests/ReadOnlyBufferFactory.cs +++ b/tests/System.Buffers.Primitives.Tests/ReadOnlyBufferFactory.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Buffers; +using System.Buffers.Testing; using System.Collections.Generic; -using System.IO.Pipelines.Testing; using System.Text; namespace System.IO.Pipelines.Tests diff --git a/tests/System.Buffers.Primitives.Tests/ReadableBufferFacts.cs b/tests/System.Buffers.Primitives.Tests/ReadableBufferFacts.cs index 8fd60903221..770f924a795 100644 --- a/tests/System.Buffers.Primitives.Tests/ReadableBufferFacts.cs +++ b/tests/System.Buffers.Primitives.Tests/ReadableBufferFacts.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Buffers; -using System.IO.Pipelines.Testing; +using System.Buffers.Testing; using System.Linq; using Xunit; diff --git a/tests/System.Buffers.Primitives.Tests/ReadableBufferReaderFacts.cs b/tests/System.Buffers.Primitives.Tests/ReadableBufferReaderFacts.cs index c014545516b..fea042ac470 100644 --- a/tests/System.Buffers.Primitives.Tests/ReadableBufferReaderFacts.cs +++ b/tests/System.Buffers.Primitives.Tests/ReadableBufferReaderFacts.cs @@ -4,7 +4,7 @@ using System.Buffers; using System.Buffers.Reader; -using System.IO.Pipelines.Testing; +using System.Buffers.Testing; using Xunit; namespace System.IO.Pipelines.Tests diff --git a/tests/System.Text.Http.Parser.Tests/System.Text.Http.Parser.Tests.csproj b/tests/System.Text.Http.Parser.Tests/System.Text.Http.Parser.Tests.csproj deleted file mode 100644 index bb49340ed05..00000000000 --- a/tests/System.Text.Http.Parser.Tests/System.Text.Http.Parser.Tests.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - netcoreapp2.1 - True - ../../tools/test_key.snk - true - true - - Microsoft Corporation, All rights reserved - - - - - - False - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/System.Text.Http.Parser.Tests/HttpParserBasicTests.cs b/tests/System.Text.Http.Tests/HttpParserBasicTests.cs similarity index 100% rename from tests/System.Text.Http.Parser.Tests/HttpParserBasicTests.cs rename to tests/System.Text.Http.Tests/HttpParserBasicTests.cs diff --git a/tests/System.Text.Http.Parser.Tests/HttpParserTests.cs b/tests/System.Text.Http.Tests/HttpParserTests.cs similarity index 99% rename from tests/System.Text.Http.Parser.Tests/HttpParserTests.cs rename to tests/System.Text.Http.Tests/HttpParserTests.cs index 3b8ce0f6d81..30da0391a38 100644 --- a/tests/System.Text.Http.Parser.Tests/HttpParserTests.cs +++ b/tests/System.Text.Http.Tests/HttpParserTests.cs @@ -2,9 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Buffers; +using System.Buffers.Testing; using System.Buffers.Text; using System.Collections.Generic; -using System.IO.Pipelines.Testing; using System.Linq; using Xunit; diff --git a/tests/System.Text.Http.Parser.Tests/HttpParsingData.cs b/tests/System.Text.Http.Tests/HttpParsingData.cs similarity index 100% rename from tests/System.Text.Http.Parser.Tests/HttpParsingData.cs rename to tests/System.Text.Http.Tests/HttpParsingData.cs diff --git a/tests/System.Text.Http.Parser.Tests/StringExtensions.cs b/tests/System.Text.Http.Tests/StringExtensions.cs similarity index 100% rename from tests/System.Text.Http.Parser.Tests/StringExtensions.cs rename to tests/System.Text.Http.Tests/StringExtensions.cs diff --git a/tests/System.Text.Http.Tests/System.Text.Http.Tests.csproj b/tests/System.Text.Http.Tests/System.Text.Http.Tests.csproj index 66879ecf84b..41b09f8df6d 100644 --- a/tests/System.Text.Http.Tests/System.Text.Http.Tests.csproj +++ b/tests/System.Text.Http.Tests/System.Text.Http.Tests.csproj @@ -25,6 +25,7 @@ +