Skip to content

Commit 62c6e5f

Browse files
committed
respect scrub member
fixes #249
1 parent 23ff30a commit 62c6e5f

8 files changed

+25
-10
lines changed

src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<Version>1.4.0</Version>
4+
<Version>1.4.1</Version>
55
<LangVersion>preview</LangVersion>
66
<AssemblyVersion>1.0.0</AssemblyVersion>
77
<PackageTags>NodaTime, Verify</PackageTags>

src/Directory.Packages.props

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<PackageVersion Include="Polyfill" Version="7.4.0" />
1010
<PackageVersion Include="ProjectDefaults" Version="1.0.141" />
1111
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
12+
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
1213
<PackageVersion Include="Verify" Version="28.2.0" />
1314
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
1415
<PackageVersion Include="Verify.XunitV3" Version="28.2.0" />
+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
short: {
3+
original: http://www.foo.com/,
4+
short: foo,
5+
error: Scrubbed
6+
}
7+
}

src/Tests/Tests.cs

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ public class Tests
1717
public Task TestJsonDocument() =>
1818
Verify(JsonDocument.Parse(json));
1919

20+
[Fact]
21+
public Task ScrubMember() =>
22+
Verify(JsonDocument.Parse(json)).ScrubMember("error");
23+
2024
[Fact]
2125
public Task TestJsonElement() =>
2226
Verify(JsonDocument.Parse(json).RootElement);

src/Tests/Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
</PropertyGroup>
66
<ItemGroup>
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
class JsonPropertyConverter :
22
WriteOnlyJsonConverter<JsonProperty>
33
{
4-
public override void Write(VerifyJsonWriter writer, JsonProperty value)
4+
public override void Write(VerifyJsonWriter writer, JsonProperty property)
55
{
6-
writer.WritePropertyName(value.Name);
7-
if (value.Value.ValueKind == JsonValueKind.Null)
6+
var value = property.Value;
7+
var name = property.Name;
8+
if (value.ValueKind == JsonValueKind.Null)
89
{
9-
writer.WriteNull();
10+
writer.WriteMember(property, null, name);
1011
}
1112
else
1213
{
13-
writer.Serialize(value.Value);
14+
writer.WriteMember(property, value, name);
1415
}
1516
}
1617
}
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="System.Text.Json" />
76
<PackageReference Include="Verify" />
87
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
98
<PackageReference Include="Polyfill" PrivateAssets="all" />
109
</ItemGroup>
10+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
11+
<PackageReference Include="System.Text.Json" />
12+
</ItemGroup>
1113
</Project>

src/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.2.24474.11",
3+
"version": "9.0.100",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature"
66
}

0 commit comments

Comments
 (0)