From e01d12c36ab7fd416bc5032d20222d5f85253fc3 Mon Sep 17 00:00:00 2001 From: genteure Date: Tue, 7 Jun 2022 22:41:09 +0800 Subject: [PATCH] Update dependencies --- .../BililiveRecorder.Cli.csproj | 5 +++-- .../Configure/ConfigureCommand.cs | 4 ++-- BililiveRecorder.Cli/Program.cs | 2 +- .../BililiveRecorder.Flv.csproj | 2 +- .../BililiveRecorder.ToolBox.csproj | 3 ++- BililiveRecorder.ToolBox/ToolCommand.cs | 2 +- .../BililiveRecorder.WPF.csproj | 9 ++++++--- BililiveRecorder.WPF/Controls/LogPanel.xaml.cs | 18 +++++++++++------- BililiveRecorder.WPF/Program.cs | 2 +- .../BililiveRecorder.Core.UnitTests.csproj | 2 +- .../VerifyConfig.cs | 2 +- .../BililiveRecorder.Flv.Tests.csproj | 2 +- .../BililiveRecorder.Flv.Tests/VerifyConfig.cs | 2 +- 13 files changed, 32 insertions(+), 23 deletions(-) diff --git a/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj b/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj index 33c6311..b926328 100644 --- a/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj +++ b/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj @@ -26,11 +26,12 @@ - + - + + diff --git a/BililiveRecorder.Cli/Configure/ConfigureCommand.cs b/BililiveRecorder.Cli/Configure/ConfigureCommand.cs index fbfa516..33d1181 100644 --- a/BililiveRecorder.Cli/Configure/ConfigureCommand.cs +++ b/BililiveRecorder.Cli/Configure/ConfigureCommand.cs @@ -1,6 +1,6 @@ using System; using System.CommandLine; -using System.CommandLine.Invocation; +using System.CommandLine.NamingConventionBinder; using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.IO; @@ -16,7 +16,7 @@ namespace BililiveRecorder.Cli.Configure { public ConfigureCommand() : base("configure", "Interactively configure config.json") { - this.AddArgument(new Argument("path") { Description = "Path to work directory or config.json" }); + this.AddArgument(new Argument("path") { Description = "Path to work directory or config.json" }); this.Handler = CommandHandler.Create(Run); } diff --git a/BililiveRecorder.Cli/Program.cs b/BililiveRecorder.Cli/Program.cs index 96b21bd..0f1bd2c 100644 --- a/BililiveRecorder.Cli/Program.cs +++ b/BililiveRecorder.Cli/Program.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.Invocation; +using System.CommandLine.NamingConventionBinder; using System.IO; using System.Linq; using System.Net; diff --git a/BililiveRecorder.Flv/BililiveRecorder.Flv.csproj b/BililiveRecorder.Flv/BililiveRecorder.Flv.csproj index 34e371a..06a4e35 100644 --- a/BililiveRecorder.Flv/BililiveRecorder.Flv.csproj +++ b/BililiveRecorder.Flv/BililiveRecorder.Flv.csproj @@ -20,7 +20,7 @@ - + diff --git a/BililiveRecorder.ToolBox/BililiveRecorder.ToolBox.csproj b/BililiveRecorder.ToolBox/BililiveRecorder.ToolBox.csproj index 458f0d4..254a020 100644 --- a/BililiveRecorder.ToolBox/BililiveRecorder.ToolBox.csproj +++ b/BililiveRecorder.ToolBox/BililiveRecorder.ToolBox.csproj @@ -8,7 +8,8 @@ - + + diff --git a/BililiveRecorder.ToolBox/ToolCommand.cs b/BililiveRecorder.ToolBox/ToolCommand.cs index 9f7a76e..f2cbb2f 100644 --- a/BililiveRecorder.ToolBox/ToolCommand.cs +++ b/BililiveRecorder.ToolBox/ToolCommand.cs @@ -1,6 +1,6 @@ using System; using System.CommandLine; -using System.CommandLine.Invocation; +using System.CommandLine.NamingConventionBinder; using System.Threading.Tasks; using BililiveRecorder.ToolBox.Tool.Analyze; using BililiveRecorder.ToolBox.Tool.DanmakuMerger; diff --git a/BililiveRecorder.WPF/BililiveRecorder.WPF.csproj b/BililiveRecorder.WPF/BililiveRecorder.WPF.csproj index 0e7a41d..56cbbb5 100644 --- a/BililiveRecorder.WPF/BililiveRecorder.WPF.csproj +++ b/BililiveRecorder.WPF/BililiveRecorder.WPF.csproj @@ -351,7 +351,7 @@ 13.0.1 - 6.1.0 + 6.2.0 runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -368,7 +368,7 @@ 3.1.0 - 8.1.0 + 8.2.0 1.1.0 @@ -386,7 +386,10 @@ 2.0.1 - 2.0.0-beta1.21308.1 + 2.0.0-beta4.22272.1 + + + 2.0.0-beta4.22272.1 1.1.2 diff --git a/BililiveRecorder.WPF/Controls/LogPanel.xaml.cs b/BililiveRecorder.WPF/Controls/LogPanel.xaml.cs index 976883e..4b0f60f 100644 --- a/BililiveRecorder.WPF/Controls/LogPanel.xaml.cs +++ b/BililiveRecorder.WPF/Controls/LogPanel.xaml.cs @@ -35,15 +35,19 @@ namespace BililiveRecorder.WPF.Controls private void ListView_SizeChanged(object sender, SizeChangedEventArgs e) { - if (sender is not ListView listView) return; - if (listView.View is not GridView view) return; + try + { + if (sender is not ListView listView) return; + if (listView.View is not GridView view) return; - var w = listView.ActualWidth - SystemParameters.VerticalScrollBarWidth - 105 - 60 - 105; + var w = listView.ActualWidth - SystemParameters.VerticalScrollBarWidth - 105 - 60 - 105; - view.Columns[0].Width = 105; - view.Columns[1].Width = 60; - view.Columns[2].Width = 105; - view.Columns[3].Width = w; + view.Columns[0].Width = 105; + view.Columns[1].Width = 60; + view.Columns[2].Width = 105; + view.Columns[3].Width = w; + } + catch (Exception) { } } } } diff --git a/BililiveRecorder.WPF/Program.cs b/BililiveRecorder.WPF/Program.cs index 3746f03..3cbb00d 100644 --- a/BililiveRecorder.WPF/Program.cs +++ b/BililiveRecorder.WPF/Program.cs @@ -1,6 +1,6 @@ using System; using System.CommandLine; -using System.CommandLine.Invocation; +using System.CommandLine.NamingConventionBinder; using System.Diagnostics; using System.IO; using System.Net; diff --git a/test/BililiveRecorder.Core.UnitTests/BililiveRecorder.Core.UnitTests.csproj b/test/BililiveRecorder.Core.UnitTests/BililiveRecorder.Core.UnitTests.csproj index a1d075a..dec5a1c 100644 --- a/test/BililiveRecorder.Core.UnitTests/BililiveRecorder.Core.UnitTests.csproj +++ b/test/BililiveRecorder.Core.UnitTests/BililiveRecorder.Core.UnitTests.csproj @@ -11,7 +11,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/BililiveRecorder.Core.UnitTests/VerifyConfig.cs b/test/BililiveRecorder.Core.UnitTests/VerifyConfig.cs index 2b4ad2c..fe83abb 100644 --- a/test/BililiveRecorder.Core.UnitTests/VerifyConfig.cs +++ b/test/BililiveRecorder.Core.UnitTests/VerifyConfig.cs @@ -11,7 +11,7 @@ namespace BililiveRecorder.Core.UnitTests public static void Init() { VerifierSettings.DerivePathInfo(Expectations.Initialize); - VerifierSettings.ModifySerialization(_ => _.IgnoreMembersWithType()); + VerifierSettings.IgnoreMembersWithType(); DiffRunner.Disabled = false; DiffTools.UseOrder(DiffTool.VisualStudioCode, DiffTool.Rider, DiffTool.WinMerge, DiffTool.VisualStudio); } diff --git a/test/BililiveRecorder.Flv.Tests/BililiveRecorder.Flv.Tests.csproj b/test/BililiveRecorder.Flv.Tests/BililiveRecorder.Flv.Tests.csproj index 9f5dae6..a30e45e 100644 --- a/test/BililiveRecorder.Flv.Tests/BililiveRecorder.Flv.Tests.csproj +++ b/test/BililiveRecorder.Flv.Tests/BililiveRecorder.Flv.Tests.csproj @@ -12,7 +12,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/BililiveRecorder.Flv.Tests/VerifyConfig.cs b/test/BililiveRecorder.Flv.Tests/VerifyConfig.cs index 2c0870c..eb13265 100644 --- a/test/BililiveRecorder.Flv.Tests/VerifyConfig.cs +++ b/test/BililiveRecorder.Flv.Tests/VerifyConfig.cs @@ -19,7 +19,7 @@ namespace BililiveRecorder.Flv.Tests return Expectations.Initialize(sourceFile, projectDirectory, type, method); }); - VerifierSettings.ModifySerialization(_ => _.IgnoreMembersWithType()); + VerifierSettings.IgnoreMembersWithType(); DiffRunner.Disabled = false; DiffTools.UseOrder(DiffTool.VisualStudioCode, DiffTool.Rider, DiffTool.WinMerge, DiffTool.VisualStudio); }