Skip to content

Commit 2e8d9d4

Browse files
committed
update startup class to work with new APIs, updated package versions to specific packages. Changed variable name in index.cshtml
1 parent 9c77f52 commit 2e8d9d4

File tree

4 files changed

+30
-36
lines changed

4 files changed

+30
-36
lines changed

samples/HelloWeb/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"version": "0.1-alpha-*",
33
"dependencies": {
4-
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
5-
"Microsoft.AspNet.Hosting": "0.1-alpha-*",
6-
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
7-
"Microsoft.AspNet.Diagnostics":"0.1-alpha-*",
8-
"Microsoft.AspNet.StaticFiles":"0.1-alpha-*"
4+
"Microsoft.AspNet.Abstractions": "0.1-alpha-279",
5+
"Microsoft.AspNet.Hosting": "0.1-alpha-300",
6+
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-245",
7+
"Microsoft.AspNet.Diagnostics": "0.1-alpha-192",
8+
"Microsoft.AspNet.StaticFiles": "0.1-alpha-223"
99
},
1010
"commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
1111
"configurations": {

samples/HelloWebFx/Startup.cs

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1+
using Microsoft.AspNet;
12
using Microsoft.AspNet.Abstractions;
2-
using Microsoft.AspNet.DependencyInjection;
3-
using Microsoft.AspNet.DependencyInjection.Fallback;
43
using Microsoft.AspNet.Mvc;
5-
using Microsoft.AspNet.RequestContainer;
64
using Microsoft.AspNet.Routing;
75
using Microsoft.AspNet.Diagnostics;
8-
using Microsoft.AspNet;
96

107
namespace KWebStartup
118
{
129
public class Startup
1310
{
1411
public void Configuration(IBuilder app)
1512
{
16-
var services = new ServiceCollection();
17-
services.Add(MvcServices.GetDefaultServices());
18-
var serviceProvider = services.BuildServiceProvider(app.ServiceProvider);
13+
app.UseErrorPage();
1914

20-
var routes = new RouteCollection
15+
app.UseServices(services =>
2116
{
22-
DefaultHandler = new MvcApplication(serviceProvider)
23-
};
17+
services.AddMvc();
18+
});
19+
20+
app.UseMvc(routes =>
21+
{
22+
routes.MapRoute("{controller}/{action}", new { controller = "Home", action = "Index" });
23+
});
2424

25-
routes.MapRoute("{controller}/{action}", new { controller = "Home", action = "Index" });
26-
27-
app.UseErrorPage();
28-
app.UseContainer(serviceProvider);
29-
app.UseRouter(routes);
3025
app.UseWelcomePage();
3126
}
3227
}

samples/HelloWebFx/Views/Home/Index.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@{
44
Layout = "/Views/Shared/_Layout.cshtml";
55
ViewBag.Title = "Home Page";
6-
string nullValue = null;
6+
string helloClass = null;
77
}
88

99
<div class="jumbotron">
@@ -12,5 +12,5 @@
1212
<p><a href="http://asp.net" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
1313
</div>
1414
<div class="row">
15-
<h3 title="@Model.Name" class="@nullValue">Hello @Model.Name!</h3>
15+
<h3 title="@Model.Name" class="@helloClass">Hello @Model.Name!</h3>
1616
</div>

samples/HelloWebFx/project.json

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
{
22
"version": "0.1-alpha-*",
33
"dependencies": {
4-
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
5-
"Microsoft.AspNet.Hosting": "0.1-alpha-*",
6-
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
7-
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
8-
"Microsoft.AspNet.RequestContainer": "0.1-alpha-*",
9-
"Microsoft.AspNet.Routing": "0.1-alpha-*",
4+
"Microsoft.AspNet.Abstractions": "0.1-alpha-279",
5+
"Microsoft.AspNet.Hosting": "0.1-alpha-300",
6+
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-245",
7+
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-267",
8+
"Microsoft.AspNet.RequestContainer": "0.1-alpha-300",
9+
"Microsoft.AspNet.Routing": "0.1-alpha-281",
1010
"Microsoft.ComponentModel.DataAnnotations": "4.0.10.0",
11-
"Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-*",
12-
"Microsoft.AspNet.Mvc.Core": "0.1-alpha-*",
13-
"Microsoft.AspNet.Mvc": "0.1-alpha-*",
14-
"Microsoft.AspNet.Mvc.Razor": "0.1-alpha-*",
15-
"Microsoft.AspNet.Mvc.Rendering": "0.1-alpha-*",
16-
"Microsoft.AspNet.ConfigurationModel": "0.1-alpha-*",
17-
"Microsoft.AspNet.Diagnostics":"0.1-alpha-*"
11+
"Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-699",
12+
"Microsoft.AspNet.Mvc.Core": "0.1-alpha-699",
13+
"Microsoft.AspNet.Mvc": "0.1-alpha-699",
14+
"Microsoft.AspNet.Mvc.Razor": "0.1-alpha-699",
15+
"Microsoft.AspNet.ConfigurationModel": "0.1-alpha-180",
16+
"Microsoft.AspNet.Diagnostics": "0.1-alpha-192"
1817
},
1918
"commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
2019
"configurations": {
@@ -40,7 +39,7 @@
4039
"System.Runtime.Extensions": "4.0.10.0",
4140
"System.Runtime.InteropServices": "4.0.10.0",
4241
"System.Text.Encoding": "4.0.10.0",
43-
"System.Threading.Tasks": "4.0.0.0",
42+
"System.Threading.Tasks": "4.0.10.0",
4443
"System.ComponentModel": "4.0.0.0",
4544
"System.Dynamic.Runtime": "4.0.0.0"
4645
}

0 commit comments

Comments
 (0)