Combined Http Writer and Parser Projects (#2256)

* Bug fix in BufferWriter * Combined Http Writer/Parser Projects
dotnet · May 4, 2018 · 2162242 · 2162242
1 parent 35e606e
commit 2162242
Show file tree

Hide file tree

Showing 33 changed files with 17 additions and 95 deletions.
diff --git 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
@@ -14,7 +14,6 @@
     <None Remove="LowAllocationWebServerLibrary\obj\**" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\System.Text.Http.Parser\System.Text.Http.Parser.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Json\System.Text.Json.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Http\System.Text.Http.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Formatting\System.Text.Formatting.csproj" />

diff --git a/src/System.Text.Http.Parser/System.Text.Http.Parser.csproj b/src/System.Text.Http.Parser/System.Text.Http.Parser.csproj
diff --git a/src/System.Text.Http/System.Text.Http.csproj b/src/System.Text.Http/System.Text.Http.csproj
@@ -4,13 +4,11 @@
     <Description>Non-allocating HTTP parser</Description>
     <TargetFramework>netstandard1.3</TargetFramework>
     <PackageTags>HTTP parser parsing .NET non-allocating corefxlab</PackageTags>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <LangVersion>7.2</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Buffers.ReaderWriter\System.Buffers.ReaderWriter.csproj" />
     <ProjectReference Include="..\System.Text.Formatting\System.Text.Formatting.csproj" />
-    <ProjectReference Include="..\System.Text.Http.Parser\System.Text.Http.Parser.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...System.Text.Http.Parser/AsciiUtilities.cs → ...System/Text/Http/Parser/AsciiUtilities.cs b/...System.Text.Http.Parser/AsciiUtilities.cs → ...System/Text/Http/Parser/AsciiUtilities.cs
diff --git a/...xt.Http.Parser/BadHttpRequestException.cs → ...xt/Http/Parser/BadHttpRequestException.cs b/...xt.Http.Parser/BadHttpRequestException.cs → ...xt/Http/Parser/BadHttpRequestException.cs
diff --git a/src/System.Text.Http.Parser/Constants.cs → ...Http/System/Text/Http/Parser/Constants.cs b/src/System.Text.Http.Parser/Constants.cs → ...Http/System/Text/Http/Parser/Constants.cs
diff --git a/src/System.Text.Http.Parser/HttpMethod.cs → ...ttp/System/Text/Http/Parser/HttpMethod.cs b/src/System.Text.Http.Parser/HttpMethod.cs → ...ttp/System/Text/Http/Parser/HttpMethod.cs
diff --git a/src/System.Text.Http.Parser/HttpParser.cs → ...ttp/System/Text/Http/Parser/HttpParser.cs b/src/System.Text.Http.Parser/HttpParser.cs → ...ttp/System/Text/Http/Parser/HttpParser.cs
diff --git a/src/System.Text.Http.Parser/HttpScheme.cs → ...ttp/System/Text/Http/Parser/HttpScheme.cs b/src/System.Text.Http.Parser/HttpScheme.cs → ...ttp/System/Text/Http/Parser/HttpScheme.cs
diff --git a/src/System.Text.Http.Parser/HttpUtilities.cs → .../System/Text/Http/Parser/HttpUtilities.cs b/src/System.Text.Http.Parser/HttpUtilities.cs → .../System/Text/Http/Parser/HttpUtilities.cs
diff --git a/src/System.Text.Http.Parser/HttpVersion.cs → ...tp/System/Text/Http/Parser/HttpVersion.cs b/src/System.Text.Http.Parser/HttpVersion.cs → ...tp/System/Text/Http/Parser/HttpVersion.cs
diff --git a/...m.Text.Http.Parser/IHttpHeadersHandler.cs → ...m/Text/Http/Parser/IHttpHeadersHandler.cs b/...m.Text.Http.Parser/IHttpHeadersHandler.cs → ...m/Text/Http/Parser/IHttpHeadersHandler.cs
diff --git a/src/System.Text.Http.Parser/IHttpParser.cs → ...tp/System/Text/Http/Parser/IHttpParser.cs b/src/System.Text.Http.Parser/IHttpParser.cs → ...tp/System/Text/Http/Parser/IHttpParser.cs
diff --git a/...xt.Http.Parser/IHttpRequestLineHandler.cs → ...xt/Http/Parser/IHttpRequestLineHandler.cs b/...xt.Http.Parser/IHttpRequestLineHandler.cs → ...xt/Http/Parser/IHttpRequestLineHandler.cs
diff --git a/...t.Http.Parser/IHttpResponseLineHandler.cs → ...t/Http/Parser/IHttpResponseLineHandler.cs b/...t.Http.Parser/IHttpResponseLineHandler.cs → ...t/Http/Parser/IHttpResponseLineHandler.cs
diff --git a/...em.Text.Http.Parser/PipelineExtensions.cs → ...em/Text/Http/Parser/PipelineExtensions.cs b/...em.Text.Http.Parser/PipelineExtensions.cs → ...em/Text/Http/Parser/PipelineExtensions.cs
diff --git a/...ext.Http.Parser/RequestRejectionReason.cs → ...ext/Http/Parser/RequestRejectionReason.cs b/...ext.Http.Parser/RequestRejectionReason.cs → ...ext/Http/Parser/RequestRejectionReason.cs
diff --git a/...m/Text/Http/BufferWriterHttpExtensions.cs → ...Http/Writer/BufferWriterHttpExtensions.cs b/...m/Text/Http/BufferWriterHttpExtensions.cs → ...Http/Writer/BufferWriterHttpExtensions.cs
diff --git a/...tem/Text/Http/IFormatterHttpExtensions.cs → ...t/Http/Writer/IFormatterHttpExtensions.cs b/...tem/Text/Http/IFormatterHttpExtensions.cs → ...t/Http/Writer/IFormatterHttpExtensions.cs
diff --git a/tests/Benchmarks/Benchmarks.csproj b/tests/Benchmarks/Benchmarks.csproj
@@ -23,7 +23,6 @@
     <ProjectReference Include="..\..\src\System.Binary.Base64\System.Binary.Base64.csproj" />
     <ProjectReference Include="..\..\src\System.Buffers.ReaderWriter\System.Buffers.ReaderWriter.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Encodings.Web.Utf8\System.Text.Encodings.Web.Utf8.csproj" />
-    <ProjectReference Include="..\..\src\System.Text.Http.Parser\System.Text.Http.Parser.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Http\System.Text.Http.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Json\System.Text.Json.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Utf8String\System.Text.Utf8String.csproj" />

diff --git 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
@@ -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<byte>
     {

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/...Http.Parser.Tests/HttpParserBasicTests.cs → ...m.Text.Http.Tests/HttpParserBasicTests.cs b/...Http.Parser.Tests/HttpParserBasicTests.cs → ...m.Text.Http.Tests/HttpParserBasicTests.cs
diff --git a/...Text.Http.Parser.Tests/HttpParserTests.cs → ...System.Text.Http.Tests/HttpParserTests.cs b/...Text.Http.Parser.Tests/HttpParserTests.cs → ...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/...Text.Http.Parser.Tests/HttpParsingData.cs → ...System.Text.Http.Tests/HttpParsingData.cs b/...Text.Http.Parser.Tests/HttpParsingData.cs → ...System.Text.Http.Tests/HttpParsingData.cs
diff --git a/...ext.Http.Parser.Tests/StringExtensions.cs → ...ystem.Text.Http.Tests/StringExtensions.cs b/...ext.Http.Parser.Tests/StringExtensions.cs → ...ystem.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
@@ -25,6 +25,7 @@
   <!-- Project references -->
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Text.Http\System.Text.Http.csproj" />
+    <ProjectReference Include="..\..\tests\System.Buffers.Primitives.Tests\System.Buffers.Primitives.Tests.csproj" />
   </ItemGroup>
   <!-- register for test discovery in Visual Studio -->
   <ItemGroup>