Skip to content

Commit 45124a9

Browse files
chore(deps): update dependency yamldotnet to v16 (#449)
* chore(deps): update dependency yamldotnet to v16 * Fix for breaking changes --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Einar Omang <einar.omang@cognite.com> Co-authored-by: Einar <einar@omang.com>
1 parent 60e0a2c commit 45124a9

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

Cognite.Config/Cognite.Configuration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.8.0" />
3030
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
3131
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
32-
<PackageReference Include="YamlDotNet" Version="15.3.0" />
32+
<PackageReference Include="YamlDotNet" Version="16.3.0" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

Cognite.Config/KeyVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public KeyVaultResolver(KeyVaultConfig config)
107107
{
108108
_client = config.GetClient();
109109
}
110-
public bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)
110+
public bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer deserializer)
111111
{
112112
if (reader.Accept<Scalar>(out var scalar)
113113
&& scalar != null

Cognite.Config/TimestampWrapper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ public bool Accepts(Type type)
5858
return type == typeof(TimestampWrapper);
5959
}
6060

61-
public object? ReadYaml(IParser parser, Type type)
61+
public object? ReadYaml(IParser parser, Type type, ObjectDeserializer deserializer)
6262
{
6363
var scalar = parser.Consume<Scalar>();
6464
return new TimestampWrapper(scalar.Value);
6565
}
6666

67-
public void WriteYaml(IEmitter emitter, object? value, Type type)
67+
public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
6868
{
6969
var it = value as TimestampWrapper;
7070
emitter.Emit(new Scalar(AnchorName.Empty, TagName.Empty, it?.RawValue ?? "", ScalarStyle.DoubleQuoted, false, true));

Cognite.Config/Yaml/DefaultFilterTypeInspector.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ public DefaultFilterTypeInspector(
4747
_customConverters = customConverters;
4848
}
4949

50+
public override string GetEnumName(Type enumType, string name)
51+
{
52+
return _innerTypeDescriptor.GetEnumName(enumType, name);
53+
}
54+
55+
public override string GetEnumValue(object enumValue)
56+
{
57+
return _innerTypeDescriptor.GetEnumValue(enumValue);
58+
}
59+
5060
/// <inheritdoc />
5161
public override IEnumerable<IPropertyDescriptor> GetProperties(Type type, object? container)
5262
{

Cognite.Config/Yaml/ListOrStringConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public bool Accepts(Type type)
1717
return type == typeof(ListOrSpaceSeparated);
1818
}
1919

20-
public object? ReadYaml(IParser parser, Type type)
20+
public object? ReadYaml(IParser parser, Type type, ObjectDeserializer deserializer)
2121
{
2222
if (parser.TryConsume<Scalar>(out var scalar))
2323
{
@@ -41,7 +41,7 @@ public bool Accepts(Type type)
4141
throw new InvalidOperationException("Expected list or value");
4242
}
4343

44-
public void WriteYaml(IEmitter emitter, object? value, Type type)
44+
public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
4545
{
4646
emitter.Emit(new SequenceStart(AnchorName.Empty, TagName.Empty, true,
4747
SequenceStyle.Block, Mark.Empty, Mark.Empty));

Cognite.Config/Yaml/TemplatedValueDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private static bool IsNumericType(Type t)
2020

2121
private static readonly Regex _envRegex = new Regex(@"\$\{([A-Za-z0-9_]+)\}", RegexOptions.Compiled | RegexOptions.CultureInvariant);
2222

23-
bool INodeDeserializer.Deserialize(IParser parser, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)
23+
bool INodeDeserializer.Deserialize(IParser parser, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer deserializer)
2424
{
2525
if (expectedType != typeof(string) && !IsNumericType(expectedType))
2626
{

Cognite.Config/Yaml/YamlEnumConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public bool Accepts(Type type)
1515
return type.IsEnum || (Nullable.GetUnderlyingType(type)?.IsEnum ?? false);
1616
}
1717

18-
public object? ReadYaml(IParser parser, Type type)
18+
public object? ReadYaml(IParser parser, Type type, ObjectDeserializer deserializer)
1919
{
2020
var scalar = parser.Consume<Scalar>();
2121

@@ -42,7 +42,7 @@ public bool Accepts(Type type)
4242
return Enum.Parse(type, scalar.Value, true);
4343
}
4444

45-
public void WriteYaml(IEmitter emitter, object? value, Type type)
45+
public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
4646
{
4747
if (value == null) return;
4848
var member = type.GetMember(value.ToString() ?? "").FirstOrDefault();

0 commit comments

Comments
 (0)