Skip to content

Commit beb1427

Browse files
ryanbrandenburgryanbrandenburg
committed
Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1
2 parents d025e4e + dabf5d8 commit beb1427

File tree

14 files changed

+123
-5
lines changed

14 files changed

+123
-5
lines changed

‎src/Servers/Kestrel.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
4949
EndProject
5050
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}"
5151
EndProject
52+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libuv.BindTests", "Kestrel\test\Libuv.BindTests\Libuv.BindTests.csproj", "{B211AEE8-F28F-45A4-9C71-81691D7C99E1}"
53+
EndProject
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sockets.BindTests", "Kestrel\test\Sockets.BindTests\Sockets.BindTests.csproj", "{94135813-EBCC-4E4E-8B12-8E5BD58E1350}"
55+
EndProject
5256
Global
5357
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5458
Debug|Any CPU = Debug|Any CPU
@@ -299,6 +303,30 @@ Global
299303
{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}.Release|x64.Build.0 = Release|Any CPU
300304
{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}.Release|x86.ActiveCfg = Release|Any CPU
301305
{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}.Release|x86.Build.0 = Release|Any CPU
306+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
307+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
308+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x64.ActiveCfg = Debug|Any CPU
309+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x64.Build.0 = Debug|Any CPU
310+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x86.ActiveCfg = Debug|Any CPU
311+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x86.Build.0 = Debug|Any CPU
312+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
313+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|Any CPU.Build.0 = Release|Any CPU
314+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x64.ActiveCfg = Release|Any CPU
315+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x64.Build.0 = Release|Any CPU
316+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x86.ActiveCfg = Release|Any CPU
317+
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x86.Build.0 = Release|Any CPU
318+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
319+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|Any CPU.Build.0 = Debug|Any CPU
320+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x64.ActiveCfg = Debug|Any CPU
321+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x64.Build.0 = Debug|Any CPU
322+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x86.ActiveCfg = Debug|Any CPU
323+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x86.Build.0 = Debug|Any CPU
324+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|Any CPU.ActiveCfg = Release|Any CPU
325+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|Any CPU.Build.0 = Release|Any CPU
326+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x64.ActiveCfg = Release|Any CPU
327+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x64.Build.0 = Release|Any CPU
328+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x86.ActiveCfg = Release|Any CPU
329+
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x86.Build.0 = Release|Any CPU
302330
EndGlobalSection
303331
GlobalSection(SolutionProperties) = preSolution
304332
HideSolutionNode = FALSE

‎src/Servers/Kestrel/Core/src/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1212
[assembly: InternalsVisibleTo("Http2SampleApp, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1313
[assembly: InternalsVisibleTo("PlatformBenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
14+
[assembly: InternalsVisibleTo("Libuv.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
15+
[assembly: InternalsVisibleTo("Sockets.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

‎src/Servers/Kestrel/test/FunctionalTests/TestHelpers/HostNameIsReachableAttribute.cs renamed to ‎src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs

File renamed without changes.

‎src/Servers/Kestrel/test/FunctionalTests/TestHelpers/IPv6ScopeIdPresentConditionAttribute.cs renamed to ‎src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6ScopeIdPresentConditionAttribute.cs

File renamed without changes.

‎src/Servers/Kestrel/test/FunctionalTests/TestHelpers/IPv6SupportedConditionAttribute.cs renamed to ‎src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6SupportedConditionAttribute.cs

File renamed without changes.

‎src/Servers/Kestrel/test/FunctionalTests/TestHelpers/IWebHostPortExtensions.cs renamed to ‎src/Servers/Kestrel/shared/test/TransportTestHelpers/IWebHostPortExtensions.cs

File renamed without changes.

‎src/Servers/Kestrel/test/FunctionalTests/TestHelpers/TestApplicationErrorLoggerLoggedTest.cs renamed to ‎src/Servers/Kestrel/shared/test/TransportTestHelpers/TestApplicationErrorLoggerLoggedTest.cs

File renamed without changes.

‎src/Servers/Kestrel/test/FunctionalTests/AddressRegistrationTests.cs renamed to ‎src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs

File renamed without changes.

‎src/Servers/Kestrel/test/BindTests/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using Microsoft.Extensions.Logging.Testing;
5+
6+
[assembly: ShortClassName]

‎src/Servers/Kestrel/test/FunctionalTests/TestHelpers/TestServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public TestServer(RequestDelegate app, TestServiceContext context, ListenOptions
7979
_host.Start();
8080
}
8181

82-
public static void RemoveDevCert(IServiceCollection services)
82+
private static void RemoveDevCert(IServiceCollection services)
8383
{
8484
// KestrelServerOptionsSetup would scan all system certificates on every test server creation
8585
// making test runs very slow

0 commit comments

Comments
 (0)