From 63c033f7368ec39efa980f448256ebb7c4667d3a Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Sun, 8 Mar 2015 12:59:24 -0700 Subject: [PATCH] Update aspnet50/aspnetcore50 => dnx451/dnxcore50. --- samples/StaticFileSample/project.json | 8 ++++---- src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs | 4 ++-- src/Microsoft.AspNet.StaticFiles/project.json | 6 +++--- test/Microsoft.AspNet.StaticFiles.Tests/project.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/StaticFileSample/project.json b/samples/StaticFileSample/project.json index 47d2733df8..9948338281 100644 --- a/samples/StaticFileSample/project.json +++ b/samples/StaticFileSample/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.Urls http://localhost:12345/" }, @@ -11,8 +11,8 @@ "Microsoft.Framework.Logging.Console": "1.0.0-*" }, "frameworks": { - "aspnet50": {}, - "aspnetcore50": {} + "dnx451": {}, + "dnxcore50": {} }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs index b9be2cc7da..5b1d1dfe91 100644 --- a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs +++ b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -81,7 +81,7 @@ namespace Microsoft.AspNet.StaticFiles throw new ArgumentOutOfRangeException("length", length, string.Empty); } -#if ASPNET50 +#if DNX451 Stream fileStream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 1024 * 64, FileOptions.Asynchronous | FileOptions.SequentialScan); #else diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json index d7b842b92c..0090bb41b4 100644 --- a/src/Microsoft.AspNet.StaticFiles/project.json +++ b/src/Microsoft.AspNet.StaticFiles/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "ASP.NET 5 static files middleware.", "dependencies": { @@ -10,7 +10,7 @@ "Microsoft.Framework.WebEncoders": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } } diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/project.json b/test/Microsoft.AspNet.StaticFiles.Tests/project.json index e091d742bb..5e63d5e3ab 100644 --- a/test/Microsoft.AspNet.StaticFiles.Tests/project.json +++ b/test/Microsoft.AspNet.StaticFiles.Tests/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", @@ -11,10 +11,10 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Shouldly": "1.1.1.1" } } } -} \ No newline at end of file +}