Skip to content

Commit

Permalink
Merge pull request #222 from gitfool/renovate/minor
Browse files Browse the repository at this point in the history
  • Loading branch information
gitfool committed Jan 7, 2024
2 parents e0279f6 + 29e86d9 commit ed071ad
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "3.1.0",
"version": "3.2.0",
"commands": [
"dotnet-cake"
]
Expand Down
4 changes: 2 additions & 2 deletions Cli/Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
<PackageReference Include="Spectre.Console.Cli" Version="0.48.0" />
<PackageReference Include="System.Interactive" Version="6.0.1" />
<PackageReference Include="System.Interactive.Async" Version="6.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM mcr.microsoft.com/dotnet/runtime:7.0.12-jammy
FROM mcr.microsoft.com/dotnet/runtime:7.0.14-jammy

LABEL org.opencontainers.image.source=https://github.com/gitfool/BoardGameGeek.Dungeon

Expand Down
24 changes: 12 additions & 12 deletions Cli/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@
},
"Serilog": {
"type": "Direct",
"requested": "[3.0.1, )",
"resolved": "3.0.1",
"contentHash": "E4UmOQ++eNJax1laE+lws7E3zbhKgHsGJbO7ra0yE5smUh+5FfUPIKKBxM3MO1tK4sgpQke6/pLReDxIc/ggNw=="
"requested": "[3.1.1, )",
"resolved": "3.1.1",
"contentHash": "P6G4/4Kt9bT635bhuwdXlJ2SCqqn2nhh4gqFqQueCOr9bK/e7W9ll/IoX1Ter948cV2Z/5+5v8pAfJYUISY03A=="
},
"Serilog.Enrichers.Thread": {
"type": "Direct",
Expand Down Expand Up @@ -146,11 +146,11 @@
},
"Spectre.Console.Cli": {
"type": "Direct",
"requested": "[0.47.0, )",
"resolved": "0.47.0",
"contentHash": "S2cZCbve4fAgRtigNUNZbF+NLQJcAapSqSbbDYqLtqXJcIZ6tKiRTveYe05d+oLY2bAmP7sgnLdzVknGXruy2Q==",
"requested": "[0.48.0, )",
"resolved": "0.48.0",
"contentHash": "HNoDxAOTODQ9h+4K5Cs2caW8kIicRKw5SS4vgEEkJtnTp7/4XR8OIGvCjVi09w3m+xn4lTlkS0ENy2ktGz4HRw==",
"dependencies": {
"Spectre.Console": "0.47.0"
"Spectre.Console": "0.48.0"
}
},
"System.Interactive": {
Expand All @@ -170,8 +170,8 @@
},
"FluentValidation": {
"type": "Transitive",
"resolved": "11.8.0",
"contentHash": "TiEaaYqSIAS+wXQv46LRm8Mca092XYNePD0n231Hqlkmm5FuToZoWnjI1ef/vJUxBzqR7/k2vaVQXxijNgVKRQ=="
"resolved": "11.9.0",
"contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig=="
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
Expand Down Expand Up @@ -620,8 +620,8 @@
},
"Spectre.Console": {
"type": "Transitive",
"resolved": "0.47.0",
"contentHash": "wz8mszcZr0cSOo8GyoG9e2DFW0SkMT8/n78Q/lIXX7EbCtHNXOoOKWpJ9Str+rCYtmQOGGyDutZzubrUHK/XkA==",
"resolved": "0.48.0",
"contentHash": "4Mc1UT7Azgtyb8FyNwK5FZmoZbKuT5PmY7ZwaKUytjD5kGFMNBACpOZTwYtkuY377YkYtZYBeDDTJUwTW86QXw==",
"dependencies": {
"System.Memory": "4.5.5"
}
Expand Down Expand Up @@ -1392,7 +1392,7 @@
"library": {
"type": "Project",
"dependencies": {
"FluentValidation": "[11.8.0, )",
"FluentValidation": "[11.9.0, )",
"YamlDotNet": "[13.7.1, )"
}
}
Expand Down
2 changes: 1 addition & 1 deletion Library/Library.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.8.0" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="YamlDotNet" Version="13.7.1" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Library/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net7.0": {
"FluentValidation": {
"type": "Direct",
"requested": "[11.8.0, )",
"resolved": "11.8.0",
"contentHash": "TiEaaYqSIAS+wXQv46LRm8Mca092XYNePD0n231Hqlkmm5FuToZoWnjI1ef/vJUxBzqR7/k2vaVQXxijNgVKRQ=="
"requested": "[11.9.0, )",
"resolved": "11.9.0",
"contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig=="
},
"Microsoft.SourceLink.GitHub": {
"type": "Direct",
Expand Down
8 changes: 4 additions & 4 deletions Tests/ModelTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public IsHighlightMatchMethod(ITestOutputHelper testOutput) : base(testOutput) {
[InlineData("Highlights: 2014, 2018.")]
[InlineData(@"Highlight 2014\nHighlight 2018")]
[InlineData(@"Highlight: 2014.\nHighlight: 2018.")]
public void Should_ReturnFalse_WhenHighlightYear_IsNotInComments(string comments)
public void Should_ReturnFalse_WhenHighlightYear_IsNotInComments(string? comments)
{
var isHighlight = Game.IsHighlightMatch(comments, 2016);

Expand All @@ -32,7 +32,7 @@ public void Should_ReturnFalse_WhenHighlightYear_IsNotInComments(string comments
[InlineData(@"Highlight: 2014.\nHighlight: 2016.")]
[InlineData(@"Highlights 2010 2012\nHighlights 2014 2016 2018")]
[InlineData(@"Highlights: 2010, 2012.\nHighlights: 2014, 2016, 2018.")]
public void Should_ReturnTrue_WhenHighlightYear_IsInComments(string comments)
public void Should_ReturnTrue_WhenHighlightYear_IsInComments(string? comments)
{
var isHighlight = Game.IsHighlightMatch(comments, 2016);

Expand All @@ -50,7 +50,7 @@ public IsSessionMatchMethod(ITestOutputHelper testOutput) : base(testOutput) { }
[InlineData("Session.")]
[InlineData("Session ?/?")]
[InlineData("Session: ?/?.")]
public void Should_ReturnFalse_WhenSessionStats_AreNotInComments(string comments)
public void Should_ReturnFalse_WhenSessionStats_AreNotInComments(string? comments)
{
var session = Play.IsSessionMatch(comments);

Expand All @@ -64,7 +64,7 @@ public void Should_ReturnFalse_WhenSessionStats_AreNotInComments(string comments
[InlineData("Session: 1/2.")]
[InlineData("Session 2/2")]
[InlineData("Session: 2/2.")]
public void Should_ReturnTrue_WhenSessionStats_AreInComments(string comments)
public void Should_ReturnTrue_WhenSessionStats_AreInComments(string? comments)
{
var session = Play.IsSessionMatch(comments);

Expand Down
6 changes: 3 additions & 3 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<PackageReference Include="FakeItEasy" Version="7.4.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="JunitXml.TestLogger" Version="3.0.134" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageReference Include="xunit" Version="2.6.5" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
</ItemGroup>

<PropertyGroup>
Expand Down
95 changes: 46 additions & 49 deletions Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[17.7.2, )",
"resolved": "17.7.2",
"contentHash": "WOSF/GUYcnrLGkdvCbXDRig2rShtBwfQc5l7IxQE6PZI3CeXAqF1SpyzwlGA5vw+MdEAXs3niy+ZkGBBWna6tw==",
"requested": "[17.8.0, )",
"resolved": "17.8.0",
"contentHash": "BmTYGbD/YuDHmApIENdoyN1jCk0Rj1fJB0+B/fVekyTdVidr91IlzhqzytiUgaEAzL1ZJcYCme0MeBMYvJVzvw==",
"dependencies": {
"Microsoft.CodeCoverage": "17.7.2",
"Microsoft.TestPlatform.TestHost": "17.7.2"
"Microsoft.CodeCoverage": "17.8.0",
"Microsoft.TestPlatform.TestHost": "17.8.0"
}
},
"Microsoft.SourceLink.GitHub": {
Expand All @@ -66,20 +66,20 @@
},
"xunit": {
"type": "Direct",
"requested": "[2.5.3, )",
"resolved": "2.5.3",
"contentHash": "VxYDiWSwrLxOJ3UEN+ZPrBybB0SFShQ1E6PjT65VdoKCJhorgerFznThjSwawRH/WAip73YnucDVsE8WRj/8KQ==",
"requested": "[2.6.5, )",
"resolved": "2.6.5",
"contentHash": "iPSL63kw21BdSsdA79bvbVNvyn17DWI4D6VbgNxYtvzgViKrmbRLr8sWPxSlc4AvnofEuFfAi/rrLSzSRomwCg==",
"dependencies": {
"xunit.analyzers": "1.4.0",
"xunit.assert": "2.5.3",
"xunit.core": "[2.5.3]"
"xunit.analyzers": "1.9.0",
"xunit.assert": "2.6.5",
"xunit.core": "[2.6.5]"
}
},
"xunit.runner.visualstudio": {
"type": "Direct",
"requested": "[2.5.3, )",
"resolved": "2.5.3",
"contentHash": "HFFL6O+QLEOfs555SqHii48ovVa4CqGYanY+B32BjLpPptdE+wEJmCFNXlLHdEOD5LYeayb9EroaUpydGpcybg=="
"requested": "[2.5.6, )",
"resolved": "2.5.6",
"contentHash": "CW6uhMXNaQQNMSG1IWhHkBT+V5eqHqn7MP0zfNMhU9wS/sgKX7FGL3rzoaUgt26wkY3bpf7pDVw3IjXhwfiP4w=="
},
"Castle.Core": {
"type": "Transitive",
Expand All @@ -100,8 +100,8 @@
},
"FluentValidation": {
"type": "Transitive",
"resolved": "11.8.0",
"contentHash": "TiEaaYqSIAS+wXQv46LRm8Mca092XYNePD0n231Hqlkmm5FuToZoWnjI1ef/vJUxBzqR7/k2vaVQXxijNgVKRQ=="
"resolved": "11.9.0",
"contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig=="
},
"Flurl": {
"type": "Transitive",
Expand Down Expand Up @@ -139,8 +139,8 @@
},
"Microsoft.CodeCoverage": {
"type": "Transitive",
"resolved": "17.7.2",
"contentHash": "ntbkwIqwszkfCRjxVZOyEQiHauiYsY9NtYjw9ASsoxDSiG8YtV6AGcOAwrAk3TZv2UOq4MrpX+3MYEeMHSb03w=="
"resolved": "17.8.0",
"contentHash": "KC8SXWbGIdoFVdlxKk9WHccm0llm9HypcHMLUUFabRiTS3SO2fQXNZfdiF3qkEdTJhbRrxhdRxjL4jbtwPq4Ew=="
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
Expand Down Expand Up @@ -426,19 +426,19 @@
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "17.7.2",
"contentHash": "aHzQWgDMVBnk39HhQVmn06w+YxzF1h2V5/M4WgrNQAn7q97GR4Si3vLRTDlmJo9nK/Nknce+H4tXx4gqOKyLeg==",
"resolved": "17.8.0",
"contentHash": "AYy6vlpGMfz5kOFq99L93RGbqftW/8eQTqjT9iGXW6s9MRP3UdtY8idJ8rJcjeSja8A18IhIro5YnH3uv1nz4g==",
"dependencies": {
"NuGet.Frameworks": "6.5.0",
"System.Reflection.Metadata": "1.6.0"
}
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
"resolved": "17.7.2",
"contentHash": "pv9yVD7IKPLJV28zYjLsWFiM3j506I2ye+6NquG8vsbm/gR7lgyig8IgY6Vo57VMvGaAKwtUECzcj+C5tH271Q==",
"resolved": "17.8.0",
"contentHash": "9ivcl/7SGRmOT0YYrHQGohWiT5YCpkmy/UEzldfVisLm6QxbLaK3FAJqZXI34rnRLmqqDCeMQxKINwmKwAPiDw==",
"dependencies": {
"Microsoft.TestPlatform.ObjectModel": "17.7.2",
"Microsoft.TestPlatform.ObjectModel": "17.8.0",
"Newtonsoft.Json": "13.0.1"
}
},
Expand Down Expand Up @@ -646,8 +646,8 @@
},
"Serilog": {
"type": "Transitive",
"resolved": "3.0.1",
"contentHash": "E4UmOQ++eNJax1laE+lws7E3zbhKgHsGJbO7ra0yE5smUh+5FfUPIKKBxM3MO1tK4sgpQke6/pLReDxIc/ggNw=="
"resolved": "3.1.1",
"contentHash": "P6G4/4Kt9bT635bhuwdXlJ2SCqqn2nhh4gqFqQueCOr9bK/e7W9ll/IoX1Ter948cV2Z/5+5v8pAfJYUISY03A=="
},
"Serilog.Enrichers.Thread": {
"type": "Transitive",
Expand Down Expand Up @@ -698,18 +698,18 @@
},
"Spectre.Console": {
"type": "Transitive",
"resolved": "0.47.0",
"contentHash": "wz8mszcZr0cSOo8GyoG9e2DFW0SkMT8/n78Q/lIXX7EbCtHNXOoOKWpJ9Str+rCYtmQOGGyDutZzubrUHK/XkA==",
"resolved": "0.48.0",
"contentHash": "4Mc1UT7Azgtyb8FyNwK5FZmoZbKuT5PmY7ZwaKUytjD5kGFMNBACpOZTwYtkuY377YkYtZYBeDDTJUwTW86QXw==",
"dependencies": {
"System.Memory": "4.5.5"
}
},
"Spectre.Console.Cli": {
"type": "Transitive",
"resolved": "0.47.0",
"contentHash": "S2cZCbve4fAgRtigNUNZbF+NLQJcAapSqSbbDYqLtqXJcIZ6tKiRTveYe05d+oLY2bAmP7sgnLdzVknGXruy2Q==",
"resolved": "0.48.0",
"contentHash": "HNoDxAOTODQ9h+4K5Cs2caW8kIicRKw5SS4vgEEkJtnTp7/4XR8OIGvCjVi09w3m+xn4lTlkS0ENy2ktGz4HRw==",
"dependencies": {
"Spectre.Console": "0.47.0"
"Spectre.Console": "0.48.0"
}
},
"System.AppContext": {
Expand Down Expand Up @@ -1629,42 +1629,39 @@
},
"xunit.analyzers": {
"type": "Transitive",
"resolved": "1.4.0",
"contentHash": "7ljnTJfFjz5zK+Jf0h2dd2QOSO6UmFizXsojv/x4QX7TU5vEgtKZPk9RvpkiuUqg2bddtNZufBoKQalsi7djfA=="
"resolved": "1.9.0",
"contentHash": "02ucFDty6Y9BBT5c35YueFfbM3uEzeFdRvlNtAPhZVUkGUlhl3jsV2XesgTj986/PZXIjpVoc2D8ee6p1ha/Fw=="
},
"xunit.assert": {
"type": "Transitive",
"resolved": "2.5.3",
"contentHash": "MK3HiBckO3vdxEdUxXZyyRPsBNPsC/nz6y1gj/UZIZkjMnsVQyZPU8yxS/3cjTchYcqskt/nqUOS5wmD8JezdQ==",
"dependencies": {
"NETStandard.Library": "1.6.1"
}
"resolved": "2.6.5",
"contentHash": "gb5uv7vjBFz7nhEa6aXK5sVJwsG/88xf8DN5wqK0ejCDsDybqICyNJIj+eoD43xbmdPZryNDPpeWDCfiKI/bnA=="
},
"xunit.core": {
"type": "Transitive",
"resolved": "2.5.3",
"contentHash": "FE8yEEUkoMLd6kOHDXm/QYfX/dYzwc0c+Q4MQon6VGRwFuy6UVGwK/CFA5LEea+ZBEmcco7AEl2q78VjsA0j/w==",
"resolved": "2.6.5",
"contentHash": "hpdMnSNlx4ejaxpaIAFaqHt4q9ZCnzZLnURrSa5CzYXxHhIQbV8/0yXLjRdublhreonGXVMmsQ1KHlS9WbfpCw==",
"dependencies": {
"xunit.extensibility.core": "[2.5.3]",
"xunit.extensibility.execution": "[2.5.3]"
"xunit.extensibility.core": "[2.6.5]",
"xunit.extensibility.execution": "[2.6.5]"
}
},
"xunit.extensibility.core": {
"type": "Transitive",
"resolved": "2.5.3",
"contentHash": "IjAQlPeZWXP89pl1EuOG9991GH1qgAL0rQfkmX2UV+PDenbYb7oBnQopL9ujE6YaXxgaQazp7lFjsDyyxD6Mtw==",
"resolved": "2.6.5",
"contentHash": "dSGRkVxzH27XaL83+Z9kNPllqgsmsiPayXw+0weCGsrZQxfSCBNNkSb9nYUpkVoEBCUviXOmo1tfApqhgqTjog==",
"dependencies": {
"NETStandard.Library": "1.6.1",
"xunit.abstractions": "2.0.3"
}
},
"xunit.extensibility.execution": {
"type": "Transitive",
"resolved": "2.5.3",
"contentHash": "w9eGCHl+gJj1GzZSf0VTzYPp/gv4fiUDkr+yR7/Wv9/ucO2CHltGg2TnyySLFjzekkjuxVJZUE+tZyDNzryJFw==",
"resolved": "2.6.5",
"contentHash": "jUMr88e0lSqDq8Vut0XVqx7plFg91QsKW/rX6gaVnJL6Z19LmNSDmyqd7cg6HQGfboAmyoFZyydA4Kcgouu1BA==",
"dependencies": {
"NETStandard.Library": "1.6.1",
"xunit.extensibility.core": "[2.5.3]"
"xunit.extensibility.core": "[2.6.5]"
}
},
"YamlDotNet": {
Expand All @@ -1683,20 +1680,20 @@
"Microsoft.Extensions.Options": "[7.0.1, )",
"NetEscapades.Configuration.Yaml": "[3.1.0, )",
"Polly": "[7.2.4, )",
"Serilog": "[3.0.1, )",
"Serilog": "[3.1.1, )",
"Serilog.Enrichers.Thread": "[3.1.0, )",
"Serilog.Extensions.Hosting": "[7.0.0, )",
"Serilog.Settings.Configuration": "[7.0.1, )",
"Serilog.Sinks.Console": "[4.1.0, )",
"Spectre.Console.Cli": "[0.47.0, )",
"Spectre.Console.Cli": "[0.48.0, )",
"System.Interactive": "[6.0.1, )",
"System.Interactive.Async": "[6.0.1, )"
}
},
"library": {
"type": "Project",
"dependencies": {
"FluentValidation": "[11.8.0, )",
"FluentValidation": "[11.9.0, )",
"YamlDotNet": "[13.7.1, )"
}
}
Expand Down

0 comments on commit ed071ad

Please sign in to comment.