From abc80d9a63a3eea97ce5f560b384b1f9548c55fc Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Tue, 26 Nov 2024 21:24:09 -0500 Subject: [PATCH] updated deps --- .config/dotnet-tools.json | 2 +- .github/workflows/ci.yml | 6 ++++-- Directory.Packages.props | 18 +++++++++--------- Directory.Packages.support.props | 16 ++++++++-------- .../GeneratorTest.cs | 3 ++- .../StaticScanningTests.cs | 4 ++-- .../StaticScanning_WithAssemblyLoadTests.cs | 2 +- test/Extensions.Tests/BindingTests.cs | 10 +++------- .../DeconstructorExtensionsTests.cs | 6 +----- .../ExecuteScopedOptionalTests.cs | 5 +++-- .../DependencyInjection/ExecuteScopedTests.cs | 9 ++++----- .../Encoding/Base3264EncodingTests.cs | 4 ++-- .../Encoding/Base32UrlTests.cs | 4 ++-- test/Extensions.Tests/NullableTests.cs | 6 +----- .../Observables/DebounceTests.cs | 9 ++------- .../Observables/RealThrottleTests.cs | 9 ++------- test/Extensions.Tests/PropertyGetterTests.cs | 6 +----- .../Rocket.Surgery.Extensions.Tests.csproj | 2 +- 18 files changed, 49 insertions(+), 72 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6f90df91b..343365768 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -13,7 +13,7 @@ "rollForward": false }, "nuke.globaltool": { - "version": "8.1.4", + "version": "9.0.1", "commands": ["nuke"], "rollForward": false }, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b14c682fa..15c9caf0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,14 +164,16 @@ jobs: name: 'coverage' path: 'coverage/' - name: 📫 Publish Coverage Comment - if: github.event_name == 'pull_request' + if: always() && github.event_name == 'pull_request' + continue-on-error: true uses: marocchino/sticky-pull-request-comment@v2 with: header: 'Coverage' path: 'coverage/summary/SummaryGithub.md' GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' - name: 📫 Publish Codecov Coverage - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || ((github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'dependabot[bot]') + if: always() && (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || ((github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'dependabot[bot]') + continue-on-error: true uses: codecov/codecov-action@v5.0.7 with: name: 'actions' diff --git a/Directory.Packages.props b/Directory.Packages.props index b46446b64..a499e1e53 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,5 +1,4 @@ - - + true @@ -30,9 +29,9 @@ - + - + @@ -47,7 +46,7 @@ - + @@ -58,9 +57,9 @@ - - - + + + @@ -68,5 +67,6 @@ + Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" + /> diff --git a/Directory.Packages.support.props b/Directory.Packages.support.props index 9243c23b3..ab09c13ee 100644 --- a/Directory.Packages.support.props +++ b/Directory.Packages.support.props @@ -2,13 +2,13 @@ - - - - - - - - + + + + + + + + diff --git a/test/DependencyInjection.Analyzers.Tests/GeneratorTest.cs b/test/DependencyInjection.Analyzers.Tests/GeneratorTest.cs index 1df759a9c..bf06f4902 100644 --- a/test/DependencyInjection.Analyzers.Tests/GeneratorTest.cs +++ b/test/DependencyInjection.Analyzers.Tests/GeneratorTest.cs @@ -6,12 +6,13 @@ using Rocket.Surgery.DependencyInjection.Compiled; using Rocket.Surgery.Extensions.Testing; using Rocket.Surgery.Extensions.Testing.SourceGenerators; +using Serilog.Events; using Xunit.Abstractions; namespace Rocket.Surgery.DependencyInjection.Analyzers.Tests; public abstract class GeneratorTest - (ITestOutputHelper testOutputHelper, bool compiled_scan_assembly_load) : LoggerTest(testOutputHelper, LogLevel.Trace), IAsyncLifetime + (ITestOutputHelper testOutputHelper, bool compiled_scan_assembly_load) : LoggerTest(XUnitTestContext.Create(testOutputHelper)), IAsyncLifetime { public GeneratorTestContextBuilder Builder { get; protected set; } = null!; public AssemblyLoadContext AssemblyLoadContext { get; } = new CollectibleTestAssemblyLoadContext(); diff --git a/test/DependencyInjection.Analyzers.Tests/StaticScanningTests.cs b/test/DependencyInjection.Analyzers.Tests/StaticScanningTests.cs index 7ba5d6cc1..eb2a16d37 100644 --- a/test/DependencyInjection.Analyzers.Tests/StaticScanningTests.cs +++ b/test/DependencyInjection.Analyzers.Tests/StaticScanningTests.cs @@ -2,8 +2,8 @@ using System.Runtime.Loader; using Microsoft.CodeAnalysis; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Rocket.Surgery.Extensions.Testing.SourceGenerators; +using Serilog; using Xunit.Abstractions; namespace Rocket.Surgery.DependencyInjection.Analyzers.Tests; @@ -1683,7 +1683,7 @@ static IServiceCollection LoadServices() .AsImplementedInterfaces() .With{{serviceLifetime}}Lifetime() ); - + provider.Scan( services, z => z diff --git a/test/DependencyInjection.Analyzers.Tests/StaticScanning_WithAssemblyLoadTests.cs b/test/DependencyInjection.Analyzers.Tests/StaticScanning_WithAssemblyLoadTests.cs index 9e32a432f..83ec4a876 100644 --- a/test/DependencyInjection.Analyzers.Tests/StaticScanning_WithAssemblyLoadTests.cs +++ b/test/DependencyInjection.Analyzers.Tests/StaticScanning_WithAssemblyLoadTests.cs @@ -1,8 +1,8 @@ using System.Reflection; using System.Runtime.Loader; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Rocket.Surgery.Extensions.Testing.SourceGenerators; +using Serilog; using Xunit.Abstractions; namespace Rocket.Surgery.DependencyInjection.Analyzers.Tests; diff --git a/test/Extensions.Tests/BindingTests.cs b/test/Extensions.Tests/BindingTests.cs index bbb448c98..812ffebc4 100644 --- a/test/Extensions.Tests/BindingTests.cs +++ b/test/Extensions.Tests/BindingTests.cs @@ -24,12 +24,8 @@ namespace Rocket.Surgery.Extensions.Tests; -public class JsonBinderTests : AutoFakeTest +public class JsonBinderTests(ITestOutputHelper outputHelper) : AutoFakeTest(XUnitTestContext.Create(outputHelper)) { - public JsonBinderTests(ITestOutputHelper outputHelper) : base(outputHelper) - { - } - private class AutoProperty { public string Value { get; set; } @@ -414,7 +410,7 @@ public void BindsTo_ExtensionData(BindDelegate @delegate) result.CustomFields["something"].ToString().Should().Be("1123"); result.CustomFields["somethingelse"]["value"]!.ToString().Should().Be("1456"); - Logger.LogInformation(JsonConvert.SerializeObject(result.CustomFields)); + Logger.Information(JsonConvert.SerializeObject(result.CustomFields)); binder.From(result) .Select(x => new KeyValuePair(x.Key.ToLower(), x.Value)) @@ -465,7 +461,7 @@ public void Populates_Value(PopulateDelegate @delegate) result.ComplexProperty.CustomFields.Should().NotBeEmpty(); result.CustomFields.Should().NotBeEmpty(); - Logger.LogInformation(JsonConvert.SerializeObject(result.CustomFields)); + Logger.Information(JsonConvert.SerializeObject(result.CustomFields)); } diff --git a/test/Extensions.Tests/DeconstructorExtensionsTests.cs b/test/Extensions.Tests/DeconstructorExtensionsTests.cs index e4909fa02..583cca83f 100644 --- a/test/Extensions.Tests/DeconstructorExtensionsTests.cs +++ b/test/Extensions.Tests/DeconstructorExtensionsTests.cs @@ -5,12 +5,8 @@ namespace Rocket.Surgery.Extensions.Tests; -public class DeconstructorExtensionsTests : AutoFakeTest +public class DeconstructorExtensionsTests(ITestOutputHelper outputHelper) : AutoFakeTest(XUnitTestContext.Create(outputHelper)) { - public DeconstructorExtensionsTests(ITestOutputHelper outputHelper) : base(outputHelper) - { - } - [Fact] public void Deconstructs_TheTarget_KeyValuePair() { diff --git a/test/Extensions.Tests/DependencyInjection/ExecuteScopedOptionalTests.cs b/test/Extensions.Tests/DependencyInjection/ExecuteScopedOptionalTests.cs index 37cd94534..6c46aa436 100644 --- a/test/Extensions.Tests/DependencyInjection/ExecuteScopedOptionalTests.cs +++ b/test/Extensions.Tests/DependencyInjection/ExecuteScopedOptionalTests.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging; using Rocket.Surgery.DependencyInjection; using Rocket.Surgery.Extensions.Testing; +using Serilog.Events; using Xunit; using Xunit.Abstractions; @@ -11,12 +12,12 @@ namespace Rocket.Surgery.Extensions.Tests.DependencyInjection; -public class ExecuteScopedOptionalTests : LoggerTest +public class ExecuteScopedOptionalTests : LoggerTest { private int _value; private readonly IServiceProvider _serviceProvider; - public ExecuteScopedOptionalTests(ITestOutputHelper outputHelper) : base(outputHelper, LogLevel.Information) + public ExecuteScopedOptionalTests(ITestOutputHelper outputHelper) : base(XUnitTestContext.Create(outputHelper, LogEventLevel.Information)) { _value = 0; _serviceProvider = new ServiceCollection() diff --git a/test/Extensions.Tests/DependencyInjection/ExecuteScopedTests.cs b/test/Extensions.Tests/DependencyInjection/ExecuteScopedTests.cs index 1bea39816..a7f1ff8c9 100644 --- a/test/Extensions.Tests/DependencyInjection/ExecuteScopedTests.cs +++ b/test/Extensions.Tests/DependencyInjection/ExecuteScopedTests.cs @@ -10,17 +10,16 @@ namespace Rocket.Surgery.Extensions.Tests.DependencyInjection; -public class ExecuteScopedTests : LoggerTest +public class ExecuteScopedTests : LoggerTest { - private int _value; private readonly IServiceProvider _serviceProvider; - public ExecuteScopedTests(ITestOutputHelper outputHelper) : base(outputHelper, LogLevel.Information) + public ExecuteScopedTests(ITestOutputHelper outputHelper) : base(XUnitTestContext.Create(outputHelper)) { - _value = 0; + var value = 0; _serviceProvider = new ServiceCollection() .AddExecuteScopedServices() - .AddScoped(_ => new ScopedValue(_value++)) + .AddScoped(_ => new ScopedValue(value++)) .AddScoped() .AddScoped() .AddScoped() diff --git a/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs b/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs index 66bcee859..74fd992c8 100644 --- a/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs +++ b/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs @@ -10,7 +10,7 @@ namespace Rocket.Surgery.Extensions.Tests.Encoding; /// TODO: Anyone feels like it some more comprehensive testing of the crockford encoding would be helpful. Cheers, Mhano /// TODO: Tests evolved a bit over time, refactoring to organise might be needed if adding significant test cases. /// -public class Base3264EncodingTests : AutoFakeTest +public class Base3264EncodingTests : AutoFakeTest { [Fact] public void TestEncodeDecode() @@ -535,7 +535,7 @@ public void TestKnownValues() }*/ } - public Base3264EncodingTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + public Base3264EncodingTests(ITestOutputHelper outputHelper) : base(XUnitTestContext.Create(outputHelper)) { } private const string Chars = @"!""#$%&'()*+,-./:;<=>?@[\]^_`{|}~€‚ƒ„…†‡ˆ‰Š‹Œ¼½¾¿ÀÁÂÃÄÅÆÇÈÏÐÑÕ×ØÛÜÝÞßåæçéíðñõö÷øüýþÿabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ electricity 電 电 電 red 紅 红 紅"; diff --git a/test/Extensions.Tests/Encoding/Base32UrlTests.cs b/test/Extensions.Tests/Encoding/Base32UrlTests.cs index fdb4cf21e..51c4be424 100644 --- a/test/Extensions.Tests/Encoding/Base32UrlTests.cs +++ b/test/Extensions.Tests/Encoding/Base32UrlTests.cs @@ -10,7 +10,7 @@ namespace Rocket.Surgery.Extensions.Tests.Encoding; /// TODO: Anyone feels like it some more comprehensive testing of the crockford encoding would be helpful. Cheers, Mhano /// TODO: Tests evolved a bit over time, refactoring to organise might be needed if adding significant test cases. /// -public class Base32UrlTests : AutoFakeTest +public class Base32UrlTests : AutoFakeTest { [Fact] public void Rfc4648TestVectorsEncodeDecode() @@ -138,7 +138,7 @@ public void SequentialValuesSequentialLengths() } } - public Base32UrlTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + public Base32UrlTests(ITestOutputHelper outputHelper) : base(XUnitTestContext.Create(outputHelper)) { } private static readonly string[][] rfc4684TestVectors = { diff --git a/test/Extensions.Tests/NullableTests.cs b/test/Extensions.Tests/NullableTests.cs index baa04f5a6..890138337 100644 --- a/test/Extensions.Tests/NullableTests.cs +++ b/test/Extensions.Tests/NullableTests.cs @@ -8,12 +8,8 @@ #pragma warning disable CS8618 namespace Rocket.Surgery.Extensions.Tests; -public class NullableTests : LoggerTest +public class NullableTests(ITestOutputHelper outputHelper) : LoggerTest(XUnitTestContext.Create(outputHelper)) { - public NullableTests(ITestOutputHelper outputHelper) : base(outputHelper) - { - } - [Fact] public void Checks_Nullable_Property() { diff --git a/test/Extensions.Tests/Observables/DebounceTests.cs b/test/Extensions.Tests/Observables/DebounceTests.cs index 4be0f69ad..77d2cf2b2 100644 --- a/test/Extensions.Tests/Observables/DebounceTests.cs +++ b/test/Extensions.Tests/Observables/DebounceTests.cs @@ -8,14 +8,9 @@ namespace Rocket.Surgery.Extensions.Tests.Observables; -public class DebounceTests : LoggerTest +public class DebounceTests(ITestOutputHelper testOutputHelper) : LoggerTest(XUnitTestContext.Create(testOutputHelper)) { - private readonly TestScheduler _scheduler; - - public DebounceTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, LogLevel.Information) - { - _scheduler = new TestScheduler(); - } + private readonly TestScheduler _scheduler = new(); [Fact] public void Should_Debounce_On_Leading_Edge() diff --git a/test/Extensions.Tests/Observables/RealThrottleTests.cs b/test/Extensions.Tests/Observables/RealThrottleTests.cs index 26a53cc7f..a2939ca80 100644 --- a/test/Extensions.Tests/Observables/RealThrottleTests.cs +++ b/test/Extensions.Tests/Observables/RealThrottleTests.cs @@ -8,14 +8,9 @@ namespace Rocket.Surgery.Extensions.Tests.Observables; -public class RealThrottleTests : LoggerTest +public class RealThrottleTests(ITestOutputHelper testOutputHelper) : LoggerTest(XUnitTestContext.Create(testOutputHelper)) { - private readonly TestScheduler _scheduler; - - public RealThrottleTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, LogLevel.Information) - { - _scheduler = new TestScheduler(); - } + private readonly TestScheduler _scheduler = new(); [Fact] public void Should_Throttle_On_Leading_Edge() diff --git a/test/Extensions.Tests/PropertyGetterTests.cs b/test/Extensions.Tests/PropertyGetterTests.cs index b55b25584..c749f2b59 100644 --- a/test/Extensions.Tests/PropertyGetterTests.cs +++ b/test/Extensions.Tests/PropertyGetterTests.cs @@ -8,12 +8,8 @@ namespace Rocket.Surgery.Extensions.Tests; -public class PropertyGetterTests : AutoFakeTest +public class PropertyGetterTests(ITestOutputHelper outputHelper) : AutoFakeTest(XUnitTestContext.Create(outputHelper)) { - public PropertyGetterTests(ITestOutputHelper outputHelper) : base(outputHelper) - { - } - [Fact] public void Fixture_Thing() { diff --git a/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj b/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj index 33c8550af..0e308a279 100644 --- a/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj +++ b/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj @@ -1,6 +1,6 @@  - net8.0;net9.0 + net9.0