Skip to content

Commit

Permalink
Bump YamlDotNet from 15.3.0 to 16.0.0 (#1874)
Browse files Browse the repository at this point in the history
* Update to YamlDotNet v16.1.3

* Additional fixes

---------

Co-authored-by: Bernie White <[email protected]>
  • Loading branch information
dependabot[bot] and BernieWhite authored Oct 25, 2024
1 parent fb6bd85 commit 727a174
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 66 deletions.
4 changes: 4 additions & 0 deletions docs/CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ See [upgrade notes][1] for helpful information when upgrading from previous vers

## Unreleased

- Engineering:
- Bump YamlDotNet to v16.1.3.
[#1874](https://github.com/microsoft/PSRule/pull/1874)

## v3.0.0-B0275 (pre-release)

What's changed since pre-release v3.0.0-B0267:
Expand Down
6 changes: 3 additions & 3 deletions src/PSRule.Benchmark/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1986,8 +1986,8 @@
},
"YamlDotNet": {
"type": "Transitive",
"resolved": "15.3.0",
"contentHash": "F93japYa9YrJ59AZGhgdaUGHN7ITJ55FBBg/D/8C0BDgahv/rQD6MOSwHxOJJpon1kYyslVbeBrQ2wcJhox01w=="
"resolved": "16.1.3",
"contentHash": "gtHGiDvU9VTtWte8f0thIM38cL1oowOjStKpeAEKKfA+Rc4AvekJzqFDZiiPcc4kw00ZiwR4OTJS56L16q98DQ=="
},
"Microsoft.PSRule.Badges": {
"type": "Project",
Expand All @@ -2012,7 +2012,7 @@
"type": "Project",
"dependencies": {
"Newtonsoft.Json": "[13.0.3, )",
"YamlDotNet": "[15.3.0, )"
"YamlDotNet": "[16.1.3, )"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/PSRule.CommandLine/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1635,8 +1635,8 @@
},
"YamlDotNet": {
"type": "Transitive",
"resolved": "15.3.0",
"contentHash": "F93japYa9YrJ59AZGhgdaUGHN7ITJ55FBBg/D/8C0BDgahv/rQD6MOSwHxOJJpon1kYyslVbeBrQ2wcJhox01w=="
"resolved": "16.1.3",
"contentHash": "gtHGiDvU9VTtWte8f0thIM38cL1oowOjStKpeAEKKfA+Rc4AvekJzqFDZiiPcc4kw00ZiwR4OTJS56L16q98DQ=="
},
"Microsoft.PSRule.Badges": {
"type": "Project",
Expand Down Expand Up @@ -1667,7 +1667,7 @@
"type": "Project",
"dependencies": {
"Newtonsoft.Json": "[13.0.3, )",
"YamlDotNet": "[15.3.0, )"
"YamlDotNet": "[16.1.3, )"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/PSRule.SDK/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,8 @@
},
"YamlDotNet": {
"type": "Transitive",
"resolved": "15.3.0",
"contentHash": "F93japYa9YrJ59AZGhgdaUGHN7ITJ55FBBg/D/8C0BDgahv/rQD6MOSwHxOJJpon1kYyslVbeBrQ2wcJhox01w=="
"resolved": "16.1.3",
"contentHash": "gtHGiDvU9VTtWte8f0thIM38cL1oowOjStKpeAEKKfA+Rc4AvekJzqFDZiiPcc4kw00ZiwR4OTJS56L16q98DQ=="
},
"Microsoft.PSRule.Badges": {
"type": "Project",
Expand All @@ -1059,7 +1059,7 @@
"type": "Project",
"dependencies": {
"Newtonsoft.Json": "[13.0.3, )",
"YamlDotNet": "[15.3.0, )"
"YamlDotNet": "[16.1.3, )"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/PSRule.Tool/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1632,8 +1632,8 @@
},
"YamlDotNet": {
"type": "Transitive",
"resolved": "15.3.0",
"contentHash": "F93japYa9YrJ59AZGhgdaUGHN7ITJ55FBBg/D/8C0BDgahv/rQD6MOSwHxOJJpon1kYyslVbeBrQ2wcJhox01w=="
"resolved": "16.1.3",
"contentHash": "gtHGiDvU9VTtWte8f0thIM38cL1oowOjStKpeAEKKfA+Rc4AvekJzqFDZiiPcc4kw00ZiwR4OTJS56L16q98DQ=="
},
"Microsoft.PSRule.Badges": {
"type": "Project",
Expand Down Expand Up @@ -1673,7 +1673,7 @@
"type": "Project",
"dependencies": {
"Newtonsoft.Json": "[13.0.3, )",
"YamlDotNet": "[15.3.0, )"
"YamlDotNet": "[16.1.3, )"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/PSRule.Types/Converters/Yaml/StringArrayConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bool IYamlTypeConverter.Accepts(Type type)
}

/// <inheritdoc/>
object? IYamlTypeConverter.ReadYaml(IParser parser, Type type)
object? IYamlTypeConverter.ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
{
if (parser.TryConsume<SequenceStart>(out _))
{
Expand All @@ -38,7 +38,7 @@ bool IYamlTypeConverter.Accepts(Type type)
}

/// <inheritdoc/>
void IYamlTypeConverter.WriteYaml(IEmitter emitter, object? value, Type type)
void IYamlTypeConverter.WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
{
throw new NotImplementedException();
}
Expand Down
4 changes: 2 additions & 2 deletions src/PSRule.Types/Converters/Yaml/StringArrayMapConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bool IYamlTypeConverter.Accepts(Type type)
}

/// <inheritdoc/>
object? IYamlTypeConverter.ReadYaml(IParser parser, Type type)
object? IYamlTypeConverter.ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
{
var result = new StringArrayMap();
if (parser.TryConsume<MappingStart>(out _))
Expand Down Expand Up @@ -56,7 +56,7 @@ bool IYamlTypeConverter.Accepts(Type type)
}

/// <inheritdoc/>
void IYamlTypeConverter.WriteYaml(IEmitter emitter, object? value, Type type)
void IYamlTypeConverter.WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
{
if (type == typeof(StringArrayMap) && value == null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PSRule.Types/PSRule.Types.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="YamlDotNet" Version="15.3.0" />
<PackageReference Include="YamlDotNet" Version="16.1.3" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PSRule.Types/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
},
"YamlDotNet": {
"type": "Direct",
"requested": "[15.3.0, )",
"resolved": "15.3.0",
"contentHash": "F93japYa9YrJ59AZGhgdaUGHN7ITJ55FBBg/D/8C0BDgahv/rQD6MOSwHxOJJpon1kYyslVbeBrQ2wcJhox01w=="
"requested": "[16.1.3, )",
"resolved": "16.1.3",
"contentHash": "gtHGiDvU9VTtWte8f0thIM38cL1oowOjStKpeAEKKfA+Rc4AvekJzqFDZiiPcc4kw00ZiwR4OTJS56L16q98DQ=="
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
Expand Down
Loading

0 comments on commit 727a174

Please sign in to comment.