From 5273d492707f918cae77d0373e01fe5eee8935ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Nov 2022 03:57:55 +0000 Subject: [PATCH 1/2] fix(deps): update dependency spectre.console to v0.45.0 --- .../packages.lock.json | 14 +++++++++++--- src/VideoConverter.Tests/packages.lock.json | 14 +++++++++++--- src/VideoConverter/VideoConverter.csproj | 2 +- src/VideoConverter/packages.lock.json | 14 +++++++++++--- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/VideoConverter.IntegrationTests/packages.lock.json b/src/VideoConverter.IntegrationTests/packages.lock.json index 4d980224..478ac87e 100644 --- a/src/VideoConverter.IntegrationTests/packages.lock.json +++ b/src/VideoConverter.IntegrationTests/packages.lock.json @@ -609,8 +609,11 @@ }, "Spectre.Console": { "type": "Transitive", - "resolved": "0.44.0", - "contentHash": "QMpKtn5QV1j2nklqDwuRE/XwbDn5jxww+Mt5J6Jn3EeQIzaLcuLyUhCLh/mS8giN6uXbqOV1ep5HlUGxrV1ujQ==" + "resolved": "0.45.0", + "contentHash": "e//13o8/BCrWmwN26eJ4zCzD2iq7iUlqQd+nDI9nJUdnJ/rYAanYiNFZZ7YHwlv48IKuKtRYYP6/wPt1DG67ww==", + "dependencies": { + "System.Memory": "4.5.5" + } }, "System.CodeDom": { "type": "Transitive", @@ -655,6 +658,11 @@ "System.CodeDom": "5.0.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -776,7 +784,7 @@ "DryIoc": "[5.2.2, )", "Humanizer": "[2.14.1, )", "Newtonsoft.Json": "[13.0.1, )", - "Spectre.Console": "[0.44.0, )", + "Spectre.Console": "[0.45.0, )", "VideoConverter.Core": "[1.0.0, )", "VideoConverter.Storage": "[1.0.0, )", "Xabe.FFmpeg": "[5.2.0, )", diff --git a/src/VideoConverter.Tests/packages.lock.json b/src/VideoConverter.Tests/packages.lock.json index 4d980224..478ac87e 100644 --- a/src/VideoConverter.Tests/packages.lock.json +++ b/src/VideoConverter.Tests/packages.lock.json @@ -609,8 +609,11 @@ }, "Spectre.Console": { "type": "Transitive", - "resolved": "0.44.0", - "contentHash": "QMpKtn5QV1j2nklqDwuRE/XwbDn5jxww+Mt5J6Jn3EeQIzaLcuLyUhCLh/mS8giN6uXbqOV1ep5HlUGxrV1ujQ==" + "resolved": "0.45.0", + "contentHash": "e//13o8/BCrWmwN26eJ4zCzD2iq7iUlqQd+nDI9nJUdnJ/rYAanYiNFZZ7YHwlv48IKuKtRYYP6/wPt1DG67ww==", + "dependencies": { + "System.Memory": "4.5.5" + } }, "System.CodeDom": { "type": "Transitive", @@ -655,6 +658,11 @@ "System.CodeDom": "5.0.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -776,7 +784,7 @@ "DryIoc": "[5.2.2, )", "Humanizer": "[2.14.1, )", "Newtonsoft.Json": "[13.0.1, )", - "Spectre.Console": "[0.44.0, )", + "Spectre.Console": "[0.45.0, )", "VideoConverter.Core": "[1.0.0, )", "VideoConverter.Storage": "[1.0.0, )", "Xabe.FFmpeg": "[5.2.0, )", diff --git a/src/VideoConverter/VideoConverter.csproj b/src/VideoConverter/VideoConverter.csproj index 8112202a..a9f515db 100644 --- a/src/VideoConverter/VideoConverter.csproj +++ b/src/VideoConverter/VideoConverter.csproj @@ -36,7 +36,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VideoConverter/packages.lock.json b/src/VideoConverter/packages.lock.json index 4cc3409b..528b1add 100644 --- a/src/VideoConverter/packages.lock.json +++ b/src/VideoConverter/packages.lock.json @@ -99,9 +99,12 @@ }, "Spectre.Console": { "type": "Direct", - "requested": "[0.44.0, )", - "resolved": "0.44.0", - "contentHash": "QMpKtn5QV1j2nklqDwuRE/XwbDn5jxww+Mt5J6Jn3EeQIzaLcuLyUhCLh/mS8giN6uXbqOV1ep5HlUGxrV1ujQ==" + "requested": "[0.45.0, )", + "resolved": "0.45.0", + "contentHash": "e//13o8/BCrWmwN26eJ4zCzD2iq7iUlqQd+nDI9nJUdnJ/rYAanYiNFZZ7YHwlv48IKuKtRYYP6/wPt1DG67ww==", + "dependencies": { + "System.Memory": "4.5.5" + } }, "System.Linq.Async": { "type": "Direct", @@ -550,6 +553,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", From c20e2fe5bc5ad92cdec3db521e6a3ec701fe3fab Mon Sep 17 00:00:00 2001 From: AdmiringWorm Date: Thu, 3 Nov 2022 23:13:24 +0100 Subject: [PATCH 2/2] chore: add missing packages for cli version of spectre --- .github/renovate.json | 11 ++++++++++- .../VideoConverter.Core.csproj | 4 ++++ src/VideoConverter.Core/packages.lock.json | 6 ++++++ .../packages.lock.json | 9 +++++++++ .../VideoConverter.Storage.csproj | 4 ++++ src/VideoConverter.Storage/packages.lock.json | 6 ++++++ src/VideoConverter.Tests/packages.lock.json | 9 +++++++++ src/VideoConverter/Commands/AddCriteriaCommand.cs | 5 +---- src/VideoConverter/Commands/EncodeCommand.cs | 2 +- src/VideoConverter/VideoConverter.csproj | 5 +++++ src/VideoConverter/packages.lock.json | 15 +++++++++++++++ 11 files changed, 70 insertions(+), 6 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index e9a4918c..6526d575 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -28,7 +28,6 @@ "DryIoc", "Humanizer", "Newtonsoft.Json", - "Spectre.Console", "system.Linq.Async", "Xabe.FFmpeg", "Xabe.FFMpeg" @@ -36,6 +35,16 @@ "semanticCommitType": "fix", "addLabels": ["enhancement"] }, + { + "matchPackageNames":[ + "Spectre.Console", + "Spectre.Console.Analyzers", + "Spectre.Console.Cli" + ], + "groupName": "spectre console packages", + "semanticCommitType": "fix", + "addLabels": ["enhancement"] + }, { "matchSourceUrlPrefixes": [ "https://github.com/nunit/" diff --git a/src/VideoConverter.Core/VideoConverter.Core.csproj b/src/VideoConverter.Core/VideoConverter.Core.csproj index 68d2cbf1..718c4b1e 100644 --- a/src/VideoConverter.Core/VideoConverter.Core.csproj +++ b/src/VideoConverter.Core/VideoConverter.Core.csproj @@ -30,6 +30,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/VideoConverter.Core/packages.lock.json b/src/VideoConverter.Core/packages.lock.json index 81e8d255..219978b4 100644 --- a/src/VideoConverter.Core/packages.lock.json +++ b/src/VideoConverter.Core/packages.lock.json @@ -26,6 +26,12 @@ "resolved": "4.1.2", "contentHash": "0TsiZQgeO7w5K1awpZvj4qw0ZUX6xOpCY37xtkgxoZ+7aIpT7H9EvW2BJrJiRoxxtfKkA+LEHmAgl9r4e6rUFg==" }, + "Spectre.Console.Analyzer": { + "type": "Direct", + "requested": "[0.45.0, )", + "resolved": "0.45.0", + "contentHash": "0OiLWW4sSUB3p/eAufk8AV998LxKR1ztquxzGfPKq1EBO1dS44M40kIaQXdwux+vWiVqfHnfDYdo9Lt5OjPshg==" + }, "Xabe.FFmpeg": { "type": "Direct", "requested": "[5.2.0, )", diff --git a/src/VideoConverter.IntegrationTests/packages.lock.json b/src/VideoConverter.IntegrationTests/packages.lock.json index 478ac87e..84026975 100644 --- a/src/VideoConverter.IntegrationTests/packages.lock.json +++ b/src/VideoConverter.IntegrationTests/packages.lock.json @@ -615,6 +615,14 @@ "System.Memory": "4.5.5" } }, + "Spectre.Console.Cli": { + "type": "Transitive", + "resolved": "0.45.0", + "contentHash": "SZcYjwEmmYgmTDqOluWFYtURI9bgRtmx3tSdslHsMU9lKWkev3UHEkzDbOtu4XwY+hCn9NOjBRSDWNafa4fyCQ==", + "dependencies": { + "Spectre.Console": "0.45.0" + } + }, "System.CodeDom": { "type": "Transitive", "resolved": "5.0.0", @@ -785,6 +793,7 @@ "Humanizer": "[2.14.1, )", "Newtonsoft.Json": "[13.0.1, )", "Spectre.Console": "[0.45.0, )", + "Spectre.Console.Cli": "[0.45.0, )", "VideoConverter.Core": "[1.0.0, )", "VideoConverter.Storage": "[1.0.0, )", "Xabe.FFmpeg": "[5.2.0, )", diff --git a/src/VideoConverter.Storage/VideoConverter.Storage.csproj b/src/VideoConverter.Storage/VideoConverter.Storage.csproj index 8ffc4c2b..d0bec717 100644 --- a/src/VideoConverter.Storage/VideoConverter.Storage.csproj +++ b/src/VideoConverter.Storage/VideoConverter.Storage.csproj @@ -31,6 +31,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/VideoConverter.Storage/packages.lock.json b/src/VideoConverter.Storage/packages.lock.json index e9438c09..11480330 100644 --- a/src/VideoConverter.Storage/packages.lock.json +++ b/src/VideoConverter.Storage/packages.lock.json @@ -41,6 +41,12 @@ "resolved": "4.1.2", "contentHash": "0TsiZQgeO7w5K1awpZvj4qw0ZUX6xOpCY37xtkgxoZ+7aIpT7H9EvW2BJrJiRoxxtfKkA+LEHmAgl9r4e6rUFg==" }, + "Spectre.Console.Analyzer": { + "type": "Direct", + "requested": "[0.45.0, )", + "resolved": "0.45.0", + "contentHash": "0OiLWW4sSUB3p/eAufk8AV998LxKR1ztquxzGfPKq1EBO1dS44M40kIaQXdwux+vWiVqfHnfDYdo9Lt5OjPshg==" + }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.0.1", diff --git a/src/VideoConverter.Tests/packages.lock.json b/src/VideoConverter.Tests/packages.lock.json index 478ac87e..84026975 100644 --- a/src/VideoConverter.Tests/packages.lock.json +++ b/src/VideoConverter.Tests/packages.lock.json @@ -615,6 +615,14 @@ "System.Memory": "4.5.5" } }, + "Spectre.Console.Cli": { + "type": "Transitive", + "resolved": "0.45.0", + "contentHash": "SZcYjwEmmYgmTDqOluWFYtURI9bgRtmx3tSdslHsMU9lKWkev3UHEkzDbOtu4XwY+hCn9NOjBRSDWNafa4fyCQ==", + "dependencies": { + "Spectre.Console": "0.45.0" + } + }, "System.CodeDom": { "type": "Transitive", "resolved": "5.0.0", @@ -785,6 +793,7 @@ "Humanizer": "[2.14.1, )", "Newtonsoft.Json": "[13.0.1, )", "Spectre.Console": "[0.45.0, )", + "Spectre.Console.Cli": "[0.45.0, )", "VideoConverter.Core": "[1.0.0, )", "VideoConverter.Storage": "[1.0.0, )", "Xabe.FFmpeg": "[5.2.0, )", diff --git a/src/VideoConverter/Commands/AddCriteriaCommand.cs b/src/VideoConverter/Commands/AddCriteriaCommand.cs index 81e3ffc8..8897e132 100644 --- a/src/VideoConverter/Commands/AddCriteriaCommand.cs +++ b/src/VideoConverter/Commands/AddCriteriaCommand.cs @@ -77,10 +77,7 @@ private async Task AddOrUpdateCriteriaAsync(Core.Models.EpisodeData episodeData, { newCriteria.Episode = episodeData.EpisodeNumber; newCriteria.NewEpisode = settings.EpisodeNumber.Value; - if (newCriteria.Season is null) - { - newCriteria.Season = episodeData.SeasonNumber; - } + newCriteria.Season ??= episodeData.SeasonNumber; } await repository.AddOrUpdateCriteriaAsync(newCriteria).ConfigureAwait(false); diff --git a/src/VideoConverter/Commands/EncodeCommand.cs b/src/VideoConverter/Commands/EncodeCommand.cs index 5e4d0848..537f140f 100644 --- a/src/VideoConverter/Commands/EncodeCommand.cs +++ b/src/VideoConverter/Commands/EncodeCommand.cs @@ -42,7 +42,7 @@ public EncodeCommand(QueueRepository queueRepo, ConverterConfiguration config, I Console.CancelKeyPress += (sender, e) => { - Console.WriteLine("Cancelling!!!"); + console.WriteLine("Cancelling!!!"); if (e.SpecialKey != ConsoleSpecialKey.ControlC) { diff --git a/src/VideoConverter/VideoConverter.csproj b/src/VideoConverter/VideoConverter.csproj index a9f515db..c252f4ac 100644 --- a/src/VideoConverter/VideoConverter.csproj +++ b/src/VideoConverter/VideoConverter.csproj @@ -37,6 +37,11 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/VideoConverter/packages.lock.json b/src/VideoConverter/packages.lock.json index 528b1add..ed0449dd 100644 --- a/src/VideoConverter/packages.lock.json +++ b/src/VideoConverter/packages.lock.json @@ -106,6 +106,21 @@ "System.Memory": "4.5.5" } }, + "Spectre.Console.Analyzer": { + "type": "Direct", + "requested": "[0.45.0, )", + "resolved": "0.45.0", + "contentHash": "0OiLWW4sSUB3p/eAufk8AV998LxKR1ztquxzGfPKq1EBO1dS44M40kIaQXdwux+vWiVqfHnfDYdo9Lt5OjPshg==" + }, + "Spectre.Console.Cli": { + "type": "Direct", + "requested": "[0.45.0, )", + "resolved": "0.45.0", + "contentHash": "SZcYjwEmmYgmTDqOluWFYtURI9bgRtmx3tSdslHsMU9lKWkev3UHEkzDbOtu4XwY+hCn9NOjBRSDWNafa4fyCQ==", + "dependencies": { + "Spectre.Console": "0.45.0" + } + }, "System.Linq.Async": { "type": "Direct", "requested": "[6.0.1, )",