updated deps

RocketSurgeonsGuild · Nov 27, 2024 · abc80d9 · abc80d9
1 parent b045840
commit abc80d9
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 72 deletions.
diff --git 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
@@ -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/[email protected]
         with:
           name: 'actions'

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0" encoding="utf-8" ?>
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
@@ -30,9 +29,9 @@
         <PackageVersion Include="Polyfill" Version="7.5.0" />
         <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
         <PackageVersion Include="GitVersion.Tool" Version="6.0.5" />
-        <PackageVersion Include="Nuke.Common" Version="8.1.4" />
+        <PackageVersion Include="Nuke.Common" Version="9.0.1" />
         <PackageVersion Include="ReportGenerator" Version="5.4.1" />
-        <PackageVersion Include="Rocket.Surgery.Nuke" Version="2.8.119" />
+        <PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.1" />
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
         <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
@@ -47,7 +46,7 @@
         <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
         <PackageVersion Include="System.Interactive" Version="6.0.1" />
         <PackageVersion Include="System.Interactive.Async" Version="6.0.1" />
-        <PackageVersion Include="System.Text.Json" Version="8.0.0" />
+        <PackageVersion Include="System.Text.Json" Version="9.0.0" />
         <PackageVersion Include="System.Reactive" Version="6.0.1" />
         <PackageVersion Include="System.Reactive.Observable.Aliases" Version="6.0.1" />
         <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
@@ -58,15 +57,16 @@
         <PackageVersion Include="FakeItEasy" Version="8.3.0" />
         <PackageVersion Include="FluentAssertions" Version="6.12.2" />
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="8.0.18" />
-        <PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="8.0.18" />
-        <PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="8.0.18" />
+        <PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="9.0.0" />
+        <PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="9.0.0" />
+        <PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="9.0.0" />
         <PackageVersion Include="Verify.Xunit" Version="28.3.2" />
         <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
         <PackageVersion Include="xunit" Version="2.9.2" />
         <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
     <Import
         Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props"
-        Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" />
+        Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')"
+    />
 </Project>
diff --git a/Directory.Packages.support.props b/Directory.Packages.support.props
@@ -2,13 +2,13 @@
 
 <Project>
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-        <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-        <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-        <PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-        <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-        <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
+        <PackageVersion Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
+        <PackageVersion Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+        <PackageVersion Update="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
+        <PackageVersion Update="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+        <PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+        <PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+        <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+        <PackageVersion Update="System.Collections.Immutable" Version="8.0.0" />
     </ItemGroup>
 </Project>
diff --git 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>(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
@@ -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
@@ -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
@@ -24,12 +24,8 @@
 
 namespace Rocket.Surgery.Extensions.Tests;
 
-public class JsonBinderTests : AutoFakeTest
+public class JsonBinderTests(ITestOutputHelper outputHelper) : AutoFakeTest<XUnitTestContext>(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<string, string>(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
@@ -5,12 +5,8 @@
 
 namespace Rocket.Surgery.Extensions.Tests;
 
-public class DeconstructorExtensionsTests : AutoFakeTest
+public class DeconstructorExtensionsTests(ITestOutputHelper outputHelper) : AutoFakeTest<XUnitTestContext>(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
@@ -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<XUnitTestContext>
 {
     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
@@ -10,17 +10,16 @@
 
 namespace Rocket.Surgery.Extensions.Tests.DependencyInjection;
 
-public class ExecuteScopedTests : LoggerTest
+public class ExecuteScopedTests : LoggerTest<XUnitTestContext>
 {
-    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<Service1>()
                           .AddScoped<Service2>()
                           .AddScoped<Service3>()

diff --git 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.
 /// </summary>
-public class Base3264EncodingTests : AutoFakeTest
+public class Base3264EncodingTests : AutoFakeTest<XUnitTestContext>
 {
     [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
@@ -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.
 /// </summary>
-public class Base32UrlTests : AutoFakeTest
+public class Base32UrlTests : AutoFakeTest<XUnitTestContext>
 {
     [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
@@ -8,12 +8,8 @@
 #pragma warning disable CS8618
 namespace Rocket.Surgery.Extensions.Tests;
 
-public class NullableTests : LoggerTest
+public class NullableTests(ITestOutputHelper outputHelper) : LoggerTest<XUnitTestContext>(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
@@ -8,14 +8,9 @@
 
 namespace Rocket.Surgery.Extensions.Tests.Observables;
 
-public class DebounceTests : LoggerTest
+public class DebounceTests(ITestOutputHelper testOutputHelper) : LoggerTest<XUnitTestContext>(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
@@ -8,14 +8,9 @@
 
 namespace Rocket.Surgery.Extensions.Tests.Observables;
 
-public class RealThrottleTests : LoggerTest
+public class RealThrottleTests(ITestOutputHelper testOutputHelper) : LoggerTest<XUnitTestContext>(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
@@ -8,12 +8,8 @@
 
 namespace Rocket.Surgery.Extensions.Tests;
 
-public class PropertyGetterTests : AutoFakeTest
+public class PropertyGetterTests(ITestOutputHelper outputHelper) : AutoFakeTest<XUnitTestContext>(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
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\Binding.Extensions\Rocket.Surgery.Extensions.Binding.csproj" />