Update Microsoft.Owin dependencies to Microsoft.AspNet.

Tratcher · Tratcher · commit ad3112917bb7 · 2014-02-07T11:29:22.000-08:00
diff --git 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
@@ -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
@@ -4,7 +4,7 @@
 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
@@ -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
@@ -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
@@ -7,8 +7,8 @@
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -23,5 +23,4 @@
 // 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
@@ -8,9 +8,9 @@
 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
@@ -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
@@ -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
@@ -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
@@ -6,11 +6,7 @@
     "Microsoft.AspNet.FileSystems" : "0.1-alpha-*"
   },
   "configurations": {
-    "net45": { 
-      "dependencies": {
-        "Owin" : "1.0"
-      }
-    },
+    "net45": { },
     "k10" : { }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.`
`2`	`2`
`3`	`3`	`using System;`
`4`		`-using Microsoft.AspNet.StaticFiles;`
`5`	`4`	`using Microsoft.AspNet.Abstractions;`
	`5`	`+using Microsoft.AspNet.StaticFiles;`
`6`	`6`
`7`	`7`	`namespace Microsoft.AspNet`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`	`using Microsoft.AspNet.Abstractions;`
`7`		`-using Microsoft.Owin.FileSystems;`
	`7`	`+using Microsoft.AspNet.FileSystems;`
`8`	`8`
`9`	`9`	`namespace Microsoft.AspNet.StaticFiles`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Threading.Tasks;`
`6`		`-using Microsoft.Owin.FileSystems;`
`7`	`6`	`using Microsoft.AspNet.Abstractions;`
	`7`	`+using Microsoft.AspNet.FileSystems;`
`8`	`8`
`9`	`9`	`namespace Microsoft.AspNet.StaticFiles`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`using System.Net;`
`8`	`8`	`using System.Text;`
`9`	`9`	`using System.Threading.Tasks;`
`10`		`-using Microsoft.Owin.FileSystems;`
`11`	`10`	`using Microsoft.AspNet.Abstractions;`
	`11`	`+using Microsoft.AspNet.FileSystems;`
`12`	`12`
`13`	`13`	`namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using Microsoft.Owin.FileSystems;`
`6`	`5`	`using Microsoft.AspNet.Abstractions;`
	`6`	`+using Microsoft.AspNet.FileSystems;`
`7`	`7`
`8`	`8`	`namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters`
`9`	`9`	`{`