From f5e6f2c10a2a2bb06af0f054c73db10815b9ca56 Mon Sep 17 00:00:00 2001
From: Wibe van Klaveren <wibe.van.klaveren@quotationfactory.com>
Date: Thu, 1 Oct 2026 13:46:34 +0200
Subject: [PATCH 1/3] chore: Upgrade target framework to net10.0 and update
 package versions for compatibility

---
 Directory.Packages.props                               | 10 +++++-----
 global.json                                            |  4 ++--
 publish/publish-agent.ps1                              |  2 +-
 publish/published-latest-version.txt                   |  2 +-
 src/QF.BySoft.Entities/QF.BySoft.Entities.csproj       |  2 +-
 src/QF.BySoft.Integration/QF.BySoft.Integration.csproj |  2 +-
 src/QF.BySoft.LocalData/QF.BySoft.LocalData.csproj     |  2 +-
 .../QF.BySoft.Manufacturability.csproj                 |  2 +-
 src/QF.BySoft.Tests/QF.BySoft.Tests.csproj             |  2 +-
 src/QF.Integration.Common/QF.Integration.Common.csproj |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2736ab7..6ec62a3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
-    <MicrosoftExtensionsPatchVersion>9.0.20</MicrosoftExtensionsPatchVersion>
+    <MicrosoftExtensionsVersion>10.0.0</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsPatchVersion>10.0.12</MicrosoftExtensionsPatchVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <!-- External Libraries -->
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="coverlet.collector" Version="10.1.0" />
     <PackageVersion Include="ClosedXML" Version="0.104.2" />
     <PackageVersion Include="FluentAssertions" Version="8.8.0" />
     <PackageVersion Include="MediatR" Version="12.5.0" />
@@ -32,8 +32,8 @@
     <PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="Serilog" Version="4.4.0" />
-    <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
+    <PackageVersion Include="Serilog.Extensions.Hosting" Version="10.0.0" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
diff --git a/global.json b/global.json
index 394a392..35bdbc7 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "10.0.0",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }
-}
+}
\ No newline at end of file
diff --git a/publish/publish-agent.ps1 b/publish/publish-agent.ps1
index 35dd562..edf0776 100644
--- a/publish/publish-agent.ps1
+++ b/publish/publish-agent.ps1
@@ -7,7 +7,7 @@ $buildVersion
 New-Item -ItemType Directory -Force -Path ".\published"
 # Remove files/folders inside the published folder
 Remove-Item ".\published\*" -Recurse -Force
-dotnet publish ../src/QF.BySoft.Integration -r win-x64 -p:PublishSingleFile=true /p:Version=$buildVersion -f net9.0 -p:IncludeAllContentForSelfExtract=true -c Release /p:DebugType=none /p:DebugSymbols=false -o ./published/Integration
+dotnet publish ../src/QF.BySoft.Integration -r win-x64 -p:PublishSingleFile=true /p:Version=$buildVersion -f net10.0 -p:IncludeAllContentForSelfExtract=true -c Release /p:DebugType=none /p:DebugSymbols=false -o ./published/Integration
 Copy-Item "../src/QF.BySoft.Integration/appsettings.json" -Destination ".\published\Integration"
 Copy-Item ".\data" -Destination ".\published\Integration" -Recurse
 # Copy the manual
diff --git a/publish/published-latest-version.txt b/publish/published-latest-version.txt
index 9451b7a..41ee19b 100644
--- a/publish/published-latest-version.txt
+++ b/publish/published-latest-version.txt
@@ -1 +1 @@
-2026.03.25.18195
+2026.10.01.24738
diff --git a/src/QF.BySoft.Entities/QF.BySoft.Entities.csproj b/src/QF.BySoft.Entities/QF.BySoft.Entities.csproj
index 1f059d7..4340f62 100644
--- a/src/QF.BySoft.Entities/QF.BySoft.Entities.csproj
+++ b/src/QF.BySoft.Entities/QF.BySoft.Entities.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj b/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj
index c881e10..0c0b199 100644
--- a/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj
+++ b/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <UserSecretsId>eb167adc-6dc9-410b-968d-79e97bdcacb8</UserSecretsId>
   </PropertyGroup>
 
diff --git a/src/QF.BySoft.LocalData/QF.BySoft.LocalData.csproj b/src/QF.BySoft.LocalData/QF.BySoft.LocalData.csproj
index a1c5902..56ad2db 100644
--- a/src/QF.BySoft.LocalData/QF.BySoft.LocalData.csproj
+++ b/src/QF.BySoft.LocalData/QF.BySoft.LocalData.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/QF.BySoft.Manufacturability/QF.BySoft.Manufacturability.csproj b/src/QF.BySoft.Manufacturability/QF.BySoft.Manufacturability.csproj
index 5fab5ab..c3d6ba3 100644
--- a/src/QF.BySoft.Manufacturability/QF.BySoft.Manufacturability.csproj
+++ b/src/QF.BySoft.Manufacturability/QF.BySoft.Manufacturability.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj b/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj
index 7124111..e58fc15 100644
--- a/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj
+++ b/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);VSTHRD200</NoWarn>
     <!--
diff --git a/src/QF.Integration.Common/QF.Integration.Common.csproj b/src/QF.Integration.Common/QF.Integration.Common.csproj
index 7fe684b..37fd172 100644
--- a/src/QF.Integration.Common/QF.Integration.Common.csproj
+++ b/src/QF.Integration.Common/QF.Integration.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

From 3d82589abb7d851bfe32e5f14a702b834b4a6750 Mon Sep 17 00:00:00 2001
From: Wibe van Klaveren <wibe.van.klaveren@quotationfactory.com>
Date: Fri, 2 Oct 2026 09:54:49 +0200
Subject: [PATCH 2/3] refactor: Remove MediatR dependency and update
 AgentOutputFileWatcherService to use AgentOutputFileCreatedHandler

---
 Directory.Packages.props                            |  2 --
 .../Extensions/DependencyInjectionExtensions.cs     |  5 ++---
 .../AgentOutputFile/AgentOutputFileCreated.cs       |  6 ++----
 .../AgentOutputFileCreatedHandler.cs                |  5 ++---
 .../AgentOutputFileWatcherService.cs                | 13 ++++++-------
 .../QF.BySoft.Integration.csproj                    |  1 -
 .../QF.Integration.Common.csproj                    |  1 -
 7 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6ec62a3..a42230b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -15,8 +15,6 @@
     <PackageVersion Include="coverlet.collector" Version="10.1.0" />
     <PackageVersion Include="ClosedXML" Version="0.104.2" />
     <PackageVersion Include="FluentAssertions" Version="8.8.0" />
-    <PackageVersion Include="MediatR" Version="12.5.0" />
-    <PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsPatchVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsPatchVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="$(MicrosoftExtensionsPatchVersion)" />
diff --git a/src/QF.BySoft.Integration/Extensions/DependencyInjectionExtensions.cs b/src/QF.BySoft.Integration/Extensions/DependencyInjectionExtensions.cs
index e64be1f..87567d6 100644
--- a/src/QF.BySoft.Integration/Extensions/DependencyInjectionExtensions.cs
+++ b/src/QF.BySoft.Integration/Extensions/DependencyInjectionExtensions.cs
@@ -7,11 +7,10 @@ public static class DependencyInjectionExtensions
 {
     public static void AddFileWatchFeature(this IServiceCollection services)
     {
+        // register agent output file created handler
+        services.AddTransient<AgentOutputFileCreatedHandler>();
 
         // register agent output file watcher service
         services.AddHostedService<AgentOutputFileWatcherService>();
-
-        // register MediatR with current assembly
-        services.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(AgentOutputFileWatcherService).Assembly));
     }
 }
diff --git a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreated.cs b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreated.cs
index cea44dd..bc39e4c 100644
--- a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreated.cs
+++ b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreated.cs
@@ -1,8 +1,6 @@
-using MediatR;
+namespace QF.BySoft.Integration.Features.AgentOutputFile;
 
-namespace QF.BySoft.Integration.Features.AgentOutputFile;
-
-public class AgentOutputFileCreated : INotification
+public class AgentOutputFileCreated
 {
     public AgentOutputFileCreated(string filePath)
     {
diff --git a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreatedHandler.cs b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreatedHandler.cs
index effc55a..08a7e36 100644
--- a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreatedHandler.cs
+++ b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileCreatedHandler.cs
@@ -1,12 +1,11 @@
 using System.Threading;
 using System.Threading.Tasks;
-using MediatR;
 using Microsoft.Extensions.Logging;
 using QF.BySoft.Integration.Features.BySoftIntegration;
 
 namespace QF.BySoft.Integration.Features.AgentOutputFile;
 
-public class AgentOutputFileCreatedHandler : INotificationHandler<AgentOutputFileCreated>
+public class AgentOutputFileCreatedHandler
 {
     private readonly IBySoftIntegration _bySoftIntegration;
     private readonly ILogger<AgentOutputFileCreatedHandler> _logger;
@@ -19,7 +18,7 @@ public AgentOutputFileCreatedHandler(
         _bySoftIntegration = bySoftIntegration;
     }
 
-    public async Task Handle(AgentOutputFileCreated notification, CancellationToken cancellationToken)
+    public async Task HandleAsync(AgentOutputFileCreated notification, CancellationToken cancellationToken)
     {
         _logger.LogInformation("File created: {FilePath}", notification.FilePath);
 
diff --git a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs
index e5c2d1f..ae85bd5 100644
--- a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs
+++ b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Threading;
-using MediatR;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using QF.BySoft.Entities;
@@ -11,20 +10,20 @@ namespace QF.BySoft.Integration.Features.AgentOutputFile;
 
 /// <summary>
 ///     Service that watches on the output directory of the agent for *.json files
-///     Publishes an AgentOutputFileCreated notification if a file is created
+///     Calls AgentOutputFileCreatedHandler if a file is created
 /// </summary>
 public class AgentOutputFileWatcherService : FileWatcherService
 {
     private readonly ILogger<AgentOutputFileWatcherService> _logger;
-    private readonly IMediator _mediator;
+    private readonly AgentOutputFileCreatedHandler _handler;
     private readonly SemaphoreSlim _semaphore = new(1, 1);
 
     public AgentOutputFileWatcherService(
-        IMediator mediator,
+        AgentOutputFileCreatedHandler handler,
         IOptions<BySoftIntegrationSettings> options,
         ILogger<AgentOutputFileWatcherService> logger)
     {
-        _mediator = mediator;
+        _handler = handler;
         _logger = logger;
 
         // add file watcher to the agent output directory
@@ -49,7 +48,7 @@ protected override async void OnAllChanges(object sender, FileSystemEventArgs e)
             switch (e.ChangeType)
             {
                 case WatcherChangeTypes.Created:
-                    await _mediator.Publish(new AgentOutputFileCreated(e.FullPath));
+                    await _handler.HandleAsync(new AgentOutputFileCreated(e.FullPath), CancellationToken.None);
                     break;
                 case WatcherChangeTypes.Deleted:
                 case WatcherChangeTypes.Changed:
@@ -85,7 +84,7 @@ protected override async void OnExistingFile(object sender, FileSystemEventArgs
                 case WatcherChangeTypes.Renamed:
                     break;
                 case WatcherChangeTypes.All:
-                    await _mediator.Publish(new AgentOutputFileCreated(e.FullPath));
+                    await _handler.HandleAsync(new AgentOutputFileCreated(e.FullPath), CancellationToken.None);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
diff --git a/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj b/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj
index 0c0b199..af05964 100644
--- a/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj
+++ b/src/QF.BySoft.Integration/QF.BySoft.Integration.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
diff --git a/src/QF.Integration.Common/QF.Integration.Common.csproj b/src/QF.Integration.Common/QF.Integration.Common.csproj
index 37fd172..5170d90 100644
--- a/src/QF.Integration.Common/QF.Integration.Common.csproj
+++ b/src/QF.Integration.Common/QF.Integration.Common.csproj
@@ -7,7 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="MediatR"/>
       <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
       <PackageReference Include="Microsoft.Extensions.Options" />
       <PackageReference Include="Newtonsoft.Json" />

From e298ba94617c59ad4f7933040649cbffb37644e1 Mon Sep 17 00:00:00 2001
From: Wibe van Klaveren <wibe.van.klaveren@quotationfactory.com>
Date: Mon, 5 Oct 2026 10:25:47 +0200
Subject: [PATCH 3/3] refactor: Update AgentOutputFileWatcherService to use
 IServiceScopeFactory for handler resolution and add unit tests

---
 .../AgentOutputFileWatcherService.cs          |  19 ++-
 .../AgentOutputFileWatcherServiceTests.cs     | 108 ++++++++++++++++++
 src/QF.BySoft.Tests/QF.BySoft.Tests.csproj    |   4 +
 3 files changed, 126 insertions(+), 5 deletions(-)
 create mode 100644 src/QF.BySoft.Tests/AgentOutputFileWatcherServiceTests.cs

diff --git a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs
index ae85bd5..87fd24d 100644
--- a/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs
+++ b/src/QF.BySoft.Integration/Features/AgentOutputFile/AgentOutputFileWatcherService.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using QF.BySoft.Entities;
@@ -15,15 +17,15 @@ namespace QF.BySoft.Integration.Features.AgentOutputFile;
 public class AgentOutputFileWatcherService : FileWatcherService
 {
     private readonly ILogger<AgentOutputFileWatcherService> _logger;
-    private readonly AgentOutputFileCreatedHandler _handler;
+    private readonly IServiceScopeFactory _serviceScopeFactory;
     private readonly SemaphoreSlim _semaphore = new(1, 1);
 
     public AgentOutputFileWatcherService(
-        AgentOutputFileCreatedHandler handler,
+        IServiceScopeFactory serviceScopeFactory,
         IOptions<BySoftIntegrationSettings> options,
         ILogger<AgentOutputFileWatcherService> logger)
     {
-        _handler = handler;
+        _serviceScopeFactory = serviceScopeFactory;
         _logger = logger;
 
         // add file watcher to the agent output directory
@@ -48,7 +50,7 @@ protected override async void OnAllChanges(object sender, FileSystemEventArgs e)
             switch (e.ChangeType)
             {
                 case WatcherChangeTypes.Created:
-                    await _handler.HandleAsync(new AgentOutputFileCreated(e.FullPath), CancellationToken.None);
+                    await HandleCreatedFileAsync(e.FullPath, CancellationToken.None);
                     break;
                 case WatcherChangeTypes.Deleted:
                 case WatcherChangeTypes.Changed:
@@ -84,7 +86,7 @@ protected override async void OnExistingFile(object sender, FileSystemEventArgs
                 case WatcherChangeTypes.Renamed:
                     break;
                 case WatcherChangeTypes.All:
-                    await _handler.HandleAsync(new AgentOutputFileCreated(e.FullPath), CancellationToken.None);
+                    await HandleCreatedFileAsync(e.FullPath, CancellationToken.None);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
@@ -99,4 +101,11 @@ protected override async void OnExistingFile(object sender, FileSystemEventArgs
             _semaphore.Release();
         }
     }
+
+    private async Task HandleCreatedFileAsync(string filePath, CancellationToken cancellationToken)
+    {
+        using var scope = _serviceScopeFactory.CreateScope();
+        var handler = scope.ServiceProvider.GetRequiredService<AgentOutputFileCreatedHandler>();
+        await handler.HandleAsync(new AgentOutputFileCreated(filePath), cancellationToken);
+    }
 }
diff --git a/src/QF.BySoft.Tests/AgentOutputFileWatcherServiceTests.cs b/src/QF.BySoft.Tests/AgentOutputFileWatcherServiceTests.cs
new file mode 100644
index 0000000..8b6afdc
--- /dev/null
+++ b/src/QF.BySoft.Tests/AgentOutputFileWatcherServiceTests.cs
@@ -0,0 +1,108 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Moq;
+using QF.BySoft.Entities;
+using QF.BySoft.Integration.Features.AgentOutputFile;
+using QF.BySoft.Integration.Features.BySoftIntegration;
+using QF.BySoft.Tests.Util;
+using Xunit;
+
+namespace QF.BySoft.Tests;
+
+public class AgentOutputFileWatcherServiceTests
+{
+    [Fact]
+    public async Task OnAllChangesShouldResolveNewBySoftIntegrationPerCreatedFile()
+    {
+        var rootDirectory = Path.Combine(Path.GetTempPath(), $"{nameof(AgentOutputFileWatcherServiceTests)}-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(rootDirectory);
+
+        var state = new TestState(expectedHandledCount: 2);
+        var settings = SettingsBuilder.GetBySoftIntegrationSettings();
+        settings.RootDirectory = rootDirectory;
+
+        var serviceProvider = BuildServiceProvider(settings, state);
+        var sut = new TestAgentOutputFileWatcherService(
+            serviceProvider.GetRequiredService<IServiceScopeFactory>(),
+            serviceProvider.GetRequiredService<IOptions<BySoftIntegrationSettings>>(),
+            serviceProvider.GetRequiredService<ILogger<AgentOutputFileWatcherService>>()
+        );
+
+        try
+        {
+            sut.RaiseAllChanges(new FileSystemEventArgs(WatcherChangeTypes.Created, rootDirectory, "first.json"));
+            sut.RaiseAllChanges(new FileSystemEventArgs(WatcherChangeTypes.Created, rootDirectory, "second.json"));
+
+            await state.AllHandled.Task.WaitAsync(TimeSpan.FromSeconds(10));
+
+            state.HandledCount.Should().Be(2);
+            state.ResolutionCount.Should().Be(2, "a fresh scoped handler dependency graph should be resolved for each event");
+        }
+        finally
+        {
+            await sut.StopAsync(CancellationToken.None);
+            await serviceProvider.DisposeAsync();
+            Directory.Delete(rootDirectory, true);
+        }
+    }
+
+    private static ServiceProvider BuildServiceProvider(BySoftIntegrationSettings settings, TestState state)
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<IOptions<BySoftIntegrationSettings>>(Options.Create(settings));
+        services.AddSingleton(Mock.Of<ILogger<AgentOutputFileCreatedHandler>>());
+        services.AddSingleton(Mock.Of<ILogger<AgentOutputFileWatcherService>>());
+        services.AddTransient<IBySoftIntegration>(_ =>
+        {
+            Interlocked.Increment(ref state.ResolutionCount);
+            var bySoftIntegrationMock = new Mock<IBySoftIntegration>();
+            bySoftIntegrationMock
+                .Setup(x => x.HandleManufacturabilityCheckRequestAsync(It.IsAny<string>()))
+                .Returns(() =>
+                {
+                    if (Interlocked.Increment(ref state.HandledCount) == state.ExpectedHandledCount)
+                    {
+                        state.AllHandled.TrySetResult(true);
+                    }
+
+                    return Task.CompletedTask;
+                });
+            return bySoftIntegrationMock.Object;
+        });
+        services.AddTransient<AgentOutputFileCreatedHandler>();
+
+        return services.BuildServiceProvider();
+    }
+
+    private sealed class TestAgentOutputFileWatcherService : AgentOutputFileWatcherService
+    {
+        public TestAgentOutputFileWatcherService(
+            IServiceScopeFactory serviceScopeFactory,
+            IOptions<BySoftIntegrationSettings> options,
+            ILogger<AgentOutputFileWatcherService> logger)
+            : base(serviceScopeFactory, options, logger)
+        {
+        }
+
+        public void RaiseAllChanges(FileSystemEventArgs fileSystemEventArgs)
+        {
+            OnAllChanges(this, fileSystemEventArgs);
+        }
+    }
+
+    private sealed class TestState(int expectedHandledCount)
+    {
+        public TaskCompletionSource<bool> AllHandled { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        public int ExpectedHandledCount { get; } = expectedHandledCount;
+        public int HandledCount;
+        public int ResolutionCount;
+    }
+}
+
+
diff --git a/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj b/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj
index e58fc15..d610e05 100644
--- a/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj
+++ b/src/QF.BySoft.Tests/QF.BySoft.Tests.csproj
@@ -11,7 +11,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.Extensions.Options" />
     <PackageReference Include="Moq" />
     <PackageReference Include="Moq.Contrib.HttpClient" />
     <PackageReference Include="xunit" />
@@ -22,7 +24,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\QF.BySoft.Integration\QF.BySoft.Integration.csproj" />
     <ProjectReference Include="..\QF.BySoft.Manufacturability\QF.BySoft.Manufacturability.csproj" />
+    <ProjectReference Include="..\QF.Integration.Common\QF.Integration.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>