diff --git a/Directory.Build.props b/Directory.Build.props index b4c8d32d52..b0344ff39a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,9 +18,4 @@ true - - - - - diff --git a/build/dependencies.props b/build/dependencies.props index 98f8132ae9..0e92a8d118 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,7 +3,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview1-15618 + 2.1.0-preview1-15620 1.0.0-pre-10223 2.1.0-preview1-27773 2.1.0-preview1-27773 @@ -26,16 +26,15 @@ 2.1.0-preview1-27773 2.1.0-preview1-27773 2.0.0 - 2.1.0-preview1-25915-01 - 2.6.0-beta2-62211-02 + 2.1.0-preview1-26008-01 15.3.0 - 4.5.0-preview1-25914-04 - 0.1.0-alpha-002 - 4.5.0-preview1-25914-04 - 4.5.0-preview1-25914-04 - 4.5.0-preview1-25914-04 + 4.5.0-preview1-26006-06 + 0.1.0-e171206-2 + 4.5.0-preview1-26006-06 + 4.5.0-preview1-26006-06 + 4.5.0-preview1-26006-06 4.5.0-preview1-25914-04 - 0.1.0-alpha-002 + 0.1.0-e171206-2 2.3.1 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e7cce93009..67d7724041 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-15618 -commithash:00ce1383114015fe89b221146036e59e6bc11219 +version:2.1.0-preview1-15620 +commithash:6432b49a2c00310416df39b6fe548ef4af9c6011 \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs index 4b7f3c12d7..608aae0626 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs @@ -19,7 +19,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpSys.Internal; using Microsoft.AspNetCore.WebUtilities; -using Microsoft.Extensions.Primitives; namespace Microsoft.AspNetCore.Server.IISIntegration { @@ -41,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration protected Stack, object>> _onCompleted; protected Exception _applicationException; - private readonly BufferPool _bufferPool; + private readonly MemoryPool _memoryPool; private GCHandle _thisHandle; private MemoryHandle _inputHandle; @@ -64,12 +63,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private const string NegotiateString = "Negotiate"; private const string BasicString = "Basic"; - internal unsafe IISHttpContext(BufferPool bufferPool, IntPtr pHttpContext, IISOptions options) + internal unsafe IISHttpContext(MemoryPool memoryPool, IntPtr pHttpContext, IISOptions options) : base((HttpApiTypes.HTTP_REQUEST*)NativeMethods.http_get_raw_request(pHttpContext)) { _thisHandle = GCHandle.Alloc(this); - _bufferPool = bufferPool; + _memoryPool = memoryPool; _pHttpContext = pHttpContext; NativeMethods.http_set_managed_context(_pHttpContext, (IntPtr)_thisHandle); @@ -142,8 +141,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration RequestBody = new IISHttpRequestBody(this); ResponseBody = new IISHttpResponseBody(this); - Input = new Pipe(new PipeOptions(_bufferPool, readerScheduler: TaskRunScheduler.Default)); - var pipe = new Pipe(new PipeOptions(_bufferPool, readerScheduler: TaskRunScheduler.Default)); + Input = new Pipe(new PipeOptions(_memoryPool, readerScheduler: TaskRunScheduler.Default)); + var pipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: TaskRunScheduler.Default)); Output = new OutputProducer(pipe); } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs index 5d326b27b1..483ea3c163 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs @@ -5,7 +5,6 @@ using System; using System.Buffers; using System.Threading.Tasks; using System.Threading; -using System.IO.Pipelines; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting.Server; @@ -15,8 +14,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration { private readonly IHttpApplication _application; - public IISHttpContextOfT(BufferPool bufferPool, IHttpApplication application, IntPtr pHttpContext, IISOptions options) - : base(bufferPool, pHttpContext, options) + public IISHttpContextOfT(MemoryPool memoryPool, IHttpApplication application, IntPtr pHttpContext, IISOptions options) + : base(memoryPool, pHttpContext, options) { _application = application; } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs index a02e1fac1c..efd548c527 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private static NativeMethods.PFN_ASYNC_COMPLETION _onAsyncCompletion = OnAsyncCompletion; private IISContextFactory _iisContextFactory; - private readonly BufferPool _bufferPool = new MemoryPool(); + private readonly MemoryPool _memoryPool = new MemoryPool(); private GCHandle _httpServerHandle; private readonly IApplicationLifetime _applicationLifetime; private readonly IAuthenticationSchemeProvider _authentication; @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration { _httpServerHandle = GCHandle.Alloc(this); - _iisContextFactory = new IISContextFactory(_bufferPool, application, _options); + _iisContextFactory = new IISContextFactory(_memoryPool, application, _options); // Start the server by registering the callback NativeMethods.register_callbacks(_requestHandler, _shutdownHandler, _onAsyncCompletion, (IntPtr)_httpServerHandle, (IntPtr)_httpServerHandle); @@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration _httpServerHandle.Free(); } - _bufferPool.Dispose(); + _memoryPool.Dispose(); } private static NativeMethods.REQUEST_NOTIFICATION_STATUS HandleRequest(IntPtr pHttpContext, IntPtr pvRequestContext) @@ -126,19 +126,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private class IISContextFactory : IISContextFactory { private readonly IHttpApplication _application; - private readonly BufferPool _bufferPool; + private readonly MemoryPool _memoryPool; private readonly IISOptions _options; - public IISContextFactory(BufferPool bufferPool, IHttpApplication application, IISOptions options) + public IISContextFactory(MemoryPool memoryPool, IHttpApplication application, IISOptions options) { _application = application; - _bufferPool = bufferPool; + _memoryPool = memoryPool; _options = options; } public IISHttpContext CreateHttpContext(IntPtr pHttpContext) { - return new IISHttpContextOfT(_bufferPool, _application, pHttpContext, _options); + return new IISHttpContextOfT(_memoryPool, _application, pHttpContext, _options); } } } diff --git a/test/IISIntegration.FunctionalTests/HttpsTest.cs b/test/IISIntegration.FunctionalTests/HttpsTest.cs index cbc1b137f6..fa15c4b6cd 100644 --- a/test/IISIntegration.FunctionalTests/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/HttpsTest.cs @@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Fact] public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable() { - return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44398, sendClientCert: false); + return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false); } [Fact]