huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update startup class to work with new APIs, updated package versions to specific packages. Changed variable name in index.cshtml

This commit is contained in:
Glenn Condron 2014-04-21 14:48:04 -07:00
parent 9c77f52cd1
commit 2e8d9d4056
4 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/HelloWeb/project.json
View File

@ -1,11 +1,11 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.Abstractions": "0.1-alpha-279",
"Microsoft.AspNet.Hosting": "0.1-alpha-*", "Microsoft.AspNet.Hosting": "0.1-alpha-300",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*", "Microsoft.AspNet.Server.WebListener": "0.1-alpha-245",
"Microsoft.AspNet.Diagnostics":"0.1-alpha-*", "Microsoft.AspNet.Diagnostics": "0.1-alpha-192",
"Microsoft.AspNet.StaticFiles":"0.1-alpha-*" "Microsoft.AspNet.StaticFiles": "0.1-alpha-223"
}, },
"commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" }, "commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"configurations": { "configurations": {

29
samples/HelloWebFx/Startup.cs
View File

@ -1,11 +1,8 @@
using Microsoft.AspNet;
using Microsoft.AspNet.Abstractions; using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.RequestContainer;
using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics;
using Microsoft.AspNet;
namespace KWebStartup namespace KWebStartup
{ {
@ -13,20 +10,18 @@ namespace KWebStartup
{ {
public void Configuration(IBuilder app) public void Configuration(IBuilder app)
{ {
var services = new ServiceCollection();
services.Add(MvcServices.GetDefaultServices());
var serviceProvider = services.BuildServiceProvider(app.ServiceProvider);
var routes = new RouteCollection
{
DefaultHandler = new MvcApplication(serviceProvider)
};
routes.MapRoute("{controller}/{action}", new { controller = "Home", action = "Index" });
app.UseErrorPage(); app.UseErrorPage();
app.UseContainer(serviceProvider);
app.UseRouter(routes); app.UseServices(services =>
{
services.AddMvc();
});
app.UseMvc(routes =>
{
routes.MapRoute("{controller}/{action}", new { controller = "Home", action = "Index" });
});
app.UseWelcomePage(); app.UseWelcomePage();
} }
} }

4
samples/HelloWebFx/Views/Home/Index.cshtml
View File

@ -3,7 +3,7 @@
@{ @{
Layout = "/Views/Shared/_Layout.cshtml"; Layout = "/Views/Shared/_Layout.cshtml";
ViewBag.Title = "Home Page"; ViewBag.Title = "Home Page";
string nullValue = null; string helloClass = null;
} }
<div class="jumbotron"> <div class="jumbotron">
@ -12,5 +12,5 @@
<p><a href="http://asp.net" class="btn btn-primary btn-large">Learn more &raquo;</a></p> <p><a href="http://asp.net" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
</div> </div>
<div class="row"> <div class="row">
<h3 title="@Model.Name" class="@nullValue">Hello @Model.Name!</h3> <h3 title="@Model.Name" class="@helloClass">Hello @Model.Name!</h3>
</div> </div>

27
samples/HelloWebFx/project.json
View File

@ -1,20 +1,19 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.Abstractions": "0.1-alpha-279",
"Microsoft.AspNet.Hosting": "0.1-alpha-*", "Microsoft.AspNet.Hosting": "0.1-alpha-300",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*", "Microsoft.AspNet.Server.WebListener": "0.1-alpha-245",
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection": "0.1-alpha-267",
"Microsoft.AspNet.RequestContainer": "0.1-alpha-*", "Microsoft.AspNet.RequestContainer": "0.1-alpha-300",
"Microsoft.AspNet.Routing": "0.1-alpha-*", "Microsoft.AspNet.Routing": "0.1-alpha-281",
"Microsoft.ComponentModel.DataAnnotations": "4.0.10.0", "Microsoft.ComponentModel.DataAnnotations": "4.0.10.0",
"Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-*", "Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-699",
"Microsoft.AspNet.Mvc.Core": "0.1-alpha-*", "Microsoft.AspNet.Mvc.Core": "0.1-alpha-699",
"Microsoft.AspNet.Mvc": "0.1-alpha-*", "Microsoft.AspNet.Mvc": "0.1-alpha-699",
"Microsoft.AspNet.Mvc.Razor": "0.1-alpha-*", "Microsoft.AspNet.Mvc.Razor": "0.1-alpha-699",
"Microsoft.AspNet.Mvc.Rendering": "0.1-alpha-*", "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-180",
"Microsoft.AspNet.ConfigurationModel": "0.1-alpha-*", "Microsoft.AspNet.Diagnostics": "0.1-alpha-192"
"Microsoft.AspNet.Diagnostics":"0.1-alpha-*"
}, },
"commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" }, "commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"configurations": { "configurations": {
@ -40,7 +39,7 @@
"System.Runtime.Extensions": "4.0.10.0", "System.Runtime.Extensions": "4.0.10.0",
"System.Runtime.InteropServices": "4.0.10.0", "System.Runtime.InteropServices": "4.0.10.0",
"System.Text.Encoding": "4.0.10.0", "System.Text.Encoding": "4.0.10.0",
"System.Threading.Tasks": "4.0.0.0", "System.Threading.Tasks": "4.0.10.0",
"System.ComponentModel": "4.0.0.0", "System.ComponentModel": "4.0.0.0",
"System.Dynamic.Runtime": "4.0.0.0" "System.Dynamic.Runtime": "4.0.0.0"
} }