From 4310fa144b278ad0298c4eb33ba64f7623136a21 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 22 Oct 2015 00:55:55 -0700 Subject: [PATCH] Switching to generations TFMs --- .../SendFileMiddleware.cs | 15 ++++---- src/Microsoft.AspNet.StaticFiles/project.json | 36 +++++++++---------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs index c642a1eb39..a47dc491c1 100644 --- a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs +++ b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs @@ -92,13 +92,14 @@ namespace Microsoft.AspNet.StaticFiles throw new ArgumentOutOfRangeException(nameof(length), length, string.Empty); } -#if DNX451 - Stream fileStream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 1024 * 64, - FileOptions.Asynchronous | FileOptions.SequentialScan); -#else - // TODO: Bring back async when the contract gets it - Stream fileStream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 1024 * 64); -#endif + var fileStream = new FileStream( + fileName, + FileMode.Open, + FileAccess.Read, + FileShare.ReadWrite, + bufferSize: 1024 * 64, + options: FileOptions.Asynchronous | FileOptions.SequentialScan); + try { fileStream.Seek(offset, SeekOrigin.Begin); diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json index 52f19a518e..c25fa37e0f 100644 --- a/src/Microsoft.AspNet.StaticFiles/project.json +++ b/src/Microsoft.AspNet.StaticFiles/project.json @@ -1,19 +1,19 @@ { - "version": "1.0.0-*", - "description": "ASP.NET 5 static files middleware.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/staticfiles" - }, - "dependencies": { - "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", - "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", - "Microsoft.Extensions.WebEncoders": "1.0.0-*" - }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { } - } -} + "version": "1.0.0-*", + "description": "ASP.NET 5 static files middleware.", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/staticfiles" + }, + "dependencies": { + "Microsoft.AspNet.Http.Extensions": "1.0.0-*", + "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", + "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", + "Microsoft.Extensions.WebEncoders": "1.0.0-*" + }, + "frameworks": { + "net451": {}, + "dotnet5.4": {} + } +} \ No newline at end of file