Skip to content

Remove Json.NET from Parsers library #2289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 23, 2018
Merged

Remove Json.NET from Parsers library #2289

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5dfc65b
Remove Json.NET from Parsers library
skendrot Jul 9, 2018
063e874
Remove unused using
skendrot Jul 9, 2018
4258c32
Merge branch 'master' into JsonNetParsers
skendrot Jul 13, 2018
cd64d29
Merge branch 'master' into JsonNetParsers
nmetulev Jul 13, 2018
7b076eb
Merge branch 'master' into JsonNetParsers
nmetulev Jul 16, 2018
ee92041
Merge branch 'master' into JsonNetParsers
nmetulev Jul 16, 2018
4801a9c
Merge branch 'master' into JsonNetParsers
azchohfi Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Microsoft.Toolkit.Parsers/Markdown/Inlines/LinkAnchorInline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.

using System.Collections.Generic;
using System.Xml;
using System.Xml.Linq;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;

namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
Expand Down Expand Up @@ -85,10 +85,12 @@ internal static InlineParseResult Parse(string markdown, int start, int maxEnd)

try
{
var xml = new XmlDocument();
xml.LoadXml(contents);
var attr = xml.DocumentElement.Attributes.GetNamedItem("name");
link = attr.Value;
var xml = XElement.Parse(contents);
var attr = xml.Attribute("name");
if (attr != null)
{
link = attr.Value;
}
}
catch
{
Expand Down
4 changes: 0 additions & 4 deletions Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<DebugType>Full</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
</ItemGroup>
Expand Down