From 3cc83165ba59b2403a256436cafd5eab828a7750 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Fri, 13 Feb 2026 12:31:54 -0500
Subject: [PATCH 1/3] Update NServiceBus

---
 src/Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 398136b693..b9aaf2b441 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -34,8 +34,8 @@
     <PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.5" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.5.0" />
-    <PackageVersion Include="NServiceBus" Version="10.0.0" />
-    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.0.0" />
+    <PackageVersion Include="NServiceBus" Version="10.1.0" />
+    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.1.0" />
     <PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.0" />
     <PackageVersion Include="NServiceBus.CustomChecks" Version="6.0.0" />
     <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="4.0.0" />

From e41f38c97f62d7804db6b310379d05f30d6e0bd2 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Fri, 13 Feb 2026 11:59:00 -0500
Subject: [PATCH 2/3] Don't load assembly when higher version is already loaded

---
 .../PluginAssemblyLoadContext.cs                              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs b/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs
index 53417e74a4..bfe640faa9 100644
--- a/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs
+++ b/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs
@@ -19,7 +19,9 @@ protected override Assembly Load(AssemblyName assemblyName)
             // Since we ensure we are using the same version of dependencies in every project, it should be okay to use the already loaded copy.
             foreach (var assembly in Default.Assemblies)
             {
-                if (assembly.FullName == assemblyName.FullName)
+                var loadedAssembly = assembly.GetName();
+
+                if (loadedAssembly.Name == assemblyName.Name && loadedAssembly.Version >= assemblyName.Version)
                 {
                     return null;
                 }

From c689da71f42cc632392c0aac417ea0cc2b2fa056 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Fri, 13 Feb 2026 12:43:09 -0500
Subject: [PATCH 3/3] Add debug logging to failing workflow

---
 .github/workflows/build-db-container.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-db-container.yml b/.github/workflows/build-db-container.yml
index 28f7b40912..f20c0530c7 100644
--- a/.github/workflows/build-db-container.yml
+++ b/.github/workflows/build-db-container.yml
@@ -70,10 +70,16 @@ jobs:
         shell: pwsh
         run: |
           $manifestCreate = "docker manifest create ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }}"
+          echo "first"
           $containers = cat src/ServiceControl.RavenDB/containers.json | ConvertFrom-Json
+          echo "second"
           $containers | ForEach-Object -Process {
             $manifestCreate += " --amend ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }}-$($_.tag)"
           }
+          echo $manifestCreate
           Invoke-Expression $manifestCreate
+          echo "third"
           docker buildx imagetools inspect ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }}
-          docker manifest push ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }}
\ No newline at end of file
+          echo "fourth"
+          docker manifest push ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }}
+          echo "fifth"
\ No newline at end of file