diff --git a/build/artifacts.props b/build/artifacts.props
index 5b65d40ce8..b12c0870ea 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -127,6 +127,7 @@
+
diff --git a/build/dependencies.props b/build/dependencies.props
index 01ac7ca2d0..0e6582f464 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,116 +1,117 @@
- 4.6.0-preview1-26907-04
- 3.0.0-preview1-26907-05
-
- 3.0.0-preview1-26907-05
- 3.0.0-preview1-26907-05
- 3.0.0-preview1-26907-05
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 1.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26717-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 1.7.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.10.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26829-04
+
+
+ 3.0.0-preview-27117-01
+ 3.0.0-preview-27117-01
+ 3.0.0-preview-27117-01
+ 3.0.0-preview-27117-01
+
+
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 1.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.7.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.5.2-servicing-27114-05
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 1.7.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.6.0-preview.18566.8
+ 4.10.0-preview.18566.8
+ 4.6.0-preview.18566.8
+
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-alpha1-10742
- 3.0.0-alpha1-10742
- 3.0.0-alpha1-10742
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-preview-181113-11
- 3.0.0-alpha1-10727
- 3.0.0-alpha1-10727
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+ 3.0.0-preview.18569.14
+
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
- 3.0.0-preview-181109-02
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
+ 3.0.0-preview.18569.2
@@ -233,11 +234,13 @@
2.0.513
1.3.23
1.0.0
+ 4.5.0
5.3.0
4.3.2
3.1.1
4.3.0
4.3.0
+ 4.5.0
1.3.7
9.0.1
2.11.0-beta1-63430-03
diff --git a/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj b/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
index a469dc113a..46854acfb4 100644
--- a/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
+++ b/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
@@ -11,8 +11,6 @@
true
aspnetcore;testing
false
- true
- false
diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
index e49f5d9230..9ff8d13e9c 100644
--- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
+++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.2;net461
@@ -6,6 +6,7 @@
+
diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
index 671eee1336..e6c74a0010 100644
--- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
+++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
@@ -5,6 +5,7 @@
+
diff --git a/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj b/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj
index 9570e756da..17c05a6cd7 100644
--- a/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj
+++ b/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj
@@ -7,6 +7,7 @@
+
diff --git a/src/Servers/Kestrel/shared/test/MockLogger.cs b/src/Servers/Kestrel/shared/test/MockLogger.cs
index 677d0687de..f5fd9008fe 100644
--- a/src/Servers/Kestrel/shared/test/MockLogger.cs
+++ b/src/Servers/Kestrel/shared/test/MockLogger.cs
@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
+using Microsoft.AspNetCore.Internal;
using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions.Internal;
namespace Microsoft.AspNetCore.Testing
{
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs
index 5928f5d661..d386500e68 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs
@@ -11,6 +11,7 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
using Microsoft.AspNetCore.Server.Kestrel.Https;
@@ -18,8 +19,8 @@ using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions.Internal;
using Microsoft.Extensions.Logging.Testing;
using Xunit;
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
index b2e3133845..3d85aad7f8 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.2;net461
@@ -6,6 +6,7 @@
+
@@ -14,6 +15,7 @@
+
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
index 80544cba00..9f4ecb8b89 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.2
@@ -8,6 +8,7 @@
+
diff --git a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
index aaea3c2c83..0f779c713e 100644
--- a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
+++ b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.2;net461
@@ -9,6 +9,7 @@
+
diff --git a/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj b/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj
index 0e86764f26..8a2901d587 100644
--- a/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj
@@ -10,6 +10,7 @@
+
diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
index 4f564fa410..067f8feded 100644
--- a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
+++ b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.2;net461
@@ -9,6 +9,7 @@
+
diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj
index be7f4001ee..f34e2c6e6e 100644
--- a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj
@@ -9,6 +9,7 @@
+
diff --git a/src/Shared/NullScope.cs b/src/Shared/NullScope.cs
new file mode 100644
index 0000000000..d70c31ddf6
--- /dev/null
+++ b/src/Shared/NullScope.cs
@@ -0,0 +1,24 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Internal
+{
+ ///
+ /// An empty scope without any logic
+ ///
+ internal class NullScope : IDisposable
+ {
+ public static NullScope Instance { get; } = new NullScope();
+
+ private NullScope()
+ {
+ }
+
+ ///
+ public void Dispose()
+ {
+ }
+ }
+}