Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update startup class to work with new APIs #4

Merged
merged 1 commit into from Apr 22, 2014
Merged

update startup class to work with new APIs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions samples/HelloWeb/project.json
View file
Open in desktop
@@ -1,11 +1,11 @@
{
"version": "0.1-alpha-*",
"dependencies": {
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
"Microsoft.AspNet.Hosting": "0.1-alpha-*",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
"Microsoft.AspNet.Diagnostics":"0.1-alpha-*",
"Microsoft.AspNet.StaticFiles":"0.1-alpha-*"
"Microsoft.AspNet.Abstractions": "0.1-alpha-279",
"Microsoft.AspNet.Hosting": "0.1-alpha-300",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-245",
"Microsoft.AspNet.Diagnostics": "0.1-alpha-192",
"Microsoft.AspNet.StaticFiles": "0.1-alpha-223"
},
"commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"configurations": {
Expand Down
25 changes: 10 additions & 15 deletions samples/HelloWebFx/Startup.cs
View file
Open in desktop
@@ -1,32 +1,27 @@
using Microsoft.AspNet;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.RequestContainer;
using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Diagnostics;
using Microsoft.AspNet;

namespace KWebStartup
{
public class Startup
{
public void Configuration(IBuilder app)
{
var services = new ServiceCollection();
services.Add(MvcServices.GetDefaultServices());
var serviceProvider = services.BuildServiceProvider(app.ServiceProvider);
app.UseErrorPage();

var routes = new RouteCollection
app.UseServices(services =>
{
DefaultHandler = new MvcApplication(serviceProvider)
};
services.AddMvc();
});

app.UseMvc(routes =>
{
routes.MapRoute("{controller}/{action}", new { controller = "Home", action = "Index" });
});

routes.MapRoute("{controller}/{action}", new { controller = "Home", action = "Index" });

app.UseErrorPage();
app.UseContainer(serviceProvider);
app.UseRouter(routes);
app.UseWelcomePage();
}
}
Expand Down
4 changes: 2 additions & 2 deletions samples/HelloWebFx/Views/Home/Index.cshtml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
@{
Layout = "/Views/Shared/_Layout.cshtml";
ViewBag.Title = "Home Page";
string nullValue = null;
string helloClass = null;
}

<div class="jumbotron">
Expand All @@ -12,5 +12,5 @@
<p><a href="http://asp.net" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
</div>
<div class="row">
<h3 title="@Model.Name" class="@nullValue">Hello @Model.Name!</h3>
<h3 title="@Model.Name" class="@helloClass">Hello @Model.Name!</h3>
</div>
27 changes: 13 additions & 14 deletions samples/HelloWebFx/project.json
View file
Open in desktop
@@ -1,20 +1,19 @@
{
"version": "0.1-alpha-*",
"dependencies": {
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
"Microsoft.AspNet.Hosting": "0.1-alpha-*",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
"Microsoft.AspNet.RequestContainer": "0.1-alpha-*",
"Microsoft.AspNet.Routing": "0.1-alpha-*",
"Microsoft.AspNet.Abstractions": "0.1-alpha-279",
"Microsoft.AspNet.Hosting": "0.1-alpha-300",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-245",
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-267",
"Microsoft.AspNet.RequestContainer": "0.1-alpha-300",
"Microsoft.AspNet.Routing": "0.1-alpha-281",
"Microsoft.ComponentModel.DataAnnotations": "4.0.10.0",
"Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.Core": "0.1-alpha-*",
"Microsoft.AspNet.Mvc": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.Razor": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.Rendering": "0.1-alpha-*",
"Microsoft.AspNet.ConfigurationModel": "0.1-alpha-*",
"Microsoft.AspNet.Diagnostics":"0.1-alpha-*"
"Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-699",
"Microsoft.AspNet.Mvc.Core": "0.1-alpha-699",
"Microsoft.AspNet.Mvc": "0.1-alpha-699",
"Microsoft.AspNet.Mvc.Razor": "0.1-alpha-699",
"Microsoft.AspNet.ConfigurationModel": "0.1-alpha-180",
"Microsoft.AspNet.Diagnostics": "0.1-alpha-192"
},
"commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"configurations": {
Expand All @@ -40,7 +39,7 @@
"System.Runtime.Extensions": "4.0.10.0",
"System.Runtime.InteropServices": "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.Dynamic.Runtime": "4.0.0.0"
}
Expand Down