From bfc8dc229e1296b3292b141c1da163a5a8577d2e Mon Sep 17 00:00:00 2001 From: Mihail Gribkov <61027276+Misha-133@users.noreply.github.com> Date: Tue, 19 Mar 2024 00:23:01 +0300 Subject: [PATCH] Update library dependencies (#2806) * bump dependencies * sealed class * forgot to push * downgrade `IDisposableAnalyzers` to `4.0.2` * also forgot to push * Update docs.yml * samples => `net8.0` | deps more up to date * mark as non-trimmable & remove some cringe conditions * format for beauty --- .github/workflows/docs.yml | 2 -- .../Discord.Net.BuildOverrides.csproj | 4 +++- samples/BasicBot/_BasicBot.csproj | 4 ++-- .../_InteractionFramework.csproj | 14 +++++------ samples/ShardedClient/_ShardedClient.csproj | 6 ++--- .../_TextCommandFramework.csproj | 8 +++---- samples/WebhookClient/_WebhookClient.csproj | 4 ++-- samples/idn/idn.csproj | 4 ++-- .../Discord.Net.Analyzers.csproj | 4 +++- .../Discord.Net.Commands.csproj | 2 ++ src/Discord.Net.Core/Discord.Net.Core.csproj | 24 +++++++------------ .../Utils/Paging/PagedEnumerator.cs | 2 +- .../Discord.Net.Examples.csproj | 4 ++-- .../Discord.Net.Interactions.csproj | 10 ++++---- src/Discord.Net.Rest/Discord.Net.Rest.csproj | 2 ++ .../Discord.Net.WebSocket.csproj | 2 ++ .../Discord.Net.Webhook.csproj | 2 ++ .../Discord.Net.Analyzers.Tests.csproj | 8 +++---- .../Verifiers/CodeFixVerifier.cs | 3 +-- .../Verifiers/DiagnosticVerifier.cs | 24 +++++++------------ .../Discord.Net.Tests.Integration.csproj | 8 +++---- .../Discord.Net.Tests.Unit.csproj | 10 ++++---- 22 files changed, 73 insertions(+), 78 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2c58fda6..d611e3f2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,8 +6,6 @@ on: - '*' paths: - 'docs/**' - branches: - - 'dev' workflow_dispatch: pull_request: paths: diff --git a/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj b/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj index 25b1c40b..8667a225 100644 --- a/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj +++ b/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj @@ -7,10 +7,12 @@ A Discord.Net extension adding a way to add build overrides for testing. net6.0;net5.0; net6.0;net5.0; + false + false - + diff --git a/samples/BasicBot/_BasicBot.csproj b/samples/BasicBot/_BasicBot.csproj index 9f56dede..7c61bcad 100644 --- a/samples/BasicBot/_BasicBot.csproj +++ b/samples/BasicBot/_BasicBot.csproj @@ -2,11 +2,11 @@ Exe - net6.0 + net8.0 - + diff --git a/samples/InteractionFramework/_InteractionFramework.csproj b/samples/InteractionFramework/_InteractionFramework.csproj index dbaaec69..4d73d736 100644 --- a/samples/InteractionFramework/_InteractionFramework.csproj +++ b/samples/InteractionFramework/_InteractionFramework.csproj @@ -2,18 +2,18 @@ Exe - net6.0 + net8.0 InteractionFramework - - - - - - + + + + + + diff --git a/samples/ShardedClient/_ShardedClient.csproj b/samples/ShardedClient/_ShardedClient.csproj index d2af3be4..d37cb24e 100644 --- a/samples/ShardedClient/_ShardedClient.csproj +++ b/samples/ShardedClient/_ShardedClient.csproj @@ -2,13 +2,13 @@ Exe - net6.0 + net8.0 ShardedClient - - + + diff --git a/samples/TextCommandFramework/_TextCommandFramework.csproj b/samples/TextCommandFramework/_TextCommandFramework.csproj index fdf7990e..5fab4f02 100644 --- a/samples/TextCommandFramework/_TextCommandFramework.csproj +++ b/samples/TextCommandFramework/_TextCommandFramework.csproj @@ -2,14 +2,14 @@ Exe - net6.0 + net8.0 TextCommandFramework - - - + + + diff --git a/samples/WebhookClient/_WebhookClient.csproj b/samples/WebhookClient/_WebhookClient.csproj index 749dcaaa..d0ce98c0 100644 --- a/samples/WebhookClient/_WebhookClient.csproj +++ b/samples/WebhookClient/_WebhookClient.csproj @@ -2,12 +2,12 @@ Exe - net6.0 + net8.0 WebHookClient - + diff --git a/samples/idn/idn.csproj b/samples/idn/idn.csproj index fafb3df3..85b26b50 100644 --- a/samples/idn/idn.csproj +++ b/samples/idn/idn.csproj @@ -2,11 +2,11 @@ Exe - net5.0 + net8.0 - + diff --git a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj index 5fe98fc8..a44e9721 100644 --- a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj +++ b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj @@ -5,9 +5,11 @@ Discord.Analyzers A Discord.Net extension adding support for design-time analysis of the API usage. netstandard2.0;netstandard2.1 + false + false - + diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj index 8a888180..633fcb3e 100644 --- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj +++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj @@ -8,6 +8,8 @@ net6.0;net5.0;net461;netstandard2.0;netstandard2.1 5 True + false + false diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj index 0ed4a28a..1755ab52 100644 --- a/src/Discord.Net.Core/Discord.Net.Core.csproj +++ b/src/Discord.Net.Core/Discord.Net.Core.csproj @@ -8,27 +8,19 @@ net6.0;net5.0;net461;netstandard2.0;netstandard2.1 5 True + false + false - - - + + + + + all - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs b/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs index 2b85735b..29ce3fdd 100644 --- a/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs +++ b/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs @@ -26,7 +26,7 @@ namespace Discord } public IAsyncEnumerator> GetAsyncEnumerator(CancellationToken cancellationToken = new CancellationToken()) => new Enumerator(this, cancellationToken); - internal class Enumerator : IAsyncEnumerator> + internal sealed class Enumerator : IAsyncEnumerator> { private readonly PagedAsyncEnumerable _source; private readonly CancellationToken _token; diff --git a/src/Discord.Net.Examples/Discord.Net.Examples.csproj b/src/Discord.Net.Examples/Discord.Net.Examples.csproj index 1bdca799..5fca6159 100644 --- a/src/Discord.Net.Examples/Discord.Net.Examples.csproj +++ b/src/Discord.Net.Examples/Discord.Net.Examples.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 @@ -15,7 +15,7 @@ - + diff --git a/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj b/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj index dbb8613b..7810c6a2 100644 --- a/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj +++ b/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj @@ -8,6 +8,8 @@ A Discord.Net extension adding support for Application Commands. 5 True + false + false @@ -17,11 +19,11 @@ - - - + + + - + diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj index 66643ffa..53b6a7b1 100644 --- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj +++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj @@ -8,6 +8,8 @@ net6.0;net5.0;net461;netstandard2.0;netstandard2.1 5 True + false + false diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj index 18e2e8c2..cbabc1f5 100644 --- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj +++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj @@ -9,6 +9,8 @@ true 5 True + false + false diff --git a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj index 1e3c3f7f..9ce1bdab 100644 --- a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj +++ b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj @@ -8,6 +8,8 @@ net6.0;net5.0;netstandard2.0;netstandard2.1 5 True + false + false diff --git a/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj b/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj index 460a2c9e..abb8a0f4 100644 --- a/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj +++ b/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj @@ -15,10 +15,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Discord.Net.Analyzers.Tests/Verifiers/CodeFixVerifier.cs b/test/Discord.Net.Analyzers.Tests/Verifiers/CodeFixVerifier.cs index d1cb6cd1..570f8b4d 100644 --- a/test/Discord.Net.Analyzers.Tests/Verifiers/CodeFixVerifier.cs +++ b/test/Discord.Net.Analyzers.Tests/Verifiers/CodeFixVerifier.cs @@ -108,8 +108,7 @@ namespace TestHelper document = document.WithSyntaxRoot(Formatter.Format(document.GetSyntaxRootAsync().Result, Formatter.Annotation, document.Project.Solution.Workspace)); newCompilerDiagnostics = GetNewDiagnostics(compilerDiagnostics, GetCompilerDiagnostics(document)); - Assert.True(false, - string.Format("Fix introduced new compiler diagnostics:\r\n{0}\r\n\r\nNew document:\r\n{1}\r\n", + Assert.Fail(string.Format("Fix introduced new compiler diagnostics:\r\n{0}\r\n\r\nNew document:\r\n{1}\r\n", string.Join("\r\n", newCompilerDiagnostics.Select(d => d.ToString())), document.GetSyntaxRootAsync().Result.ToFullString())); } diff --git a/test/Discord.Net.Analyzers.Tests/Verifiers/DiagnosticVerifier.cs b/test/Discord.Net.Analyzers.Tests/Verifiers/DiagnosticVerifier.cs index 542d2a85..3f64c3a5 100644 --- a/test/Discord.Net.Analyzers.Tests/Verifiers/DiagnosticVerifier.cs +++ b/test/Discord.Net.Analyzers.Tests/Verifiers/DiagnosticVerifier.cs @@ -110,8 +110,7 @@ namespace TestHelper { string diagnosticsOutput = actualResults.Any() ? FormatDiagnostics(analyzer, actualResults.ToArray()) : " NONE."; - Assert.True(false, - string.Format("Mismatch between number of diagnostics returned, expected \"{0}\" actual \"{1}\"\r\n\r\nDiagnostics:\r\n{2}\r\n", expectedCount, actualCount, diagnosticsOutput)); + Assert.Fail(string.Format("Mismatch between number of diagnostics returned, expected \"{0}\" actual \"{1}\"\r\n\r\nDiagnostics:\r\n{2}\r\n", expectedCount, actualCount, diagnosticsOutput)); } for (int i = 0; i < expectedResults.Length; i++) @@ -123,8 +122,7 @@ namespace TestHelper { if (actual.Location != Location.None) { - Assert.True(false, - string.Format("Expected:\nA project diagnostic with No location\nActual:\n{0}", + Assert.Fail(string.Format("Expected:\nA project diagnostic with No location\nActual:\n{0}", FormatDiagnostics(analyzer, actual))); } } @@ -135,8 +133,7 @@ namespace TestHelper if (additionalLocations.Length != expected.Locations.Length - 1) { - Assert.True(false, - string.Format("Expected {0} additional locations but got {1} for Diagnostic:\r\n {2}\r\n", + Assert.Fail(string.Format("Expected {0} additional locations but got {1} for Diagnostic:\r\n {2}\r\n", expected.Locations.Length - 1, additionalLocations.Length, FormatDiagnostics(analyzer, actual))); } @@ -149,22 +146,19 @@ namespace TestHelper if (actual.Id != expected.Id) { - Assert.True(false, - string.Format("Expected diagnostic id to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", + Assert.Fail(string.Format("Expected diagnostic id to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Id, actual.Id, FormatDiagnostics(analyzer, actual))); } if (actual.Severity != expected.Severity) { - Assert.True(false, - string.Format("Expected diagnostic severity to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", + Assert.Fail(string.Format("Expected diagnostic severity to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Severity, actual.Severity, FormatDiagnostics(analyzer, actual))); } if (actual.GetMessage() != expected.Message) { - Assert.True(false, - string.Format("Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", + Assert.Fail(string.Format("Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Message, actual.GetMessage(), FormatDiagnostics(analyzer, actual))); } } @@ -192,8 +186,7 @@ namespace TestHelper { if (actualLinePosition.Line + 1 != expected.Line) { - Assert.True(false, - string.Format("Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", + Assert.Fail(string.Format("Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Line, actualLinePosition.Line + 1, FormatDiagnostics(analyzer, diagnostic))); } } @@ -203,8 +196,7 @@ namespace TestHelper { if (actualLinePosition.Character + 1 != expected.Column) { - Assert.True(false, - string.Format("Expected diagnostic to start at column \"{0}\" was actually at column \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", + Assert.Fail(string.Format("Expected diagnostic to start at column \"{0}\" was actually at column \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Column, actualLinePosition.Character + 1, FormatDiagnostics(analyzer, diagnostic))); } } diff --git a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj index 7b8257bf..1d7d9b1c 100644 --- a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj +++ b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj @@ -14,10 +14,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj index 937a5fb9..b16b6b18 100644 --- a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj +++ b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj @@ -12,11 +12,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive