From bb52bcf11b48a5a76b751a8f0ba48cb65ed2eabc Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 14 Mar 2018 15:32:59 -0700 Subject: [PATCH] Set 2.0 baselines --- build/dependencies.props | 2 +- korebuild-lock.txt | 4 +- .../baseline.netcore.json | 116 ++++++++++++++++-- .../Internal/DefaultClaimUidExtractorTest.cs | 1 - 4 files changed, 110 insertions(+), 13 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index f1330cf76a..958a582fff 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,7 +3,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview2-15742 + 2.1.0-preview2-15744 2.1.0-preview2-30355 2.1.0-preview2-30355 2.1.0-preview2-30355 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e40ef6651b..f531e7b0f7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15742 -commithash:21fbb0f2c3fe4a9216e2d59632b98cfd7d685962 +version:2.1.0-preview2-15744 +commithash:9e15cb6062ab5b9790d3fa699e018543a6950713 diff --git a/src/Microsoft.AspNetCore.Antiforgery/baseline.netcore.json b/src/Microsoft.AspNetCore.Antiforgery/baseline.netcore.json index 9117fb75fd..c095a3501b 100644 --- a/src/Microsoft.AspNetCore.Antiforgery/baseline.netcore.json +++ b/src/Microsoft.AspNetCore.Antiforgery/baseline.netcore.json @@ -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": [ { "Name": "Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions", @@ -55,19 +55,19 @@ "Members": [ { "Kind": "Method", - "Name": "get_CookieName", + "Name": "get_Cookie", "Parameters": [], - "ReturnType": "System.String", + "ReturnType": "Microsoft.AspNetCore.Http.CookieBuilder", "Visibility": "Public", "GenericParameter": [] }, { "Kind": "Method", - "Name": "set_CookieName", + "Name": "set_Cookie", "Parameters": [ { "Name": "value", - "Type": "System.String" + "Type": "Microsoft.AspNetCore.Http.CookieBuilder" } ], "ReturnType": "System.Void", @@ -118,7 +118,7 @@ }, { "Kind": "Method", - "Name": "get_RequireSsl", + "Name": "get_SuppressXFrameOptionsHeader", "Parameters": [], "ReturnType": "System.Boolean", "Visibility": "Public", @@ -126,7 +126,7 @@ }, { "Kind": "Method", - "Name": "set_RequireSsl", + "Name": "set_SuppressXFrameOptionsHeader", "Parameters": [ { "Name": "value", @@ -139,7 +139,70 @@ }, { "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", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "set_CookiePath", + "Parameters": [ + { + "Name": "value", + "Type": "System.Nullable" + } + ], + "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": [], "ReturnType": "System.Boolean", "Visibility": "Public", @@ -147,7 +210,7 @@ }, { "Kind": "Method", - "Name": "set_SuppressXFrameOptionsHeader", + "Name": "set_RequireSsl", "Parameters": [ { "Name": "value", @@ -1034,6 +1097,27 @@ ], "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", "Visibility": "Public", @@ -1122,6 +1206,20 @@ "Visibility": "Public", "GenericParameter": [] }, + { + "Kind": "Method", + "Name": "SetDoNotCacheHeaders", + "Parameters": [ + { + "Name": "httpContext", + "Type": "Microsoft.AspNetCore.Http.HttpContext" + } + ], + "ReturnType": "System.Void", + "Virtual": true, + "Visibility": "Protected", + "GenericParameter": [] + }, { "Kind": "Constructor", "Name": ".ctor", diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs index aa5234c690..1852b910da 100644 --- a/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs +++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Security.Claims; using Microsoft.Extensions.ObjectPool;