Skip to content

Commit e537f1d

Browse files
Update dependency yamldotnet to v16 (#1659)
* Update dependency yamldotnet to v16 * Fix YarnBerryTypeConverter for YamlDotNet 16 interface changes YamlDotNet 16 changed IYamlTypeConverter: ReadYaml now takes an ObjectDeserializer parameter, WriteYaml now takes an ObjectSerializer and the value is nullable. Updated both method signatures to match. Removed #nullable disable since the interface requires object?. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jamie Magee <jamie.magee@gmail.com>
1 parent 647bd1f commit e537f1d

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<PackageVersion Include="System.Text.Json" Version="9.0.13" />
5050
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
5151
<PackageVersion Include="Tomlyn.Signed" Version="0.20.0" />
52-
<PackageVersion Include="yamldotnet" Version="15.3.0" />
52+
<PackageVersion Include="yamldotnet" Version="16.3.0" />
5353
<PackageVersion Include="Faker.net" Version="2.0.163" />
5454
<PackageVersion Include="Valleysoft.DockerfileModel" Version="1.2.0" />
5555
<!-- Fix security alerts -->

src/Microsoft.ComponentDetection.Detectors/yarn/Contracts/YarnBerryTypeConverter.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
namespace Microsoft.ComponentDetection.Detectors.Yarn.Contracts;
32

43
using System;
@@ -16,7 +15,7 @@ public class YarnBerryTypeConverter : IYamlTypeConverter
1615
public bool Accepts(Type type) => type == typeof(YarnBerryLockfile);
1716

1817
/// <inheritdoc />
19-
public object ReadYaml(IParser parser, Type type)
18+
public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
2019
{
2120
var metadata = new YarnBerryLockfileMetadata();
2221
var entries = new Dictionary<string, YarnBerryLockfileEntry>();
@@ -44,13 +43,14 @@ public object ReadYaml(IParser parser, Type type)
4443
}
4544
}
4645

47-
return new YarnBerryLockfile
48-
{
49-
Metadata = metadata,
50-
Entries = entries,
51-
};
46+
return new YarnBerryLockfile { Metadata = metadata, Entries = entries };
5247
}
5348

5449
/// <inheritdoc />
55-
public void WriteYaml(IEmitter emitter, object value, Type type) => throw new NotImplementedException();
50+
public void WriteYaml(
51+
IEmitter emitter,
52+
object? value,
53+
Type type,
54+
ObjectSerializer serializer
55+
) => throw new NotImplementedException();
5656
}

0 commit comments

Comments
 (0)