Skip to content

Commit 13ee32b

Browse files
pakrympakrym
authored
Fetch corefx lab sources and compile them into kestrel (#1581)
1 parent f787c52 commit 13ee32b

File tree

55 files changed

+229
-57
lines changed

Some content is hidden

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

55 files changed

+229
-57
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "corefxlab"]
2+
path = corefxlab
3+
url = https://github.com/dotnet/corefxlab

‎KestrelHttpServer.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
6565
EndProject
6666
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "src\Microsoft.AspNetCore.Server.Kestrel\Microsoft.AspNetCore.Server.Kestrel.csproj", "{56139957-5C29-4E7D-89BD-7D20598B4EAF}"
6767
EndProject
68+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Internalizer", "tools\Internalizer\Internalizer.csproj", "{6B04EAAA-08DE-464B-92DB-1D32BB86892C}"
69+
EndProject
6870
Global
6971
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7072
Debug|Any CPU = Debug|Any CPU
@@ -195,6 +197,18 @@ Global
195197
{56139957-5C29-4E7D-89BD-7D20598B4EAF}.Release|x64.Build.0 = Release|Any CPU
196198
{56139957-5C29-4E7D-89BD-7D20598B4EAF}.Release|x86.ActiveCfg = Release|Any CPU
197199
{56139957-5C29-4E7D-89BD-7D20598B4EAF}.Release|x86.Build.0 = Release|Any CPU
200+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
201+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Debug|Any CPU.Build.0 = Debug|Any CPU
202+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Debug|x64.ActiveCfg = Debug|Any CPU
203+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Debug|x64.Build.0 = Debug|Any CPU
204+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Debug|x86.ActiveCfg = Debug|Any CPU
205+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Debug|x86.Build.0 = Debug|Any CPU
206+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Release|Any CPU.ActiveCfg = Release|Any CPU
207+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Release|Any CPU.Build.0 = Release|Any CPU
208+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Release|x64.ActiveCfg = Release|Any CPU
209+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Release|x64.Build.0 = Release|Any CPU
210+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Release|x86.ActiveCfg = Release|Any CPU
211+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C}.Release|x86.Build.0 = Release|Any CPU
198212
EndGlobalSection
199213
GlobalSection(SolutionProperties) = preSolution
200214
HideSolutionNode = FALSE
@@ -212,5 +226,6 @@ Global
212226
{2822C132-BFFB-4D53-AC5B-E7E47DD81A6E} = {0EF2ACDF-012F-4472-A13A-4272419E2903}
213227
{A76B8C8C-0DC5-4DD3-9B1F-02E51A0915F4} = {2D5D5227-4DBD-499A-96B1-76A36B03B750}
214228
{56139957-5C29-4E7D-89BD-7D20598B4EAF} = {2D5D5227-4DBD-499A-96B1-76A36B03B750}
229+
{6B04EAAA-08DE-464B-92DB-1D32BB86892C} = {327F7880-D9AF-46BD-B45C-3B7E34A01DFD}
215230
EndGlobalSection
216231
EndGlobal

‎build/corefxlab.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project>
2+
<Target Name="_GetCoreFXLabSources">
3+
<PropertyGroup>
4+
<CoreFXLabSourcesPath>$(MSBuildThisFileDirectory)..\corefxlab\</CoreFXLabSourcesPath>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<CoreFXLabCompile Include="$(CoreFXLabSourcesPath)src\System.IO.Pipelines\**\*.cs" />
8+
<CoreFXLabCompile Include="$(CoreFXLabSourcesPath)src\System.Binary\**\*.cs" />
9+
<CoreFXLabCompile Include="$(CoreFXLabSourcesPath)src\System.Buffers.Primitives\**\*.cs" />
10+
<CoreFXLabCompile Include="$(CoreFXLabSourcesPath)src\System.Collections.Sequences\**\*.cs" />
11+
<CoreFXLabCompile Include="$(CoreFXLabSourcesPath)src\System.Text.Encodings.Web.Utf8\UrlEncoder.cs" />
12+
</ItemGroup>
13+
</Target>
14+
</Project>

‎build/dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<CoreFxLabsPipelinesVersion>0.1.0-*</CoreFxLabsPipelinesVersion>
55
<CoreFxLabsVersion>0.1.0-*</CoreFxLabsVersion>
66
<CoreFxVersion>4.3.0</CoreFxVersion>
7+
<SystemMemoryVersion>4.4.0-*</SystemMemoryVersion>
78
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
89
<LibUvVersion>1.10.0-*</LibUvVersion>
910
<JsonNetVersion>9.0.1</JsonNetVersion>

‎build/repo.targets

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
<Project>
2+
<PropertyGroup>
3+
<CompileDependsOn>Internalize;$(CompileDependsOn)</CompileDependsOn>
4+
</PropertyGroup>
5+
26
<Target Name="CodeGen">
37
<Exec Command="dotnet run" WorkingDirectory="$(MSBuildThisFileDirectory)..\tools\CodeGenerator\" />
48
</Target>
9+
10+
<Target Name="GitSubmoduleInit">
11+
<Exec Command="git submodule update --init --recursive" WorkingDirectory="$(MSBuildThisFileDirectory)..\" />
12+
<Exec Command="git reset --hard" WorkingDirectory="$(MSBuildThisFileDirectory)..\corefxlab\" />
13+
</Target>
14+
15+
<Import Project="$(MSBuildThisFileDirectory)\corefxlab.props" />
16+
<Target Name="Internalize" DependsOnTargets="GitSubmoduleInit;_GetCoreFXLabSources;Restore">
17+
<PropertyGroup>
18+
<InternalizeTempFileName>$(MSBuildThisFileDirectory)..\artifacts\corefxlabfiles.txt</InternalizeTempFileName>
19+
</PropertyGroup>
20+
21+
<WriteLinesToFile File="$(InternalizeTempFileName)" Lines="@(CoreFXLabCompile)" Overwrite="true" Encoding="Unicode"/>
22+
<Exec Command="dotnet run $(InternalizeTempFileName)" WorkingDirectory="$(MSBuildThisFileDirectory)..\tools\Internalizer\" />
23+
</Target>
524
</Project>

‎corefxlab

Submodule corefxlab added at 5afdb0e

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/AdaptedPipeline.cs

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

44
using System;
55
using System.IO;
6-
using System.IO.Pipelines;
76
using System.Threading.Tasks;
87
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
8+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
99

1010
namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
1111
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/RawStream.cs

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

44
using System;
55
using System.IO;
6-
using System.IO.Pipelines;
76
using System.Threading;
87
using System.Threading.Tasks;
98
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
9+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
1010

1111
namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
1212
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/StreamSocketOutput.cs

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

44
using System;
55
using System.IO;
6-
using System.IO.Pipelines;
76
using System.Threading;
87
using System.Threading.Tasks;
98
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
9+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
1010

1111
namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
1212
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.IO.Pipelines;
54
using Microsoft.AspNetCore.Hosting.Server;
65
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
76
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
7+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
88
using Microsoft.AspNetCore.Server.Kestrel.Transport;
99

1010
namespace Microsoft.AspNetCore.Server.Kestrel.Internal

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/FrameConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
using System;
55
using System.Collections.Generic;
66
using System.IO;
7-
using System.IO.Pipelines;
87
using System.Threading.Tasks;
98
using Microsoft.AspNetCore.Server.Kestrel.Adapter;
109
using Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal;
1110
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
1211
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
12+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
1313
using Microsoft.AspNetCore.Server.Kestrel.Transport;
1414
using Microsoft.Extensions.Internal;
1515
using Microsoft.Extensions.Logging;

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/FrameConnectionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Collections.Generic;
5-
using System.IO.Pipelines;
65
using Microsoft.AspNetCore.Server.Kestrel.Adapter;
76
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
7+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
88

99
namespace Microsoft.AspNetCore.Server.Kestrel.Internal
1010
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ChunkWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IO.Pipelines;
65
using System.Text;
6+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
77

88
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
99
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ConnectionLifetimeControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.IO.Pipelines;
54
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
5+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
66

77
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
88
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
using System.Collections.Generic;
66
using System.Diagnostics;
77
using System.IO;
8-
using System.IO.Pipelines;
98
using System.Linq;
109
using System.Net;
1110
using System.Runtime.CompilerServices;
1211
using System.Text;
13-
using System.Text.Encodings.Web.Utf8;
1412
using System.Threading;
1513
using System.Threading.Tasks;
1614
using Microsoft.AspNetCore.Http;
1715
using Microsoft.AspNetCore.Server.Kestrel.Adapter;
1816
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
17+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
18+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.Text.Encodings.Web.Utf8;
1919
using Microsoft.AspNetCore.Server.Kestrel.Transport;
2020
using Microsoft.Extensions.Internal;
2121
using Microsoft.Extensions.Logging;
@@ -987,7 +987,7 @@ private void CreateResponseHeader(bool appCompleted)
987987
responseHeaders.SetRawDate(dateHeaderValues.String, dateHeaderValues.Bytes);
988988
}
989989

990-
Output.Write(_writeHeaders, this);
990+
Output.Write<Frame>(_writeHeaders, this);
991991
}
992992

993993
private static void WriteResponseHeaders(WritableBuffer writableBuffer, Frame frame)

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameHeaders.Generated.cs

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

44
using System;
55
using System.Collections.Generic;
6-
using System.IO.Pipelines;
7-
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
6+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
87
using Microsoft.Extensions.Primitives;
98
using Microsoft.Net.Http.Headers;
109

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseHeaders.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using System;
55
using System.Collections;
66
using System.Collections.Generic;
7-
using System.IO.Pipelines;
87
using System.Runtime.CompilerServices;
8+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
99
using Microsoft.Extensions.Primitives;
1010
using Microsoft.Net.Http.Headers;
1111

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IHttpParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.IO.Pipelines;
4+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
55

66
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
77
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ISocketOutput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IO.Pipelines;
65
using System.Threading;
76
using System.Threading.Tasks;
7+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
88

99
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
1010
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/KestrelHttpParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IO.Pipelines;
65
using System.Numerics;
76
using System.Runtime.CompilerServices;
87
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
8+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
99
using Microsoft.Extensions.Logging;
1010

1111
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/MessageBody.cs

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

44
using System;
55
using System.IO;
6-
using System.IO.Pipelines;
76
using System.Threading;
87
using System.Threading.Tasks;
98
using Microsoft.AspNetCore.Http;
9+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
1010
using Microsoft.Extensions.Internal;
1111

1212
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/PipelineExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.Buffers;
6-
using System.IO.Pipelines;
75
using System.Runtime.CompilerServices;
86
using System.Threading.Tasks;
7+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.Buffers;
8+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
99

1010
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
1111
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/SocketOutputProducer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IO.Pipelines;
65
using System.Threading;
76
using System.Threading.Tasks;
87
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
8+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
99
using Microsoft.Extensions.Internal;
1010

1111
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IThreadPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IO.Pipelines;
65
using System.Threading;
76
using System.Threading.Tasks;
7+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
88

99
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
1010
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="..\..\build\common.props" />
4+
<Import Project="..\..\build\corefxlab.props" />
45

56
<PropertyGroup>
67
<Description>Core components of ASP.NET Core Kestrel cross-platform web server.</Description>
78
<TargetFrameworks>netstandard1.3;net46</TargetFrameworks>
89
<GenerateDocumentationFile>true</GenerateDocumentationFile>
910
<PackageTags>aspnetcore;kestrel</PackageTags>
1011
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11-
<NoWarn>CS1591;$(NoWarn)</NoWarn>
12+
<NoWarn>CS1570;CS1571;CS1572;CS1573;CS1574;CS1591;$(NoWarn)</NoWarn>
1213
<EnableApiCheck>false</EnableApiCheck>
1314
</PropertyGroup>
1415

@@ -19,10 +20,9 @@
1920
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
2021
<PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
2122
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
23+
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
2224
<PackageReference Include="System.Numerics.Vectors" Version="$(CoreFxVersion)" />
2325
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxVersion)" />
24-
<PackageReference Include="System.IO.Pipelines" Version="$(CoreFxLabsPipelinesVersion)" />
25-
<PackageReference Include="System.Text.Encodings.Web.Utf8" Version="$(CoreFxLabsVersion)" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
@@ -31,4 +31,9 @@
3131
<PackageReference Include="System.Threading.ThreadPool" Version="$(CoreFxVersion)" />
3232
</ItemGroup>
3333

34+
<Target Name="LoadCoreFXLabSources" BeforeTargets="CoreCompile" DependsOnTargets="_GetCoreFXLabSources">
35+
<ItemGroup>
36+
<Compile Include="@(CoreFXLabCompile)" />
37+
</ItemGroup>
38+
</Target>
3439
</Project>

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Transport/IConnectionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IO.Pipelines;
65
using System.Threading.Tasks;
6+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
77

88
namespace Microsoft.AspNetCore.Server.Kestrel.Transport
99
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Core/Transport/IConnectionInformation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.IO.Pipelines;
54
using System.Net;
65
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
6+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
77

88
namespace Microsoft.AspNetCore.Server.Kestrel.Transport
99
{

‎src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Http/Connection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
using System;
55
using System.Diagnostics;
66
using System.IO;
7-
using System.IO.Pipelines;
87
using System.Threading;
98
using System.Threading.Tasks;
109
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
1110
using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking;
11+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
1212
using Microsoft.AspNetCore.Server.Kestrel.Transport;
1313
using Microsoft.AspNetCore.Server.Kestrel.Transport.Exceptions;
1414
using Microsoft.Extensions.Logging;

‎src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Http/ConnectionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.IO.Pipelines;
54
using System.Net;
5+
using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines;
66
using Microsoft.AspNetCore.Server.Kestrel.Transport;
77

88
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http

0 commit comments

Comments
 (0)