From 2730b29cb655c90f92f86a09a7b530a7d5e4a2a5 Mon Sep 17 00:00:00 2001 From: sysadmin Date: Wed, 10 Jun 2026 09:08:14 +0100 Subject: [PATCH] refactor(toolbox): drop unused IProcessRunner from ApplyService ctor Co-Authored-By: Claude Sonnet 4.6 --- windows/welcome/src/SilverOS.Welcome.App/MauiProgram.cs | 1 - .../welcome/src/SilverOS.Welcome.Core/Apply/ApplyService.cs | 2 +- .../tests/SilverOS.Welcome.Tests/ApplyServiceTests.cs | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/windows/welcome/src/SilverOS.Welcome.App/MauiProgram.cs b/windows/welcome/src/SilverOS.Welcome.App/MauiProgram.cs index 34113bf..bbbbd37 100644 --- a/windows/welcome/src/SilverOS.Welcome.App/MauiProgram.cs +++ b/windows/welcome/src/SilverOS.Welcome.App/MauiProgram.cs @@ -39,7 +39,6 @@ public static class MauiProgram var appsDir = Path.Combine(AppContext.BaseDirectory, "apps"); builder.Services.AddSingleton(sp => new AppInstaller(sp.GetRequiredService(), appsDir)); builder.Services.AddSingleton(sp => new ApplyService( - sp.GetRequiredService(), sp.GetRequiredService(), sp.GetRequiredService())); builder.Services.AddScoped(); diff --git a/windows/welcome/src/SilverOS.Welcome.Core/Apply/ApplyService.cs b/windows/welcome/src/SilverOS.Welcome.Core/Apply/ApplyService.cs index c51f88c..a77dad2 100644 --- a/windows/welcome/src/SilverOS.Welcome.Core/Apply/ApplyService.cs +++ b/windows/welcome/src/SilverOS.Welcome.Core/Apply/ApplyService.cs @@ -4,7 +4,7 @@ namespace SilverOS.Welcome.Core.Apply; // Toolbox Apply pipeline: apps -> bitlocker -> done. // Account creation moved to Windows Setup (WinPE collector); OS hardening runs from // SetupComplete; sm-bootstrap teardown is owned by Setup, not the toolbox. -public sealed class ApplyService(IProcessRunner runner, IBitLockerService bitlocker, IAppInstaller installer) : IApplyService +public sealed class ApplyService(IBitLockerService bitlocker, IAppInstaller installer) : IApplyService { public async Task RunAsync(ApplyRequest req, IProgress progress, CancellationToken ct = default) { diff --git a/windows/welcome/tests/SilverOS.Welcome.Tests/ApplyServiceTests.cs b/windows/welcome/tests/SilverOS.Welcome.Tests/ApplyServiceTests.cs index 3b8262b..dc484b6 100644 --- a/windows/welcome/tests/SilverOS.Welcome.Tests/ApplyServiceTests.cs +++ b/windows/welcome/tests/SilverOS.Welcome.Tests/ApplyServiceTests.cs @@ -33,7 +33,7 @@ public class ApplyServiceTests It.IsAny>(), It.IsAny())) .Callback(() => order.Add("apps")).ReturnsAsync(Array.Empty()); - var sut = new ApplyService(run.Object, bl.Object, installer.Object); + var sut = new ApplyService(bl.Object, installer.Object); var req = new ApplyRequest(Flavour(), "123456", System.Array.Empty()); var progress = new List(); @@ -59,7 +59,7 @@ public class ApplyServiceTests It.IsAny>(), It.IsAny())) .Callback(() => order.Add("apps")).ReturnsAsync(Array.Empty()); - var sut = new ApplyService(run.Object, bl.Object, installer.Object); + var sut = new ApplyService(bl.Object, installer.Object); var req = new ApplyRequest(Flavour(), "", System.Array.Empty()); await sut.RunAsync(req, new Progress(_ => { })); @@ -78,7 +78,7 @@ public class ApplyServiceTests var installer = NoApps(); var apps = new[] { new AppCatalogEntry { Id = "firefox", Name = "Firefox" } }; - var sut = new ApplyService(run.Object, bl.Object, installer.Object); + var sut = new ApplyService(bl.Object, installer.Object); var req = new ApplyRequest(Flavour(), "123456", apps); await sut.RunAsync(req, new Progress(_ => { }));