From 0815681a9551ddc65213449e73306e89476d801c Mon Sep 17 00:00:00 2001 From: Suhas Joshi Date: Thu, 13 Nov 2014 11:16:36 -0800 Subject: [PATCH 1/2] Added kestrel to run samples on Mono --- samples/CookieSample/project.json | 22 +++++++++++++--------- samples/CookieSessionSample/project.json | 8 ++++++-- samples/SocialSample/project.json | 8 ++++++-- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json index e84a83269e..0cc0dd1f4b 100644 --- a/samples/CookieSample/project.json +++ b/samples/CookieSample/project.json @@ -1,13 +1,17 @@ { - "dependencies": { - "Microsoft.AspNet.Security.Cookies": "1.0.0-*", - "Microsoft.AspNet.Server.WebListener": "1.0.0-*" - }, - "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" }, - "frameworks": { - "aspnet50": { + "dependencies": { + "Microsoft.AspNet.Security.Cookies": "1.0.0-*", + "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Kestrel": "1.0.0-*" }, - "aspnetcore50": { + "commands": { + "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345", + "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004" + }, + "frameworks": { + "aspnet50": { + }, + "aspnetcore50": { + } } - } } diff --git a/samples/CookieSessionSample/project.json b/samples/CookieSessionSample/project.json index ff8e88be02..7ef0f4e969 100644 --- a/samples/CookieSessionSample/project.json +++ b/samples/CookieSessionSample/project.json @@ -2,9 +2,13 @@ "dependencies": { "Microsoft.AspNet.Security.Cookies": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.Framework.Cache.Memory": "1.0.0-*" + "Microsoft.Framework.Cache.Memory": "1.0.0-*", + "Kestrel": "1.0.0-*" + }, + "commands": { + "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345", + "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004" }, - "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" }, "frameworks": { "aspnet50": { }, "aspnetcore50": { } diff --git a/samples/SocialSample/project.json b/samples/SocialSample/project.json index 9a47104e23..737c6638e8 100644 --- a/samples/SocialSample/project.json +++ b/samples/SocialSample/project.json @@ -7,9 +7,13 @@ "Microsoft.AspNet.Security.MicrosoftAccount": "1.0.0-*", "Microsoft.AspNet.Security.Twitter": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", - "Microsoft.AspNet.Server.WebListener": "1.0.0-*" + "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Kestrel": "1.0.0-*" + }, + "commands": { + "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345", + "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004" }, - "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" }, "frameworks": { "aspnet50": { }, From 2f7c186b24eb7c76f2610bc935f9c553d61906c4 Mon Sep 17 00:00:00 2001 From: Suhas Joshi Date: Thu, 13 Nov 2014 12:57:01 -0800 Subject: [PATCH 2/2] Adding necesary files for IIS hosting --- samples/CookieSample/project.json | 4 +++- samples/CookieSample/wwwroot/.gitkeep | 0 samples/CookieSessionSample/project.json | 6 ++++-- samples/CookieSessionSample/wwwroot/.gitkeep | 0 samples/SocialSample/wwwroot/.gitkeep | 0 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 samples/CookieSample/wwwroot/.gitkeep create mode 100644 samples/CookieSessionSample/wwwroot/.gitkeep create mode 100644 samples/SocialSample/wwwroot/.gitkeep diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json index 0cc0dd1f4b..2cda02680e 100644 --- a/samples/CookieSample/project.json +++ b/samples/CookieSample/project.json @@ -2,6 +2,7 @@ "dependencies": { "Microsoft.AspNet.Security.Cookies": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Kestrel": "1.0.0-*" }, "commands": { @@ -13,5 +14,6 @@ }, "aspnetcore50": { } - } + }, + "webroot":"wwwroot" } diff --git a/samples/CookieSample/wwwroot/.gitkeep b/samples/CookieSample/wwwroot/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/samples/CookieSessionSample/project.json b/samples/CookieSessionSample/project.json index 7ef0f4e969..684c765174 100644 --- a/samples/CookieSessionSample/project.json +++ b/samples/CookieSessionSample/project.json @@ -3,7 +3,8 @@ "Microsoft.AspNet.Security.Cookies": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.Framework.Cache.Memory": "1.0.0-*", - "Kestrel": "1.0.0-*" + "Kestrel": "1.0.0-*", + "Microsoft.AspNet.Server.IIS": "1.0.0-*" }, "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345", @@ -12,5 +13,6 @@ "frameworks": { "aspnet50": { }, "aspnetcore50": { } - } + }, + "webroot": "wwwroot" } diff --git a/samples/CookieSessionSample/wwwroot/.gitkeep b/samples/CookieSessionSample/wwwroot/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/samples/SocialSample/wwwroot/.gitkeep b/samples/SocialSample/wwwroot/.gitkeep new file mode 100644 index 0000000000..e69de29bb2