Updated samples to use new hosting APIs

davidfowl · davidfowl · commit a18e0375784a · 2014-03-31T02:44:09.000-07:00
diff --git a/samples/ErrorPageSample/Program.cs b/samples/ErrorPageSample/Program.cs
diff --git a/samples/ErrorPageSample/Startup.cs b/samples/ErrorPageSample/Startup.cs
@@ -1,27 +1,18 @@
-﻿#if NET45
-using System;
+﻿using System;
 using Microsoft.AspNet;
 using Microsoft.AspNet.Abstractions;
-using Owin;
 
 namespace ErrorPageSample
 {
     public class Startup
     {
-        public void Configuration(IAppBuilder app)
+        public void Configuration(IBuilder app)
         {
-            // Temporary bridge from katana to Owin
-            app.UseBuilder(ConfigurePK);
-        }
-
-        private void ConfigurePK(IBuilder builder)
-        {
-            builder.UseErrorPage();
-            builder.Run(context =>
+            app.UseErrorPage();
+            app.Run(context =>
             {
                 throw new Exception("Demonstration exception");
             });
         }
     }
 }
-#endif
diff --git a/samples/ErrorPageSample/project.json b/samples/ErrorPageSample/project.json
@@ -3,18 +3,13 @@
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*"
+    "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
+    "Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
+    "Microsoft.AspNet.Hosting": "0.1-alpha-*"
   },
+  "commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
   "configurations": {
-    "net45": {
-      "dependencies": {
-        "Owin": "1.0",
-        "Microsoft.Owin": "2.1.0",
-        "Microsoft.Owin.Hosting": "2.1.0",
-        "Microsoft.Owin.Host.HttpListener": "2.1.0",
-        "Microsoft.AspNet.AppBuilderSupport": "0.1-alpha-*"
-      }
-    },
+    "net45": {},
     "k10": {
       "dependencies": {
         "System.Console": "4.0.0.0",
diff --git a/samples/WelcomePageSample/Program.cs b/samples/WelcomePageSample/Program.cs
diff --git a/samples/WelcomePageSample/Startup.cs b/samples/WelcomePageSample/Startup.cs
@@ -1,22 +1,13 @@
-﻿#if NET45
-using Microsoft.AspNet;
+﻿using Microsoft.AspNet;
 using Microsoft.AspNet.Abstractions;
-using Owin;
 
 namespace WelcomePageSample
 {
     public class Startup
     {
-        public void Configuration(IAppBuilder app)
+        public void Configuration(IBuilder app)
         {
-            // Temporary bridge from katana to Owin
-            app.UseBuilder(ConfigurePK);
-        }
-
-        private void ConfigurePK(IBuilder builder)
-        {
-            builder.UseWelcomePage();
+            app.UseWelcomePage();
         }
     }
 }
-#endif
diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json
@@ -3,18 +3,13 @@
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*"
+    "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
+    "Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
+    "Microsoft.AspNet.Hosting": "0.1-alpha-*"
   },
+  "commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
   "configurations": {
-    "net45": {
-      "dependencies": {
-        "Owin": "1.0",
-        "Microsoft.Owin": "2.1.0",
-        "Microsoft.Owin.Hosting": "2.1.0",
-        "Microsoft.Owin.Host.HttpListener": "2.1.0",
-        "Microsoft.AspNet.AppBuilderSupport": "0.1-alpha-*"
-      }
-    },
+    "net45": { },
     "k10": {
       "dependencies": {
         "System.Console": "4.0.0.0",

Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,18 @@`
`1`		`-#if NET45`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using Microsoft.AspNet;`
`4`	`3`	`using Microsoft.AspNet.Abstractions;`
`5`		`-using Owin;`
`6`	`4`
`7`	`5`	`namespace ErrorPageSample`
`8`	`6`	`{`
`9`	`7`	`public class Startup`
`10`	`8`	`{`
`11`		`- public void Configuration(IAppBuilder app)`
	`9`	`+ public void Configuration(IBuilder app)`
`12`	`10`	`{`
`13`		`- // Temporary bridge from katana to Owin`
`14`		`- app.UseBuilder(ConfigurePK);`
`15`		`- }`
`16`		`-`
`17`		`- private void ConfigurePK(IBuilder builder)`
`18`		`- {`
`19`		`- builder.UseErrorPage();`
`20`		`- builder.Run(context =>`
	`11`	`+ app.UseErrorPage();`
	`12`	`+ app.Run(context =>`
`21`	`13`	`{`
`22`	`14`	`throw new Exception("Demonstration exception");`
`23`	`15`	`});`
`24`	`16`	`}`
`25`	`17`	`}`
`26`	`18`	`}`
`27`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,13 @@`
`1`		`-#if NET45`
`2`		`-using Microsoft.AspNet;`
	`1`	`+using Microsoft.AspNet;`
`3`	`2`	`using Microsoft.AspNet.Abstractions;`
`4`		`-using Owin;`
`5`	`3`
`6`	`4`	`namespace WelcomePageSample`
`7`	`5`	`{`
`8`	`6`	`public class Startup`
`9`	`7`	`{`
`10`		`- public void Configuration(IAppBuilder app)`
	`8`	`+ public void Configuration(IBuilder app)`
`11`	`9`	`{`
`12`		`- // Temporary bridge from katana to Owin`
`13`		`- app.UseBuilder(ConfigurePK);`
`14`		`- }`
`15`		`-`
`16`		`- private void ConfigurePK(IBuilder builder)`
`17`		`- {`
`18`		`- builder.UseWelcomePage();`
	`10`	`+ app.UseWelcomePage();`
`19`	`11`	`}`
`20`	`12`	`}`
`21`	`13`	`}`
`22`		`-#endif`