From cf788c76e81ad67783edb10305da2816feb12433 Mon Sep 17 00:00:00 2001
From: "dependencyupdates[bot]"
 <218638057+dependencyupdates[bot]@users.noreply.github.com>
Date: Sun, 15 Feb 2026 22:25:32 +0000
Subject: [PATCH 1/2] Update dependency Caliburn.Micro to v5

---
 src/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index dd8dfeb8e7..0c26a81a32 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -10,7 +10,7 @@
     <PackageVersion Include="Azure.Monitor.Query.Metrics" Version="1.0.0" />
     <PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
     <PackageVersion Include="ByteSize" Version="2.1.2" />
-    <PackageVersion Include="Caliburn.Micro" Version="4.0.230" />
+    <PackageVersion Include="Caliburn.Micro" Version="5.0.258" />
     <PackageVersion Include="DnsClient" Version="1.8.0" />
     <PackageVersion Include="FluentValidation" Version="12.1.1" />
     <PackageVersion Include="Fody" Version="6.9.3" />

From a305bf87874cae42c3d5a2d41715ee7db06987ac Mon Sep 17 00:00:00 2001
From: Andreas Bednarz <andreas.bednarz@particular.net>
Date: Thu, 12 Feb 2026 13:26:19 +1100
Subject: [PATCH 2/2] Activated event handler must be async in Caliburn.Micro 5

---
 src/ServiceControl.Config/Framework/Rx/RxScreen.cs    | 4 ++--
 src/ServiceControl.Config/Framework/Rx/RxViewAware.cs | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ServiceControl.Config/Framework/Rx/RxScreen.cs b/src/ServiceControl.Config/Framework/Rx/RxScreen.cs
index bbab4f7dbd..44b7a33f5f 100644
--- a/src/ServiceControl.Config/Framework/Rx/RxScreen.cs
+++ b/src/ServiceControl.Config/Framework/Rx/RxScreen.cs
@@ -37,7 +37,7 @@ public class RxScreen : RxViewAware, IScreen, IChild, IModalResult
         /// <summary>
         /// Raised after activation occurs.
         /// </summary>
-        public event EventHandler<ActivationEventArgs> Activated = (sender, e) => { };
+        public event AsyncEventHandler<ActivationEventArgs> Activated = (sender, e) => Task.CompletedTask;
 
         public IEventAggregator EventAggregator { get; set; }
 
@@ -70,7 +70,7 @@ async Task IActivate.ActivateAsync(CancellationToken cancellationToken)
             Log.Info("Activating {0}.", this);
             await OnActivate();
 
-            Activated(this, new ActivationEventArgs
+            await Activated(this, new ActivationEventArgs
             {
                 WasInitialized = initialized
             });
diff --git a/src/ServiceControl.Config/Framework/Rx/RxViewAware.cs b/src/ServiceControl.Config/Framework/Rx/RxViewAware.cs
index 97fd822c56..7ad381fc88 100644
--- a/src/ServiceControl.Config/Framework/Rx/RxViewAware.cs
+++ b/src/ServiceControl.Config/Framework/Rx/RxViewAware.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Threading.Tasks;
     using Caliburn.Micro;
 
     public class RxViewAware : RxPropertyChanged, IViewAware
@@ -61,7 +62,7 @@ public virtual object GetView(object context = null)
         static void AttachViewReadyOnActivated(IActivate activatable, object nonGeneratedView)
         {
             var viewReference = new WeakReference(nonGeneratedView);
-            EventHandler<ActivationEventArgs> handler = null;
+            AsyncEventHandler<ActivationEventArgs> handler = null;
             handler = (s, e) =>
             {
                 ((IActivate)s).Activated -= handler;
@@ -70,6 +71,8 @@ static void AttachViewReadyOnActivated(IActivate activatable, object nonGenerate
                 {
                     PlatformProvider.Current.ExecuteOnLayoutUpdated(view, ((RxViewAware)s).OnViewReady);
                 }
+
+                return Task.CompletedTask;
             };
             activatable.Activated += handler;
         }