From f82d28c723c14e5a9c0bd06763447a6436ded9f4 Mon Sep 17 00:00:00 2001 From: Brennan Date: Thu, 21 Jan 2016 17:03:18 -0800 Subject: [PATCH] React to Fileprovider namespace changes --- src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs | 2 +- src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs | 2 +- src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs | 2 +- .../Infrastructure/SharedOptions.cs | 2 +- .../Infrastructure/SharedOptionsBase.cs | 2 +- src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs | 2 +- src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs | 2 +- src/Microsoft.AspNet.StaticFiles/project.json | 2 +- .../DefaultFilesMiddlewareTests.cs | 2 +- .../DirectoryBrowserMiddlewareTests.cs | 2 +- .../Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs | 2 +- .../StaticFileMiddlewareTests.cs | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs index 167623e434..1761b2ebee 100644 --- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs +++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs @@ -4,9 +4,9 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; +using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs index 6f641e2f1c..2b769d9031 100644 --- a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs +++ b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs @@ -8,9 +8,9 @@ using System.Linq; using System.Text; using System.Text.Encodings.Web; using System.Threading.Tasks; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.FileProviders; namespace Microsoft.AspNet.StaticFiles { diff --git a/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs index 5c6dd0e227..8c43063878 100644 --- a/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs +++ b/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; +using Microsoft.Extensions.FileProviders; namespace Microsoft.AspNet.StaticFiles { diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs index 87f5a5fb20..c6839268f7 100644 --- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs +++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; +using Microsoft.Extensions.FileProviders; namespace Microsoft.AspNet.StaticFiles.Infrastructure { diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs index 9f502f2cfe..5fce4fed15 100644 --- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs +++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; +using Microsoft.Extensions.FileProviders; namespace Microsoft.AspNet.StaticFiles.Infrastructure { diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs index 6c54ba865c..d54032af2a 100644 --- a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs +++ b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs @@ -8,12 +8,12 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Extensions; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Headers; using Microsoft.AspNet.StaticFiles.Infrastructure; +using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs index dcb81621cc..d67d4906cd 100644 --- a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs +++ b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs @@ -1,8 +1,8 @@ // 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 Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; +using Microsoft.Extensions.FileProviders; namespace Microsoft.AspNet.StaticFiles { diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json index 87611531d7..58e6629adc 100644 --- a/src/Microsoft.AspNet.StaticFiles/project.json +++ b/src/Microsoft.AspNet.StaticFiles/project.json @@ -11,8 +11,8 @@ }, "dependencies": { "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*", + "Microsoft.Extensions.FileProviders.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.WebEncoders": "1.0.0-*" }, diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs index f51142ea66..e8976d6ddd 100644 --- a/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs +++ b/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs @@ -7,10 +7,10 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; using Microsoft.AspNet.Testing.xunit; +using Microsoft.Extensions.FileProviders; using Xunit; namespace Microsoft.AspNet.StaticFiles diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs index 64b33a14ba..74480d2002 100644 --- a/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs +++ b/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs @@ -8,11 +8,11 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; using Microsoft.AspNet.Testing.xunit; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.FileProviders; using Xunit; namespace Microsoft.AspNet.StaticFiles diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs index 60161b4bc6..4666486f46 100644 --- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs +++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.IO; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; +using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Primitives; using Xunit; diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs index b85ad11fa9..c6735c5b17 100644 --- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs +++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs @@ -6,11 +6,11 @@ using System.IO; using System.Net; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; using Microsoft.AspNet.Testing.xunit; +using Microsoft.Extensions.FileProviders; using Xunit; namespace Microsoft.AspNet.StaticFiles