From 70c69178f69b09d4c59fa9b41d9ee7b99b302541 Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Thu, 21 Jan 2016 16:54:44 -0800
Subject: [PATCH] React to Fileprovider namespace changes

---
 .../IHostingEnvironment.cs                                    | 2 +-
 src/Microsoft.AspNet.Hosting.Abstractions/project.json        | 4 ++--
 src/Microsoft.AspNet.Hosting/Internal/HostingEnvironment.cs   | 2 +-
 .../Internal/HostingEnvironmentExtensions.cs                  | 2 +-
 src/Microsoft.AspNet.Hosting/Internal/NullFileProvider.cs     | 2 +-
 src/Microsoft.AspNet.Hosting/project.json                     | 2 +-
 .../HostingEnvironmentExtensionsTests.cs                      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/IHostingEnvironment.cs b/src/Microsoft.AspNet.Hosting.Abstractions/IHostingEnvironment.cs
index 6c9ddf464b..5878bd489c 100644
--- a/src/Microsoft.AspNet.Hosting.Abstractions/IHostingEnvironment.cs
+++ b/src/Microsoft.AspNet.Hosting.Abstractions/IHostingEnvironment.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.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNet.Hosting
 {
diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/project.json b/src/Microsoft.AspNet.Hosting.Abstractions/project.json
index f6a665e878..e23808c2f1 100644
--- a/src/Microsoft.AspNet.Hosting.Abstractions/project.json
+++ b/src/Microsoft.AspNet.Hosting.Abstractions/project.json
@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*",
     "Microsoft.AspNet.Hosting.Server.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*"
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
+    "Microsoft.Extensions.FileProviders.Abstractions": "1.0.0-*"
   },
   "frameworks": {
     "net451": {},
diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironment.cs b/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironment.cs
index 0428ce490b..ac87b19b94 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironment.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironment.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.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNet.Hosting.Internal
 {
diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironmentExtensions.cs b/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironmentExtensions.cs
index 36f8c9bb41..d491a4fef7 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironmentExtensions.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironmentExtensions.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting.Internal;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNet.Hosting.Internal
 {
diff --git a/src/Microsoft.AspNet.Hosting/Internal/NullFileProvider.cs b/src/Microsoft.AspNet.Hosting/Internal/NullFileProvider.cs
index 73f0bebc93..5448e6a5ec 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/NullFileProvider.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/NullFileProvider.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.AspNet.FileProviders;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Hosting.Internal
diff --git a/src/Microsoft.AspNet.Hosting/project.json b/src/Microsoft.AspNet.Hosting/project.json
index 302aa0ba37..7677512471 100644
--- a/src/Microsoft.AspNet.Hosting/project.json
+++ b/src/Microsoft.AspNet.Hosting/project.json
@@ -10,11 +10,11 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*",
     "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*",
     "Microsoft.AspNet.Hosting.Server.Abstractions": "1.0.0-*",
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
+    "Microsoft.Extensions.FileProviders.Physical": "1.0.0-*",
     "Microsoft.Extensions.Options": "1.0.0-*",
     "Microsoft.Extensions.Configuration": "1.0.0-*",
     "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-*",
diff --git a/test/Microsoft.AspNet.Hosting.Tests/HostingEnvironmentExtensionsTests.cs b/test/Microsoft.AspNet.Hosting.Tests/HostingEnvironmentExtensionsTests.cs
index 60a413acf5..709385fc66 100644
--- a/test/Microsoft.AspNet.Hosting.Tests/HostingEnvironmentExtensionsTests.cs
+++ b/test/Microsoft.AspNet.Hosting.Tests/HostingEnvironmentExtensionsTests.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting.Internal;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
 using Xunit;
 
 namespace Microsoft.AspNet.Hosting.Tests