aspnetwebstack update

3 files changed, 208 insertions, 201 deletions

diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.dll.sources b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.dll.sources
index 9026a6e4c9b..4314870ba0f 100644
--- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.dll.sources
+++ b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.dll.sources
@@ -8,6 +8,7 @@
 ../../../external/aspnetwebstack/src/Common/TaskHelpers.cs
 ../../../external/aspnetwebstack/src/Common/TaskHelpersExtensions.cs
 
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/CloneableExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/BufferedMediaTypeFormatter.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/ContentNegotiationResult.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/DefaultContentNegotiator.cs
@@ -26,22 +27,11 @@
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeFormatterCollection.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeFormatter.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeFormatterExtensions.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeHeaderValueEqualityComparer.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeHeaderValueExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeMapping.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeMatch.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/MediaTypeWithQualityHeaderValueComparer.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/ParsedMediaTypeHeaderValue.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/QueryStringMapping.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/RequestHeaderMapping.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/ResponseFormatterSelectionResult.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/ResponseMediaTypeMatch.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/SecureJsonTextReader.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/StringComparisonHelper.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/StringWithQualityHeaderValueComparer.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/UriPathExtensionMapping.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/XHRRequestHeaderMapping.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/XmlMediaTypeFormatter.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/Parsers/FormUrlEncodedParser.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/Parsers/HttpRequestHeaderParser.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/Parsers/HttpRequestLineParser.cs
@@ -51,15 +41,19 @@
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/Parsers/MimeMultipartBodyPartParser.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/Parsers/MimeMultipartParser.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/Parsers/ParserState.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/AsyncResultWithExtraData.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/DelegatingStream.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/NonClosingDelegatingStream.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/UriQueryUtility.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/AssemblyInfo.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/Resources.Designer.cs
-../../../external/aspnetwebstack/src/System.Net.Http.Formatting/CloneableExtensions.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/QueryStringMapping.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/RequestHeaderMapping.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/ResponseFormatterSelectionResult.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/ResponseMediaTypeMatch.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/SecureJsonTextReader.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/StringComparisonHelper.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/StringWithQualityHeaderValueComparer.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/FormattingUtilities.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/XHRRequestHeaderMapping.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Formatting/XmlMediaTypeFormatter.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/GlobalSuppressions.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Headers/CookieHeaderValue.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Headers/CookieState.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpClientExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpContentCollectionExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpContentExtensions.cs
@@ -67,16 +61,25 @@
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpContentMultipartExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpHeaderExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpMessageContent.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpRequestHeadersExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpRequestMessageExtensions.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpResponseHeadersExtensions.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpUnsortedHeaders.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpUnsortedRequest.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/HttpUnsortedResponse.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/IMultipartStreamProvider.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/AsyncResultWithExtraData.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/DelegatingStream.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/HttpValueCollection.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/NonClosingDelegatingStream.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Internal/UriQueryUtility.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/MimeBodyPart.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/MultipartFileStreamProvider.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/MultipartFormDataStreamProvider.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/MultipartMemoryStreamProvider.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/ObjectContent.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/AssemblyInfo.cs
+../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/Resources.Designer.cs
 ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/UriExtensions.cs
 
 Extensions.cs
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
diff --git a/mcs/class/System.Web.Razor/System.Web.Razor.dll.sources b/mcs/class/System.Web.Razor/System.Web.Razor.dll.sources
index cf906755caf..052e19d6363 100644
--- a/mcs/class/System.Web.Razor/System.Web.Razor.dll.sources
+++ b/mcs/class/System.Web.Razor/System.Web.Razor.dll.sources
@@ -9,145 +9,145 @@ Assembly/AssemblyInfo.cs
 ../../../external/aspnetwebstack/src/HashCodeCombiner.cs
 ../../../external/aspnetwebstack/src/TransparentCommonAssemblyInfo.cs
 
-../../../external/aspnetwebstack/src/System.Web.Razor/VBRazorCodeLanguage.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Utils/EnumeratorExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Utils/DisposableAction.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Utils/CharUtils.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Utils/EnumUtil.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/RazorTemplateEngine.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/RazorCodeLanguage.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxConstants.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserContext.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/CSharpRazorCodeLanguage.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/DocumentParseCompleteEventArgs.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Editor/AutoCompleteEditHandler.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Editor/BackgroundParseTask.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Editor/EditorHints.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Editor/EditResult.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Editor/ImplicitExpressionEditHandler.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Editor/SingleLineMarkupEditHandler.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Editor/SpanEditHandler.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/AddImportCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/AttributeBlockCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/BaseCodeWriter.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/BlockCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeGenerationCompleteEventArgs.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeGeneratorBase.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeGeneratorContext.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeWriter.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeWriterExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CSharpCodeWriter.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CSharpRazorCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/DynamicAttributeBlockCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ExpressionCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ExpressionRenderingMode.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/GeneratedClassContext.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/GeneratedCodeMapping.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/HelperCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/HybridCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/IBlockCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ISpanCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/LiteralAttributeCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/MarkupCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/RazorCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/RazorCommentCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/RazorDirectiveAttributeCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ResolveUrlCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/GeneratorResults.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SectionCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SetBaseTypeCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SetLayoutCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SetVBOptionCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SpanCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/StatementCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/TemplateBlockCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/TypeMemberCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/VBCodeWriter.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Generator/VBRazorCodeGenerator.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/GlobalSuppressions.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/BalancingModes.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CallbackVisitor.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ConditionalAttributeCollapser.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/VBCodeParser.Directives.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/MarkupRewriter.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/LanguageCharacteristics.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpCodeParser.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpCodeParser.Directives.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpCodeParser.Statements.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpLanguageCharacteristics.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlLanguageCharacteristics.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlMarkupParser.Block.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/TokenizerBackedParser.Helpers.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/BlockBuilder.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/RazorError.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlMarkupParser.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlMarkupParser.Document.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlMarkupParser.Section.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ISyntaxTreeRewriter.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/LanguageCharacteristics.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/MarkupCollapser.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/MarkupRewriter.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserBase.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserContext.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserHelpers.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserVisitor.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserVisitorExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/RazorParser.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/ParserResults.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxConstants.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/AcceptedCharacters.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/BlockBuilder.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/Block.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/BlockType.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/EquivalenceComparer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/RazorError.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/SpanBuilder.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/Span.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/BlockType.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/SpanKind.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/Block.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/SyntaxTree/SpanBuilder.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlMarkupParser.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/RazorParser.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserVisitor.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/MarkupCollapser.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpCodeParser.Statements.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpLanguageCharacteristics.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlMarkupParser.Document.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ISyntaxTreeRewriter.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserVisitorExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlMarkupParser.Section.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/TextReaderExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CallbackVisitor.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpCodeParser.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/VBLanguageCharacteristics.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/CSharpCodeParser.Directives.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/BalancingModes.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/VBCodeParser.Statements.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/HtmlLanguageCharacteristics.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserBase.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/ParserHelpers.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Parser/WhitespaceRewriter.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/TokenizerBackedParser.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/TokenizerBackedParser.Helpers.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Parser/VBCodeParser.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/CSharpRazorCodeLanguage.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/VBCodeParser.Directives.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/VBCodeParser.Statements.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/VBLanguageCharacteristics.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Parser/WhitespaceRewriter.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/PartialParseResult.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Properties/AssemblyInfo.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/RazorCodeLanguage.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/RazorDebugHelpers.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/PartialParseResult.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/ParserResults.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.Designer.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/RazorDirectiveAttribute.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/GeneratorResults.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/DocumentParseCompleteEventArgs.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/RazorEditorParser.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/RazorEngineHost.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/VBTokenizer.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/ITokenizer.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/XmlHelpers.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/CSharpTokenizer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/RazorTemplateEngine.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.Designer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/StateMachine.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/BufferingTextReader.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/ITextBuffer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/LineTrackingStringBuffer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/LocationTagged.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/LookaheadTextReader.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/LookaheadToken.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/SeekableTextReader.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/SourceLocation.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/SourceLocationTracker.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextBufferReader.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextChange.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextChangeType.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextDocumentReader.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/CSharpHelpers.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/CSharpKeywordDetector.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/CSharpTokenizer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/HtmlTokenizer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/ITokenizer.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/CSharpKeyword.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/ISymbol.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/VBKeyword.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/CSharpSymbol.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/CSharpSymbolType.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/HtmlSymbol.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/ISymbol.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/KnownSymbolType.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/SymbolBase.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/SymbolExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/VBSymbol.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/CSharpSymbol.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/KnownSymbolType.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/SymbolTypeSuppressions.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/VBKeyword.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/VBSymbol.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/VBSymbolType.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Symbols/CSharpSymbolType.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/VBHelpers.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/VBKeywordDetector.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/Tokenizer.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/HtmlTokenizer.cs
 ../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/TokenizerView.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/CSharpHelpers.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Editor/BackgroundParseTask.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Editor/AutoCompleteEditHandler.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Editor/SpanEditHandler.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Editor/ImplicitExpressionEditHandler.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Editor/EditorHints.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Editor/SingleLineMarkupEditHandler.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Editor/EditResult.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/GlobalSuppressions.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/LiteralAttributeCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/RazorDirectiveAttributeCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/StatementCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SetVBOptionCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/AttributeBlockCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/DynamicAttributeBlockCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SetLayoutCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeGeneratorBase.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeWriterExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/GeneratedCodeMapping.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ExpressionRenderingMode.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeGenerationCompleteEventArgs.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/GeneratedClassContext.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeWriter.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ExpressionCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/RazorCommentCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/BaseCodeWriter.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SectionCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CSharpCodeWriter.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/AddImportCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/VBCodeWriter.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/HelperCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/BlockCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CodeGeneratorContext.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/VBRazorCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/HybridCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/RazorCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/TypeMemberCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/CSharpRazorCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/TemplateBlockCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SetBaseTypeCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/SpanCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/IBlockCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/MarkupCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ISpanCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Generator/ResolveUrlCodeGenerator.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/RazorEditorParser.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextExtensions.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/SourceLocation.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextDocumentReader.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/LookaheadToken.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/SourceLocationTracker.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextBufferReader.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/LineTrackingStringBuffer.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/ITextBuffer.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/LocationTagged.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/BufferingTextReader.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextChange.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/TextChangeType.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/SeekableTextReader.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/Text/LookaheadTextReader.cs
-../../../external/aspnetwebstack/src/System.Web.Razor/StateMachine.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/VBHelpers.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/VBKeywordDetector.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/VBTokenizer.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Tokenizer/XmlHelpers.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Utils/CharUtils.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Utils/DisposableAction.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Utils/EnumeratorExtensions.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/Utils/EnumUtil.cs
+../../../external/aspnetwebstack/src/System.Web.Razor/VBRazorCodeLanguage.cs