From ff536cc868d8e45a62689e1d61f81328417c33e5 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 7 Apr 2016 15:23:39 -0700 Subject: [PATCH] Move web.config and use ANCM --- samples/CookieSample/Startup.cs | 2 +- samples/CookieSample/project.json | 17 ++++++++------ samples/CookieSample/web.config | 9 ++++++++ samples/CookieSample/wwwroot/.gitkeep | 0 samples/CookieSample/wwwroot/web.config | 9 -------- samples/CookieSessionSample/Startup.cs | 2 +- samples/CookieSessionSample/project.json | 17 ++++++++------ samples/CookieSessionSample/web.config | 9 ++++++++ samples/CookieSessionSample/wwwroot/.gitkeep | 0 .../CookieSessionSample/wwwroot/web.config | 9 -------- samples/JwtBearerSample/Startup.cs | 4 +--- samples/JwtBearerSample/project.json | 23 +++++++------------ samples/JwtBearerSample/web.config | 9 ++++++++ samples/JwtBearerSample/wwwroot/web.config | 9 -------- .../OpenIdConnect.AzureAdSample/Startup.cs | 4 +--- .../OpenIdConnect.AzureAdSample/project.json | 10 ++++---- .../OpenIdConnect.AzureAdSample/web.config | 9 ++++++++ .../wwwroot/web.config | 9 -------- samples/OpenIdConnectSample/Startup.cs | 4 +--- samples/OpenIdConnectSample/project.json | 15 ++++++------ samples/OpenIdConnectSample/web.config | 9 ++++++++ .../wwwroot/placeholder.html | 10 -------- .../OpenIdConnectSample/wwwroot/web.config | 9 -------- samples/SocialSample/Startup.cs | 8 +------ samples/SocialSample/project.json | 16 ++++++------- samples/SocialSample/web.config | 9 ++++++++ samples/SocialSample/wwwroot/web.config | 9 -------- 27 files changed, 108 insertions(+), 132 deletions(-) create mode 100644 samples/CookieSample/web.config delete mode 100644 samples/CookieSample/wwwroot/.gitkeep delete mode 100644 samples/CookieSample/wwwroot/web.config create mode 100644 samples/CookieSessionSample/web.config delete mode 100644 samples/CookieSessionSample/wwwroot/.gitkeep delete mode 100644 samples/CookieSessionSample/wwwroot/web.config create mode 100644 samples/JwtBearerSample/web.config delete mode 100644 samples/JwtBearerSample/wwwroot/web.config create mode 100644 samples/OpenIdConnect.AzureAdSample/web.config delete mode 100644 samples/OpenIdConnect.AzureAdSample/wwwroot/web.config create mode 100644 samples/OpenIdConnectSample/web.config delete mode 100644 samples/OpenIdConnectSample/wwwroot/placeholder.html delete mode 100644 samples/OpenIdConnectSample/wwwroot/web.config create mode 100644 samples/SocialSample/web.config delete mode 100644 samples/SocialSample/wwwroot/web.config diff --git a/samples/CookieSample/Startup.cs b/samples/CookieSample/Startup.cs index 4ad27b180b..49ac74a7fa 100644 --- a/samples/CookieSample/Startup.cs +++ b/samples/CookieSample/Startup.cs @@ -47,7 +47,7 @@ namespace CookieSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration()() .UseStartup() .Build(); diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json index a3e9f4556d..f61695c213 100644 --- a/samples/CookieSample/project.json +++ b/samples/CookieSample/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.DataProtection": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" @@ -10,15 +10,18 @@ "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "CookieSample" - }, "frameworks": { - "dnx451": {}, + "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/CookieSample/web.config b/samples/CookieSample/web.config new file mode 100644 index 0000000000..8d61177619 --- /dev/null +++ b/samples/CookieSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/CookieSample/wwwroot/.gitkeep b/samples/CookieSample/wwwroot/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/samples/CookieSample/wwwroot/web.config b/samples/CookieSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/CookieSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/CookieSessionSample/Startup.cs b/samples/CookieSessionSample/Startup.cs index 7843f66a1f..d3b72bae20 100644 --- a/samples/CookieSessionSample/Startup.cs +++ b/samples/CookieSessionSample/Startup.cs @@ -57,7 +57,7 @@ namespace CookieSessionSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration()() .UseStartup() .Build(); diff --git a/samples/CookieSessionSample/project.json b/samples/CookieSessionSample/project.json index e60b1b355c..deff15e38d 100644 --- a/samples/CookieSessionSample/project.json +++ b/samples/CookieSessionSample/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.DataProtection": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.Caching.Memory": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", @@ -11,15 +11,18 @@ "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "CookieSessionSample" - }, "frameworks": { - "dnx451": {}, + "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } - } + }, + "content": [ + "web.config" + ] } \ No newline at end of file diff --git a/samples/CookieSessionSample/web.config b/samples/CookieSessionSample/web.config new file mode 100644 index 0000000000..fb7e915bfd --- /dev/null +++ b/samples/CookieSessionSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/CookieSessionSample/wwwroot/.gitkeep b/samples/CookieSessionSample/wwwroot/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/samples/CookieSessionSample/wwwroot/web.config b/samples/CookieSessionSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/CookieSessionSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/JwtBearerSample/Startup.cs b/samples/JwtBearerSample/Startup.cs index b0c2464f87..9916955c36 100644 --- a/samples/JwtBearerSample/Startup.cs +++ b/samples/JwtBearerSample/Startup.cs @@ -54,8 +54,6 @@ namespace JwtBearerSample } }); - app.UseIISPlatformHandler(); - app.UseDefaultFiles(); app.UseStaticFiles(); @@ -115,7 +113,7 @@ namespace JwtBearerSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration()() .UseStartup() .Build(); diff --git a/samples/JwtBearerSample/project.json b/samples/JwtBearerSample/project.json index a271c2b5c7..f940b1b103 100644 --- a/samples/JwtBearerSample/project.json +++ b/samples/JwtBearerSample/project.json @@ -5,34 +5,27 @@ }, "dependencies": { "Microsoft.AspNetCore.Authentication.JwtBearer": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" }, - "commands": { - "web": "JwtBearerSample" - }, "frameworks": { - "dnx451": { }, + "net451": { }, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } }, - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "**.user", - "**.vspscc" - ], "content": [ "project.json", - "wwwroot" + "wwwroot", + "web.config" ], "userSecretsId": "aspnet5-JwtBearerSample-20151210102827" } \ No newline at end of file diff --git a/samples/JwtBearerSample/web.config b/samples/JwtBearerSample/web.config new file mode 100644 index 0000000000..801dbfd85b --- /dev/null +++ b/samples/JwtBearerSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/JwtBearerSample/wwwroot/web.config b/samples/JwtBearerSample/wwwroot/web.config deleted file mode 100644 index 8485f6719f..0000000000 --- a/samples/JwtBearerSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/OpenIdConnect.AzureAdSample/Startup.cs b/samples/OpenIdConnect.AzureAdSample/Startup.cs index 3a73a090ac..5841d6f2eb 100644 --- a/samples/OpenIdConnect.AzureAdSample/Startup.cs +++ b/samples/OpenIdConnect.AzureAdSample/Startup.cs @@ -62,8 +62,6 @@ namespace OpenIdConnect.AzureAdSample } }); - app.UseIISPlatformHandler(); - app.UseCookieAuthentication(new CookieAuthenticationOptions()); var clientId = Configuration["oidc:clientid"]; @@ -158,7 +156,7 @@ namespace OpenIdConnect.AzureAdSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration()() .UseStartup() .Build(); diff --git a/samples/OpenIdConnect.AzureAdSample/project.json b/samples/OpenIdConnect.AzureAdSample/project.json index fd74610190..6c7adf7f2d 100644 --- a/samples/OpenIdConnect.AzureAdSample/project.json +++ b/samples/OpenIdConnect.AzureAdSample/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", @@ -10,16 +10,14 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "dnx451": { } + "net451": { } }, "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "OpenIdConnect.AzureAdSample" - }, "content": [ - "project.json" + "project.json", + "web.config" ], "userSecretsId": "aspnet5-OpenIdConnectSample-20151210110318" } \ No newline at end of file diff --git a/samples/OpenIdConnect.AzureAdSample/web.config b/samples/OpenIdConnect.AzureAdSample/web.config new file mode 100644 index 0000000000..cdcb5a6149 --- /dev/null +++ b/samples/OpenIdConnect.AzureAdSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/OpenIdConnect.AzureAdSample/wwwroot/web.config b/samples/OpenIdConnect.AzureAdSample/wwwroot/web.config deleted file mode 100644 index 8485f6719f..0000000000 --- a/samples/OpenIdConnect.AzureAdSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/OpenIdConnectSample/Startup.cs b/samples/OpenIdConnectSample/Startup.cs index 76ac7c7120..1591ac1196 100644 --- a/samples/OpenIdConnectSample/Startup.cs +++ b/samples/OpenIdConnectSample/Startup.cs @@ -57,8 +57,6 @@ namespace OpenIdConnectSample } }); - app.UseIISPlatformHandler(); - app.UseCookieAuthentication(new CookieAuthenticationOptions()); app.UseOpenIdConnectAuthentication(new OpenIdConnectOptions @@ -104,7 +102,7 @@ namespace OpenIdConnectSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration()() .UseStartup() .Build(); diff --git a/samples/OpenIdConnectSample/project.json b/samples/OpenIdConnectSample/project.json index 4fd829a22c..cd923e7e01 100644 --- a/samples/OpenIdConnectSample/project.json +++ b/samples/OpenIdConnectSample/project.json @@ -2,28 +2,29 @@ "dependencies": { "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "dnx451": { }, + "net451": { }, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } }, "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "OpenIdConnectSample" - }, "content": [ - "project.json" + "project.json", + "web.config" ], "userSecretsId": "aspnet5-OpenIdConnectSample-20151210110318" } \ No newline at end of file diff --git a/samples/OpenIdConnectSample/web.config b/samples/OpenIdConnectSample/web.config new file mode 100644 index 0000000000..b1b731ccef --- /dev/null +++ b/samples/OpenIdConnectSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/OpenIdConnectSample/wwwroot/placeholder.html b/samples/OpenIdConnectSample/wwwroot/placeholder.html deleted file mode 100644 index 125a5a8cf1..0000000000 --- a/samples/OpenIdConnectSample/wwwroot/placeholder.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/samples/OpenIdConnectSample/wwwroot/web.config b/samples/OpenIdConnectSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/OpenIdConnectSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/SocialSample/Startup.cs b/samples/SocialSample/Startup.cs index 0e13b78e92..156af2a5c7 100644 --- a/samples/SocialSample/Startup.cs +++ b/samples/SocialSample/Startup.cs @@ -73,12 +73,6 @@ namespace SocialSample } }); - // Forward the scheme from IISPlatformHandler - app.UseForwardedHeaders(new ForwardedHeadersOptions() - { - ForwardedHeaders = ForwardedHeaders.XForwardedProto, - }); - app.UseCookieAuthentication(new CookieAuthenticationOptions { AutomaticAuthenticate = true, @@ -344,7 +338,7 @@ namespace SocialSample var host = new WebHostBuilder() .UseDefaultHostingConfiguration(args) .UseKestrel() - .UseIISPlatformHandlerUrl() + .UseIISIntegration()() .UseStartup() .Build(); diff --git a/samples/SocialSample/project.json b/samples/SocialSample/project.json index 1d02230294..edf9129fd8 100644 --- a/samples/SocialSample/project.json +++ b/samples/SocialSample/project.json @@ -6,8 +6,7 @@ "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0-*", "Microsoft.AspNetCore.DataProtection": "1.0.0-*", - "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*", @@ -18,20 +17,21 @@ "compilationOptions": { "emitEntryPoint": true }, - "commands": { - "web": "SocialSample" - }, "frameworks": { - "dnx451": {}, + "net451": {}, "netstandardapp1.5": { "imports": [ "dnxcore50" - ] + ], + "dependencies": { + "NETStandard.Library": "1.5.0-*" + } } }, "userSecretsId": "aspnet5-SocialSample-20151210111056", "content": [ "config.json", - "project.json" + "project.json", + "web.config" ] } diff --git a/samples/SocialSample/web.config b/samples/SocialSample/web.config new file mode 100644 index 0000000000..5611f93f11 --- /dev/null +++ b/samples/SocialSample/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/SocialSample/wwwroot/web.config b/samples/SocialSample/wwwroot/web.config deleted file mode 100644 index 9a0d90abf8..0000000000 --- a/samples/SocialSample/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file