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

Merge pull request #185 from aspnet/rybrande/DevMerge 

Merge release/2.1 into dev
This commit is contained in:
Ryan Brandenburg 2018-03-23 11:42:04 -07:00 committed by GitHub
parent 071b3ddbf7 d6e3ac1639
commit b754c38fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 107 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/Microsoft.AspNetCore.Antiforgery/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Antiforgery, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Antiforgery, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions", "Name": "Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions",
@ -55,19 +55,19 @@
"Members": [ "Members": [
{ {
"Kind": "Method", "Kind": "Method",
"Name": "get_CookieName", "Name": "get_Cookie",
"Parameters": [], "Parameters": [],
"ReturnType": "System.String", "ReturnType": "Microsoft.AspNetCore.Http.CookieBuilder",
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
}, },
{ {
"Kind": "Method", "Kind": "Method",
"Name": "set_CookieName", "Name": "set_Cookie",
"Parameters": [ "Parameters": [
{ {
"Name": "value", "Name": "value",
"Type": "System.String" "Type": "Microsoft.AspNetCore.Http.CookieBuilder"
} }
], ],
"ReturnType": "System.Void", "ReturnType": "System.Void",
@ -118,7 +118,7 @@
}, },
{ {
"Kind": "Method", "Kind": "Method",
"Name": "get_RequireSsl", "Name": "get_SuppressXFrameOptionsHeader",
"Parameters": [], "Parameters": [],
"ReturnType": "System.Boolean", "ReturnType": "System.Boolean",
"Visibility": "Public", "Visibility": "Public",
@ -126,7 +126,7 @@
}, },
{ {
"Kind": "Method", "Kind": "Method",
"Name": "set_RequireSsl", "Name": "set_SuppressXFrameOptionsHeader",
"Parameters": [ "Parameters": [
{ {
"Name": "value", "Name": "value",
@ -139,7 +139,70 @@
}, },
{ {
"Kind": "Method", "Kind": "Method",
"Name": "get_SuppressXFrameOptionsHeader", "Name": "get_CookieName",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_CookieName",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_CookiePath",
"Parameters": [],
"ReturnType": "System.Nullable<Microsoft.AspNetCore.Http.PathString>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_CookiePath",
"Parameters": [
{
"Name": "value",
"Type": "System.Nullable<Microsoft.AspNetCore.Http.PathString>"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_CookieDomain",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_CookieDomain",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_RequireSsl",
"Parameters": [], "Parameters": [],
"ReturnType": "System.Boolean", "ReturnType": "System.Boolean",
"Visibility": "Public", "Visibility": "Public",
@ -147,7 +210,7 @@
}, },
{ {
"Kind": "Method", "Kind": "Method",
"Name": "set_SuppressXFrameOptionsHeader", "Name": "set_RequireSsl",
"Parameters": [ "Parameters": [
{ {
"Name": "value", "Name": "value",
@ -1034,6 +1097,27 @@
], ],
"GenericParameters": [] "GenericParameters": []
}, },
{
"Name": "Microsoft.AspNetCore.Antiforgery.Internal.CryptographyAlgorithms",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "CreateSHA256",
"Parameters": [],
"ReturnType": "System.Security.Cryptography.SHA256",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{ {
"Name": "Microsoft.AspNetCore.Antiforgery.Internal.DefaultAntiforgery", "Name": "Microsoft.AspNetCore.Antiforgery.Internal.DefaultAntiforgery",
"Visibility": "Public", "Visibility": "Public",
@ -1122,6 +1206,20 @@
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
}, },
{
"Kind": "Method",
"Name": "SetDoNotCacheHeaders",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{ {
"Kind": "Constructor", "Kind": "Constructor",
"Name": ".ctor", "Name": ".ctor",

1
test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.ObjectPool;