Skip to content

Commit b31bdd4

Browse files
davidfowldavidfowl
authored
Moved things around (#11508)
- Put middleware in th middeware folder - Rename PipelineExtensions to BufferExtensions - Move DuplexPipe to shared
1 parent f162ba1 commit b31bdd4

15 files changed

+10
-191
lines changed

‎src/Servers/Kestrel/Core/src/Internal/ClosedStream.cs

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎src/Servers/Kestrel/Core/src/Internal/Http/PipelineExtensions.cs renamed to ‎src/Servers/Kestrel/Core/src/Internal/Http/BufferExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
using System.Runtime.CompilerServices;
88
using System.Runtime.InteropServices;
99

10-
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
10+
namespace System.Buffers
1111
{
12-
internal static class PipelineExtensions
12+
internal static class BufferExtensions
1313
{
1414
private const int _maxULongByteLength = 20;
1515

‎src/Servers/Kestrel/Core/src/Internal/Infrastructure/CancellationTokenExtensions.cs

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎src/Servers/Kestrel/Core/src/Internal/Infrastructure/DisposableAction.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/Servers/Kestrel/Core/src/Internal/ConnectionLimitMiddleware.cs renamed to ‎src/Servers/Kestrel/Core/src/Middleware/ConnectionLimitMiddleware.cs

File renamed without changes.

‎src/Servers/Kestrel/Core/src/Internal/HttpConnectionBuilderExtensions.cs renamed to ‎src/Servers/Kestrel/Core/src/Middleware/HttpConnectionBuilderExtensions.cs

File renamed without changes.

‎src/Servers/Kestrel/Core/src/Internal/HttpConnectionMiddleware.cs renamed to ‎src/Servers/Kestrel/Core/src/Middleware/HttpConnectionMiddleware.cs

File renamed without changes.

‎src/Servers/Kestrel/Core/src/Internal/HttpsConnectionMiddleware.cs renamed to ‎src/Servers/Kestrel/Core/src/Middleware/HttpsConnectionMiddleware.cs

File renamed without changes.

‎src/Servers/Kestrel/Core/src/Middleware/Internal/LoggingConnectionMiddleware.cs renamed to ‎src/Servers/Kestrel/Core/src/Middleware/LoggingConnectionMiddleware.cs

File renamed without changes.

‎src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Compile Include="$(KestrelSharedSourceRoot)KnownHeaders.cs" LinkBase="shared" />
1414
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
1515
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
16+
<Compile Include="$(KestrelSharedSourceRoot)\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
1617
</ItemGroup>
1718

1819
<ItemGroup>

‎src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>Libuv transport for the ASP.NET Core Kestrel cross-platform web server.</Description>
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
15-
<Compile Include="..\..\Core\src\Internal\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
15+
<Compile Include="$(KestrelSharedSourceRoot)\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
1616
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.cs" Link="Internal\TransportConnection.cs" />
1717
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" Link="Internal\TransportConnection.Generated.cs" />
1818
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.FeatureCollection.cs" Link="Internal\TransportConnection.FeatureCollection.cs" />

‎src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>Managed socket transport for the ASP.NET Core Kestrel cross-platform web server.</Description>
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
15-
<Compile Include="..\..\Core\src\Internal\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
15+
<Compile Include="$(KestrelSharedSourceRoot)\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
1616
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.cs" Link="Internal\TransportConnection.cs" />
1717
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" Link="Internal\TransportConnection.Generated.cs" />
1818
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.FeatureCollection.cs" Link="Internal\TransportConnection.FeatureCollection.cs" />

‎src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
@@ -15,6 +15,7 @@
1515
<Compile Include="$(KestrelSharedSourceRoot)test\TestHttp1Connection.cs" />
1616
<Compile Include="$(KestrelSharedSourceRoot)test\TestKestrelTrace.cs" />
1717
<Compile Include="..\..\Transport.Sockets\src\Internal\IOQueue.cs" Link="Internal\IOQueue.cs" />
18+
<Compile Include="$(KestrelSharedSourceRoot)\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
1819
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.cs" Link="Internal\TransportConnection.cs" />
1920
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" Link="Internal\TransportConnection.Generated.cs" />
2021
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.FeatureCollection.cs" Link="Internal\TransportConnection.FeatureCollection.cs" />

‎src/Servers/Kestrel/Core/src/Internal/DuplexPipe.cs renamed to ‎src/Servers/Kestrel/shared/DuplexPipe.cs

File renamed without changes.

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
1414
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
1515
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
16+
<Compile Include="$(KestrelSharedSourceRoot)\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
1617
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.cs" Link="Internal\TransportConnection.cs" />
1718
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" Link="Internal\TransportConnection.Generated.cs" />
1819
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.FeatureCollection.cs" Link="Internal\TransportConnection.FeatureCollection.cs" />

0 commit comments

Comments
 (0)