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

Merge branch 'release' into dev

This commit is contained in:
John Luo 2016-04-11 10:13:10 -07:00
parent 4daf205595 ff536cc868
commit b26dd10e31
27 changed files with 108 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/CookieSample/Startup.cs
View File

@ -47,7 +47,7 @@ namespace CookieSample
var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args)
.UseKestrel()
.UseIISPlatformHandlerUrl()
.UseIISIntegration()()
.UseStartup<Startup>()
.Build();

17
samples/CookieSample/project.json
View File

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

9
samples/CookieSample/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath=".\CookieSample.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

0
samples/CookieSample/wwwroot/.gitkeep
View File

9
samples/CookieSample/wwwroot/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
</system.webServer>
</configuration>

2
samples/CookieSessionSample/Startup.cs
View File

@ -57,7 +57,7 @@ namespace CookieSessionSample
var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args)
.UseKestrel()
.UseIISPlatformHandlerUrl()
.UseIISIntegration()()
.UseStartup<Startup>()
.Build();

17
samples/CookieSessionSample/project.json
View File

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

9
samples/CookieSessionSample/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath=".\CookieSessionSample.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

0
samples/CookieSessionSample/wwwroot/.gitkeep
View File

9
samples/CookieSessionSample/wwwroot/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
</system.webServer>
</configuration>

4
samples/JwtBearerSample/Startup.cs
View File

@ -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<Startup>()
.Build();

23
samples/JwtBearerSample/project.json
View File

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

9
samples/JwtBearerSample/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath=".\JwtBearerSample.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/JwtBearerSample/wwwroot/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified"/>
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" stdoutLogEnabled="false" startupTimeLimit="3600"/>
</system.webServer>
</configuration>

4
samples/OpenIdConnect.AzureAdSample/Startup.cs
View File

@ -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<Startup>()
.Build();

10
samples/OpenIdConnect.AzureAdSample/project.json
View File

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

9
samples/OpenIdConnect.AzureAdSample/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath=".\OpenIdConnect.AzureAdSample.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/OpenIdConnect.AzureAdSample/wwwroot/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified"/>
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" stdoutLogEnabled="false" startupTimeLimit="3600"/>
</system.webServer>
</configuration>

4
samples/OpenIdConnectSample/Startup.cs
View File

@ -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<Startup>()
.Build();

15
samples/OpenIdConnectSample/project.json
View File

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

9
samples/OpenIdConnectSample/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath=".\OpenIdConnectSample.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

10
samples/OpenIdConnectSample/wwwroot/placeholder.html
View File

@ -1,10 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
</head>
<body>
</body>
</html>

9
samples/OpenIdConnectSample/wwwroot/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
</system.webServer>
</configuration>

8
samples/SocialSample/Startup.cs
View File

@ -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<Startup>()
.Build();

16
samples/SocialSample/project.json
View File

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

9
samples/SocialSample/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath=".\SocialSample.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/SocialSample/wwwroot/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
</system.webServer>
</configuration>