huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove hacky self host sample and replace with helios sample.

This commit is contained in:
David Fowler 2014-03-14 01:15:01 -07:00 committed by Ryan Nowak
parent e1a8b5e140
commit 707a563e08
8 changed files with 28 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Routing.sln
View File

@ -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

6
samples/RoutingSample/HttpContextRouteEndpoint.cs → samples/RoutingSample.Web/HttpContextRouteEndpoint.cs
View File

@ -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
{

6
samples/RoutingSample/PrefixRoute.cs → samples/RoutingSample.Web/PrefixRoute.cs
View File

@ -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
{

6
samples/RoutingSample/RouteCollectionExtensions.cs → samples/RoutingSample.Web/RouteCollectionExtensions.cs
View File

@ -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
{

24
samples/RoutingSample/Startup.cs → samples/RoutingSample.Web/Startup.cs
View File

@ -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
}

1
samples/RoutingSample/project.json → samples/RoutingSample.Web/project.json
View File

@ -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" : ""

9
samples/RoutingSample.Web/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.web>
<compilation debug="true" targetFramework="4.5" />
<httpRuntime targetFramework="4.5" />
</system.web>
</configuration>

24
samples/RoutingSample/Program.cs
View File

@ -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<Startup>(url))
{
Console.WriteLine("Listening on {0}", url);
Console.WriteLine("Press ENTER to quit");
Console.ReadLine();
}
}
}
}
#endif