Skip to content

Don't serialize to json ETS properties for DateTime and string types #15665

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
rjmholt merged 3 commits into from
Jul 12, 2021
Merged

Don't serialize to json ETS properties for DateTime and string types #15665

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
141b77b
Don't serialize to json ETS properties for DateTime and string types
SteveL-MSFT Jun 24, 2021
735ec54
updated test to account for different culture settings in CI
SteveL-MSFT Jun 24, 2021
4e21347
Update src/Microsoft.PowerShell.Commands.Utility/commands/utility/Web…
SteveL-MSFT Jul 1, 2021
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
6 changes: 6 additions & 0 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,12 @@ private static object AddPsProperties(object psObj, object obj, int depth, bool
/// <param name="context">The context for the operation.</param>
private static void AppendPsProperties(PSObject psObj, IDictionary receiver, int depth, bool isCustomObject, in ConvertToJsonContext context)
{
// if the psObj is a DateTime or String type, we don't serialize any extended or adapted properties
if (psObj.BaseObject is string || psObj.BaseObject is DateTime)
{
return;
}

// serialize only Extended and Adapted properties..
PSMemberInfoCollection<PSPropertyInfo> srcPropertiesToSearch =
new PSMemberInfoIntegratingCollection<PSPropertyInfo>(psObj,
Expand Down
15 changes: 15 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,19 @@ Describe 'ConvertTo-Json' -tags "CI" {
$p2.psobject.Properties.Remove('nullstr')
}
}

It 'Should not serialize ETS properties added to DateTime' {
$date = "2021-06-24T15:54:06.796999-07:00"
$d = [DateTime]::Parse($date)

# need to use wildcard here due to some systems may be configured with different culture setting showing time in different format
$d | ConvertTo-Json -Compress | Should -BeLike '"2021-06-24T*'
$d | ConvertTo-Json | ConvertFrom-Json | Should -Be $d
}

It 'Should not serialize ETS properties added to String' {
$text = "Hello there"
$t = Add-Member -InputObject $text -MemberType NoteProperty -Name text -Value $text -PassThru
$t | ConvertTo-Json -Compress | Should -BeExactly "`"$text`""
}
}