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:19:02 -07:00
parent 656689b5f7 e0c0617185
commit dfe35bbef7
43 changed files with 158 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ActionConstraintSample.Web/Startup.cs
View File

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

10
samples/ActionConstraintSample.Web/project.json
View File

@ -3,11 +3,8 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "ActionConstraintSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
@ -23,5 +20,8 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"web.config"
]
}

9
samples/ActionConstraintSample.Web/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=".\ActionConstraintSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/ActionConstraintSample.Web/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>

2
samples/CustomRouteSample.Web/Startup.cs
View File

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

10
samples/CustomRouteSample.Web/project.json
View File

@ -3,11 +3,8 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "CustomRouteSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
@ -23,5 +20,8 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"web.config"
]
}

9
samples/CustomRouteSample.Web/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=".\CustomRouteSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/CustomRouteSample.Web/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>

2
samples/EmbeddedViewSample.Web/Startup.cs
View File

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

10
samples/EmbeddedViewSample.Web/project.json
View File

@ -3,12 +3,9 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "EmbeddedViewSample.Web"
},
"resource": "EmbeddedResources/**",
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*",
@ -25,5 +22,8 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"web.config"
]
}

9
samples/EmbeddedViewSample.Web/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=".\EmbeddedViewSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/EmbeddedViewSample.Web/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>

2
samples/FormatFilterSample.Web/Startup.cs
View File

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

10
samples/FormatFilterSample.Web/project.json
View File

@ -3,11 +3,8 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "FormatFilterSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@ -24,5 +21,8 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"web.config"
]
}

9
samples/FormatFilterSample.Web/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=".\FormatFilterSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/FormatFilterSample.Web/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>

2
samples/InlineConstraintSample.Web/Startup.cs
View File

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

11
samples/InlineConstraintSample.Web/project.json
View File

@ -3,11 +3,8 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "InlineConstraintSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
@ -23,5 +20,9 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"Views",
"web.config"
]
}

9
samples/InlineConstraintSample.Web/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=".\InlineConstraintSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/InlineConstraintSample.Web/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>

2
samples/JsonPatchSample.Web/Startup.cs
View File

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

10
samples/JsonPatchSample.Web/project.json
View File

@ -3,11 +3,8 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "JsonPatchSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
@ -23,5 +20,8 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"web.config"
]
}

9
samples/JsonPatchSample.Web/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=".\JsonPatchSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/JsonPatchSample.Web/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>

2
samples/LocalizationSample.Web/Startup.cs
View File

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

11
samples/LocalizationSample.Web/project.json
View File

@ -1,13 +1,10 @@
{
"commands": {
"web": "LocalizationSample.Web"
},
"compilationOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
@ -23,5 +20,9 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"Views",
"web.config"
]
}

9
samples/LocalizationSample.Web/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=".\LocalizationSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/LocalizationSample.Web/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>

2
samples/MvcSandbox/Startup.cs
View File

@ -36,7 +36,7 @@ namespace MvcSandbox
var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl()
.UseIISIntegration()
.UseKestrel()
.UseStartup<Startup>()
.Build();

22
samples/MvcSandbox/project.json
View File

@ -1,7 +1,4 @@
{
"commands": {
"web": "MvcSandbox"
},
"compilationOptions": {
"emitEntryPoint": true,
"warningsAsErrors": true,
@ -9,7 +6,7 @@
},
"dependencies": {
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@ -19,11 +16,9 @@
"Microsoft.NETCore.Platforms": "1.0.1-*"
},
"content": [
"Views"
"Views",
"web.config"
],
"tools": {
"dotnet-razor-tooling": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
@ -35,14 +30,5 @@
"NETStandard.Library": "1.5.0-*"
}
}
},
"exclude": [
"wwwroot",
"node_modules",
"bower_components"
],
"publishExclude": [
"**.user",
"**.vspscc"
]
}
}

BIN
samples/MvcSandbox/wwwroot/favicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

9
samples/MvcSandbox/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>

2
samples/MvcSubAreaSample.Web/Startup.cs
View File

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

11
samples/MvcSubAreaSample.Web/project.json
View File

@ -3,11 +3,8 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "MvcSubAreaSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
@ -26,5 +23,9 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"Views",
"web.config"
]
}

9
samples/MvcSubAreaSample.Web/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=".\MvcSubAreaSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/MvcSubAreaSample.Web/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/TagHelperSample.Web/Startup.cs
View File

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

18
samples/TagHelperSample.Web/project.json
View File

@ -4,11 +4,8 @@
"warningsAsErrors": true,
"preserveCompilationContext": true
},
"commands": {
"web": "TagHelperSample.Web"
},
"dependencies": {
"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.AspNetCore.Diagnostics": "1.0.0-*",
@ -17,9 +14,6 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
},
"tools": {
"dotnet-razor-tooling": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
@ -32,13 +26,9 @@
}
}
},
"exclude": [
"content": [
"Views",
"wwwroot",
"node_modules",
"bower_components"
],
"publishExclude": [
"**.user",
"**.vspscc"
"web.config"
]
}

9
samples/TagHelperSample.Web/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=".\TagHelperSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
samples/TagHelperSample.Web/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>

1
samples/UrlHelperSample.Web/Startup.cs
View File

@ -41,6 +41,7 @@ namespace UrlHelperSample.Web
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()
.UseIISIntegration()
.Build();
host.Run();

10
samples/UrlHelperSample.Web/project.json
View File

@ -3,11 +3,9 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"commands": {
"web": "UrlHelperSample.Web"
},
"dependencies": {
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
},
@ -22,5 +20,9 @@
"NETStandard.Library": "1.5.0-*"
}
}
}
},
"content": [
"Views",
"web.config"
]
}

9
samples/UrlHelperSample.Web/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=".\UrlHelperSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>