Skip to content
This repository was archived by the owner on Nov 22, 2018. It is now read-only.

Commit e7b0a76

Browse files
HaoKHaoK
committed
React to hosting
1 parent e8d3fbf commit e7b0a76

File tree

4 files changed

+29
-57
lines changed

4 files changed

+29
-57
lines changed

‎samples/StaticFileSample/Startup.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ public void Configure(IApplicationBuilder app, ILoggerFactory factory)
1818
// Displays all log levels
1919
factory.AddConsole(LogLevel.Verbose);
2020

21-
app.UseRequestServices();
22-
2321
app.UseFileServer(new FileServerOptions()
2422
{
2523
EnableDirectoryBrowsing = true,

‎samples/StaticFileSample/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
},
55
"dependencies": {
66
"Kestrel": "1.0.0-*",
7-
"Microsoft.AspNet.RequestContainer": "1.0.0-*",
87
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
98
"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
109
"Microsoft.AspNet.StaticFiles": "1.0.0-*",

‎test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs

Lines changed: 29 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,19 @@ public class DirectoryBrowserMiddlewareTests
1919
[Fact]
2020
public async Task NullArguments()
2121
{
22-
Assert.Throws<ArgumentException>(() => TestServer.Create(app =>
23-
{
24-
app.UseServices(services => services.AddDirectoryBrowser());
25-
26-
app.UseDirectoryBrowser(new DirectoryBrowserOptions() { Formatter = null });
27-
}));
22+
Assert.Throws<ArgumentException>(() => TestServer.Create(
23+
app => app.UseDirectoryBrowser(new DirectoryBrowserOptions() { Formatter = null }),
24+
services => services.AddDirectoryBrowser()));
2825

2926
// No exception, default provided
30-
TestServer.Create(app =>
31-
{
32-
app.UseServices(services => services.AddDirectoryBrowser());
33-
34-
app.UseDirectoryBrowser(new DirectoryBrowserOptions() { FileProvider = null });
35-
});
27+
TestServer.Create(
28+
app => app.UseDirectoryBrowser(new DirectoryBrowserOptions() { FileProvider = null }),
29+
services => services.AddDirectoryBrowser());
3630

3731
// PathString(null) is OK.
38-
TestServer server = TestServer.Create(app =>
39-
{
40-
app.UseServices(services => services.AddDirectoryBrowser());
41-
42-
app.UseDirectoryBrowser((string)null);
43-
});
32+
TestServer server = TestServer.Create(
33+
app => app.UseDirectoryBrowser((string)null),
34+
services => services.AddDirectoryBrowser());
4435

4536
var response = await server.CreateClient().GetAsync("/");
4637
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -54,16 +45,13 @@ public async Task NullArguments()
5445
[InlineData("", @".\", "/missing.dir")]
5546
public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string requestUrl)
5647
{
57-
TestServer server = TestServer.Create(app =>
58-
{
59-
app.UseServices(services => services.AddDirectoryBrowser());
60-
61-
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
48+
TestServer server = TestServer.Create(
49+
app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
6250
{
6351
RequestPath = new PathString(baseUrl),
6452
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
65-
});
66-
});
53+
}),
54+
services => services.AddDirectoryBrowser());
6755
HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
6856
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
6957
}
@@ -76,16 +64,13 @@ public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string r
7664
[InlineData("/somedir", @".", "/somedir/subfolder/")]
7765
public async Task FoundDirectory_Served(string baseUrl, string baseDir, string requestUrl)
7866
{
79-
TestServer server = TestServer.Create(app =>
80-
{
81-
app.UseServices(services => services.AddDirectoryBrowser());
82-
83-
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
67+
TestServer server = TestServer.Create(
68+
app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
8469
{
8570
RequestPath = new PathString(baseUrl),
8671
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
87-
});
88-
});
72+
}),
73+
services => services.AddDirectoryBrowser());
8974
HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
9075

9176
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -103,16 +88,13 @@ public async Task FoundDirectory_Served(string baseUrl, string baseDir, string r
10388
[InlineData("/somedir", @".", "/somedir/subfolder", "?a=b")]
10489
public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, string requestUrl, string queryString)
10590
{
106-
TestServer server = TestServer.Create(app =>
107-
{
108-
app.UseServices(services => services.AddDirectoryBrowser());
109-
110-
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
91+
TestServer server = TestServer.Create(
92+
app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
11193
{
11294
RequestPath = new PathString(baseUrl),
11395
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
114-
});
115-
});
96+
}),
97+
services => services.AddDirectoryBrowser());
11698

11799
HttpResponseMessage response = await server.CreateRequest(requestUrl + queryString).GetAsync();
118100

@@ -128,16 +110,13 @@ public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, str
128110
[InlineData("/somedir", @".", "/somedir/subfolder/")]
129111
public async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, string requestUrl)
130112
{
131-
TestServer server = TestServer.Create(app =>
132-
{
133-
app.UseServices(services => services.AddDirectoryBrowser());
134-
135-
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
113+
TestServer server = TestServer.Create(
114+
app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
136115
{
137116
RequestPath = new PathString(baseUrl),
138117
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
139-
});
140-
});
118+
}),
119+
services => services.AddDirectoryBrowser());
141120

142121
HttpResponseMessage response = await server.CreateRequest(requestUrl).PostAsync();
143122
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
@@ -150,16 +129,13 @@ public async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, st
150129
[InlineData("/somedir", @".", "/somedir/subfolder/")]
151130
public async Task HeadDirectory_HeadersButNotBodyServed(string baseUrl, string baseDir, string requestUrl)
152131
{
153-
TestServer server = TestServer.Create(app =>
154-
{
155-
app.UseServices(services => services.AddDirectoryBrowser());
156-
157-
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
132+
TestServer server = TestServer.Create(
133+
app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
158134
{
159135
RequestPath = new PathString(baseUrl),
160136
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
161-
});
162-
});
137+
}),
138+
services => services.AddDirectoryBrowser());
163139

164140
HttpResponseMessage response = await server.CreateRequest(requestUrl).SendAsync("HEAD");
165141

‎test/Microsoft.AspNet.StaticFiles.Tests/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"dependencies": {
33
"Microsoft.AspNet.Http.Core": "1.0.0-*",
4-
"Microsoft.AspNet.RequestContainer": "1.0.0-*",
54
"Microsoft.AspNet.StaticFiles": "1.0.0-*",
65
"Microsoft.AspNet.TestHost": "1.0.0-*",
76
"Microsoft.Framework.Logging.Testing": "1.0.0-*",

0 commit comments

Comments
 (0)