aspnetwebstack update

1 files changed, 68 insertions, 64 deletions

diff --git a/mcs/class/System.Web.Http/System.Web.Http.dll.sources b/mcs/class/System.Web.Http/System.Web.Http.dll.sources
index 9e70f9c09e1..1eeccadb017 100644
--- a/mcs/class/System.Web.Http/System.Web.Http.dll.sources
+++ b/mcs/class/System.Web.Http/System.Web.Http.dll.sources
@@ -10,6 +10,11 @@
 ../../../external/aspnetwebstack/src/Common/TaskHelpers.cs
 ../../../external/aspnetwebstack/src/Common/TaskHelpersExtensions.cs
 
+../../../external/aspnetwebstack/src/System.Web.Http/AcceptVerbsAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ActionNameAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/AllowAnonymousAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ApiController.cs
+../../../external/aspnetwebstack/src/System.Web.Http/AuthorizeAttribute.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Controllers/ApiControllerActionInvoker.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Controllers/ApiControllerActionSelector.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Controllers/HttpActionBinding.cs
@@ -33,6 +38,9 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/Controllers/ResponseMessageResultConverter.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Controllers/ValueResultConverter.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Controllers/VoidResultConverter.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dependencies/EmptyResolver.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dependencies/IDependencyResolver.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dependencies/IDependencyScope.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Description/ApiDescription.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Description/ApiExplorer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Description/ApiExplorerSettingsAttribute.cs
@@ -40,17 +48,17 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/Description/ApiParameterSource.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Description/IApiExplorer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Description/IDocumentationProvider.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/DefaultBuildManager.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/DefaultAssembliesResolver.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/DefaultHttpControllerActivator.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/DefaultHttpControllerFactory.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/DefaultHttpControllerSelector.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/DefaultHttpControllerTypeResolver.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/ExceptionSurrogate.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/HttpControllerDispatcher.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/HttpControllerTypeCache.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/HttpControllerTypeCacheSerializer.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/HttpControllerTypeCacheUtil.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/IBuildManager.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/IAssembliesResolver.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/IHttpControllerActivator.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/IHttpControllerFactory.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/IHttpControllerSelector.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Dispatcher/IHttpControllerTypeResolver.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Filters/ActionDescriptorFilterProvider.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Filters/ActionFilterAttribute.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Filters/AuthorizationFilterAttribute.cs
@@ -67,8 +75,28 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/Filters/IExceptionFilter.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Filters/IFilter.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Filters/IFilterProvider.cs
+../../../external/aspnetwebstack/src/System.Web.Http/FromBodyAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/FromUriAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/GlobalSuppressions.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Hosting/HttpPipelineFactory.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Hosting/HttpPropertyKeys.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpBindNeverAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpBindRequiredAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpConfiguration.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpDeleteAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpGetAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpHeadAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpOptionsAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpPatchAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpPostAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpPutAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpRequestMessageExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpResponseException.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpResponseMessageExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpRouteCollection.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpRouteCollectionExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Http/HttpServer.cs
+../../../external/aspnetwebstack/src/System.Web.Http/IncludeErrorDetailPolicy.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Internal/CollectionModelBinderUtil.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Internal/DataTypeUtil.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Internal/HttpActionContextExtensions.cs
@@ -89,28 +117,6 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/Metadata/Providers/CachedDataAnnotationsModelMetadataProvider.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Metadata/Providers/CachedModelMetadata.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Metadata/Providers/EmptyMetadataProvider.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/CancellationTokenParameterBinding.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/CustomModelBinderAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/DefaultActionValueBinder.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ErrorParameterBinding.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/FormatterParameterBinding.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/FormDataCollectionExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/HttpBindingBehaviorAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/HttpBindingBehavior.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/HttpRequestParameterBinding.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/IModelBinder.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/JQueryMVCFormUrlEncodedFormatter.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderConfig.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderErrorMessageProvider.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderParameterBinding.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderProvider.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBindingContext.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBindingHelper.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelErrorCollection.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelError.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelState.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelStateDictionary.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/Binders/ArrayModelBinder.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/Binders/ArrayModelBinderProvider.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/Binders/BinaryDataModelBinderProvider.cs
@@ -134,8 +140,32 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/Binders/TypeConverterModelBinderProvider.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/Binders/TypeMatchModelBinder.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/Binders/TypeMatchModelBinderProvider.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/CancellationTokenParameterBinding.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/CustomModelBinderAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/DefaultActionValueBinder.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ErrorParameterBinding.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/FormatterParameterBinding.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/FormDataCollectionExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/HttpBindingBehaviorAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/HttpBindingBehavior.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/HttpRequestParameterBinding.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/IModelBinder.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/JQueryMVCFormUrlEncodedFormatter.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderConfig.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderErrorMessageProvider.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderParameterBinding.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBinderProvider.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBindingContext.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelBindingHelper.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelErrorCollection.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelError.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelState.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ModelBinding/ModelStateDictionary.cs
+../../../external/aspnetwebstack/src/System.Web.Http/NonActionAttribute.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Properties/AssemblyInfo.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.Designer.cs
+../../../external/aspnetwebstack/src/System.Web.Http/QueryableAttribute.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Query/DynamicQueryable.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Query/ODataQueryDeserializer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Query/ParseException.cs
@@ -144,6 +174,7 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/Query/QueryValidator.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Query/ServiceQuery.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Query/ServiceQueryPart.cs
+../../../external/aspnetwebstack/src/System.Web.Http/RouteParameter.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/BoundRouteTemplate.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/HttpMethodConstraint.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/HttpParsedRoute.cs
@@ -157,16 +188,17 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/IHttpRoute.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/IHttpRouteData.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/IHttpVirtualPathData.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Routing/MediaTypeFormatterExtensions.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/PathContentSegment.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/PathLiteralSubsegment.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/PathParameterSubsegment.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/PathSegment.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/PathSeparatorSegment.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/PathSubsegment.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Routing/UriPathExtensionMapping.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Routing/UrlHelper.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Services/DefaultServiceResolver.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Services/DependencyResolver.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Services/IDependencyResolver.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Services/DefaultServices.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ServicesExtensions.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/FormattingUtilities.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/HttpRequestMessageExtensions.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/IFormatterTracer.cs
@@ -195,7 +227,8 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpActionInvokerTracer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpActionSelectorTracer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpControllerActivatorTracer.cs
-../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpControllerFactoryTracer.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpControllerDescriptorTracer.cs
+../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpControllerSelectorTracer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpControllerTracer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/HttpParameterBindingTracer.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/Tracing/Tracers/JsonMediaTypeFormatterTracer.cs
@@ -223,9 +256,6 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/IEnumerableValueProvider.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/IUriValueProviderFactory.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/IValueProvider.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/ValueProviderAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/ValueProviderFactory.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/ValueProviderResult.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/Providers/CompositeValueProvider.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/Providers/CompositeValueProviderFactory.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/Providers/ElementalValueProvider.cs
@@ -234,32 +264,6 @@
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/Providers/QueryStringValueProviderFactory.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/Providers/RouteDataValueProvider.cs
 ../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/Providers/RouteDataValueProviderFactory.cs
-../../../external/aspnetwebstack/src/System.Web.Http/AcceptVerbsAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ActionNameAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/AllowAnonymousAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/ApiController.cs
-../../../external/aspnetwebstack/src/System.Web.Http/AuthorizeAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/DependencyResolverExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Http/FromBodyAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/FromUriAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/GlobalSuppressions.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpBindNeverAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpBindRequiredAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpConfiguration.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpDeleteAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpGetAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpHeadAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpOptionsAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpPatchAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpPostAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpPutAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpRequestMessageExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpResponseException.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpResponseMessageExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpRouteCollection.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpRouteCollectionExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Http/HttpServer.cs
-../../../external/aspnetwebstack/src/System.Web.Http/IncludeErrorDetailPolicy.cs
-../../../external/aspnetwebstack/src/System.Web.Http/NonActionAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/QueryableAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Http/RouteParameter.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/ValueProviderAttribute.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/ValueProviderFactory.cs
+../../../external/aspnetwebstack/src/System.Web.Http/ValueProviders/ValueProviderResult.cs