Skip to content

Commit 1f16a7f

Browse files
Update YamlDotNet to 8.1.2 (#504)
1 parent 7a1f9b9 commit 1f16a7f

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/KubernetesClient/KubernetesClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
3838
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.1'" />
3939
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'" />
40-
<PackageReference Include="YamlDotNet" Version="6.0.0" />
40+
<PackageReference Include="YamlDotNet" Version="8.1.2" />
4141
<PackageReference Include="System.Buffers" Version="4.5.1" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
4242
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
4343
</ItemGroup>

src/KubernetesClient/Yaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ public static string SaveToString<T>(T value)
176176
.WithTypeConverter(new IntOrStringYamlConverter())
177177
.WithTypeConverter(new ByteArrayStringYamlConverter())
178178
.WithEventEmitter(e => new StringQuotingEmitter(e))
179+
.ConfigureDefaultValuesHandling(DefaultValuesHandling.OmitNull)
179180
.BuildValueSerializer();
180181
emitter.Emit(new StreamStart());
181182
emitter.Emit(new DocumentStart());

tests/KubernetesClient.Tests/YamlTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ public void WriteToString()
114114
var pod = new V1Pod() { ApiVersion = "v1", Kind = "Pod", Metadata = new V1ObjectMeta() { Name = "foo" } };
115115

116116
var yaml = Yaml.SaveToString(pod);
117-
Assert.True(ToLines(@"apiVersion: v1
117+
Assert.Equal(ToLines(@"apiVersion: v1
118118
kind: Pod
119119
metadata:
120-
name: foo").SequenceEqual(ToLines(yaml)));
120+
name: foo"), ToLines(yaml));
121121
}
122122

123123
[Fact]
@@ -131,11 +131,11 @@ public void WriteNamespacedToString()
131131
};
132132

133133
var yaml = Yaml.SaveToString(pod);
134-
Assert.True(ToLines(@"apiVersion: v1
134+
Assert.Equal(ToLines(@"apiVersion: v1
135135
kind: Pod
136136
metadata:
137137
name: foo
138-
namespace: bar").SequenceEqual(ToLines(yaml)));
138+
namespace: bar"), ToLines(yaml));
139139
}
140140

141141
[Fact]
@@ -170,7 +170,7 @@ public void WritePropertyNamedReadOnlyToString()
170170
};
171171

172172
var yaml = Yaml.SaveToString(pod);
173-
Assert.True(ToLines(@"apiVersion: v1
173+
Assert.Equal(ToLines(@"apiVersion: v1
174174
kind: Pod
175175
metadata:
176176
name: foo
@@ -184,7 +184,7 @@ public void WritePropertyNamedReadOnlyToString()
184184
readOnly: true
185185
- mountPath: /vm2
186186
name: vm2
187-
readOnly: false").SequenceEqual(ToLines(yaml)));
187+
readOnly: false"), ToLines(yaml));
188188
}
189189

190190
private static IEnumerable<string> ToLines(string s)
@@ -289,7 +289,7 @@ public void SerializeIntOrString()
289289
};
290290

291291
var output = Yaml.SaveToString<V1Service>(obj);
292-
Assert.True(ToLines(output).SequenceEqual(ToLines(content)));
292+
Assert.Equal(ToLines(output), ToLines(content));
293293
}
294294

295295
[Fact]

0 commit comments

Comments
 (0)