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
commit 17bc538def
2 changed files with 10 additions and 2 deletions

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": [
{
"Name": "Microsoft.AspNetCore.Html.HtmlContentBuilder",
@ -9,6 +9,14 @@
"Microsoft.AspNetCore.Html.IHtmlContentBuilder"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Count",
"Parameters": [],
"ReturnType": "System.Int32",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Append",

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": [
{
"Name": "Microsoft.Extensions.WebEncoders.WebEncoderOptions",