Skip to content

String with escape chars cannot be converted into json object #12283

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
erich-wang merged 3 commits into from
Jul 1, 2020
Merged

String with escape chars cannot be converted into json object #12283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5ac1d5
Fix the issue that string with escape chars cannot be converted into …
wyunchi-ms Jun 29, 2020
8f0ae88
Change changelog.md
wyunchi-ms Jun 30, 2020
dc782b5
Change the implement of serializtion and deserializtion of json in au…
wyunchi-ms Jun 30, 2020
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
1 change: 1 addition & 0 deletions src/Automation/Automation/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Fixed the issue that string with escape chars cannot be converted into json object.

## Version 1.3.6
* Fixed typo in Example 1 in reference documentation for `New-AzAutomationSoftwareUpdateConfiguration`
Expand Down
27 changes: 8 additions & 19 deletions src/Automation/Automation/Common/PowershellJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using System.Globalization;
using System.Management.Automation;
using System.Text;
using Newtonsoft.Json;

namespace Microsoft.Azure.Commands.Automation.Common
{
Expand All @@ -31,17 +32,7 @@ public static string Serialize(object inputObject)
return null;
}

Hashtable parameters = new Hashtable();
parameters.Add(Constants.PsCommandParamInputObject, inputObject);
parameters.Add(Constants.PsCommandParamDepth, Constants.PsCommandValueDepth);
var result = PowerShellJsonConverter.InvokeScript(Constants.PsCommandConvertToJson, parameters);

if (result.Count != 1)
{
return null;
}

return result[0].ToString();
return JsonConvert.SerializeObject(inputObject);
}

public static PSObject Deserialize(string json)
Expand All @@ -51,16 +42,14 @@ public static PSObject Deserialize(string json)
return null;
}

Hashtable parameters = new Hashtable();
parameters.Add(Constants.PsCommandParamInputObject, json);
var result = PowerShellJsonConverter.InvokeScript(Constants.PsCommandConvertFromJson, parameters);
if (result.Count != 1)
try
{
return null;
object result = JsonConvert.DeserializeObject(json);
return new PSObject(result);
} catch
{
return json;
}

//count == 1. return the first psobject
return result[0];
}

/// <summary>
Expand Down