Skip to content

Convert ComHost tasks to use System.Text.Json instead of Newtonsoft.Json #3087

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

Closed
wants to merge 4 commits into from
Closed

Convert ComHost tasks to use System.Text.Json instead of Newtonsoft.Json #3087

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7f53dc
Add reference to Microsoft.Bcl.Json.Sources source package.
jkoritzinsky Apr 4, 2019
ed58b77
Convert reg-free com manifest generation to System.Text.Json.
jkoritzinsky Apr 5, 2019
b781924
Move ComHost tasks over to System.Text.Json.
jkoritzinsky Apr 5, 2019
1f5ef15
Add TODO remove comment.
jkoritzinsky Apr 5, 2019
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
Prev Previous commit
Next Next commit
Convert reg-free com manifest generation to System.Text.Json.
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Apr 5, 2019
commit ed58b77f0371ff57bc652db3e47c88c015d1b191
18 changes: 7 additions & 11 deletions src/Tasks/Microsoft.NET.Build.Tasks/RegFreeComManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
using System.Text;
using System.Xml;
using System.Xml.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Text.Json;

namespace Microsoft.NET.Build.Tasks
{
Expand All @@ -22,7 +21,7 @@ internal static class RegFreeComManifest
/// <param name="assemblyVersion">The version of the assembly.</param>
/// <param name="clsidMapPath">The path to the clasidmap file.</param>
/// <param name="comManifestPath">The path to which to write the manifest.</param>
public static void CreateManifestFromClsidmap(string assemblyName, string comHostName, string assemblyVersion, string clsidMapPath, string comManifestPath)
private static void CreateManifestFromClsidmap(string assemblyName, string comHostName, string assemblyVersion, string clsidMapPath, string comManifestPath)
{
XNamespace ns = "urn:shemas-microsoft-com:asm.v1";

Expand All @@ -34,18 +33,15 @@ public static void CreateManifestFromClsidmap(string assemblyName, string comHos

XElement fileElement = new XElement(ns + "file", new XAttribute("name", comHostName));

JObject clsidMap;
string clsidMapText = File.ReadAllText(clsidMapPath);
using (StreamReader clsidMapReader = File.OpenText(clsidMapPath))
using (JsonTextReader jsonReader = new JsonTextReader(clsidMapReader))
JsonDocument clsidMap;
Copy link

@ahsonkhan ahsonkhan Apr 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be disposed.

using (Stream fileStream = File.OpenRead(clsidMapPath))
{
clsidMap = JObject.Load(jsonReader);
clsidMap = JsonDocument.Parse(clsidMapPath);
}

foreach (JProperty property in clsidMap.Properties())
foreach (var clsid in clsidMap.RootElement.EnumerateObject())
{
string guid = property.Name;
fileElement.Add(new XElement(ns + "comClass", new XAttribute("clsid", guid), new XAttribute("threadingModel", "Both")));
fileElement.Add(new XElement(ns + "comClass", new XAttribute("clsid", clsid.Name), new XAttribute("threadingModel", "Both")));
}

manifest.Add(fileElement);
Expand Down