From 2e8d9d4056a8b16a97a4dc9c0036552737e21d8c Mon Sep 17 00:00:00 2001
From: Glenn Condron <glennc@microsoft.com>
Date: Mon, 21 Apr 2014 14:48:04 -0700
Subject: [PATCH] update startup class to work with new APIs, updated package
 versions to specific packages. Changed variable name in index.cshtml

---
 samples/HelloWeb/project.json              | 10 ++++----
 samples/HelloWebFx/Startup.cs              | 29 +++++++++-------------
 samples/HelloWebFx/Views/Home/Index.cshtml |  4 +--
 samples/HelloWebFx/project.json            | 27 ++++++++++----------
 4 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/samples/HelloWeb/project.json b/samples/HelloWeb/project.json
index 4864861539..25debbf270 100644
--- a/samples/HelloWeb/project.json
+++ b/samples/HelloWeb/project.json
@@ -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": {
diff --git a/samples/HelloWebFx/Startup.cs b/samples/HelloWebFx/Startup.cs
index 9e8a9bd19c..eda27a4e9b 100644
--- a/samples/HelloWebFx/Startup.cs
+++ b/samples/HelloWebFx/Startup.cs
@@ -1,11 +1,8 @@
+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
 {
@@ -13,20 +10,18 @@ namespace KWebStartup
     {
         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.UseContainer(serviceProvider);
-            app.UseRouter(routes);
+
+            app.UseServices(services =>
+            {
+                services.AddMvc();
+            });
+
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute("{controller}/{action}", new { controller = "Home", action = "Index" });
+            });
+
             app.UseWelcomePage();
         }       
     }
diff --git a/samples/HelloWebFx/Views/Home/Index.cshtml b/samples/HelloWebFx/Views/Home/Index.cshtml
index f86b89eb7f..b786e64b5e 100644
--- a/samples/HelloWebFx/Views/Home/Index.cshtml
+++ b/samples/HelloWebFx/Views/Home/Index.cshtml
@@ -3,7 +3,7 @@
 @{
     Layout = "/Views/Shared/_Layout.cshtml";
     ViewBag.Title = "Home Page";
-    string nullValue = null;
+    string helloClass = null;
 }
 
 <div class="jumbotron">
@@ -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>
diff --git a/samples/HelloWebFx/project.json b/samples/HelloWebFx/project.json
index c8f732ed3e..cd66af84d0 100644
--- a/samples/HelloWebFx/project.json
+++ b/samples/HelloWebFx/project.json
@@ -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": {
@@ -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"
       }