From 42f259981e51fd278952a64b37c227d8424661e4 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sun, 28 Jun 2026 22:34:26 +0000 Subject: [PATCH 1/2] Bump package dependencies Co-authored-by: Daniel Cazzulino --- src/Attributed/Attributed.msbuildproj | 6 +++--- src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj | 4 ++-- .../DependencyInjection.CodeAnalysis.csproj | 6 +++--- .../DependencyInjection.CodeFixes.csproj | 2 +- .../DependencyInjection.Tests.csproj | 14 +++++++------- src/NoAddServices/NoAddServices.csproj | 2 +- .../DependencyInjection.Package.msbuildproj | 4 ++-- src/Samples/ConsoleApp/ConsoleApp.csproj | 2 +- src/Samples/Library1/Library1.csproj | 4 ++-- src/Samples/Library2/Library2.csproj | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Attributed/Attributed.msbuildproj b/src/Attributed/Attributed.msbuildproj index f9b18df..1849601 100644 --- a/src/Attributed/Attributed.msbuildproj +++ b/src/Attributed/Attributed.msbuildproj @@ -1,4 +1,4 @@ - + net6.0 Devlooped.Extensions.DependencyInjection.Attributed @@ -6,7 +6,7 @@ 2.2.0 - - + + \ No newline at end of file diff --git a/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj b/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj index c32ed8f..b623a81 100644 --- a/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj +++ b/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/DependencyInjection.CodeAnalysis/DependencyInjection.CodeAnalysis.csproj b/src/DependencyInjection.CodeAnalysis/DependencyInjection.CodeAnalysis.csproj index 3cd2803..0ecce7f 100644 --- a/src/DependencyInjection.CodeAnalysis/DependencyInjection.CodeAnalysis.csproj +++ b/src/DependencyInjection.CodeAnalysis/DependencyInjection.CodeAnalysis.csproj @@ -13,11 +13,11 @@ - + - - + + diff --git a/src/DependencyInjection.CodeFixes/DependencyInjection.CodeFixes.csproj b/src/DependencyInjection.CodeFixes/DependencyInjection.CodeFixes.csproj index 725ce2f..e60d622 100644 --- a/src/DependencyInjection.CodeFixes/DependencyInjection.CodeFixes.csproj +++ b/src/DependencyInjection.CodeFixes/DependencyInjection.CodeFixes.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/DependencyInjection.Tests/DependencyInjection.Tests.csproj b/src/DependencyInjection.Tests/DependencyInjection.Tests.csproj index dbb8650..7c17f8c 100644 --- a/src/DependencyInjection.Tests/DependencyInjection.Tests.csproj +++ b/src/DependencyInjection.Tests/DependencyInjection.Tests.csproj @@ -11,16 +11,16 @@ - + - - - - - + + + + + - + diff --git a/src/NoAddServices/NoAddServices.csproj b/src/NoAddServices/NoAddServices.csproj index 337464a..77d7a4d 100644 --- a/src/NoAddServices/NoAddServices.csproj +++ b/src/NoAddServices/NoAddServices.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Package/DependencyInjection.Package.msbuildproj b/src/Package/DependencyInjection.Package.msbuildproj index 111874b..a8d861e 100644 --- a/src/Package/DependencyInjection.Package.msbuildproj +++ b/src/Package/DependencyInjection.Package.msbuildproj @@ -1,4 +1,4 @@ - + netstandard2.0 Devlooped.Extensions.DependencyInjection @@ -12,7 +12,7 @@ true - + diff --git a/src/Samples/ConsoleApp/ConsoleApp.csproj b/src/Samples/ConsoleApp/ConsoleApp.csproj index 40c131b..5c5985b 100644 --- a/src/Samples/ConsoleApp/ConsoleApp.csproj +++ b/src/Samples/ConsoleApp/ConsoleApp.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Samples/Library1/Library1.csproj b/src/Samples/Library1/Library1.csproj index 19c6bc1..7ffde4b 100644 --- a/src/Samples/Library1/Library1.csproj +++ b/src/Samples/Library1/Library1.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Samples/Library2/Library2.csproj b/src/Samples/Library2/Library2.csproj index 8385702..74574a0 100644 --- a/src/Samples/Library2/Library2.csproj +++ b/src/Samples/Library2/Library2.csproj @@ -5,8 +5,8 @@ - - + + From 31677c09820b11357ceff0e9e86584d4ae0bf911 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sun, 28 Jun 2026 22:37:45 +0000 Subject: [PATCH 2/2] Update Spectre CLI regression test Co-authored-by: Daniel Cazzulino --- src/DependencyInjection.Tests/Regressions.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/DependencyInjection.Tests/Regressions.cs b/src/DependencyInjection.Tests/Regressions.cs index 6f1cfdc..b8b04ff 100644 --- a/src/DependencyInjection.Tests/Regressions.cs +++ b/src/DependencyInjection.Tests/Regressions.cs @@ -1,5 +1,6 @@ using System; using System.Threading; +using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Moq; using Spectre.Console.Cli; @@ -9,7 +10,7 @@ namespace Tests.Regressions; public class Regressions { [Fact] - public void CovariantRegistrationSatisfiesIntefaceConstraints() + public async Task CovariantRegistrationSatisfiesIntefaceConstraints() { var collection = new ServiceCollection(); collection.AddServices(typeof(ICommand)); @@ -18,7 +19,7 @@ public void CovariantRegistrationSatisfiesIntefaceConstraints() var command = provider.GetRequiredService(); - Assert.Equal(0, command.Execute(new CommandContext([], Mock.Of(), "my", null), + Assert.Equal(0, await ((ICommand)command).ExecuteAsync(new CommandContext([], Mock.Of(), "my", null), new MySetting { Base = "", Name = "" }, default)); } } @@ -44,7 +45,7 @@ public class MyCommand : BaseCommand { } public abstract class BaseCommand : Command where TSettings : BaseSetting, ISetting { - public override int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken) + protected override int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken) { Console.WriteLine($"Base: {settings.Base}, Name: {settings.Name}"); return 0;