Reacting to hew Hosting API

This commit is contained in:
John Luo 2015-12-17 21:35:28 -08:00
parent 8d261f8116
commit 2b2c42069c
6 changed files with 48 additions and 18 deletions

View File

@ -1,4 +1,5 @@
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.StaticFiles; using Microsoft.AspNet.StaticFiles;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -22,5 +23,15 @@ namespace StaticFilesSample
EnableDirectoryBrowsing = true, EnableDirectoryBrowsing = true,
}); });
} }
public static void Main(string[] args)
{
var application = new WebApplicationBuilder()
.UseConfiguration(WebApplicationConfiguration.GetDefault(args))
.UseStartup<Startup>()
.Build();
application.Run();
}
} }
} }

View File

@ -0,0 +1,3 @@
{
"server": "Microsoft.AspNet.Server.Kestrel"
}

View File

@ -1,17 +1,17 @@
{ {
"commands": { "compilationOptions": {
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.Urls http://localhost:12345/" "emitEntryPoint": true
}, },
"dependencies": { "commands": {
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*", "web": "StaticFileSample"
"Microsoft.AspNet.Server.IIS": "1.0.0-*", },
"Microsoft.AspNet.Server.WebListener": "1.0.0-*", "dependencies": {
"Microsoft.AspNet.StaticFiles": "1.0.0-*", "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*" "Microsoft.AspNet.StaticFiles": "1.0.0-*",
}, "Microsoft.Extensions.Logging.Console": "1.0.0-*"
"frameworks": { },
"dnx451": {}, "frameworks": {
"dnxcore50": {} "dnx451": { },
}, "dnxcore50": { }
"webroot": "wwwroot" },
} }

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
</system.webServer>
</configuration>

View File

@ -4,10 +4,10 @@
using System; using System;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.FileProviders;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.TestHost; using Microsoft.AspNet.TestHost;
using Microsoft.AspNet.Testing.xunit; using Microsoft.AspNet.Testing.xunit;
@ -20,7 +20,9 @@ namespace Microsoft.AspNet.StaticFiles
[Fact] [Fact]
public async Task ReturnsNotFoundWithoutWwwroot() public async Task ReturnsNotFoundWithoutWwwroot()
{ {
var server = TestServer.Create(app => app.UseStaticFiles()); var builder = new WebApplicationBuilder()
.Configure(app => app.UseStaticFiles());
var server = new TestServer(builder);
var response = await server.CreateClient().GetAsync("/ranges.txt"); var response = await server.CreateClient().GetAsync("/ranges.txt");

View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.TestHost; using Microsoft.AspNet.TestHost;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -19,7 +20,11 @@ namespace Microsoft.AspNet.StaticFiles
{ {
new KeyValuePair<string, string>("webroot", ".") new KeyValuePair<string, string>("webroot", ".")
}); });
return TestServer.Create(configurationBuilder.Build(), configureApp, configureServices: configureServices); var builder = new WebApplicationBuilder()
.UseConfiguration(configurationBuilder.Build())
.Configure(configureApp)
.ConfigureServices(configureServices);
return new TestServer(builder);
} }
} }
} }