#8 - Use IHostingEnvironment.WebRoot as the default static files root.

Tratcher · Tratcher · commit ea3ea90b7a93 · 2014-09-12T10:19:38.000-07:00
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
@@ -1,7 +1,6 @@
 // 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;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
@@ -17,7 +16,7 @@ public static class DefaultFilesExtensions
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder)
+        public static IApplicationBuilder UseDefaultFiles([NotNull] this IApplicationBuilder builder)
         {
             return builder.UseDefaultFiles(new DefaultFilesOptions());
         }
@@ -28,9 +27,9 @@ public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder build
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder, string requestPath)
+        public static IApplicationBuilder UseDefaultFiles([NotNull] this IApplicationBuilder builder, [NotNull] string requestPath)
         {
-            return UseDefaultFiles(builder, new DefaultFilesOptions() { RequestPath = new PathString(requestPath) });
+            return builder.UseDefaultFiles(new DefaultFilesOptions() { RequestPath = new PathString(requestPath) });
         }
 
         /// <summary>
@@ -39,14 +38,9 @@ public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder build
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder, DefaultFilesOptions options)
+        public static IApplicationBuilder UseDefaultFiles([NotNull] this IApplicationBuilder builder, [NotNull] DefaultFilesOptions options)
         {
-            if (builder == null)
-            {
-                throw new ArgumentNullException("builder");
-            }
-
-            return builder.Use(next => new DefaultFilesMiddleware(next, options).Invoke);
+            return builder.UseMiddleware<DefaultFilesMiddleware>(options);
         }
     }
 }
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
@@ -26,19 +27,11 @@ public class DefaultFilesMiddleware
         /// </summary>
         /// <param name="next">The next middleware in the pipeline.</param>
         /// <param name="options">The configuration options for this middleware.</param>
-        public DefaultFilesMiddleware(RequestDelegate next, DefaultFilesOptions options)
+        public DefaultFilesMiddleware([NotNull] RequestDelegate next, [NotNull] IHostingEnvironment hostingEnv, [NotNull] DefaultFilesOptions options)
         {
-            if (next == null)
-            {
-                throw new ArgumentNullException("next");
-            }
-            if (options == null)
-            {
-                throw new ArgumentNullException("options");
-            }
             if (options.FileSystem == null)
             {
-                options.FileSystem = new PhysicalFileSystem("." + options.RequestPath.Value);
+                options.FileSystem = new PhysicalFileSystem(Helpers.ResolveRootPath(hostingEnv.WebRoot, options.RequestPath));
             }
 
             _next = next;
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
@@ -1,7 +1,6 @@
 // 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;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
@@ -17,7 +16,7 @@ public static class DirectoryBrowserExtensions
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder builder)
+        public static IApplicationBuilder UseDirectoryBrowser([NotNull] this IApplicationBuilder builder)
         {
             return builder.UseDirectoryBrowser(new DirectoryBrowserOptions());
         }
@@ -28,9 +27,9 @@ public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder b
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder builder, string requestPath)
+        public static IApplicationBuilder UseDirectoryBrowser([NotNull] this IApplicationBuilder builder, [NotNull] string requestPath)
         {
-            return UseDirectoryBrowser(builder, new DirectoryBrowserOptions() { RequestPath = new PathString(requestPath) });
+            return builder.UseDirectoryBrowser(new DirectoryBrowserOptions() { RequestPath = new PathString(requestPath) });
         }
 
         /// <summary>
@@ -39,14 +38,9 @@ public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder b
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder builder, DirectoryBrowserOptions options)
+        public static IApplicationBuilder UseDirectoryBrowser([NotNull] this IApplicationBuilder builder, [NotNull] DirectoryBrowserOptions options)
         {
-            if (builder == null)
-            {
-                throw new ArgumentNullException("builder");
-            }
-
-            return builder.Use(next => new DirectoryBrowserMiddleware(next, options).Invoke);
+            return builder.UseMiddleware<DirectoryBrowserMiddleware>(options);
         }
     }
 }
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
@@ -24,23 +25,15 @@ public class DirectoryBrowserMiddleware
         /// </summary>
         /// <param name="next">The next middleware in the pipeline.</param>
         /// <param name="options">The configuration for this middleware.</param>
-        public DirectoryBrowserMiddleware(RequestDelegate next, DirectoryBrowserOptions options)
+        public DirectoryBrowserMiddleware([NotNull] RequestDelegate next, [NotNull] IHostingEnvironment hostingEnv, [NotNull] DirectoryBrowserOptions options)
         {
-            if (next == null)
-            {
-                throw new ArgumentNullException("next");
-            }
-            if (options == null)
-            {
-                throw new ArgumentNullException("options");
-            }
             if (options.Formatter == null)
             {
                 throw new ArgumentException(Resources.Args_NoFormatter);
             }
             if (options.FileSystem == null)
             {
-                options.FileSystem = new PhysicalFileSystem("." + options.RequestPath.Value);
+                options.FileSystem = new PhysicalFileSystem(Helpers.ResolveRootPath(hostingEnv.WebRoot, options.RequestPath));
             }
 
             _next = next;
diff --git a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
@@ -18,9 +18,9 @@ public static class FileServerExtensions
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder)
+        public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder)
         {
-            return UseFileServer(builder, new FileServerOptions());
+            return builder.UseFileServer(new FileServerOptions());
         }
 
         /// <summary>
@@ -29,9 +29,9 @@ public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder
         /// <param name="builder"></param>
         /// <param name="enableDirectoryBrowsing">Should directory browsing be enabled?</param>
         /// <returns></returns>
-        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, bool enableDirectoryBrowsing)
+        public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder, bool enableDirectoryBrowsing)
         {
-            return UseFileServer(builder, new FileServerOptions() { EnableDirectoryBrowsing = enableDirectoryBrowsing });
+            return builder.UseFileServer(new FileServerOptions() { EnableDirectoryBrowsing = enableDirectoryBrowsing });
         }
 
         /// <summary>
@@ -40,9 +40,9 @@ public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, string requestPath)
+        public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder, [NotNull] string requestPath)
         {
-            return UseFileServer(builder, new FileServerOptions() { RequestPath = new PathString(requestPath) });
+            return builder.UseFileServer(new FileServerOptions() { RequestPath = new PathString(requestPath) });
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, FileServerOptions options)
+        public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder, [NotNull] FileServerOptions options)
         {
             if (options == null)
             {
diff --git a/src/Microsoft.AspNet.StaticFiles/Helpers.cs b/src/Microsoft.AspNet.StaticFiles/Helpers.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using System.IO;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
@@ -49,5 +50,10 @@ internal static bool TryParseHttpDate(string dateString, out DateTime parsedDate
         {
             return DateTime.TryParseExact(dateString, Constants.HttpDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out parsedDate);
         }
+
+        internal static string ResolveRootPath(string webRoot, PathString path)
+        {
+            return Path.GetFullPath(Path.Combine(webRoot, path.Value ?? string.Empty));
+        }
     }
 }
diff --git a/src/Microsoft.AspNet.StaticFiles/IHostingEnvironment.cs b/src/Microsoft.AspNet.StaticFiles/IHostingEnvironment.cs
@@ -0,0 +1,15 @@
+﻿// 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 Microsoft.Framework.Runtime;
+
+namespace Microsoft.AspNet.Hosting
+{
+    [AssemblyNeutral]
+    public interface IHostingEnvironment
+    {
+        string EnvironmentName { get; }
+
+        string WebRoot { get; }
+    }
+}
diff --git a/src/Microsoft.AspNet.StaticFiles/NotNullAttribute.cs b/src/Microsoft.AspNet.StaticFiles/NotNullAttribute.cs
@@ -0,0 +1,12 @@
+// 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;
+
+namespace Microsoft.AspNet.StaticFiles
+{
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
+    internal sealed class NotNullAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
@@ -17,13 +17,8 @@ public static class SendFileExtensions
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseSendFileFallback(this IApplicationBuilder builder)
+        public static IApplicationBuilder UseSendFileFallback([NotNull] this IApplicationBuilder builder)
         {
-            if (builder == null)
-            {
-                throw new ArgumentNullException("builder");
-            }
-
             /* TODO builder.GetItem(typeof(ISendFile))
 
             // Check for advertised support
@@ -35,7 +30,7 @@ public static IApplicationBuilder UseSendFileFallback(this IApplicationBuilder b
             // Otherwise, insert a fallback SendFile middleware and advertise support
             SetSendFileCapability(builder.Properties);
              */
-            return builder.Use(next => new SendFileMiddleware(next).Invoke);
+            return builder.UseMiddleware<SendFileMiddleware>();
         }
 
         private static bool IsSendFileSupported(IDictionary<string, object> properties)
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
@@ -25,13 +25,8 @@ public class SendFileMiddleware
         /// Creates a new instance of the SendFileMiddleware.
         /// </summary>
         /// <param name="next">The next middleware in the pipeline.</param>
-        public SendFileMiddleware(RequestDelegate next)
+        public SendFileMiddleware([NotNull] RequestDelegate next)
         {
-            if (next == null)
-            {
-                throw new ArgumentNullException("next");
-            }
-
             _next = next;
         }
 
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileResponseExtensions.cs b/src/Microsoft.AspNet.StaticFiles/SendFileResponseExtensions.cs
@@ -19,12 +19,8 @@ public static class SendFileResponseExtensions
         /// </summary>
         /// <param name="response"></param>
         /// <returns>True if sendfile.SendAsync is defined in the environment.</returns>
-        public static bool SupportsSendFile(this HttpResponse response)
+        public static bool SupportsSendFile([NotNull] this HttpResponse response)
         {
-            if (response == null)
-            {
-                throw new ArgumentNullException("response");
-            }
             return response.HttpContext.GetFeature<IHttpSendFileFeature>() != null;
         }
 
@@ -34,12 +30,8 @@ public static bool SupportsSendFile(this HttpResponse response)
         /// <param name="response"></param>
         /// <param name="fileName"></param>
         /// <returns></returns>
-        public static Task SendFileAsync(this HttpResponse response, string fileName)
+        public static Task SendFileAsync([NotNull] this HttpResponse response, [NotNull] string fileName)
         {
-            if (response == null)
-            {
-                throw new ArgumentNullException("response");
-            }
             return response.SendFileAsync(fileName, 0, null, CancellationToken.None);
         }
 
@@ -52,12 +44,8 @@ public static Task SendFileAsync(this HttpResponse response, string fileName)
         /// <param name="count">The number of types to send, or null to send the remainder of the file.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public static Task SendFileAsync(this HttpResponse response, string fileName, long offset, long? count, CancellationToken cancellationToken)
+        public static Task SendFileAsync([NotNull] this HttpResponse response, [NotNull] string fileName, long offset, long? count, CancellationToken cancellationToken)
         {
-            if (response == null)
-            {
-                throw new ArgumentNullException("response");
-            }
             var sendFile = response.HttpContext.GetFeature<IHttpSendFileFeature>();
             if (sendFile == null)
             {
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
@@ -1,7 +1,6 @@
 // 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;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
@@ -17,9 +16,9 @@ public static class StaticFileExtensions
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builder)
+        public static IApplicationBuilder UseStaticFiles([NotNull] this IApplicationBuilder builder)
         {
-            return UseStaticFiles(builder, new StaticFileOptions());
+            return builder.UseStaticFiles(new StaticFileOptions());
         }
 
         /// <summary>
@@ -28,9 +27,9 @@ public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builde
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builder, string requestPath)
+        public static IApplicationBuilder UseStaticFiles([NotNull] this IApplicationBuilder builder, [NotNull] string requestPath)
         {
-            return UseStaticFiles(builder, new StaticFileOptions() { RequestPath = new PathString(requestPath) });
+            return builder.UseStaticFiles(new StaticFileOptions() { RequestPath = new PathString(requestPath) });
         }
 
         /// <summary>
@@ -39,13 +38,9 @@ public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builde
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builder, StaticFileOptions options)
+        public static IApplicationBuilder UseStaticFiles([NotNull] this IApplicationBuilder builder, [NotNull] StaticFileOptions options)
         {
-            if (builder == null)
-            {
-                throw new ArgumentNullException("builder");
-            }
-            return builder.Use(next => new StaticFileMiddleware(next, options).Invoke);
+            return builder.UseMiddleware<StaticFileMiddleware>(options);
         }
     }
 }
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-using System;`
`5`	`4`	`using Microsoft.AspNet.Http;`
`6`	`5`	`using Microsoft.AspNet.StaticFiles;`
`7`	`6`
`@@ -17,7 +16,7 @@ public static class DefaultFilesExtensions`
`17`	`16`	`/// </summary>`
`18`	`17`	`/// <param name="builder"></param>`
`19`	`18`	`/// <returns></returns>`
`20`		`- public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder)`
	`19`	`+ public static IApplicationBuilder UseDefaultFiles([NotNull] this IApplicationBuilder builder)`
`21`	`20`	`{`
`22`	`21`	`return builder.UseDefaultFiles(new DefaultFilesOptions());`
`23`	`22`	`}`
`@@ -28,9 +27,9 @@ public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder build`
`28`	`27`	`/// <param name="builder"></param>`
`29`	`28`	`/// <param name="requestPath">The relative request path and physical path.</param>`
`30`	`29`	`/// <returns></returns>`
`31`		`- public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder, string requestPath)`
	`30`	`+ public static IApplicationBuilder UseDefaultFiles([NotNull] this IApplicationBuilder builder, [NotNull] string requestPath)`
`32`	`31`	`{`
`33`		`- return UseDefaultFiles(builder, new DefaultFilesOptions() { RequestPath = new PathString(requestPath) });`
	`32`	`+ return builder.UseDefaultFiles(new DefaultFilesOptions() { RequestPath = new PathString(requestPath) });`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`/// <summary>`
`@@ -39,14 +38,9 @@ public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder build`
`39`	`38`	`/// <param name="builder"></param>`
`40`	`39`	`/// <param name="options"></param>`
`41`	`40`	`/// <returns></returns>`
`42`		`- public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder, DefaultFilesOptions options)`
	`41`	`+ public static IApplicationBuilder UseDefaultFiles([NotNull] this IApplicationBuilder builder, [NotNull] DefaultFilesOptions options)`
`43`	`42`	`{`
`44`		`- if (builder == null)`
`45`		`- {`
`46`		`- throw new ArgumentNullException("builder");`
`47`		`- }`
`48`		`-`
`49`		`- return builder.Use(next => new DefaultFilesMiddleware(next, options).Invoke);`
	`43`	`+ return builder.UseMiddleware<DefaultFilesMiddleware>(options);`
`50`	`44`	`}`
`51`	`45`	`}`
`52`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ public static class FileServerExtensions`
`18`	`18`	`/// </summary>`
`19`	`19`	`/// <param name="builder"></param>`
`20`	`20`	`/// <returns></returns>`
`21`		`- public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder)`
	`21`	`+ public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder)`
`22`	`22`	`{`
`23`		`- return UseFileServer(builder, new FileServerOptions());`
	`23`	`+ return builder.UseFileServer(new FileServerOptions());`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/// <summary>`
`@@ -29,9 +29,9 @@ public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder`
`29`	`29`	`/// <param name="builder"></param>`
`30`	`30`	`/// <param name="enableDirectoryBrowsing">Should directory browsing be enabled?</param>`
`31`	`31`	`/// <returns></returns>`
`32`		`- public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, bool enableDirectoryBrowsing)`
	`32`	`+ public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder, bool enableDirectoryBrowsing)`
`33`	`33`	`{`
`34`		`- return UseFileServer(builder, new FileServerOptions() { EnableDirectoryBrowsing = enableDirectoryBrowsing });`
	`34`	`+ return builder.UseFileServer(new FileServerOptions() { EnableDirectoryBrowsing = enableDirectoryBrowsing });`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/// <summary>`
`@@ -40,9 +40,9 @@ public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder`
`40`	`40`	`/// <param name="builder"></param>`
`41`	`41`	`/// <param name="requestPath">The relative request path and physical path.</param>`
`42`	`42`	`/// <returns></returns>`
`43`		`- public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, string requestPath)`
	`43`	`+ public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder, [NotNull] string requestPath)`
`44`	`44`	`{`
`45`		`- return UseFileServer(builder, new FileServerOptions() { RequestPath = new PathString(requestPath) });`
	`45`	`+ return builder.UseFileServer(new FileServerOptions() { RequestPath = new PathString(requestPath) });`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/// <summary>`
`@@ -51,7 +51,7 @@ public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder`
`51`	`51`	`/// <param name="builder"></param>`
`52`	`52`	`/// <param name="options"></param>`
`53`	`53`	`/// <returns></returns>`
`54`		`- public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, FileServerOptions options)`
	`54`	`+ public static IApplicationBuilder UseFileServer([NotNull] this IApplicationBuilder builder, [NotNull] FileServerOptions options)`
`55`	`55`	`{`
`56`	`56`	`if (options == null)`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`using System;`
`5`	`5`	`using System.Globalization;`
	`6`	`+using System.IO;`
`6`	`7`	`using Microsoft.AspNet.Http;`
`7`	`8`
`8`	`9`	`namespace Microsoft.AspNet.StaticFiles`
`@@ -49,5 +50,10 @@ internal static bool TryParseHttpDate(string dateString, out DateTime parsedDate`
`49`	`50`	`{`
`50`	`51`	`return DateTime.TryParseExact(dateString, Constants.HttpDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out parsedDate);`
`51`	`52`	`}`
	`53`	`+`
	`54`	`+ internal static string ResolveRootPath(string webRoot, PathString path)`
	`55`	`+ {`
	`56`	`+ return Path.GetFullPath(Path.Combine(webRoot, path.Value ?? string.Empty));`
	`57`	`+ }`
`52`	`58`	`}`
`53`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,8 @@ public class SendFileMiddleware`
`25`	`25`	`/// Creates a new instance of the SendFileMiddleware.`
`26`	`26`	`/// </summary>`
`27`	`27`	`/// <param name="next">The next middleware in the pipeline.</param>`
`28`		`- public SendFileMiddleware(RequestDelegate next)`
	`28`	`+ public SendFileMiddleware([NotNull] RequestDelegate next)`
`29`	`29`	`{`
`30`		`- if (next == null)`
`31`		`- {`
`32`		`- throw new ArgumentNullException("next");`
`33`		`- }`
`34`		`-`
`35`	`30`	`_next = next;`
`36`	`31`	`}`
`37`	`32`