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

Merge remote-tracking branch 'origin/release/2.1' into rybrande/DevMerge

This commit is contained in:
Ryan Brandenburg 2018-03-23 10:45:49 -07:00
parent 7218eec050 c8f5b2e3ae
commit 17bc538def
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Microsoft.AspNetCore.Html.Abstractions/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Html.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Html.Abstractions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Html.HtmlContentBuilder", "Name": "Microsoft.AspNetCore.Html.HtmlContentBuilder",
@ -9,6 +9,14 @@
"Microsoft.AspNetCore.Html.IHtmlContentBuilder" "Microsoft.AspNetCore.Html.IHtmlContentBuilder"
], ],
"Members": [ "Members": [
{
"Kind": "Method",
"Name": "get_Count",
"Parameters": [],
"ReturnType": "System.Int32",
"Visibility": "Public",
"GenericParameter": []
},
{ {
"Kind": "Method", "Kind": "Method",
"Name": "Append", "Name": "Append",

2
src/Microsoft.Extensions.WebEncoders/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.Extensions.WebEncoders, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.Extensions.WebEncoders, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.Extensions.WebEncoders.WebEncoderOptions", "Name": "Microsoft.Extensions.WebEncoders.WebEncoderOptions",