Skip to content

Commit d49e46f

Browse files
JamesNKJamesNK
committed
Fix test
1 parent b1ff540 commit d49e46f

17 files changed

+109
-31
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
<ItemGroup>
1616
<Compile Include="$(KestrelSharedSourceRoot)\PooledStreamStack.cs" Link="Internal\PooledStreamStack.cs" />
17+
<Compile Include="$(KestrelSharedSourceRoot)\HPackHeaderWriter.cs" Link="Internal\Http2\HPackHeaderWriter.cs" />
18+
<Compile Include="$(KestrelSharedSourceRoot)\Http2HeadersEnumerator.cs" Link="Internal\Http2\Http2HeadersEnumerator.cs" />
1719
<Compile Include="$(SharedSourceRoot)CertificateGeneration\**\*.cs" />
1820
<Compile Include="$(SharedSourceRoot)ValueTaskExtensions\**\*.cs" />
1921
<Compile Include="$(SharedSourceRoot)UrlDecoder\**\*.cs" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<TestGroupName>Kestrel.Core.Tests</TestGroupName>
6-
<DefineConstants>$(DefineConstants);KESTREL</DefineConstants>
6+
<DefineConstants>$(DefineConstants);KESTREL;IS_TESTS</DefineConstants>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
1111
<Compile Include="$(SharedSourceRoot)Buffers.Testing\*.cs" />
1212
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
1313
<Compile Include="$(KestrelSharedSourceRoot)KnownHeaders.cs" LinkBase="shared" />
14+
<Compile Include="$(KestrelSharedSourceRoot)\HPackHeaderWriter.cs" Link="Http2\HPackHeaderWriter.cs" />
15+
<Compile Include="$(KestrelSharedSourceRoot)\Http2HeadersEnumerator.cs" Link="Http2\Http2HeadersEnumerator.cs" />
1416
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
1517
<Compile Include="$(KestrelSharedSourceRoot)\CorrelationIdGenerator.cs" Link="Internal\CorrelationIdGenerator.cs" />
1618
<Compile Include="$(SharedSourceRoot)test\Shared.Tests\runtime\Http2\*.cs" LinkBase="Shared\runtime\Http2" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
9-
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
9+
<Compile Include="$(KestrelSharedSourceRoot)test\TestResources.cs" Link="shared\TestResources.cs" />
1010
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
1111
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.crt" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
1212
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.key" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88

99
<ItemGroup>
1010
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
11-
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
11+
<Compile Include="$(KestrelSharedSourceRoot)test\HttpEventSourceListener.cs" Link="shared\HttpEventSourceListener.cs" />
12+
<Compile Include="$(KestrelSharedSourceRoot)test\TestResources.cs" Link="shared\TestResources.cs" />
13+
<Compile Include="$(KestrelSharedSourceRoot)test\StreamExtensions.cs" Link="shared\StreamExtensions.cs" />
14+
<Compile Include="$(KestrelSharedSourceRoot)test\KestrelTestLoggerProvider.cs" Link="shared\KestrelTestLoggerProvider.cs" />
15+
<Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLoggerLoggedTest.cs" Link="shared\TestApplicationErrorLoggerLoggedTest.cs" />
16+
<Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLogger.cs" Link="shared\TestApplicationErrorLogger.cs" />
1217
<Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\IHostPortExtensions.cs" Link="shared\TransportTestHelpers\IHostPortExtensions.cs" />
1318
<Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\MsQuicSupportedAttribute.cs" Link="shared\TransportTestHelpers\MsQuicSupportedAttribute.cs" />
1419
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />

‎src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using Microsoft.Extensions.Logging.Abstractions;
2323
using Microsoft.Extensions.Primitives;
2424
using Microsoft.Net.Http.Headers;
25+
using Http2HeadersEnumerator = Microsoft.AspNetCore.Server.Kestrel.Core.Tests.Http2HeadersEnumerator;
2526

2627
namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks;
2728

‎src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2HeadersEnumeratorBenchmark.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
77
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
88
using Microsoft.Extensions.Primitives;
9+
using Http2HeadersEnumerator = Microsoft.AspNetCore.Server.Kestrel.Core.Tests.Http2HeadersEnumerator;
910

1011
namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks;
1112

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ServerGarbageCollection>true</ServerGarbageCollection>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<TieredCompilation>false</TieredCompilation>
9+
<DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
910
</PropertyGroup>
1011

1112
<ItemGroup>
@@ -15,6 +16,8 @@
1516
<Compile Include="$(KestrelSharedSourceRoot)\CompletionPipeReader.cs" />
1617
<Compile Include="$(KestrelSharedSourceRoot)\CompletionPipeWriter.cs" />
1718
<Compile Include="$(KestrelSharedSourceRoot)test\PipeWriterHttp2FrameExtensions.cs" Link="Internal\PipeWriterHttp2FrameExtensions.cs" />
19+
<Compile Include="$(KestrelSharedSourceRoot)\HPackHeaderWriter.cs" Link="Http2\HPackHeaderWriter.cs" />
20+
<Compile Include="$(KestrelSharedSourceRoot)\Http2HeadersEnumerator.cs" Link="Http2\Http2HeadersEnumerator.cs" />
1821
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
1922
<Compile Include="$(KestrelSharedSourceRoot)test\KestrelTestLoggerProvider.cs" />
2023
<Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLogger.cs" />

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
using System.Net.Http;
55
using System.Net.Http.HPack;
66

7+
#if !(IS_TESTS || IS_BENCHMARKS)
78
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
9+
#else
10+
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests;
11+
#endif
812

13+
// This file is used by Kestrel to write response headers and tests to write request headers.
14+
// To avoid adding test code to Kestrel this file is shared. Test specifc code is excluded from Kestrel by ifdefs.
915
internal static class HPackHeaderWriter
1016
{
1117
/// <summary>

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

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,32 @@
77
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
88
using Microsoft.Extensions.Primitives;
99

10+
#if !(IS_TESTS || IS_BENCHMARKS)
1011
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
12+
#else
13+
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests;
14+
#endif
1115

16+
#nullable enable
17+
18+
// This file is used by Kestrel to write response headers and tests to write request headers.
19+
// To avoid adding test code to Kestrel this file is shared. Test specifc code is excluded from Kestrel by ifdefs.
1220
internal sealed class Http2HeadersEnumerator : IEnumerator<KeyValuePair<string, string>>
1321
{
1422
private enum HeadersType : byte
1523
{
1624
Headers,
1725
Trailers,
18-
Untyped
26+
#if IS_TESTS || IS_BENCHMARKS
27+
Untyped,
28+
#endif
1929
}
2030
private HeadersType _headersType;
2131
private HttpResponseHeaders.Enumerator _headersEnumerator;
2232
private HttpResponseTrailers.Enumerator _trailersEnumerator;
33+
#if IS_TESTS || IS_BENCHMARKS
2334
private IEnumerator<KeyValuePair<string, StringValues>>? _genericEnumerator;
35+
#endif
2436
private StringValues.Enumerator _stringValuesEnumerator;
2537
private bool _hasMultipleValues;
2638
private KnownHeaderType _knownHeaderType;
@@ -47,6 +59,7 @@ public void Initialize(HttpResponseTrailers headers)
4759
_hasMultipleValues = false;
4860
}
4961

62+
#if IS_TESTS || IS_BENCHMARKS
5063
public void Initialize(IDictionary<string, StringValues> headers)
5164
{
5265
switch (headers)
@@ -67,6 +80,7 @@ public void Initialize(IDictionary<string, StringValues> headers)
6780

6881
_hasMultipleValues = false;
6982
}
83+
#endif
7084

7185
public bool MoveNext()
7286
{
@@ -89,13 +103,19 @@ public bool MoveNext()
89103
}
90104
else
91105
{
106+
#if IS_TESTS || IS_BENCHMARKS
92107
return _genericEnumerator!.MoveNext()
93-
? SetCurrent(_genericEnumerator.Current.Key, _genericEnumerator.Current.Value, ZZGetKnownHeaderType(_genericEnumerator.Current.Key))
108+
? SetCurrent(_genericEnumerator.Current.Key, _genericEnumerator.Current.Value, GetKnownRequestHeaderType(_genericEnumerator.Current.Key))
94109
: false;
110+
#else
111+
ThrowUnexpectedHeadersType();
112+
return false;
113+
#endif
95114
}
96115
}
97116

98-
private static KnownHeaderType ZZGetKnownHeaderType(string headerName)
117+
#if IS_TESTS || IS_BENCHMARKS
118+
private static KnownHeaderType GetKnownRequestHeaderType(string headerName)
99119
{
100120
switch (headerName)
101121
{
@@ -105,6 +125,13 @@ private static KnownHeaderType ZZGetKnownHeaderType(string headerName)
105125
return default;
106126
}
107127
}
128+
#else
129+
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
130+
private static void ThrowUnexpectedHeadersType()
131+
{
132+
throw new InvalidOperationException("Unexpected headers collection type.");
133+
}
134+
#endif
108135

109136
private bool MoveNextOnStringEnumerator(string key)
110137
{
@@ -145,7 +172,11 @@ public void Reset()
145172
}
146173
else
147174
{
175+
#if IS_TESTS || IS_BENCHMARKS
148176
_genericEnumerator!.Reset();
177+
#else
178+
ThrowUnexpectedHeadersType();
179+
#endif
149180
}
150181
_stringValuesEnumerator = default;
151182
_knownHeaderType = default;
@@ -160,8 +191,6 @@ internal static int GetResponseHeaderStaticTableId(KnownHeaderType responseHeade
160191
// Removed from this test are request-only headers, e.g. cookie.
161192
switch (responseHeaderType)
162193
{
163-
case KnownHeaderType.Method:
164-
return H2StaticTable.MethodGet;
165194
case KnownHeaderType.CacheControl:
166195
return H2StaticTable.CacheControl;
167196
case KnownHeaderType.Date:
@@ -212,6 +241,11 @@ internal static int GetResponseHeaderStaticTableId(KnownHeaderType responseHeade
212241
return H2StaticTable.ContentLength;
213242
default:
214243
return -1;
244+
#if IS_TESTS || IS_BENCHMARKS
245+
// Include request headers for tests.
246+
case KnownHeaderType.Method:
247+
return H2StaticTable.MethodGet;
248+
#endif
215249
}
216250
}
217251
}

‎src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ internal async ValueTask<Http3ControlStream> GetInboundControlStream()
107107
if (_inboundControlStream == null)
108108
{
109109
var reader = MultiplexedConnectionContext.ToClientAcceptQueue.Reader;
110-
#if IS_FUNCTIONAL_TESTS
110+
#if IS_TESTS
111111
while (await reader.WaitToReadAsync().DefaultTimeout())
112112
#else
113113
while (await reader.WaitToReadAsync())
@@ -147,7 +147,7 @@ internal async Task WaitForConnectionErrorAsync<TException>(bool ignoreNonGoAway
147147
AssertConnectionError<TException>(expectedErrorCode, matchExpectedErrorMessage, expectedErrorMessage);
148148

149149
// Verify HttpConnection.ProcessRequestsAsync has exited.
150-
#if IS_FUNCTIONAL_TESTS
150+
#if IS_TESTS
151151
await _connectionTask.DefaultTimeout();
152152
#else
153153
await _connectionTask;
@@ -461,7 +461,7 @@ protected Task SendAsync(ReadOnlySpan<byte> span)
461461
protected static Task FlushAsync(PipeWriter writableBuffer)
462462
{
463463
var task = writableBuffer.FlushAsync();
464-
#if IS_FUNCTIONAL_TESTS
464+
#if IS_TESTS
465465
return task.AsTask().DefaultTimeout();
466466
#else
467467
return task.GetAsTask();
@@ -477,7 +477,7 @@ internal async Task ReceiveEndAsync()
477477
}
478478
}
479479

480-
#if IS_FUNCTIONAL_TESTS
480+
#if IS_TESTS
481481
protected Task<ReadResult> ReadApplicationInputAsync()
482482
{
483483
return Pair.Application.Input.ReadAsync().AsTask().DefaultTimeout();

‎src/Servers/Kestrel/shared/test/PipeWriterHttp2FrameExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
using System.IO.Pipelines;
99
using System.Net.Http.HPack;
1010
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
11+
using Http2HeadersEnumerator = Microsoft.AspNetCore.Server.Kestrel.Core.Tests.Http2HeadersEnumerator;
12+
using HPackHeaderWriter = Microsoft.AspNetCore.Server.Kestrel.Core.Tests.HPackHeaderWriter;
1113

1214
namespace Microsoft.AspNetCore.Testing;
1315

‎src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
using Microsoft.AspNetCore.Server.Kestrel.FunctionalTests;
2323
using Microsoft.AspNetCore.Server.Kestrel.Https;
2424
using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
25-
using Microsoft.AspNetCore.Server.Kestrel.Tests;
2625
using Microsoft.AspNetCore.Testing;
2726
using Microsoft.Extensions.Hosting;
2827
using Microsoft.Extensions.Logging;

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,28 @@ public async Task HEADERS_Received_KnownOrCustomMethods_Accepted(string method)
103103
};
104104
await InitializeConnectionAsync(_echoMethodNoBody);
105105

106+
// First request
106107
await StartStreamAsync(1, headers, endStream: true);
107108

108-
var headersFrame = await ExpectAsync(Http2FrameType.HEADERS,
109+
var headersFrame1 = await ExpectAsync(Http2FrameType.HEADERS,
109110
withLength: 45 + method.Length,
110111
withFlags: (byte)(Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM),
111112
withStreamId: 1);
112113

114+
_hpackDecoder.Decode(headersFrame1.PayloadSequence, endHeaders: false, handler: this);
115+
116+
Assert.Equal(4, _decodedHeaders.Count);
117+
Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase);
118+
Assert.Equal("200", _decodedHeaders[HeaderNames.Status]);
119+
Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]);
120+
Assert.Equal(method, _decodedHeaders["Method"]);
121+
_decodedHeaders.Clear();
122+
123+
// Second request (will use dynamic table indexes)
113124
await StartStreamAsync(3, headers, endStream: true);
114125

115-
// Can't check length this time because it will be different with compression.
116126
var headersFrame2 = await ExpectAsync(Http2FrameType.HEADERS,
127+
withLength: 7,
117128
withFlags: (byte)(Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM),
118129
withStreamId: 3);
119130

@@ -126,6 +137,7 @@ public async Task HEADERS_Received_KnownOrCustomMethods_Accepted(string method)
126137
Assert.Equal("200", _decodedHeaders[HeaderNames.Status]);
127138
Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]);
128139
Assert.Equal(method, _decodedHeaders["Method"]);
140+
_decodedHeaders.Clear();
129141
}
130142

131143
[Fact]

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,18 +1183,6 @@ internal async Task<Http2FrameWithPayload> ExpectAsync(Http2FrameType type, int
11831183
return frame;
11841184
}
11851185

1186-
1187-
internal async Task<Http2FrameWithPayload> ExpectAsync(Http2FrameType type, byte withFlags, int withStreamId)
1188-
{
1189-
var frame = await ReceiveFrameAsync();
1190-
1191-
Assert.Equal(type, frame.Type);
1192-
Assert.Equal(withFlags, frame.Flags);
1193-
Assert.Equal(withStreamId, frame.StreamId);
1194-
1195-
return frame;
1196-
}
1197-
11981186
protected Task StopConnectionAsync(int expectedLastStreamId, bool ignoreNonGoAwayFrames)
11991187
{
12001188
_pair.Application.Output.Complete();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
<ServerGarbageCollection>true</ServerGarbageCollection>
55
<TestGroupName>InMemory.FunctionalTests</TestGroupName>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7-
<DefineConstants>$(DefineConstants);IS_FUNCTIONAL_TESTS</DefineConstants>
7+
<DefineConstants>$(DefineConstants);IS_TESTS</DefineConstants>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
1212
<Compile Include="$(SharedSourceRoot)SyncPoint\SyncPoint.cs" Link="SyncPoint.cs" />
1313
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
1414
<Compile Include="$(KestrelSharedSourceRoot)test\Http3\*.cs" LinkBase="shared" />
15+
<Compile Include="$(KestrelSharedSourceRoot)\HPackHeaderWriter.cs" Link="Http2\HPackHeaderWriter.cs" />
16+
<Compile Include="$(KestrelSharedSourceRoot)\Http2HeadersEnumerator.cs" Link="Http2\Http2HeadersEnumerator.cs" />
1517
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
1618
<Compile Include="$(KestrelSharedSourceRoot)\CompletionPipeReader.cs" Link="Internal\CompletionPipeReader.cs" />
1719
<Compile Include="$(KestrelSharedSourceRoot)\CompletionPipeWriter.cs" Link="Internal\CompletionPipeWriter.cs" />

‎src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj

Lines changed: 11 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
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -10,7 +10,16 @@
1010
<Compile Include="..\BindTests\**\*.cs" />
1111
<Compile Include="..\Sockets.FunctionalTests\TransportSelector.cs" />
1212
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
13-
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
13+
<Compile Include="$(KestrelSharedSourceRoot)test\TestServiceContext.cs" Link="shared\TestServiceContext.cs" />
14+
<Compile Include="$(KestrelSharedSourceRoot)test\TestConnection.cs" Link="shared\TestConnection.cs" />
15+
<Compile Include="$(KestrelSharedSourceRoot)test\MockSystemClock.cs" Link="shared\MockSystemClock.cs" />
16+
<Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLoggerLoggedTest.cs" Link="shared\TestApplicationErrorLoggerLoggedTest.cs" />
17+
<Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLogger.cs" Link="shared\TestApplicationErrorLogger.cs" />
18+
<Compile Include="$(KestrelSharedSourceRoot)test\StreamBackedTestConnection.cs" Link="shared\StreamBackedTestConnection.cs" />
19+
<Compile Include="$(KestrelSharedSourceRoot)test\TestResources.cs" Link="shared\TestResources.cs" />
20+
<Compile Include="$(KestrelSharedSourceRoot)test\TestConstants.cs" Link="shared\TestConstants.cs" />
21+
<Compile Include="$(KestrelSharedSourceRoot)test\KestrelTestLoggerProvider.cs" Link="shared\KestrelTestLoggerProvider.cs" />
22+
<Compile Include="$(KestrelSharedSourceRoot)test\LifetimeNotImplemented.cs" Link="shared\LifetimeNotImplemented.cs" />
1423
<Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\*.cs" LinkBase="shared\TransportTestHelpers" />
1524
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
1625
</ItemGroup>

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@
1111
<ItemGroup>
1212
<Compile Include="..\FunctionalTests\**\*.cs" />
1313
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
14-
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
14+
<Compile Include="$(KestrelSharedSourceRoot)test\TestServiceContext.cs" Link="shared\TestServiceContext.cs" />
15+
<Compile Include="$(KestrelSharedSourceRoot)test\TestConnection.cs" Link="shared\TestConnection.cs" />
16+
<Compile Include="$(KestrelSharedSourceRoot)test\MockSystemClock.cs" Link="shared\MockSystemClock.cs" />
17+
<Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLoggerLoggedTest.cs" Link="shared\TestApplicationErrorLoggerLoggedTest.cs" />
18+
<Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLogger.cs" Link="shared\TestApplicationErrorLogger.cs" />
19+
<Compile Include="$(KestrelSharedSourceRoot)test\StreamBackedTestConnection.cs" Link="shared\StreamBackedTestConnection.cs" />
20+
<Compile Include="$(KestrelSharedSourceRoot)test\TestResources.cs" Link="shared\TestResources.cs" />
21+
<Compile Include="$(KestrelSharedSourceRoot)test\TestConstants.cs" Link="shared\TestConstants.cs" />
22+
<Compile Include="$(KestrelSharedSourceRoot)test\KestrelTestLoggerProvider.cs" Link="shared\KestrelTestLoggerProvider.cs" />
23+
<Compile Include="$(KestrelSharedSourceRoot)test\LifetimeNotImplemented.cs" Link="shared\LifetimeNotImplemented.cs" />
24+
<Compile Include="$(KestrelSharedSourceRoot)test\PassThroughConnectionMiddleware.cs" Link="shared\PassThroughConnectionMiddleware.cs" />
25+
<Compile Include="$(KestrelSharedSourceRoot)test\TestApp.cs" Link="shared\TestApp.cs" />
26+
<Compile Include="$(KestrelSharedSourceRoot)test\StreamExtensions.cs" Link="shared\StreamExtensions.cs" />
1527
<Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\*.cs" LinkBase="shared\TransportTestHelpers" />
1628
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
1729
</ItemGroup>

0 commit comments

Comments
 (0)