From ad3112917bb7a3e40c1bccfeb4d1e7db62f98022 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Fri, 7 Feb 2014 11:29:22 -0800
Subject: [PATCH] Update Microsoft.Owin dependencies to Microsoft.AspNet.

---
 samples/StaticFileSample/Startup.cs                         | 6 +++---
 src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs  | 2 +-
 src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs  | 2 +-
 .../DirectoryBrowserExtensions.cs                           | 2 +-
 .../DirectoryBrowserMiddleware.cs                           | 2 +-
 .../DirectoryFormatters/HtmlDirectoryFormatter.cs           | 2 +-
 .../DirectoryFormatters/IDirectoryFormatter.cs              | 2 +-
 src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs    | 2 +-
 .../Infrastructure/SharedOptions.cs                         | 2 +-
 .../Infrastructure/SharedOptionsBase.cs                     | 2 +-
 src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs | 1 -
 src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs       | 2 +-
 src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs    | 2 +-
 src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs    | 2 +-
 .../StaticFileResponseContext.cs                            | 2 +-
 src/Microsoft.AspNet.StaticFiles/project.json               | 6 +-----
 16 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index 37d1667ab3..73e49392b3 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -1,11 +1,11 @@
 #if NET45
 using System;
 using System.IO;
-using Microsoft.AspNet.Abstractions;
-using Microsoft.Owin.FileSystems;
 using Microsoft.AspNet;
-using Owin;
+using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 using Microsoft.AspNet.StaticFiles;
+using Owin;
 
 namespace StaticFilesSample
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
index ac89ad46ca..17b2f890ba 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.StaticFiles;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.StaticFiles;
 
 namespace Microsoft.AspNet
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
index cccaeb047f..febd00e75b 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Abstractions;
-using Microsoft.Owin.FileSystems;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
index 74bf255f45..d8b578ca1a 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.StaticFiles;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.StaticFiles;
 
 namespace Microsoft.AspNet
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
index 87d56cb3a0..c8b46263b4 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
@@ -3,8 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Owin.FileSystems;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
index 8a5056d189..d5c44150c3 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
@@ -7,8 +7,8 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Owin.FileSystems;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
index 48c2b833a6..3b6a3a356c 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
@@ -2,8 +2,8 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Owin.FileSystems;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
index f647704465..281d796389 100644
--- a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.StaticFiles;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.StaticFiles;
 
 namespace Microsoft.AspNet
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
index 06ff75c429..5fe8abec98 100644
--- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Owin.FileSystems;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles.Infrastructure
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
index 7715dcc6ce..e50829b8f6 100644
--- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Owin.FileSystems;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles.Infrastructure
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs
index a373b20da5..3a34d511c4 100644
--- a/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs
@@ -23,5 +23,4 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 
 [assembly: Guid("310c92f5-1719-4616-9ca8-a5788fcb86f8")]
-[assembly: CLSCompliant(true)]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
index 6cbd30a93e..bb8d64189b 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
@@ -8,9 +8,9 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 using Microsoft.AspNet.HttpFeature;
 using Microsoft.AspNet.StaticFiles.Infrastructure;
-using Microsoft.Owin.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
index be625dcc60..5bdb17a02e 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.StaticFiles;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.StaticFiles;
 
 namespace Microsoft.AspNet
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
index f1bc8aa17f..a156156fc1 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Abstractions;
-using Microsoft.Owin.FileSystems;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
index 2f681722be..efbf6acdb0 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Owin.FileSystems;
 using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.FileSystems;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json
index eed3dc1834..d524a7eba7 100644
--- a/src/Microsoft.AspNet.StaticFiles/project.json
+++ b/src/Microsoft.AspNet.StaticFiles/project.json
@@ -6,11 +6,7 @@
     "Microsoft.AspNet.FileSystems" : "0.1-alpha-*"
   },
   "configurations": {
-    "net45": { 
-      "dependencies": {
-        "Owin" : "1.0"
-      }
-    },
+    "net45": { },
     "k10" : { }
   }
 }
\ No newline at end of file