diff --git a/Routing.sln b/Routing.sln index dc1506ebdb..46fb0783df 100644 --- a/Routing.sln +++ b/Routing.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.30313.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.net45", "src\Microsoft.AspNet.Routing\Microsoft.AspNet.Routing.net45.csproj", "{16537084-C16D-4885-B90F-18BAC218F85B}" EndProject @@ -11,13 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.k1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.net45", "samples\RoutingSample\RoutingSample.net45.csproj", "{121DC7B4-E29B-45E1-BF7E-314842F99A0D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{95359B4B-4C85-4B44-A75B-0621905C4CF6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.Tests.net45", "test\Microsoft.AspNet.Routing.Tests\Microsoft.AspNet.Routing.Tests.net45.csproj", "{3775A966-0876-45C3-A67F-0E544BC48D55}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.k10", "samples\RoutingSample\RoutingSample.k10.csproj", "{1BB31C1A-C6F8-4C00-BD30-92EF775276BE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.Web.net45", "samples\RoutingSample.Web\RoutingSample.Web.net45.csproj", "{976D31DB-FF19-49FC-A993-D61514BBE968}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.Tests.k10", "test\Microsoft.AspNet.Routing.Tests\Microsoft.AspNet.Routing.Tests.k10.csproj", "{83E74560-2C7F-415E-A324-BB31D41E2466}" EndProject @@ -35,10 +33,6 @@ Global {1366B89C-F603-4088-B313-FA053C51BAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU {1366B89C-F603-4088-B313-FA053C51BAC6}.Release|Any CPU.ActiveCfg = Release|Any CPU {1366B89C-F603-4088-B313-FA053C51BAC6}.Release|Any CPU.Build.0 = Release|Any CPU - {121DC7B4-E29B-45E1-BF7E-314842F99A0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {121DC7B4-E29B-45E1-BF7E-314842F99A0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {121DC7B4-E29B-45E1-BF7E-314842F99A0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {121DC7B4-E29B-45E1-BF7E-314842F99A0D}.Release|Any CPU.Build.0 = Release|Any CPU {3775A966-0876-45C3-A67F-0E544BC48D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3775A966-0876-45C3-A67F-0E544BC48D55}.Debug|Any CPU.Build.0 = Debug|Any CPU {3775A966-0876-45C3-A67F-0E544BC48D55}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -51,6 +45,10 @@ Global {83E74560-2C7F-415E-A324-BB31D41E2466}.Debug|Any CPU.Build.0 = Debug|Any CPU {83E74560-2C7F-415E-A324-BB31D41E2466}.Release|Any CPU.ActiveCfg = Release|Any CPU {83E74560-2C7F-415E-A324-BB31D41E2466}.Release|Any CPU.Build.0 = Release|Any CPU + {976D31DB-FF19-49FC-A993-D61514BBE968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {976D31DB-FF19-49FC-A993-D61514BBE968}.Debug|Any CPU.Build.0 = Debug|Any CPU + {976D31DB-FF19-49FC-A993-D61514BBE968}.Release|Any CPU.ActiveCfg = Release|Any CPU + {976D31DB-FF19-49FC-A993-D61514BBE968}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -58,9 +56,8 @@ Global GlobalSection(NestedProjects) = preSolution {16537084-C16D-4885-B90F-18BAC218F85B} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} {1366B89C-F603-4088-B313-FA053C51BAC6} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} - {121DC7B4-E29B-45E1-BF7E-314842F99A0D} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E} - {1BB31C1A-C6F8-4C00-BD30-92EF775276BE} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E} {3775A966-0876-45C3-A67F-0E544BC48D55} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} {83E74560-2C7F-415E-A324-BB31D41E2466} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} + {976D31DB-FF19-49FC-A993-D61514BBE968} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E} EndGlobalSection EndGlobal diff --git a/samples/RoutingSample/HttpContextRouteEndpoint.cs b/samples/RoutingSample.Web/HttpContextRouteEndpoint.cs similarity index 77% rename from samples/RoutingSample/HttpContextRouteEndpoint.cs rename to samples/RoutingSample.Web/HttpContextRouteEndpoint.cs index d2fc80daff..64c69b49e2 100644 --- a/samples/RoutingSample/HttpContextRouteEndpoint.cs +++ b/samples/RoutingSample.Web/HttpContextRouteEndpoint.cs @@ -1,10 +1,8 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. - -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNet.Abstractions; using Microsoft.AspNet.Routing; -namespace RoutingSample +namespace RoutingSample.Web { public class HttpContextRouteEndpoint : IRouter { diff --git a/samples/RoutingSample/PrefixRoute.cs b/samples/RoutingSample.Web/PrefixRoute.cs similarity index 89% rename from samples/RoutingSample/PrefixRoute.cs rename to samples/RoutingSample.Web/PrefixRoute.cs index 4980a7e41a..c497fa90b7 100644 --- a/samples/RoutingSample/PrefixRoute.cs +++ b/samples/RoutingSample.Web/PrefixRoute.cs @@ -1,10 +1,8 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. - -using System; +using System; using System.Threading.Tasks; using Microsoft.AspNet.Routing; -namespace RoutingSample +namespace RoutingSample.Web { internal class PrefixRoute : IRouter { diff --git a/samples/RoutingSample/RouteCollectionExtensions.cs b/samples/RoutingSample.Web/RouteCollectionExtensions.cs similarity index 79% rename from samples/RoutingSample/RouteCollectionExtensions.cs rename to samples/RoutingSample.Web/RouteCollectionExtensions.cs index d1581153ab..bab5565f80 100644 --- a/samples/RoutingSample/RouteCollectionExtensions.cs +++ b/samples/RoutingSample.Web/RouteCollectionExtensions.cs @@ -1,9 +1,7 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. - -using System; +using System; using Microsoft.AspNet.Routing; -namespace RoutingSample +namespace RoutingSample.Web { public static class RouteCollectionExtensions { diff --git a/samples/RoutingSample/Startup.cs b/samples/RoutingSample.Web/Startup.cs similarity index 57% rename from samples/RoutingSample/Startup.cs rename to samples/RoutingSample.Web/Startup.cs index 9f187829a4..03f6ec1bc5 100644 --- a/samples/RoutingSample/Startup.cs +++ b/samples/RoutingSample.Web/Startup.cs @@ -1,24 +1,12 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. - -#if NET45 - -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Abstractions; using Microsoft.AspNet.Routing; -using Owin; -namespace RoutingSample +namespace RoutingSample.Web { - internal class Startup + public class Startup { - public void Configuration(IAppBuilder builder) + public void Configuration(IBuilder builder) { - builder.UseErrorPage(); - - builder.UseBuilder(ConfigureRoutes); - } - - private void ConfigureRoutes(IBuilder builder) - { var routes = builder.UseRouter(); var endpoint1 = new HttpContextRouteEndpoint(async (context) => await context.Response.WriteAsync("match1")); @@ -32,6 +20,4 @@ namespace RoutingSample routes.AddPrefixRoute("", endpoint2); } } -} - -#endif +} \ No newline at end of file diff --git a/samples/RoutingSample/project.json b/samples/RoutingSample.Web/project.json similarity index 95% rename from samples/RoutingSample/project.json rename to samples/RoutingSample.Web/project.json index d7191278a7..1fcf6d1a43 100644 --- a/samples/RoutingSample/project.json +++ b/samples/RoutingSample.Web/project.json @@ -1,6 +1,7 @@ { "version": "0.1-alpha-*", "dependencies": { + "Helios": "0.1-alpha-*", "Microsoft.AspNet.Abstractions" : "0.1-alpha-*", "Microsoft.AspNet.AppBuilderSupport": "0.1-alpha-*", "Microsoft.AspNet.Routing" : "" diff --git a/samples/RoutingSample.Web/web.config b/samples/RoutingSample.Web/web.config new file mode 100644 index 0000000000..de21c9869b --- /dev/null +++ b/samples/RoutingSample.Web/web.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/samples/RoutingSample/Program.cs b/samples/RoutingSample/Program.cs deleted file mode 100644 index b39d0aefbe..0000000000 --- a/samples/RoutingSample/Program.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. - -#if NET45 -using System; -using Microsoft.Owin.Hosting; - -namespace RoutingSample -{ - public class Program - { - public static void Main(string[] args) - { - string url = "http://localhost:30000/"; - using (WebApp.Start(url)) - { - Console.WriteLine("Listening on {0}", url); - Console.WriteLine("Press ENTER to quit"); - - Console.ReadLine(); - } - } - } -} -#endif \ No newline at end of file