Merge pull request #4125 from aspnet/master

Update live with current master
pull/4322/merge
Rick Anderson 2017-08-28 02:30:14 -04:00 committed by GitHub
commit e0cc86e4ae
3 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
protected void Page_Load(object sender, EventArgs e) {
protected async void Page_Load(object sender, EventArgs e) {
await ...;
// do work
}
}

View File

@ -1,7 +1,7 @@
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
namespace WebApplication5
namespace aspnetcoreapp
{
public class Program
{
@ -15,4 +15,4 @@ namespace WebApplication5
.UseStartup<Startup>()
.Build();
}
}
}

View File

@ -54,7 +54,7 @@ Enter **TodoApi** for the **Project Name**, and then select Create.
### Launch the app
In Visual Studio, select **Run > Start With Debugging** to launch the app. Visual Studio launches a browser and navigates to `http://localhost:port`, where *port* is a randomly chosen port number. You get an HTTP 404 (Not Found) error. Change the URL to `http://localhost:port/api/values`. The `ValuesController` data will be displayed:
In Visual Studio, select **Run > Start With Debugging** to launch the app. Visual Studio launches a browser and navigates to `http://localhost:5000`. You get an HTTP 404 (Not Found) error. Change the URL to `http://localhost:port/api/values`. The `ValuesController` data will be displayed:
```
["value1","value2"]