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

Removed Cors.Core dependency from Mvc.Core

This commit is contained in:
Ajay Bhargav Baaskaran 2015-06-12 17:20:19 -07:00
parent fcdbd17e58
commit 69e051dab7
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.AspNet.Mvc.Core/HttpMethodConstraint.cs
View File

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using Microsoft.AspNet.Cors.Core;
using Microsoft.Framework.Internal;
namespace Microsoft.AspNet.Mvc
@ -16,6 +15,10 @@ namespace Microsoft.AspNet.Mvc
private readonly IReadOnlyList<string> _methods;
private readonly string OriginHeader = "Origin";
private readonly string AccessControlRequestMethod = "Access-Control-Request-Method";
private readonly string PreflightHttpMethod = "OPTIONS";
// Empty collection means any method will be accepted.
public HttpMethodConstraint([NotNull] IEnumerable<string> httpMethods)
{
@ -56,13 +59,13 @@ namespace Microsoft.AspNet.Mvc
var request = context.RouteContext.HttpContext.Request;
var method = request.Method;
if (request.Headers.ContainsKey(CorsConstants.Origin))
if (request.Headers.ContainsKey(OriginHeader))
{
// Update the http method if it is preflight request.
var accessControlRequestMethod = request.Headers.Get(CorsConstants.AccessControlRequestMethod);
var accessControlRequestMethod = request.Headers.Get(AccessControlRequestMethod);
if (string.Equals(
request.Method,
CorsConstants.PreflightHttpMethod,
PreflightHttpMethod,
StringComparison.Ordinal) &&
accessControlRequestMethod != null)
{

1
src/Microsoft.AspNet.Mvc.Core/MvcCoreServiceCollectionExtensions.cs
View File

@ -152,7 +152,6 @@ namespace Microsoft.Framework.DependencyInjection
{
services.AddOptions();
services.AddRouting();
services.AddCors();
services.AddNotifier();
services.Configure<RouteOptions>(
routeOptions => routeOptions.ConstraintMap.Add("exists", typeof(KnownRouteValueConstraint)));

2
src/Microsoft.AspNet.Mvc.Core/project.json
View File

@ -5,8 +5,8 @@
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNet.Cors.Core": "1.0.0-*",
"Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*",
"Microsoft.AspNet.Http": "1.0.0-*",
"Microsoft.AspNet.Mvc.Abstractions": "6.0.0-*",
"Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" },
"Microsoft.AspNet.WebUtilities": "1.0.0-*",