From 328d43a63853e5661ae1a43ea6a023c1a1c867a4 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sat, 25 Jan 2014 16:44:35 -0800 Subject: [PATCH] Updated the sample to use the owin http abstractions glue. --- samples/MvcSample/MvcSample.k10.csproj | 9 +- samples/MvcSample/MvcSample.net45.csproj | 13 +- samples/MvcSample/OwinHttpContext.cs | 177 ------------------ samples/MvcSample/Startup.cs | 8 +- samples/MvcSample/project.json | 1 + .../Microsoft.AspNet.Mvc.Forms.k10.csproj | 6 +- .../Microsoft.AspNet.Mvc.Forms.net45.csproj | 6 +- .../Microsoft.AspNet.Mvc.Razor.k10.csproj | 8 +- .../Microsoft.AspNet.Mvc.Razor.net45.csproj | 8 +- .../Microsoft.AspNet.Mvc.k10.csproj | 6 +- .../Microsoft.AspNet.Mvc.net45.csproj | 6 +- 11 files changed, 36 insertions(+), 212 deletions(-) delete mode 100644 samples/MvcSample/OwinHttpContext.cs diff --git a/samples/MvcSample/MvcSample.k10.csproj b/samples/MvcSample/MvcSample.k10.csproj index cc43716477..9330eb69fa 100644 --- a/samples/MvcSample/MvcSample.k10.csproj +++ b/samples/MvcSample/MvcSample.k10.csproj @@ -19,7 +19,7 @@ full false bin\Debug\K - DEBUG;TRACE;K10 + DEBUG;TRACE;K10; prompt 4 @@ -28,14 +28,13 @@ pdbonly true bin\Release\K - TRACE;K10 + TRACE;K10; prompt 4 - @@ -46,11 +45,11 @@ False - ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125101521\lib\k10\Microsoft.AspNet.FileSystems.dll + ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125113323\lib\k10\Microsoft.AspNet.FileSystems.dll False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\k10\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\k10\Microsoft.AspNet.Abstractions.dll False diff --git a/samples/MvcSample/MvcSample.net45.csproj b/samples/MvcSample/MvcSample.net45.csproj index a5dbd5d11a..ac5cdf0103 100644 --- a/samples/MvcSample/MvcSample.net45.csproj +++ b/samples/MvcSample/MvcSample.net45.csproj @@ -19,7 +19,7 @@ full false bin\Debug\net45 - DEBUG;TRACE;NET45 + DEBUG;TRACE;NET45; prompt 4 @@ -28,7 +28,7 @@ pdbonly true bin\Release\net45 - TRACE;NET45 + TRACE;NET45; prompt 4 @@ -52,11 +52,15 @@ False - ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125101521\lib\net45\Microsoft.AspNet.FileSystems.dll + ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125113323\lib\net45\Microsoft.AspNet.FileSystems.dll False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\net45\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\net45\Microsoft.AspNet.Abstractions.dll + + + False + ..\..\packages\Microsoft.AspNet.Abstractions.Owin.0.1-alpha-t140126002929\lib\net45\Microsoft.AspNet.Abstractions.Owin.dll False @@ -66,7 +70,6 @@ - diff --git a/samples/MvcSample/OwinHttpContext.cs b/samples/MvcSample/OwinHttpContext.cs deleted file mode 100644 index c7a0d83c05..0000000000 --- a/samples/MvcSample/OwinHttpContext.cs +++ /dev/null @@ -1,177 +0,0 @@ -#if NET45 -using System; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.Owin; - -namespace MvcSample -{ - public class OwinHttpContext : HttpContext - { - private readonly IOwinContext _context; - private readonly HttpRequest _request; - private readonly HttpResponse _response; - - public OwinHttpContext(IOwinContext context) - { - _context = context; - _request = new OwinHttpRequest(this, context.Request); - _response = new OwinHttpResponse(this, context.Response); - } - - public override void Dispose() - { - - } - - public override object GetInterface(Type type) - { - return null; - } - - public override HttpRequest Request - { - get { return _request; } - } - - public override HttpResponse Response - { - get { return _response; } - } - - public override void SetInterface(Type type, object instance) - { - - } - - private class OwinHttpRequest : HttpRequest - { - private HttpContext _context; - private IOwinRequest _request; - - public OwinHttpRequest(HttpContext context, IOwinRequest request) - { - _context = context; - _request = request; - } - - public override Stream Body - { - get - { - return _request.Body; - } - set - { - _request.Body = value; - } - } - - public override HttpContext HttpContext - { - get { return _context; } - } - - public override Microsoft.AspNet.Abstractions.PathString Path - { - get - { - return new Microsoft.AspNet.Abstractions.PathString(_request.Path.Value); - } - set - { - _request.Path = new Microsoft.Owin.PathString(value.Value); - } - } - - public override Microsoft.AspNet.Abstractions.PathString PathBase - { - get - { - return new Microsoft.AspNet.Abstractions.PathString(_request.PathBase.Value); - } - set - { - _request.PathBase = new Microsoft.Owin.PathString(value.Value); - } - } - - public override Microsoft.AspNet.Abstractions.QueryString QueryString - { - get - { - return new Microsoft.AspNet.Abstractions.QueryString(_request.QueryString.Value); - } - set - { - _request.QueryString = new Microsoft.Owin.QueryString(value.Value); - } - } - - public override Uri Uri - { - get { return _request.Uri; } - } - } - - private class OwinHttpResponse : HttpResponse - { - private readonly HttpContext _context; - private readonly IOwinResponse _response; - - public OwinHttpResponse(HttpContext context, IOwinResponse response) - { - _context = context; - _response = response; - } - - public override Stream Body - { - get - { - return _response.Body; - } - set - { - _response.Body = value; - } - } - - public override string ContentType - { - get - { - return _response.ContentType; - } - set - { - _response.ContentType = value; - } - } - - public override HttpContext HttpContext - { - get { return _context; } - } - - public override int StatusCode - { - get - { - return _response.StatusCode; - } - set - { - _response.StatusCode = value; - } - } - - public override Task WriteAsync(string data) - { - return _response.WriteAsync(data); - } - } - } -} -#endif \ No newline at end of file diff --git a/samples/MvcSample/Startup.cs b/samples/MvcSample/Startup.cs index 0aeccc16d8..0180efbb3f 100644 --- a/samples/MvcSample/Startup.cs +++ b/samples/MvcSample/Startup.cs @@ -30,14 +30,12 @@ namespace MvcSample var handler = new MvcHandler(serviceProvider); - app.Run(async context => + app.RunHttpContext(async context => { - var httpContext = new OwinHttpContext(context); - // Pretending to be routing - var routeData = new FakeRouteData(httpContext); + var routeData = new FakeRouteData(context); - await handler.ExecuteAsync(httpContext, routeData); + await handler.ExecuteAsync(context, routeData); }); } } diff --git a/samples/MvcSample/project.json b/samples/MvcSample/project.json index 71fad68d5b..aae08a3525 100644 --- a/samples/MvcSample/project.json +++ b/samples/MvcSample/project.json @@ -6,6 +6,7 @@ "Microsoft.Owin.Diagnostics": "2.1.0", "Microsoft.AspNet.FileSystems": "0.1-alpha-*", "Microsoft.AspNet.Abstractions": "0.1-alpha-*", + "Microsoft.AspNet.Abstractions.Owin": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.Mvc" : "", "Microsoft.AspNet.Mvc.Razor" : "" diff --git a/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.k10.csproj b/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.k10.csproj index 68ec82a0cb..0608f2df95 100644 --- a/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.k10.csproj +++ b/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.k10.csproj @@ -19,7 +19,7 @@ full false bin\Debug\K - DEBUG;TRACE;K10 + DEBUG;TRACE;K10; prompt 4 @@ -28,7 +28,7 @@ pdbonly true bin\Release\K - TRACE;K10 + TRACE;K10; prompt 4 @@ -49,7 +49,7 @@ False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\k10\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\k10\Microsoft.AspNet.Abstractions.dll diff --git a/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.net45.csproj b/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.net45.csproj index f37dbb01e6..63af3aa7f0 100644 --- a/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.net45.csproj +++ b/src/Microsoft.AspNet.Mvc.Forms/Microsoft.AspNet.Mvc.Forms.net45.csproj @@ -19,7 +19,7 @@ full false bin\Debug\net45 - DEBUG;TRACE;NET45 + DEBUG;TRACE;NET45; prompt 4 @@ -28,7 +28,7 @@ pdbonly true bin\Release\net45 - TRACE;NET45 + TRACE;NET45; prompt 4 @@ -40,7 +40,7 @@ False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\net45\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\net45\Microsoft.AspNet.Abstractions.dll diff --git a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.k10.csproj b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.k10.csproj index 41f5311f8a..da6d9d063c 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.k10.csproj +++ b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.k10.csproj @@ -19,7 +19,7 @@ full false bin\Debug\K - DEBUG;TRACE;K10 + DEBUG;TRACE;K10; prompt 4 @@ -28,7 +28,7 @@ pdbonly true bin\Release\K - TRACE;K10 + TRACE;K10; prompt 4 @@ -60,11 +60,11 @@ False - ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125101521\lib\k10\Microsoft.AspNet.FileSystems.dll + ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125113323\lib\k10\Microsoft.AspNet.FileSystems.dll False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\k10\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\k10\Microsoft.AspNet.Abstractions.dll False diff --git a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.net45.csproj b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.net45.csproj index be849270f5..7e7163b413 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.net45.csproj +++ b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.net45.csproj @@ -19,7 +19,7 @@ full false bin\Debug\net45 - DEBUG;TRACE;NET45 + DEBUG;TRACE;NET45; prompt 4 @@ -28,7 +28,7 @@ pdbonly true bin\Release\net45 - TRACE;NET45 + TRACE;NET45; prompt 4 @@ -40,11 +40,11 @@ False - ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125101521\lib\net45\Microsoft.AspNet.FileSystems.dll + ..\..\packages\Microsoft.AspNet.FileSystems.0.1-alpha-t140125113323\lib\net45\Microsoft.AspNet.FileSystems.dll False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\net45\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\net45\Microsoft.AspNet.Abstractions.dll False diff --git a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.k10.csproj b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.k10.csproj index 777c8c5965..ae53d31a10 100644 --- a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.k10.csproj +++ b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.k10.csproj @@ -19,7 +19,7 @@ full false bin\Debug\K - DEBUG;TRACE;K10 + DEBUG;TRACE;K10; prompt 4 @@ -28,7 +28,7 @@ pdbonly true bin\Release\K - TRACE;K10 + TRACE;K10; prompt 4 @@ -80,7 +80,7 @@ False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\k10\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\k10\Microsoft.AspNet.Abstractions.dll diff --git a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.net45.csproj b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.net45.csproj index c60919238e..6731209296 100644 --- a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.net45.csproj +++ b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.net45.csproj @@ -19,7 +19,7 @@ full false bin\Debug\net45 - DEBUG;TRACE;NET45 + DEBUG;TRACE;NET45; prompt 4 @@ -28,7 +28,7 @@ pdbonly true bin\Release\net45 - TRACE;NET45 + TRACE;NET45; prompt 4 @@ -48,7 +48,7 @@ False - ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140125104446\lib\net45\Microsoft.AspNet.Abstractions.dll + ..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140126002929\lib\net45\Microsoft.AspNet.Abstractions.dll