diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82ab912f..a29dd343 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,6 +66,7 @@ jobs:
           dotnet restore Dashboard/Dashboard.csproj --locked-mode
           dotnet restore Lite/PerformanceMonitorLite.csproj --locked-mode
           dotnet restore Installer/PerformanceMonitorInstaller.csproj --locked-mode
+          dotnet restore Dashboard.Tests/Dashboard.Tests.csproj --locked-mode
           dotnet restore Lite.Tests/Lite.Tests.csproj --locked-mode
           dotnet restore Installer.Tests/Installer.Tests.csproj --locked-mode
 
@@ -77,6 +78,10 @@ jobs:
         if: steps.filter.outputs.code != 'false'
         run: dotnet build Installer.Tests/Installer.Tests.csproj -c Release --no-restore
 
+      - name: Build Dashboard.Tests
+        if: steps.filter.outputs.code != 'false'
+        run: dotnet build Dashboard.Tests/Dashboard.Tests.csproj -c Release --no-restore
+
       - name: Run Lite fast tests
         if: steps.filter.outputs.code != 'false'
         run: dotnet test Lite.Tests/Lite.Tests.csproj -c Release --no-build --verbosity normal --filter "FullyQualifiedName!~AnomalyDetectorTests&FullyQualifiedName!~FactCollectorTests&FullyQualifiedName!~FactCollectorMiseryTests&FullyQualifiedName!~BaselineProviderTests&FullyQualifiedName!~InferenceEngineTests&FullyQualifiedName!~ScenarioTests&FullyQualifiedName!~AnalysisServiceTests"
@@ -89,6 +94,10 @@ jobs:
         if: steps.filter.outputs.installer == 'true' || github.event_name == 'release'
         run: dotnet test Installer.Tests/Installer.Tests.csproj -c Release --no-build --verbosity normal --filter "FullyQualifiedName!~VersionDetectionTests&FullyQualifiedName!~IdempotencyTests&FullyQualifiedName!~AdversarialTests"
 
+      - name: Run Dashboard tests
+        if: steps.filter.outputs.code != 'false'
+        run: dotnet test Dashboard.Tests/Dashboard.Tests.csproj -c Release --no-build --verbosity normal
+
       - name: Get version
         if: steps.filter.outputs.code != 'false'
         id: version
diff --git a/.gitignore b/.gitignore
index 1937a3d4..0a7caeae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,6 @@ plans/
 
 # Community scripts (user-provided, not bundled)
 community/*.sql
+/.localpilot/map.txt
+/.gitignore
+/.gitignore
diff --git a/Dashboard.Tests/Dashboard.Tests.csproj b/Dashboard.Tests/Dashboard.Tests.csproj
index f7720570..6700528e 100644
--- a/Dashboard.Tests/Dashboard.Tests.csproj
+++ b/Dashboard.Tests/Dashboard.Tests.csproj
@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net10.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
diff --git a/Dashboard.Tests/UpgradeAggregationTests.cs b/Dashboard.Tests/UpgradeAggregationTests.cs
new file mode 100644
index 00000000..1dbe16e6
--- /dev/null
+++ b/Dashboard.Tests/UpgradeAggregationTests.cs
@@ -0,0 +1,54 @@
+using PerformanceMonitorDashboard;
+using Xunit;
+
+namespace Dashboard.Tests
+{
+    public class UpgradeAggregationTests
+    {
+        [Fact]
+        public void AggregatesServerAndStepCounts_Correctly()
+        {
+            // Arrange: three servers, two successes, one failure
+            var inputs = new[]
+            {
+                // success: 2 upgrade steps succeeded, 1 step succeeded
+                new AggregationInput(true, 2, 0, 1, 0),
+                // failure: 0 succeeded, 1 upgrade failed
+                new AggregationInput(false, 0, 1, 0, 0),
+                // success: 1 upgrade succeeded
+                new AggregationInput(true, 1, 0, 0, 0)
+            };
+
+            // Act
+            var result = UpgradeAggregator.Aggregate(inputs);
+
+            // Assert
+            Assert.Equal(2, result.ServerSuccessCount);
+            Assert.Equal(1, result.ServerFailCount);
+
+            // Steps succeeded: (2+1) + (0) + (1) = 4
+            Assert.Equal(4, result.StepsSucceeded);
+            // Steps failed: 1
+            Assert.Equal(1, result.StepsFailed);
+
+            // Summary contains expected fragments
+            Assert.Contains("2 servers upgraded", result.Summary);
+            Assert.Contains("4 steps succeeded", result.Summary);
+            Assert.Contains("1 step failed", result.Summary);
+        }
+
+        [Fact]
+        public void Aggregator_FormatsSingularPlural_Correctly()
+        {
+            var singleSuccess = new[] { new AggregationInput(true, 1, 0, 0, 0) };
+            var r1 = UpgradeAggregator.Aggregate(singleSuccess);
+            Assert.Equal(1, r1.ServerSuccessCount);
+            Assert.Contains("1 server upgraded", r1.Summary);
+
+            var singleFail = new[] { new AggregationInput(false, 0, 0, 0, 1) };
+            var r2 = UpgradeAggregator.Aggregate(singleFail);
+            Assert.Equal(1, r2.ServerFailCount);
+            Assert.Contains("1 step failed", r2.Summary);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Dashboard.Tests/packages.lock.json b/Dashboard.Tests/packages.lock.json
new file mode 100644
index 00000000..5fe709e9
--- /dev/null
+++ b/Dashboard.Tests/packages.lock.json
@@ -0,0 +1,932 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0-windows7.0": {
+      "Microsoft.NET.Test.Sdk": {
+        "type": "Direct",
+        "requested": "[18.6.0, )",
+        "resolved": "18.6.0",
+        "contentHash": "kAIBt0MsYR0o2RULmlW5BhQ1ha50aGEgLKG4f1p0kePBGLJCprqs3S+NxRrYN8UH7mSQRPKpeiH9mwPMEKUObQ==",
+        "dependencies": {
+          "Microsoft.CodeCoverage": "18.6.0",
+          "Microsoft.TestPlatform.TestHost": "18.6.0"
+        }
+      },
+      "xunit.runner.visualstudio": {
+        "type": "Direct",
+        "requested": "[3.1.5, )",
+        "resolved": "3.1.5",
+        "contentHash": "tKi7dSTwP4m5m9eXPM2Ime4Kn7xNf4x4zT9sdLO/G4hZVnQCRiMTWoSZqI/pYTVeI27oPPqHBKYI/DjJ9GsYgA=="
+      },
+      "xunit.v3": {
+        "type": "Direct",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "L+4/4y0Uqcg8/d6hfnxhnwh4j9FaeULvefTwrk30rr1o4n/vdPfyUQ8k0yzH8VJx7bmFEkDdcRfbtbjEHlaYcA==",
+        "dependencies": {
+          "xunit.v3.mtp-v1": "[3.2.2]"
+        }
+      },
+      "Azure.Core": {
+        "type": "Transitive",
+        "resolved": "1.51.1",
+        "contentHash": "JRANrRvN5O5FFRh+pMUb8qqWU7jBQ39qXEbVr7Rkb1/s7rqc6RSzVHKGBz5Ro1gDy2WSGjG5YEOJKpPIBiCMcA==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "10.0.2",
+          "System.ClientModel": "1.9.0",
+          "System.Memory.Data": "10.0.1"
+        }
+      },
+      "Azure.Identity": {
+        "type": "Transitive",
+        "resolved": "1.18.0",
+        "contentHash": "HiTpL2XRANXSPyrIkaq7eNDthi99UFbbJwMfpkkbVcdo3Au6yl3vPNWveoa4nO24JTcwyyXATZHn+eVnrVAWEQ==",
+        "dependencies": {
+          "Azure.Core": "1.51.1",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.3",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.3",
+          "Microsoft.Identity.Client": "4.78.0",
+          "Microsoft.Identity.Client.Extensions.Msal": "4.78.0"
+        }
+      },
+      "CredentialManagement": {
+        "type": "Transitive",
+        "resolved": "1.0.2",
+        "contentHash": "VkP04/jFXaxT3TkcRhzETYtOrznQxRmQ2J1XJdbXz47Bir7hIzPR7mFZk4GJQ4An4gozW+vonpf+iqTHomAkQw=="
+      },
+      "Hardcodet.NotifyIcon.Wpf": {
+        "type": "Transitive",
+        "resolved": "2.0.1",
+        "contentHash": "dtxmeZXzV2GzSm91aZ3hqzgoeVoARSkDPVCYfhVUNyyKBWYxMgNC0EcLiSYxD4Uc4alq/2qb3SmV8DgAENLRLQ=="
+      },
+      "HarfBuzzSharp": {
+        "type": "Transitive",
+        "resolved": "8.3.1.1",
+        "contentHash": "tLZN66oe/uiRPTZfrCU4i8ScVGwqHNh5MHrXj0yVf4l7Mz0FhTGnQ71RGySROTmdognAs0JtluHkL41pIabWuQ==",
+        "dependencies": {
+          "HarfBuzzSharp.NativeAssets.Win32": "8.3.1.1",
+          "HarfBuzzSharp.NativeAssets.macOS": "8.3.1.1"
+        }
+      },
+      "HarfBuzzSharp.NativeAssets.Linux": {
+        "type": "Transitive",
+        "resolved": "8.3.1.1",
+        "contentHash": "3EZ1mpIiKWRLL5hUYA82ZHteeDIVaEA/Z0rA/wU6tjx6crcAkJnBPwDXZugBSfo8+J3EznvRJf49uMsqYfKrHg=="
+      },
+      "HarfBuzzSharp.NativeAssets.macOS": {
+        "type": "Transitive",
+        "resolved": "8.3.1.1",
+        "contentHash": "jbtCsgftcaFLCA13tVKo5iWdElJScrulLTKJre36O4YQTIlwDtPPqhRZNk+Y0vv4D1gxbscasGRucUDfS44ofQ=="
+      },
+      "HarfBuzzSharp.NativeAssets.Win32": {
+        "type": "Transitive",
+        "resolved": "8.3.1.1",
+        "contentHash": "UsJtQsfAJoFDZrXc4hCUfRPMqccfKZ0iumJ/upcUjz/cmsTgVFGNEL5yaJWmkqsuFYdMWbj/En5/kS4PFl9hBA=="
+      },
+      "Microsoft.ApplicationInsights": {
+        "type": "Transitive",
+        "resolved": "2.23.0",
+        "contentHash": "nWArUZTdU7iqZLycLKWe0TDms48KKGE6pONH2terYNa8REXiqixrMOkf1sk5DHGMaUTqONU2YkS4SAXBhLStgw=="
+      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "10.0.2",
+        "contentHash": "qE5JhRoeJbAipLqpUCZyNfNwnpAvUttXgIQDnTiJ15d8ji+/bPgoPkB3xLzK5cQTobN2D2ditUesUlDHb7p3Pg=="
+      },
+      "Microsoft.Bcl.Cryptography": {
+        "type": "Transitive",
+        "resolved": "9.0.13",
+        "contentHash": "5T+bH3Lb1nEe8Hf/ixMxLmhlrx5wRi53wv7OhVwG2F1ZviW1ejFRS1NHur3uqPpJRGtkQwUchtY6zhVK2R+v+w=="
+      },
+      "Microsoft.CodeCoverage": {
+        "type": "Transitive",
+        "resolved": "18.6.0",
+        "contentHash": "bkmCXn/65Cd0LdO2zTb/ValGAJ1H8y/CgYOiBb3jsDyHI3Y1ljKx6RBvhvn3e5D/4R4I00RRwLf+Bd2Sn6bJjA=="
+      },
+      "Microsoft.Data.SqlClient": {
+        "type": "Transitive",
+        "resolved": "7.0.1",
+        "contentHash": "9jZFXAJ2ThNYK7lhj2RhH7klXVNaWSvZpQncq3bPIOjmHBrdjwgeO4c8wucUVxQwFT8rAA13Z2F2jzoYR7ICDw==",
+        "dependencies": {
+          "Microsoft.Bcl.Cryptography": "9.0.13",
+          "Microsoft.Data.SqlClient.Extensions.Abstractions": "1.0.0",
+          "Microsoft.Data.SqlClient.Internal.Logging": "1.0.0",
+          "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
+          "Microsoft.Extensions.Caching.Memory": "9.0.13",
+          "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+          "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+          "Microsoft.SqlServer.Server": "1.0.0"
+        }
+      },
+      "Microsoft.Data.SqlClient.Extensions.Abstractions": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "rlnxc0KfwDSbE8ZHntFnl8SCgOa9QtJZblMv2zXLhRwl1Je7fsdsVzxSjzzC4JMsfAK+jXJWyezRB8SxUY4BdA==",
+        "dependencies": {
+          "Microsoft.Data.SqlClient.Internal.Logging": "1.0.0"
+        }
+      },
+      "Microsoft.Data.SqlClient.Extensions.Azure": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "Q1yVUvxh1Xu2I0eyLkBUJ/OI+YAqjO+HEWWrAzv1cAdSbVbaoa54uJZbFX8q6jFc1VtrHxZuNonISq9SKFXPfA==",
+        "dependencies": {
+          "Azure.Core": "1.51.1",
+          "Azure.Identity": "1.18.0",
+          "Microsoft.Data.SqlClient.Extensions.Abstractions": "1.0.0",
+          "Microsoft.Data.SqlClient.Internal.Logging": "1.0.0",
+          "Microsoft.Extensions.Caching.Memory": "8.0.1",
+          "Microsoft.Identity.Client": "4.83.0"
+        }
+      },
+      "Microsoft.Data.SqlClient.Internal.Logging": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "Kue/7CF8KNT9zozfr30C94dMZVZml3atqWZvQemSXvTau76tRdypzeKiBKXadqgbOME0UiQIyVTNo5WxCRNVNg=="
+      },
+      "Microsoft.Data.SqlClient.SNI.runtime": {
+        "type": "Transitive",
+        "resolved": "6.0.2",
+        "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w=="
+      },
+      "Microsoft.Extensions.AI.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.5.2",
+        "contentHash": "Ei+YWV9Ybnps7pR1dgjlG29gelXEwZkhLVAcWmKe6HvXS6LNBYgSdWiY3Hk9OZXYtK34rv/NtLWBQYQGOBQYPQ=="
+      },
+      "Microsoft.Extensions.Caching.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "pUDgQKEqNUFlerDIFRg7zzoDVRPEWIG7nR40h8Gzg8RXza4Ry0lWZ7u91bmwu3iUDCxw3Dv6TLHVFoAgY0gy7Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Caching.Memory": {
+        "type": "Transitive",
+        "resolved": "9.0.13",
+        "contentHash": "OdQmN8LYcUEu20Fxii9mk68nHJGL+JPXF3w0+hxenf0oDDdDBA+ZV/S92FmIgAWAElowIiFA/g0x+8YB1g80Hg==",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "9.0.13",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.13",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.13",
+          "Microsoft.Extensions.Options": "9.0.13",
+          "Microsoft.Extensions.Primitives": "9.0.13"
+        }
+      },
+      "Microsoft.Extensions.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "woZsWLhOQsASuxbmgiZJqiGUBNo3IjRdXC92xt8rRokza+P6/nIsnzq7sm9Or6ZYcRl2kL1ufj8HVzp1QlPTXw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "qGhRPd3VxfLV9UqatVOiD9mAeUbj2KiMwGFYC5uXlzExiZQoe4X/hdmzGIU7BQjNLTqCnnbTHVyBglG3668/HA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Binder": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "Tp/+LPb70RyjjtLg9m5C959eP4KrUpJHThZfAegZVpsfmGvzfuNkuYbI/ft+LvXhMSyUcAeOPaN6rzTccwnZAg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Configuration.CommandLine": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "8D4HaqxWdm5M/nuhQffjPoR1ekhlpyKTXjFMAT5KlP0dvxkJe5JLAP6MAsuUEUxKWG09Bi5aAUaYMFKrMqWHqA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Configuration.EnvironmentVariables": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "JhKySWIL8+N4yFt4HPm1rGKCHooze+MBdTdpXc0bd/PGm31TrSUi2m0Nek1y441Wlv/RE6VH0W/DCv2xnmy8FA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Configuration.FileExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "NgLB9cYnIb0/djSDcnqo4GIGGWooxGmr/gCUe3/CRXcKqLizOFui8MyW4EVkTB/KNJL+oXdMXnD6ZRm3Y+qkrQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.9",
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Json": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "LiFKJgc9jZEW+7RhcSfsvCwoikt1lDdOqOn+whZC5zVHyg/gExftHl2QPtmfiHsEdDNg+Y+BDr6835tOfj8Y7A==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Configuration.UserSecrets": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "ockJRreRW/HbGwoyHzYOxMucFBimvAZ8lKNwQLMHrS6mwkDUaCJMWzzeE+Rm9vgFlv2o/xqk8fm+FpqrDCnkTA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Configuration.Json": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "NijozhERJDIaJ4k5TSMy1jOi0cSC2HfkvRD/Sl+kGSSKgVbFnF4GxgtMN/MrzHB8D1JxIrD4xSer9Blh9v3axQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "g41l/30G3K4B/d/L8kjux0+30e27c8D0FVQ/PFCpbekgfDpj9mnDhieP67EqXWvl1EWNeZh2rpR4F5B/jcDOHA=="
+      },
+      "Microsoft.Extensions.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "NLXI3PbTe39q6/sgs7JYhmfPf7bMzReUoAJ0q9Po6yhfM+0anZa7PrEva4W2SdiLWGyB9eKZS9THGt2BP40xJg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "86RgyFsmVslW4Nu28IXgt8tLglynGQrwjk/xhGZaTe8j6YIeR1Ywoc42hSHsBSl920CQdfqq2dBohZiGm3AkUA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "Oxn4vqDk+EwceTMpZxVm7L/UZEAM1qIQlNP1+7tBZckD+P4SKrm/5X4gMTPCTdpnau/xY8Sb4/0d6onomSg4ZA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Physical": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "zm8WVod4swgprGrkxkuSILlbXqdDRqF+3y6U0I7jlmj4PMyKN6d8pzXZHUn5lr/gZVULzk/+FeTYlTupt6akpg==",
+        "dependencies": {
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.9",
+          "Microsoft.Extensions.FileSystemGlobbing": "10.0.9",
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.FileSystemGlobbing": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "mvRf9qOH/LslWIee/h+lsElnoUyKotEwoPL31soqScmO/eoxObaTCLCdx2DdqPdRi9LnB+7qKZ49jfyrLZuc+w=="
+      },
+      "Microsoft.Extensions.Hosting": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "HTgnvmK0ubesUFO16pLC+i9+RS8lEGd6TmDouuy75FsAgIFrSwUVhYCqG2IENzBJwgxGc/6Rsulfsvd9ZG/XkA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.9",
+          "Microsoft.Extensions.Configuration.CommandLine": "10.0.9",
+          "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.9",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.9",
+          "Microsoft.Extensions.Configuration.Json": "10.0.9",
+          "Microsoft.Extensions.Configuration.UserSecrets": "10.0.9",
+          "Microsoft.Extensions.DependencyInjection": "10.0.9",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Diagnostics": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.9",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.9",
+          "Microsoft.Extensions.Logging.Console": "10.0.9",
+          "Microsoft.Extensions.Logging.Debug": "10.0.9",
+          "Microsoft.Extensions.Logging.EventLog": "10.0.9",
+          "Microsoft.Extensions.Logging.EventSource": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Hosting.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "Xd/2F+uWblTiUp+ssaDZN2ea4vmnHmW6PXugmqBHumyhqVkyeh6RJ3S2Zo/F+1bXIL/KuGqe2pKv6UiGOc1KeQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.9",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Logging": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "N7Gm9SjugYjmmnhwbBKC9DFqGqjfJvh6YfOJgtwh0AW0Xpok3dIVors1ik050XmUxKAgAc7nNngDIJyFb06K2g==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Logging.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "9S/DFt4cohlMPpzIxjG6kk0L8MuN2vDm9pbMCulxtJzzk82oJHVLBd8vuQxaPskaYQwKqmFmbannf5eoChgjYg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Logging.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "bUth5ip7YsZMXWZS42IRTI0zDrPEqdE+xnsmcL0Pk784grWKApDvc5UoMi2tP2qYJ5ylFzeVDuDu08sFATq1bg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.9",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.9",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Logging.Console": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "WyZEG/O8jKqBOBF6/M6IJqiEyWFBUv6PDyzNoXDA0mBZwKtkuf7GiZ/0/8eU8OpLKKQL0O95oPOY1szrWIKofQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Logging.Debug": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "r/A0ahpXmZH/8ltPjrFFWp12BIizK9cCVJXPcHyOad8e4eIX7P/geW+uBYdczkeCAaMebT4jEU7snOm4GnmKfA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "goAl30/WwmdnWDPRwATaDPIK0iuDBnQSMTH2XYGVB1SwReg7hglhvDNjjpNhT25US3GF4I5q6BhTNs6nFYzEfg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventSource": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "tHynPVHbTicuaDpS2JVTxX0qA5VTg15CXgVKTwWvvudb5BvW5aVew8MMyek6LrDGAom7UbON1jf1T5GhpTilFA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Logging": "10.0.9",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9",
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Options": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "hyNdX4c2UwkRkzb9byw0H2DQkRzwBM3mzY2sCM9egwzTyg8dvQJmp5noQHGEaaCORQrNK3DD2gREBsc2DlXS4A==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Options.ConfigurationExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "Y4E24zffF/aPS0igNvY6ZzAQfbxd6AYdC9L4brnH+uK0yYYHIR6FeGVQVVjAOo8wub1EQDl2B90lCcpqoTF7Yw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.9",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
+          "Microsoft.Extensions.Options": "10.0.9",
+          "Microsoft.Extensions.Primitives": "10.0.9"
+        }
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "10.0.9",
+        "contentHash": "fmEbAUFsaIKirgLt/lYhuFRBwhcSJN31jjHgCdbQxJiWOum6EdLjkbgGuukSP9z/a+9LibaxII/kF+GwOXgC4g=="
+      },
+      "Microsoft.Identity.Client": {
+        "type": "Transitive",
+        "resolved": "4.83.0",
+        "contentHash": "eiirunq8tuQW1KKqi7BcD+jR6/Ge/wDt11HW6K9dTGdqS6TUuA81PtPIy1gijarEOaMBeHEPWuAiRyLUO4M87Q==",
+        "dependencies": {
+          "Microsoft.IdentityModel.Abstractions": "8.14.0"
+        }
+      },
+      "Microsoft.Identity.Client.Extensions.Msal": {
+        "type": "Transitive",
+        "resolved": "4.78.0",
+        "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==",
+        "dependencies": {
+          "Microsoft.Identity.Client": "4.78.0"
+        }
+      },
+      "Microsoft.IdentityModel.Abstractions": {
+        "type": "Transitive",
+        "resolved": "8.16.0",
+        "contentHash": "gSxKLWRZzBpIsEoeUPkxfywNCCvRvl7hkq146XHPk5vOQc9izSf1I+uL1vh4y2U19QPxd9Z8K/8AdWyxYz2lSg=="
+      },
+      "Microsoft.IdentityModel.JsonWebTokens": {
+        "type": "Transitive",
+        "resolved": "8.16.0",
+        "contentHash": "prBU72cIP4V8E9fhN+o/YdskTsLeIcnKPbhZf0X6mD7fdxoZqnS/NdEkSr+9Zp+2q7OZBOMfNBKGbTbhXODO4w==",
+        "dependencies": {
+          "Microsoft.IdentityModel.Tokens": "8.16.0"
+        }
+      },
+      "Microsoft.IdentityModel.Logging": {
+        "type": "Transitive",
+        "resolved": "8.16.0",
+        "contentHash": "MTzXmETkNQPACR7/XCXM1OGM6oU9RkyibqeJRtO9Ndew2LnGjMf9Atqj2VSf4XC27X0FQycUAlzxxEgQMWn2xQ==",
+        "dependencies": {
+          "Microsoft.IdentityModel.Abstractions": "8.16.0"
+        }
+      },
+      "Microsoft.IdentityModel.Protocols": {
+        "type": "Transitive",
+        "resolved": "8.16.0",
+        "contentHash": "UFrU7d46UTsPQTa2HIEIpB9H1uJe1BW9FLw5uhEJ2ZuKdur8bcUA/bO5caq5dlBt5gNJeRIB3QQXYNs5fCQCZA==",
+        "dependencies": {
+          "Microsoft.IdentityModel.Tokens": "8.16.0"
+        }
+      },
+      "Microsoft.IdentityModel.Protocols.OpenIdConnect": {
+        "type": "Transitive",
+        "resolved": "8.16.0",
+        "contentHash": "h4yVXyJsEBBX5lg2G5ftMsi5JzcNEGAzrNphA6DQ6eOd8P0s+cDCOyPwVTYLePZvJL5unbPvYIvzrbTXzFjXnQ==",
+        "dependencies": {
+          "Microsoft.IdentityModel.Protocols": "8.16.0",
+          "System.IdentityModel.Tokens.Jwt": "8.16.0"
+        }
+      },
+      "Microsoft.IdentityModel.Tokens": {
+        "type": "Transitive",
+        "resolved": "8.16.0",
+        "contentHash": "rtViGJcGsN7WcfUNErwNeQgjuU5cJNl6FDQsfi9TncwO+Epzn0FTfBsg3YuFW1Q0Ch/KPxaVdjLw3/+5Z5ceFQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.0",
+          "Microsoft.IdentityModel.Logging": "8.16.0"
+        }
+      },
+      "Microsoft.SqlServer.Server": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug=="
+      },
+      "Microsoft.Testing.Extensions.Telemetry": {
+        "type": "Transitive",
+        "resolved": "1.9.1",
+        "contentHash": "No5AudZMmSb+uNXjlgL2y3/stHD2IT4uxqc5yHwkE+/nNux9jbKcaJMvcp9SwgP4DVD8L9/P3OUz8mmmcvEIdQ==",
+        "dependencies": {
+          "Microsoft.ApplicationInsights": "2.23.0",
+          "Microsoft.Testing.Platform": "1.9.1"
+        }
+      },
+      "Microsoft.Testing.Extensions.TrxReport.Abstractions": {
+        "type": "Transitive",
+        "resolved": "1.9.1",
+        "contentHash": "AL46Xe1WBi85Ntd4mNPvat5ZSsZ2uejiVqoKCypr8J3wK0elA5xJ3AN4G/Q4GIwzUFnggZoH/DBjnr9J18IO/g==",
+        "dependencies": {
+          "Microsoft.Testing.Platform": "1.9.1"
+        }
+      },
+      "Microsoft.Testing.Platform": {
+        "type": "Transitive",
+        "resolved": "1.9.1",
+        "contentHash": "QafNtNSmEI0zazdebnsIkDKmFtTSpmx/5PLOjURWwozcPb3tvRxzosQSL8xwYNM1iPhhKiBksXZyRSE2COisrA=="
+      },
+      "Microsoft.Testing.Platform.MSBuild": {
+        "type": "Transitive",
+        "resolved": "1.9.1",
+        "contentHash": "oTUtyR4X/s9ytuiNA29FGsNCCH0rNmY5Wdm14NCKLjTM1cT9edVSlA+rGS/mVmusPqcP0l/x9qOnMXg16v87RQ==",
+        "dependencies": {
+          "Microsoft.Testing.Platform": "1.9.1"
+        }
+      },
+      "Microsoft.TestPlatform.ObjectModel": {
+        "type": "Transitive",
+        "resolved": "18.6.0",
+        "contentHash": "gQTW4BIfM2ZLxixo9ITXoulLKjn20FiiHtqTsx9PENqTrX7368ZeJ5L0QZJyReXDWORPRV8jXwZR6Aar8JOyaA=="
+      },
+      "Microsoft.TestPlatform.TestHost": {
+        "type": "Transitive",
+        "resolved": "18.6.0",
+        "contentHash": "em1eLz5Q46+hsCtAXdXggWAPd9gQyT4ngdsQ7k1eWvQgpsjtS/wAOJ/5TteieFdiAvrEq1iVn00LtusAxRaVmQ==",
+        "dependencies": {
+          "Microsoft.TestPlatform.ObjectModel": "18.6.0",
+          "Newtonsoft.Json": "13.0.3"
+        }
+      },
+      "Microsoft.Win32.Registry": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg=="
+      },
+      "ModelContextProtocol": {
+        "type": "Transitive",
+        "resolved": "1.4.0",
+        "contentHash": "CAmnAMQIMax2t9naUgyDAkVBj329EhQCiHcbfirMFNgP6ShQ8hJdJb0OLoaBpeGjkunH3IOjRXLdwXGKKwMlLA==",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.7",
+          "ModelContextProtocol.Core": "1.4.0"
+        }
+      },
+      "ModelContextProtocol.AspNetCore": {
+        "type": "Transitive",
+        "resolved": "1.4.0",
+        "contentHash": "Q/xGhfhbCfZsoeEsEqBeiyzr6AJw2cBUTKN3Giz3QRmWyRzn62ISsgJCTnk2/VPMNj2/Spb2jYpPahnMZWvaPg==",
+        "dependencies": {
+          "ModelContextProtocol": "1.4.0"
+        }
+      },
+      "ModelContextProtocol.Core": {
+        "type": "Transitive",
+        "resolved": "1.4.0",
+        "contentHash": "6ZJFQTgYwdu0IacUUTNExAY2Z+JFuTd10CPeORalQtuGPY4hdUqq0BXxTpNEP0n7ajruNsGXyCKQLP0erIZmog==",
+        "dependencies": {
+          "Microsoft.Extensions.AI.Abstractions": "10.5.2",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7"
+        }
+      },
+      "Newtonsoft.Json": {
+        "type": "Transitive",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
+      },
+      "OpenTK": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "fp9ZI6akO4ZuIGzuUE0QRU5zRJhXbSXa5racehFoTdvodhRDecXCOcH68mRsZaMwnxLO9ECnf2LGM9BmiJKvhw==",
+        "dependencies": {
+          "OpenTK.Audio.OpenAL": "4.9.4",
+          "OpenTK.Compute": "4.9.4",
+          "OpenTK.Core": "4.9.4",
+          "OpenTK.Graphics": "4.9.4",
+          "OpenTK.Input": "4.9.4",
+          "OpenTK.Mathematics": "4.9.4",
+          "OpenTK.Windowing.Common": "4.9.4",
+          "OpenTK.Windowing.Desktop": "4.9.4",
+          "OpenTK.Windowing.GraphicsLibraryFramework": "4.9.4"
+        }
+      },
+      "OpenTK.Audio.OpenAL": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "N/SCeFrLJ3ckUbshyfsonbtjmDxh55urGiR+Fe1iPkTWyEW5OKfQRoIOZyjEva/4eRqOXdt3bV2ka4IJ2+JvZw==",
+        "dependencies": {
+          "OpenTK.Core": "[4.9.4, 4.10.0)",
+          "OpenTK.Mathematics": "[4.9.4, 4.10.0)"
+        }
+      },
+      "OpenTK.Compute": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "30G+/9mtrUJwX5xcRyz2qcujQ2s+wDm+C7qg6jDsLyGWUdND3j/vD+nlQ6tuKuAow51zWduFVujPkaS8VrBinQ=="
+      },
+      "OpenTK.Core": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "/4Mn3ABf1xNfHMzDFUapVY2K4PG3oP/oWTQJlK0JacT20HwsNe/HPIAhnAJWz27EM3ukOJDtqyQRukvQKqkcLw=="
+      },
+      "OpenTK.GLWpfControl": {
+        "type": "Transitive",
+        "resolved": "4.3.3",
+        "contentHash": "mbKt+ZApqYk/Ym4Ph0dnI+hfSnyXn/gWW6Ys6l3C+fMlgXLYaWpbQ+/3yNm6G1lJ3vteXGxtoMJPFYlaXi/tQw==",
+        "dependencies": {
+          "OpenTK": "[4.8.2, 5.0.0)"
+        }
+      },
+      "OpenTK.Graphics": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "yZeq5swIsRnNzifVA9fLtl+qMAQvmYiF1b7U/XQLARmmU4PYQ23lPNahqAdD22XzA21ew7eG3yDyPLkYw+hDBA==",
+        "dependencies": {
+          "OpenTK.Core": "[4.9.4, 4.10.0)",
+          "OpenTK.Mathematics": "[4.9.4, 4.10.0)"
+        }
+      },
+      "OpenTK.Input": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "njbC7fySQEK30rjOQ1uRjlycEkLw+UVoPT3nRQ8uBPNLotDgr47NEcPEjmJyX1ll+pm/wmtcvJIYHBRi1HbOqg=="
+      },
+      "OpenTK.Mathematics": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "2ucF25RVJzdSLXUHgjAgB058gVfSgerrR5pLCn9J+Bnyqi45NrBfPu9wyTT35ZCjYwLJCu/HJMnzKFLjq+uFIA=="
+      },
+      "OpenTK.redist.glfw": {
+        "type": "Transitive",
+        "resolved": "3.4.0.44",
+        "contentHash": "HEjbdk0wWxSRrXHl3DSmrA8trecndgJpAHHloJJ1vPseNfeu/ynmrH/LturU1KguRn4r3IzZ81UIp5xRjnyahg=="
+      },
+      "OpenTK.Windowing.Common": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "xNjvKjoptAh6w5/YYIx/9sNv3/A2VVlTahlekTlLP+qfNyig+0jBuLHO4bWELWZ7Ta3Y1m/2Pvk0Z1KCG8VZOA==",
+        "dependencies": {
+          "OpenTK.Core": "[4.9.4, 4.10.0)",
+          "OpenTK.Mathematics": "[4.9.4, 4.10.0)"
+        }
+      },
+      "OpenTK.Windowing.Desktop": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "LBX4jwCneISIBST2vWYLI8cdR8tLwHNcswK1decElbTAXMB+H6uFIoF41ld+af4q3TsHpjR5fyP2ilbTK3T0rA==",
+        "dependencies": {
+          "OpenTK.Core": "[4.9.4, 4.10.0)",
+          "OpenTK.Mathematics": "[4.9.4, 4.10.0)",
+          "OpenTK.Windowing.Common": "[4.9.4, 4.10.0)",
+          "OpenTK.Windowing.GraphicsLibraryFramework": "[4.9.4, 4.10.0)"
+        }
+      },
+      "OpenTK.Windowing.GraphicsLibraryFramework": {
+        "type": "Transitive",
+        "resolved": "4.9.4",
+        "contentHash": "wNlxnPrD7veMV8EGTTi/sCDeg5V8w/18vC0aw0Ao69eNneD7YSq9Ad+C389rVA957eHNR6Xieu/5qzHQeEOyxQ==",
+        "dependencies": {
+          "OpenTK.Core": "[4.9.4, 4.10.0)",
+          "OpenTK.redist.glfw": "3.4.0.44"
+        }
+      },
+      "ScottPlot": {
+        "type": "Transitive",
+        "resolved": "5.1.58",
+        "contentHash": "prikNmFbV+z2ruXYmE06yYlnHQfuYzhPrrj30SvcUkRXfdiC07A+2LBSYhuSMaRFCHvgRKo6gXjfwHzhOW8ASg==",
+        "dependencies": {
+          "HarfBuzzSharp.NativeAssets.Linux": "8.3.1.1",
+          "SkiaSharp": "3.119.0",
+          "SkiaSharp.HarfBuzz": "3.119.0",
+          "SkiaSharp.NativeAssets.Linux.NoDependencies": "3.119.0"
+        }
+      },
+      "ScottPlot.WPF": {
+        "type": "Transitive",
+        "resolved": "5.1.58",
+        "contentHash": "BL6MecJPyhllqSYsM5N9SfrrVEdgkRSyDu3lYSeiFq4dGgS0obuoGEbRiXgJq5PAZWixo+6Hcxaz5OEwElC8aQ==",
+        "dependencies": {
+          "OpenTK": "4.9.4",
+          "OpenTK.GLWpfControl": "4.3.3",
+          "ScottPlot": "5.1.58",
+          "SkiaSharp.Views.WPF": "3.119.0"
+        }
+      },
+      "SkiaSharp": {
+        "type": "Transitive",
+        "resolved": "3.119.0",
+        "contentHash": "gR9yVoOta2Mc1Rxt15LD65AckfHMfwjIs/3kkD59C9bT2nYYISsE6uz3t4aMPNHA6CgsIL0Ssn+jE5OVilZ1yw==",
+        "dependencies": {
+          "SkiaSharp.NativeAssets.Win32": "3.119.0",
+          "SkiaSharp.NativeAssets.macOS": "3.119.0"
+        }
+      },
+      "SkiaSharp.HarfBuzz": {
+        "type": "Transitive",
+        "resolved": "3.119.0",
+        "contentHash": "5ocGzl+RYEZFnUPUbModshnEFvKTku4hTtOBsLvy5MCK2KAHjq5Nw2+uAVUx79Rjh0z8fTojT6ZVav8MJgW0ug==",
+        "dependencies": {
+          "HarfBuzzSharp": "8.3.1.1",
+          "SkiaSharp": "3.119.0"
+        }
+      },
+      "SkiaSharp.NativeAssets.Linux.NoDependencies": {
+        "type": "Transitive",
+        "resolved": "3.119.0",
+        "contentHash": "e92vdqf1VOETPjy1T67Fs1zPxfGMM1nbrpt69GM5foXSI/iIbq6L9avPz/bl/DbWtb81D0yF/NKjRmXuOZoLcg=="
+      },
+      "SkiaSharp.NativeAssets.macOS": {
+        "type": "Transitive",
+        "resolved": "3.119.0",
+        "contentHash": "YE1vNn0Nyw2PWtv7hw1PYkKJO0itFiQp9vSqGppZUKzQJqwp28a2jgdCMPfYtOiR8KCnDgZqQoynqJRRaE2ZVg=="
+      },
+      "SkiaSharp.NativeAssets.Win32": {
+        "type": "Transitive",
+        "resolved": "3.119.0",
+        "contentHash": "IwC9yx36lOdXVT2DjgmWHl1qkVspfj8ctd4+li8CNnvqdfaTolXCOh6TLznURcPAvzatx9K/tLOB7zT6T8EA9w=="
+      },
+      "SkiaSharp.Views.Desktop.Common": {
+        "type": "Transitive",
+        "resolved": "3.119.0",
+        "contentHash": "KST7Q3n+X5BhDj1aKTJXk9tITWWznveka9n+pBjOtE53Omc+wlZR0s4fQStybWCVVaWG9eaeOMaw93J3zEMklA==",
+        "dependencies": {
+          "SkiaSharp": "3.119.0"
+        }
+      },
+      "SkiaSharp.Views.WPF": {
+        "type": "Transitive",
+        "resolved": "3.119.0",
+        "contentHash": "1Dmj9RlBW/gvmJwSUER+N9plA/kcWOgiL5g3q2DB+USVQav8rQtfOZIQZ1Wt/AqhwepOacv1M6pZKDWtXmwDAg==",
+        "dependencies": {
+          "OpenTK": "3.3.1",
+          "OpenTK.GLWpfControl": "3.3.0",
+          "SkiaSharp": "3.119.0",
+          "SkiaSharp.Views.Desktop.Common": "3.119.0"
+        }
+      },
+      "System.ClientModel": {
+        "type": "Transitive",
+        "resolved": "1.9.0",
+        "contentHash": "1wdwKtMMMEFEYsxJmtrOd3G+7zVOVO3MlVZAsbKv9H0PnIx6J27fYAarMn0eQS0vKJPQL018DOb7YRK1O97p0A==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.2",
+          "System.Memory.Data": "10.0.1"
+        }
+      },
+      "System.IdentityModel.Tokens.Jwt": {
+        "type": "Transitive",
+        "resolved": "8.16.0",
+        "contentHash": "rrs2u7DRMXQG2yh0oVyF/vLwosfRv20Ld2iEpYcKwQWXHjfV+gFXNQsQ9p008kR9Ou4pxBs68Q6/9zC8Gi1wjg==",
+        "dependencies": {
+          "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+          "Microsoft.IdentityModel.Tokens": "8.16.0"
+        }
+      },
+      "System.Memory.Data": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "BZC4mhdL569AXV56ep9YO6ShjhxFXGP7SwVX0Bc/e0dJPWnS6aBEXZJXqh64RVx8HquqWHkJUINBydLRQ1yq0g=="
+      },
+      "Velopack": {
+        "type": "Transitive",
+        "resolved": "1.2.0",
+        "contentHash": "Rz67gJL619fSBS6omaSINUxyDuwhIxkm5mmubf7uLd5Qgi6LLKaKCha+QFP6n+Bw/UjA0vutnH4JQfYzn6ANtw=="
+      },
+      "xunit.analyzers": {
+        "type": "Transitive",
+        "resolved": "1.27.0",
+        "contentHash": "y/pxIQaLvk/kxAoDkZW9GnHLCEqzwl5TW0vtX3pweyQpjizB9y3DXhb9pkw2dGeUqhLjsxvvJM1k89JowU6z3g=="
+      },
+      "xunit.v3.assert": {
+        "type": "Transitive",
+        "resolved": "3.2.2",
+        "contentHash": "BPciBghgEEaJN/JG00QfCYDfEfnLgQhfnYEy+j1izoeHVNYd5+3Wm8GJ6JgYysOhpBPYGE+sbf75JtrRc7jrdA=="
+      },
+      "xunit.v3.common": {
+        "type": "Transitive",
+        "resolved": "3.2.2",
+        "contentHash": "Hj775PEH6GTbbg0wfKRvG2hNspDCvTH9irXhH4qIWgdrOSV1sQlqPie+DOvFeigsFg2fxSM3ZAaaCDQs+KreFA==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
+        }
+      },
+      "xunit.v3.core.mtp-v1": {
+        "type": "Transitive",
+        "resolved": "3.2.2",
+        "contentHash": "Ga5aA2Ca9ktz+5k3g5ukzwfexwoqwDUpV6z7atSEUvqtd6JuybU1XopHqg1oFd78QdTfZgZE9h5sHpO4qYIi5w==",
+        "dependencies": {
+          "Microsoft.Testing.Extensions.Telemetry": "1.9.1",
+          "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.9.1",
+          "Microsoft.Testing.Platform": "1.9.1",
+          "Microsoft.Testing.Platform.MSBuild": "1.9.1",
+          "xunit.v3.extensibility.core": "[3.2.2]",
+          "xunit.v3.runner.inproc.console": "[3.2.2]"
+        }
+      },
+      "xunit.v3.extensibility.core": {
+        "type": "Transitive",
+        "resolved": "3.2.2",
+        "contentHash": "srY8z/oMPvh/t8axtO2DwrHajhFMH7tnqKildvYrVQIfICi8fOn3yIBWkVPAcrKmHMwvXRJ/XsQM3VMR6DOYfQ==",
+        "dependencies": {
+          "xunit.v3.common": "[3.2.2]"
+        }
+      },
+      "xunit.v3.mtp-v1": {
+        "type": "Transitive",
+        "resolved": "3.2.2",
+        "contentHash": "O41aAzYKBT5PWqATa1oEWVNCyEUypFQ4va6K0kz37dduV3EKzXNMaV2UnEhufzU4Cce1I33gg0oldS8tGL5I0A==",
+        "dependencies": {
+          "xunit.analyzers": "1.27.0",
+          "xunit.v3.assert": "[3.2.2]",
+          "xunit.v3.core.mtp-v1": "[3.2.2]"
+        }
+      },
+      "xunit.v3.runner.common": {
+        "type": "Transitive",
+        "resolved": "3.2.2",
+        "contentHash": "/hkHkQCzGrugelOAehprm7RIWdsUFVmIVaD6jDH/8DNGCymTlKKPTbGokD5czbAfqfex47mBP0sb0zbHYwrO/g==",
+        "dependencies": {
+          "Microsoft.Win32.Registry": "[5.0.0]",
+          "xunit.v3.common": "[3.2.2]"
+        }
+      },
+      "xunit.v3.runner.inproc.console": {
+        "type": "Transitive",
+        "resolved": "3.2.2",
+        "contentHash": "ulWOdSvCk+bPXijJZ73bth9NyoOHsAs1ZOvamYbCkD4DNLX/Bd29Ve2ZNUwBbK0MqfIYWXHZViy/HKrdEC/izw==",
+        "dependencies": {
+          "xunit.v3.extensibility.core": "[3.2.2]",
+          "xunit.v3.runner.common": "[3.2.2]"
+        }
+      },
+      "installer.core": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Data.SqlClient": "[7.0.1, )",
+          "Microsoft.Data.SqlClient.Extensions.Azure": "[1.0.0, )"
+        }
+      },
+      "performancemonitor.analysis": {
+        "type": "Project"
+      },
+      "performancemonitor.common": {
+        "type": "Project",
+        "dependencies": {
+          "ModelContextProtocol": "[1.4.0, )"
+        }
+      },
+      "performancemonitor.notifications": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[10.0.9, )",
+          "PerformanceMonitor.Analysis": "[1.0.0, )"
+        }
+      },
+      "performancemonitor.plananalysis": {
+        "type": "Project",
+        "dependencies": {
+          "PerformanceMonitor.Common": "[1.0.0, )"
+        }
+      },
+      "performancemonitor.ui": {
+        "type": "Project",
+        "dependencies": {
+          "PerformanceMonitor.Common": "[1.0.0, )",
+          "PerformanceMonitor.PlanAnalysis": "[1.0.0, )",
+          "ScottPlot.WPF": "[5.1.58, )"
+        }
+      },
+      "PerformanceMonitorDashboard": {
+        "type": "Project",
+        "dependencies": {
+          "CredentialManagement": "[1.0.2, )",
+          "Hardcodet.NotifyIcon.Wpf": "[2.0.1, )",
+          "Installer.Core": "[3.0.0, )",
+          "Microsoft.Data.SqlClient": "[7.0.1, )",
+          "Microsoft.Data.SqlClient.Extensions.Azure": "[1.0.0, )",
+          "Microsoft.Extensions.Configuration": "[10.0.9, )",
+          "Microsoft.Extensions.Configuration.Json": "[10.0.9, )",
+          "Microsoft.Extensions.Hosting": "[10.0.9, )",
+          "ModelContextProtocol": "[1.4.0, )",
+          "ModelContextProtocol.AspNetCore": "[1.4.0, )",
+          "PerformanceMonitor.Analysis": "[1.0.0, )",
+          "PerformanceMonitor.Common": "[1.0.0, )",
+          "PerformanceMonitor.Notifications": "[1.0.0, )",
+          "PerformanceMonitor.PlanAnalysis": "[1.0.0, )",
+          "PerformanceMonitor.Ui": "[1.0.0, )",
+          "ScottPlot.WPF": "[5.1.58, )",
+          "Velopack": "[1.2.0, )"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Dashboard/ManageServersWindow.xaml b/Dashboard/ManageServersWindow.xaml
index d4c6de74..00049246 100644
--- a/Dashboard/ManageServersWindow.xaml
+++ b/Dashboard/ManageServersWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Manage Servers"
-        Height="450" Width="960"
+        Height="450" Width="1280"
         WindowStartupLocation="CenterOwner"
         ResizeMode="CanResizeWithGrip"
         Background="{DynamicResource BackgroundBrush}">
@@ -37,6 +37,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <!-- Header -->
@@ -60,7 +61,8 @@
                       AlternatingRowBackground="{DynamicResource BackgroundLightBrush}"
                       BorderThickness="0"
                       MouseDoubleClick="ServersDataGrid_MouseDoubleClick"
-                  ContextMenu="{StaticResource DataGridContextMenu}">
+                      ContextMenu="{StaticResource DataGridContextMenu}"
+                      ScrollViewer.HorizontalScrollBarVisibility="Auto">
                 <DataGrid.Columns>
                     <DataGridTemplateColumn Header="" Width="30" CanUserSort="False">
                         <DataGridTemplateColumn.CellTemplate>
@@ -71,11 +73,13 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTextColumn Header="Display Name" Binding="{Binding DisplayName}" Width="150"/>
-                    <DataGridTextColumn Header="Server" Binding="{Binding ServerName}" Width="180"/>
-                    <DataGridTextColumn Header="Authentication" Binding="{Binding AuthenticationDisplay}" Width="120"/>
-                    <DataGridTextColumn Header="Installed Version" Binding="{Binding InstalledVersion}" Width="130"/>
-                    <DataGridTextColumn Header="Monthly Cost ($)" Binding="{Binding MonthlyCostUsd, StringFormat='{}{0:N0}'}" Width="120">
+
+                    <!-- Use star-sizing so columns shrink/grow responsively -->
+                    <DataGridTextColumn Header="Display Name" Binding="{Binding DisplayName}" Width="1.2*"/>
+                    <DataGridTextColumn Header="Server" Binding="{Binding ServerName}" Width="1.2*"/>
+                    <DataGridTextColumn Header="Authentication" Binding="{Binding AuthenticationDisplay}" Width="1*"/>
+                    <DataGridTextColumn Header="Installed Version" Binding="{Binding InstalledVersion}" Width="110"/>
+                    <DataGridTextColumn Header="Monthly Cost ($)" Binding="{Binding MonthlyCostUsd, StringFormat='{}{0:N0}'}" Width="110">
                         <DataGridTextColumn.ElementStyle>
                             <Style TargetType="TextBlock">
                                 <Setter Property="HorizontalAlignment" Value="Right"/>
@@ -87,24 +91,46 @@
             </DataGrid>
         </Border>
 
+        <!-- Progress Panel -->
+        <Border x:Name="UpgradeProgressPanel" Grid.Row="2" Visibility="Collapsed"
+        Background="{DynamicResource BackgroundLightBrush}"
+        CornerRadius="4" Padding="12" Margin="0,8,0,0">
+            <StackPanel>
+                <TextBlock x:Name="UpgradeProgressText" TextWrapping="Wrap"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,6"/>
+                <ProgressBar x:Name="UpgradeProgressBar" Height="6" Margin="0,0,0,6"
+                     Foreground="{DynamicResource AccentBrush}"
+                     Background="{DynamicResource BackgroundLighterBrush}"/>
+                <TextBox x:Name="UpgradeLogTextBox" FontFamily="Consolas" FontSize="11"
+                 MaxHeight="150" IsReadOnly="True" TextWrapping="Wrap"
+                 VerticalScrollBarVisibility="Auto"
+                 Background="{DynamicResource BackgroundDarkBrush}"
+                 Foreground="{DynamicResource ForegroundBrush}"
+                 Margin="0,0,0,6"/>
+            </StackPanel>
+        </Border>
+
         <!-- Buttons -->
-        <Grid Grid.Row="2" Margin="0,16,0,0">
+        <Grid Grid.Row="3" Margin="0,16,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
             <!-- Action Buttons -->
-            <StackPanel Grid.Column="0" Orientation="Horizontal">
-                <Button Content="Add Server..." Width="100" Height="30" Margin="0,0,8,0" Click="AddServer_Click"/>
-                <Button Content="Edit..." Width="80" Height="30" Margin="0,0,8,0" Click="EditServer_Click"/>
-                <Button x:Name="ToggleFavoriteButton" Content="Toggle Favorite" Width="110" Height="30" Margin="0,0,8,0" Click="ToggleFavorite_Click"/>
-                <Button x:Name="CheckUpdatesButton" Content="Check Server Version" Width="140" Height="30" Margin="0,0,8,0" Click="CheckForUpdates_Click"/>
-                <Button Content="Excluded Databases" Width="140" Height="30" Margin="0,0,8,0" Click="ExcludedDatabases_Click"/>
-                <Button Content="Purge Now" Width="100" Height="30" Margin="0,0,8,0" Click="PurgeNow_Click"/>
-                <Button Content="Remove" Width="80" Height="30" Margin="0,0,8,0" Click="RemoveServer_Click"
+            <WrapPanel Grid.Column="0" Orientation="Horizontal">
+                <Button Content="Add Server..." Width="100" Height="30" Margin="0,0,8,8" Click="AddServer_Click"/>
+                <Button Content="Edit..." Width="80" Height="30" Margin="0,0,8,8" Click="EditServer_Click"/>
+                <Button x:Name="ToggleFavoriteButton" Content="Toggle Favorite" Width="110" Height="30" Margin="0,0,8,8" Click="ToggleFavorite_Click"/>
+                <Button x:Name="CheckUpdatesButton" Content="Check Server Version" Width="140" Height="30" Margin="0,0,8,8" Click="CheckForUpdates_Click"/>
+                <Button x:Name="CheckAllVersionsButton" Content="Check All Versions" Width="130" Height="30" Margin="0,0,8,8" Click="CheckAllVersions_Click"/>
+                <Button x:Name="UpgradeAllButton" Content="Upgrade All Outdated" Width="140" Height="30" Margin="0,0,8,8" Click="UpgradeAll_Click" Visibility="Collapsed"/>
+                <Button x:Name="CancelUpgradeButton" Content="Cancel Upgrade" Width="130" Height="30" Margin="0,0,8,8" Click="CancelUpgrade_Click" Visibility="Collapsed" IsEnabled="false"/>
+                <Button Content="Excluded Databases" Width="140" Height="30" Margin="0,0,8,8" Click="ExcludedDatabases_Click"/>
+                <Button Content="Purge Now" Width="100" Height="30" Margin="0,0,8,8" Click="PurgeNow_Click"/>
+                <Button Content="Remove" Width="80" Height="30" Margin="0,0,8,8" Click="RemoveServer_Click"
                         Foreground="{DynamicResource ErrorBrush}"/>
-            </StackPanel>
+            </WrapPanel>
 
             <!-- Close Button -->
             <Button Grid.Column="1" Content="Close" Width="80" Height="30" Click="Close_Click" IsCancel="True"/>
diff --git a/Dashboard/ManageServersWindow.xaml.cs b/Dashboard/ManageServersWindow.xaml.cs
index a58f4fe6..25560d15 100644
--- a/Dashboard/ManageServersWindow.xaml.cs
+++ b/Dashboard/ManageServersWindow.xaml.cs
@@ -6,10 +6,16 @@
  * Licensed under the MIT License. See LICENSE file in the project root for full license information.
  */
 
+using Installer.Core;
+using Installer.Core.Models;
+using PerformanceMonitorDashboard.Interfaces;
+using PerformanceMonitorDashboard.Models;
+using PerformanceMonitorDashboard.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -17,50 +23,148 @@
 using PerformanceMonitorDashboard.Models;
 using PerformanceMonitorDashboard.Services;
 using PerformanceMonitor.Ui;
+using PerformanceMonitor.Common;
 
 namespace PerformanceMonitorDashboard
 {
     public partial class ManageServersWindow : Window
     {
         private readonly ServerManager _serverManager;
+        private readonly ICredentialService _credentialService;
         public bool ServersModified { get; private set; }
 
-        public ManageServersWindow(ServerManager serverManager)
+        public int OutdatedCount { get; private set; }
+
+        // Holds the most recent results from CheckAllVersions_Click so UpgradeAll can reuse them.
+        private List<ServerVersionInfo>? _lastVersionCheckResults;
+
+        // Cancellation support for bulk upgrades
+        private CancellationTokenSource? _upgradeCts;
+
+        public ManageServersWindow(ServerManager serverManager, ICredentialService? credentialService = null)
         {
             InitializeComponent();
             _serverManager = serverManager;
+            _credentialService = credentialService ?? new CredentialService();
             ServersModified = false;
             LoadServers();
             _ = LoadInstalledVersionsAsync();
+
+            /* Ensure we cancel upgrades if the window is closed */
+            this.Closing += ManageServersWindow_Closing;
+        }
+
+        private async void ManageServersWindow_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (_upgradeCts != null && !_upgradeCts.IsCancellationRequested)
+            {
+                try
+                {
+                    _upgradeCts.Cancel();
+                }
+                catch (OperationCanceledException)
+                {
+                    // Cancellation is expected.
+                }
+                catch (Exception)
+                {   // Log any exceptions during cancellation 
+                    AppendUpgradeLog("An unexpected error occurred while closing the window.", "Warning");
+                }
+            }
+        }
+
+        private sealed record PerServerUpgradeResult(
+            string ServerId,
+            string ServerDisplay,
+            int UpgradesSucceeded,
+            int UpgradesFailed,
+            int StepsSucceeded,
+            int StepsFailed,
+            bool Success);
+
+        private static string GetAppVersion()
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var infoVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+            if (!string.IsNullOrEmpty(infoVersion))
+            {
+                /* Strip any +metadata suffix (e.g. "2.4.1+abc123" -> "2.4.1") */
+                int plusIndex = infoVersion.IndexOf('+');
+                return plusIndex >= 0 ? infoVersion[..plusIndex] : infoVersion;
+            }
+
+            var version = assembly.GetName().Version;
+            if (version != null)
+            {
+                /* Normalize 4-part to 3-part: "2.4.1.0" -> "2.4.1" */
+                return $"{version.Major}.{version.Minor}.{version.Build}";
+            }
+
+            return "0.0.0";
         }
 
         private void LoadServers()
         {
-            ServersDataGrid.ItemsSource = _serverManager.GetAllServers();
+            // Build a ServerVersionInfo list and bind the grid to it so the UI always works with the wrapper type.
+            var servers = _serverManager.GetAllServers().ToList();
+            _lastVersionCheckResults = servers.Select(s => new ServerVersionInfo
+            {
+                Server = s,
+                InstalledVersion = string.IsNullOrEmpty(s.InstalledVersion) ? "" : s.InstalledVersion,
+                NeedsUpgrade = false
+            }).ToList();
+
+            UpgradeAllButton.Visibility = Visibility.Collapsed;
+            OutdatedCount = 0;
+
+            ServersDataGrid.ItemsSource = _lastVersionCheckResults;
+            ServersDataGrid.Items.Refresh();
         }
 
         private async Task LoadInstalledVersionsAsync()
         {
-            if (ServersDataGrid.ItemsSource is not IEnumerable<ServerConnection> source) return;
+            if (_lastVersionCheckResults == null)
+            {
+                if (ServersDataGrid.ItemsSource is not IEnumerable<ServerVersionInfo> src) return;
+                _lastVersionCheckResults = src.ToList();
+            }
 
-            /* Snapshot the list so subsequent LoadServers() calls don't race us. */
-            var servers = source.ToList();
+            var list = _lastVersionCheckResults.ToList();
 
-            /* Probe in parallel — each call opens its own SqlConnection to master. */
-            var tasks = servers.Select(async s =>
+            var probeTasks = list.Select(async entry =>
             {
                 try
                 {
-                    string? version = await _serverManager.GetInstalledVersionAsync(s);
-                    s.InstalledVersion = string.IsNullOrEmpty(version) ? "Not installed" : NormalizeVersion(version);
+                    string? version = await _serverManager.GetInstalledVersionAsync(entry.Server);
+                    return (Entry: entry, Version: version, Unreachable: false);
                 }
                 catch
                 {
-                    s.InstalledVersion = "Unavailable";
+                    return (Entry: entry, Version: (string?)null, Unreachable: true);
+                }
+            }).ToList();
+
+            var results = await Task.WhenAll(probeTasks);
+
+            await Dispatcher.InvokeAsync(() =>
+            {
+                foreach (var res in results)
+                {
+                    if (res.Unreachable)
+                    {
+                        res.Entry.InstalledVersion = "Unreachable";
+                    }
+                    else
+                    {
+                        res.Entry.InstalledVersion = string.IsNullOrEmpty(res.Version) ? "Not installed" : NormalizeVersion(res.Version!);
+                    }
+
+                    // keep underlying ServerConnection in sync for other code paths
+                    res.Entry.Server.InstalledVersion = res.Entry.InstalledVersion;
                 }
-            });
 
-            await Task.WhenAll(tasks);
+                ServersDataGrid.Items.Refresh();
+            });
         }
 
         private static string NormalizeVersion(string version)
@@ -117,10 +221,10 @@ private void EditServer_Click(object sender, RoutedEventArgs e)
 
         private void EditSelectedServer()
         {
-            if (ServersDataGrid.SelectedItem is ServerConnection server)
+            if (ServersDataGrid.SelectedItem is ServerVersionInfo entry)
             {
-                var dialog = new AddServerDialog(server);
-                dialog.Owner = this;
+                var server = entry.Server;
+                var dialog = new AddServerDialog(server) { Owner = this };
 
                 if (dialog.ShowDialog() == true)
                 {
@@ -161,8 +265,9 @@ private void EditSelectedServer()
 
         private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
         {
-            if (ServersDataGrid.SelectedItem is ServerConnection server)
+            if (ServersDataGrid.SelectedItem is ServerVersionInfo entry)
             {
+                var server = entry.Server;
                 server.IsFavorite = !server.IsFavorite;
                 _serverManager.UpdateServer(server, null, null);
                 LoadServers();
@@ -181,10 +286,10 @@ private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
 
         private async void RemoveServer_Click(object sender, RoutedEventArgs e)
         {
-            if (ServersDataGrid.SelectedItem is ServerConnection server)
+            if (ServersDataGrid.SelectedItem is ServerVersionInfo entry)
             {
-                var dialog = new RemoveServerDialog(server.DisplayNameWithIntent);
-                dialog.Owner = this;
+                var server = entry.Server;
+                var dialog = new RemoveServerDialog(server.DisplayNameWithIntent) { Owner = this };
 
                 if (dialog.ShowDialog() == true)
                 {
@@ -230,7 +335,7 @@ private async void RemoveServer_Click(object sender, RoutedEventArgs e)
 
         private async void CheckForUpdates_Click(object sender, RoutedEventArgs e)
         {
-            if (ServersDataGrid.SelectedItem is not ServerConnection server)
+            if (ServersDataGrid.SelectedItem is not ServerVersionInfo entry)
             {
                 MessageBox.Show(
                     "Please select a server to check for updates.",
@@ -240,14 +345,36 @@ private async void CheckForUpdates_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
+            var server = entry.Server;
             CheckUpdatesButton.IsEnabled = false;
             CheckUpdatesButton.Content = "Checking...";
 
             try
             {
-                string? installedVersion = await _serverManager.GetInstalledVersionAsync(server);
+                string? installedVersion;
+                try
+                {
+                    installedVersion = await _serverManager.GetInstalledVersionAsync(server);
+                }
+                catch (Exception ex)
+                {
+                    entry.InstalledVersion = "Unreachable";
+                    entry.Server.InstalledVersion = entry.InstalledVersion;
+                    ServersDataGrid.Items.Refresh();
+
+                    MessageBox.Show(
+                        $"Could not reach '{server.DisplayNameWithIntent}':\n\n{ex.Message}",
+                        "Connection Error",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Error);
+                    return;
+                }
+
+                entry.InstalledVersion = string.IsNullOrEmpty(installedVersion) ? "Not installed" : NormalizeVersion(installedVersion);
+                entry.Server.InstalledVersion = entry.InstalledVersion;
+                ServersDataGrid.Items.Refresh();
 
-                if (installedVersion == null)
+                if (string.IsNullOrEmpty(installedVersion))
                 {
                     MessageBox.Show(
                         $"No PerformanceMonitor installation found on '{server.DisplayNameWithIntent}'.\n\nUse Edit to install.",
@@ -260,11 +387,9 @@ private async void CheckForUpdates_Click(object sender, RoutedEventArgs e)
                 string appVersion = Assembly.GetExecutingAssembly()
                     .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion
                     ?? Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "0.0.0";
-                /* Strip git hash suffix if present (e.g., "2.5.0+abc123" → "2.5.0") */
                 int plusIndex = appVersion.IndexOf('+');
                 if (plusIndex >= 0) appVersion = appVersion[..plusIndex];
 
-                /* Normalize both to 3-part for comparison */
                 string Normalize(string v)
                 {
                     if (Version.TryParse(v, out var parsed))
@@ -287,8 +412,7 @@ string Normalize(string v)
 
                     if (result == MessageBoxResult.Yes)
                     {
-                        var dialog = new AddServerDialog(server);
-                        dialog.Owner = this;
+                        var dialog = new AddServerDialog(server) { Owner = this };
 
                         if (dialog.ShowDialog() == true)
                         {
@@ -333,9 +457,416 @@ string Normalize(string v)
             }
         }
 
+        private async void CheckAllVersions_Click(object sender, RoutedEventArgs e)
+        {
+            CheckAllVersionsButton.IsEnabled = false;
+            CheckAllVersionsButton.Content = "Checking...";
+
+            try
+            {
+                string appVersion = GetAppVersion();
+
+                // Check all servers in parallel
+                var tasks = _serverManager.GetAllServers().Select(async server =>
+                {
+                    try
+                    {
+                        var installed = await _serverManager.GetInstalledVersionAsync(server);
+                        bool needsUpgrade = false;
+
+                        if (installed != null &&
+                            Version.TryParse(NormalizeVersion(installed), out var installedVer) &&
+                            Version.TryParse(NormalizeVersion(appVersion), out var appVer))
+                        {
+                            needsUpgrade = installedVer < appVer;
+                        }
+
+                        return new ServerVersionInfo
+                        {
+                            Server = server,
+                            InstalledVersion = installed != null ? NormalizeVersion(installed) : "Not installed",
+                            NeedsUpgrade = needsUpgrade
+                        };
+                    }
+                    catch
+                    {
+                        // Mark unreachable instead of leaving null so UI shows "Unreachable"
+                        return new ServerVersionInfo
+                        {
+                            Server = server,
+                            InstalledVersion = "Unreachable",
+                            NeedsUpgrade = false
+                        };
+                    }
+                });
+
+                var results = await Task.WhenAll(tasks);
+
+                // Persist results so UpgradeAll can reuse them
+                _lastVersionCheckResults = results.ToList();
+
+                // Update displayed InstalledVersion for each server row so grid shows values immediately
+                foreach (var r in _lastVersionCheckResults)
+                {
+                    r.Server.InstalledVersion = r.InstalledVersion ?? "Not installed";
+                }
+
+                // Update the grid with version info
+                ServersDataGrid.ItemsSource = _lastVersionCheckResults;
+                ServersDataGrid.Items.Refresh();
+
+                // Show/hide UpgradeAllButton based on whether any need upgrades
+                OutdatedCount = results.Count(r => r.NeedsUpgrade);
+                if (OutdatedCount > 0)
+                {
+                    UpgradeAllButton.Visibility = Visibility.Visible;
+                    UpgradeAllButton.Content = $"Upgrade {OutdatedCount} Server{(OutdatedCount > 1 ? "s" : "")}";
+                }
+                else
+                {
+                    UpgradeAllButton.Visibility = Visibility.Collapsed;
+                }
+            }
+            finally
+            {
+                CheckAllVersionsButton.IsEnabled = true;
+                CheckAllVersionsButton.Content = "Check All Versions";
+            }
+        }
+
+        private void AppendUpgradeLog(string message, string status)
+        {
+            if (string.IsNullOrEmpty(message))
+                return;
+
+            if (!Dispatcher.CheckAccess())
+            {
+                if (!Dispatcher.HasShutdownStarted)
+                {
+                    Dispatcher.Invoke(() => AppendUpgradeLog(message, status));
+                }
+                return;
+            }
+
+            string prefix = status switch
+            {
+                "Success" => "[OK] ",
+                "Error" => "[ERROR] ",
+                "Warning" => "[WARN] ",
+                _ => ""
+            };
+
+            UpgradeLogTextBox.AppendText($"{prefix}{message}\n");
+            UpgradeLogTextBox.ScrollToEnd();
+        }
+
+        /// <summary>
+        /// Runs a full per-server upgrade flow:
+        /// 1) Execute all applicable upgrades (migrations)
+        /// 2) Execute installation files (install/validate)
+        /// 3) Log installation history
+        /// Returns a compact result summary for aggregation by the caller.
+        /// </summary>
+        private async Task<PerServerUpgradeResult> RunUpgradeAsync(
+            ServerConnection server,
+            string installerConnectionString,
+            string installedVersion,
+            string targetVersion,
+            ScriptProvider provider,
+            IProgress<InstallationProgress>? progress,
+            CancellationToken cancellationToken)
+        {
+            int upgradesSucceeded = 0;
+            int upgradesFailed = 0;
+            int stepsSucceeded = 0;
+            int stepsFailed = 0;
+
+            try
+            {
+                AppendUpgradeLog($"[{server.DisplayNameWithIntent}] Applying upgrades from v{installedVersion} to v{targetVersion}...", "Info");
+
+                var (upSuccess, upFailure, upCount) = await InstallationService.ExecuteAllUpgradesAsync(
+                    provider,
+                    installerConnectionString,
+                    installedVersion,
+                    targetVersion,
+                    progress,
+                    cancellationToken).ConfigureAwait(false);
+
+                upgradesSucceeded = upSuccess;
+                upgradesFailed = upFailure;
+
+                AppendUpgradeLog($"[{server.DisplayNameWithIntent}] Upgrades applied: {upCount} (succeeded: {upSuccess}, failed: {upFailure})", upFailure == 0 ? "Success" : "Warning");
+
+                // Execute installation (files, validations)
+                bool cleanInstall = false;
+                bool resetSchedule = false;
+
+                var installResult = await InstallationService.ExecuteInstallationAsync(
+                    installerConnectionString,
+                    provider,
+                    cleanInstall,
+                    resetSchedule,
+                    progress,
+                    preValidationAction: null,
+                    cancellationToken).ConfigureAwait(false);
+
+                stepsSucceeded = installResult.FilesSucceeded;
+                stepsFailed = installResult.FilesFailed;
+
+                AppendUpgradeLog($"[{server.DisplayNameWithIntent}] Installation completed: stepsSucceeded={stepsSucceeded}, stepsFailed={stepsFailed}", installResult.Success ? "Success" : "Warning");
+
+                // Try to log installation history (best-effort)
+                try
+                {
+                    await InstallationService.LogInstallationHistoryAsync(
+                        installerConnectionString,
+                        targetVersion,
+                        targetVersion,
+                        installResult.StartTime,
+                        installResult.FilesSucceeded,
+                        installResult.FilesFailed,
+                        installResult.Success,
+                        progress).ConfigureAwait(false);
+
+                    AppendUpgradeLog($"[{server.DisplayNameWithIntent}] Installation history recorded", "Success");
+                }
+                catch (Exception ex)
+                {
+                    AppendUpgradeLog($"[{server.DisplayNameWithIntent}] Could not record installation history: {ex.Message}", "Warning");
+                }
+
+                bool overallSuccess = (upgradesFailed == 0 && stepsFailed == 0);
+                return new PerServerUpgradeResult(server.Id, server.DisplayNameWithIntent, upgradesSucceeded, upgradesFailed, stepsSucceeded, stepsFailed, overallSuccess);
+            }
+            catch (OperationCanceledException)
+            {
+                AppendUpgradeLog($"[{server.DisplayNameWithIntent}] Upgrade cancelled by user.", "Warning");
+                return new PerServerUpgradeResult(server.Id, server.DisplayNameWithIntent, upgradesSucceeded, upgradesFailed, stepsSucceeded, stepsFailed, false);
+            }
+            catch (Exception ex)
+            {
+                AppendUpgradeLog($"[{server.DisplayNameWithIntent}] Upgrade failed: {ex.Message}", "Error");
+                return new PerServerUpgradeResult(server.Id, server.DisplayNameWithIntent, upgradesSucceeded, upgradesFailed, stepsSucceeded, stepsFailed, false);
+            }
+        }
+
+        private async void UpgradeAll_Click(object sender, RoutedEventArgs e)
+        {
+            string appVersion = GetAppVersion();
+
+            int OutdatedEntraMFACount = _lastVersionCheckResults.Count(r => r.NeedsUpgrade && (r.AuthenticationDisplay == "Microsoft Entra MFA"));
+
+            // Confirm with the user
+            var confirm = MessageBox.Show(
+                $"Upgrade {OutdatedCount} server(s) to v{appVersion}?\n\n" +
+                $"All servers{(OutdatedEntraMFACount > 0 ? $", including {OutdatedEntraMFACount} Entra MFA server(s)," : "")} will be upgraded in parallel.",
+                "Confirm Bulk Upgrade",
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Question);
+
+            if (confirm != MessageBoxResult.Yes) return;
+
+            UpgradeProgressPanel.Visibility = Visibility.Visible;
+            UpgradeAllButton.IsEnabled = false;
+            CancelUpgradeButton.Visibility = Visibility.Visible;
+            CancelUpgradeButton.IsEnabled = true;
+
+            // Run upgrades in parallel using InstallationService directly
+            // Reuse results from CheckAllVersions_Click when available
+
+            // Prepare UI and log
+            UpgradeLogTextBox.Clear();
+            UpgradeProgressBar.Value = 0;
+            UpgradeProgressText.Text = "Preparing upgrades...";
+
+            if (_lastVersionCheckResults == null)
+            {
+                AppendUpgradeLog("No version scan results found. Please run 'Check All Versions' first.", "Warning");
+                UpgradeAllButton.IsEnabled = true;
+                CancelUpgradeButton.IsEnabled = false;
+                UpgradeProgressText.Text = "Ready";
+                return;
+            }
+
+            // create cancellation token source for this run
+            _upgradeCts?.Dispose();
+            _upgradeCts = new CancellationTokenSource();
+            var cancellationToken = _upgradeCts.Token;
+
+            var provider = ScriptProvider.FromEmbeddedResources();
+
+            // Store the number of servers we are upgrading to calculate the denominator for the average
+            int totalServersToUpgrade = _lastVersionCheckResults.Count(r => r.NeedsUpgrade);
+
+            // Thread-safe dictionary to track the most recent progress of each server by its ID
+            var serverProgressMap = new System.Collections.Concurrent.ConcurrentDictionary<string, double>();
+
+            // Change the signature to accept a tuple: (ServerId, InstallationProgress)
+            var centralProgress = new Progress<(string ServerId, InstallationProgress p)>(report =>
+            {
+                var serverId = report.ServerId;
+                var p = report.p;
+
+                Dispatcher.Invoke(() =>
+                {
+                    /* Only update the map if the payload actually contains progress data */
+                    bool progressChanged = false;
+
+                    if (p.ProgressPercent.HasValue)
+                    {
+                        serverProgressMap[serverId] = p.ProgressPercent.Value;
+                        progressChanged = true;
+                    }
+                    else if (p.TotalSteps > 0)
+                    {
+                        serverProgressMap[serverId] = ((double)p.CurrentStep / (double)p.TotalSteps) * 100.0;
+                        progressChanged = true;
+                    }
+
+                    /* Recalculate progress ONLY if a numeric update occurred */
+                    if (progressChanged && !serverProgressMap.IsEmpty)
+                    {
+                        double overallProgress = serverProgressMap.Values.Sum() / totalServersToUpgrade;
+                        UpgradeProgressBar.Value = overallProgress;
+                    }
+
+                    /* Update status text if present */
+                    if (!string.IsNullOrEmpty(p.Message))
+                    {
+                        UpgradeProgressText.Text = p.Message;
+                    }
+
+                    /* Append to log while filtering out Debug messages */
+                    if (p.Status != "Debug")
+                    {
+                        AppendUpgradeLog(p.Message, p.Status);
+                    }
+                });
+            });
+
+            var upgradeTargets = new List<(ServerConnection Server, string InstallerConnectionString, string InstalledVersion)>();
+
+            foreach (var entry in _lastVersionCheckResults.Where(r => r.NeedsUpgrade))
+            {
+                var server = entry.Server;
+                try
+                {
+                    // Determine credential values (if applicable)
+                    string? username = null;
+                    string? password = null;
+                    bool useWindowsAuth = server.UseWindowsAuth;
+                    bool useEntraAuth = server.AuthenticationType == AuthenticationTypes.EntraMFA;
+
+                    if (server.AuthenticationType == AuthenticationTypes.SqlServer ||
+                        server.AuthenticationType == AuthenticationTypes.EntraMFA)
+                    {
+                        var cred = _credentialService.GetCredential(server.Id);
+                        if (cred.HasValue)
+                        {
+                            username = cred.Value.Username;
+                            password = cred.Value.Password;
+                        }
+                    }
+
+                    // Build a connection string suitable for installation operations (connect to master)
+                    string installerConnStr = InstallationService.BuildConnectionString(
+                        server.ServerName,
+                        useWindowsAuth,
+                        username,
+                        password,
+                        server.EncryptMode,
+                        server.TrustServerCertificate,
+                        useEntraAuth);
+
+                    upgradeTargets.Add((server, installerConnStr, entry.InstalledVersion ?? "Unknown"));
+                    AppendUpgradeLog($"Queued '{server.DisplayNameWithIntent}' for upgrade (v{entry.InstalledVersion ?? "Unknown"})", "Info");
+                }
+                catch (Exception ex)
+                {
+                    AppendUpgradeLog($"Failed to prepare '{server.DisplayNameWithIntent}': {ex.Message}", "Warning");
+                }
+            }
+
+            if (upgradeTargets.Count == 0)
+            {
+                AppendUpgradeLog("No servers require upgrade.", "Info");
+                UpgradeProgressText.Text = "No upgrades required";
+                UpgradeAllButton.IsEnabled = true;
+                CancelUpgradeButton.IsEnabled = false;
+                CancelUpgradeButton.Visibility = Visibility.Collapsed;
+                _upgradeCts?.Dispose();
+                _upgradeCts = null;
+                return;
+            }
+
+            // Run per-server workflows in parallel, using per-server progress wrappers so messages are prefixed.
+            var tasks = upgradeTargets.Select(t =>
+            {
+                IProgress<InstallationProgress> serverProgress = new Progress<InstallationProgress>(p =>
+                {
+                    var prefixed = new InstallationProgress
+                    {
+                        Message = $"[{t.Server.DisplayNameWithIntent}] {p.Message}",
+                        Status = p.Status,
+                        ProgressPercent = p.ProgressPercent,
+                        CurrentStep = p.CurrentStep,
+                        TotalSteps = p.TotalSteps
+                    };
+
+                    // Report the unique server ID alongside the progress payload
+                    ((IProgress<(string, InstallationProgress)>)centralProgress).Report((t.Server.Id, prefixed));
+                });
+
+                return RunUpgradeAsync(t.Server, t.InstallerConnectionString, t.InstalledVersion, appVersion, provider, serverProgress, cancellationToken);
+            }).ToList();
+
+            PerServerUpgradeResult[] results;
+            try
+            {
+                results = await Task.WhenAll(tasks);
+            }
+            finally
+            {
+                // ensure CTS disposed in either case
+                _upgradeCts?.Dispose();
+                _upgradeCts = null;
+            }
+
+            // Map to aggregator inputs
+            var inputs = results.Select(r => new AggregationInput(
+    r.Success,
+    r.UpgradesSucceeded,
+    r.UpgradesFailed,
+    r.StepsSucceeded,
+    r.StepsFailed)).ToList();
+
+            // Aggregate results by server success/failure and step counts
+            var agg = UpgradeAggregator.Aggregate(inputs);
+
+            // After all complete: show summary (include server counts and step counts)
+            UpgradeProgressText.Text = $"Complete: {agg.ServerSuccessCount} of {upgradeTargets.Count} servers upgraded.";
+            AppendUpgradeLog($"Bulk upgrade completed: {agg.ServerSuccessCount} succeeded, {agg.ServerFailCount} failed. {agg.StepsSucceeded} steps succeeded, {agg.StepsFailed} steps failed", agg.StepsFailed == 0 ? "Success" : "Warning");
+
+            UpgradeAllButton.IsEnabled = false;
+            CancelUpgradeButton.IsEnabled = false;
+            CancelUpgradeButton.Visibility = Visibility.Collapsed;
+        }
+
+        // UI handler to cancel bulk upgrades. Wire this to a Cancel button in the XAML (e.g., CancelUpgradeButton).
+        private void CancelUpgrade_Click(object sender, RoutedEventArgs e)
+        {
+            if (_upgradeCts != null && !_upgradeCts.IsCancellationRequested)
+            {
+                _upgradeCts.Cancel();
+                AppendUpgradeLog("User requested cancellation of bulk upgrades.", "Warning");
+                CancelUpgradeButton.IsEnabled = false;
+            }
+        }
+
         private void ExcludedDatabases_Click(object sender, RoutedEventArgs e)
         {
-            if (ServersDataGrid.SelectedItem is not ServerConnection server)
+            if (ServersDataGrid.SelectedItem is not ServerVersionInfo entry)
             {
                 MessageBox.Show(
                     "Please select a server to configure excluded databases.",
@@ -345,7 +876,7 @@ private void ExcludedDatabases_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
-            var dialog = new ExcludedDatabasesDialog(_serverManager, server) { Owner = this };
+            var dialog = new ExcludedDatabasesDialog(_serverManager, entry.Server) { Owner = this };
             if (dialog.ShowDialog() == true && dialog.ExclusionsModified)
             {
                 ServersModified = true;
@@ -354,7 +885,7 @@ private void ExcludedDatabases_Click(object sender, RoutedEventArgs e)
 
         private async void PurgeNow_Click(object sender, RoutedEventArgs e)
         {
-            if (ServersDataGrid.SelectedItem is not ServerConnection server)
+            if (ServersDataGrid.SelectedItem is not ServerVersionInfo entry)
             {
                 MessageBox.Show(
                     "Please select a server to purge.",
@@ -364,6 +895,7 @@ private async void PurgeNow_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
+            var server = entry.Server;
             var dialog = new PurgeNowDialog(server.DisplayNameWithIntent) { Owner = this };
             if (dialog.ShowDialog() != true) return;
 
diff --git a/Dashboard/Models/ServerConnection.cs b/Dashboard/Models/ServerConnection.cs
index 2c548027..4efdd1bb 100644
--- a/Dashboard/Models/ServerConnection.cs
+++ b/Dashboard/Models/ServerConnection.cs
@@ -203,4 +203,97 @@ public bool HasStoredCredentials(ICredentialService credentialService)
             return credentialService.CredentialExists(Id);
         }
     }
+    public class ServerVersionInfo : System.ComponentModel.INotifyPropertyChanged
+    {
+        private ServerConnection? _server;
+        public required ServerConnection Server
+        {
+            get => _server!;
+            set
+            {
+                if (_server == value) return;
+                if (_server != null) _server.PropertyChanged -= OnInnerServerPropertyChanged;
+                _server = value;
+                if (_server != null) _server.PropertyChanged += OnInnerServerPropertyChanged;
+                RaiseAllProxyProperties();
+                OnPropertyChanged(nameof(Server));
+            }
+        }
+        public string? InstalledVersion
+        {
+            get => _server!.InstalledVersion;
+            set
+            {
+                if (_server!.InstalledVersion == value) return;
+                _server!.InstalledVersion = value;
+                OnPropertyChanged(nameof(InstalledVersion));
+                OnPropertyChanged(nameof(VersionDisplay));
+            }
+        }
+
+        private bool _needsUpgrade;
+        public bool NeedsUpgrade
+        {
+            get => _needsUpgrade;
+            set
+            {
+                if (_needsUpgrade == value) return;
+                _needsUpgrade = value;
+                OnPropertyChanged(nameof(NeedsUpgrade));
+            }
+        }
+
+        public string VersionDisplay => InstalledVersion ?? "—";
+
+        // Proxy properties so existing XAML bindings continue to work
+        public string DisplayName => Server?.DisplayName ?? string.Empty;
+        public string ServerName => Server?.ServerName ?? string.Empty;
+        public string AuthenticationDisplay => Server?.AuthenticationDisplay ?? string.Empty;
+        public decimal MonthlyCostUsd => Server?.MonthlyCostUsd ?? 0m;
+        public DateTime LastConnected => Server?.LastConnected ?? DateTime.MinValue;
+        public bool IsFavorite => Server?.IsFavorite ?? false;
+
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
+        private void OnPropertyChanged(string name) => PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(name));
+
+        private void RaiseAllProxyProperties()
+        {
+            OnPropertyChanged(nameof(DisplayName));
+            OnPropertyChanged(nameof(ServerName));
+            OnPropertyChanged(nameof(AuthenticationDisplay));
+            OnPropertyChanged(nameof(MonthlyCostUsd));
+            OnPropertyChanged(nameof(LastConnected));
+            OnPropertyChanged(nameof(IsFavorite));
+            OnPropertyChanged(nameof(InstalledVersion));
+        }
+
+        private void OnInnerServerPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            // Forward only the properties that the UI binds to
+            switch (e.PropertyName)
+            {
+                case nameof(ServerConnection.DisplayName):
+                    OnPropertyChanged(nameof(DisplayName));
+                    break;
+                case nameof(ServerConnection.ServerName):
+                    OnPropertyChanged(nameof(ServerName));
+                    break;
+                case nameof(ServerConnection.AuthenticationDisplay):
+                    OnPropertyChanged(nameof(AuthenticationDisplay));
+                    break;
+                case nameof(ServerConnection.MonthlyCostUsd):
+                    OnPropertyChanged(nameof(MonthlyCostUsd));
+                    break;
+                case nameof(ServerConnection.LastConnected):
+                    OnPropertyChanged(nameof(LastConnected));
+                    break;
+                case nameof(ServerConnection.IsFavorite):
+                    OnPropertyChanged(nameof(IsFavorite));
+                    break;
+                case nameof(ServerConnection.InstalledVersion):
+                    OnPropertyChanged(nameof(InstalledVersion));
+                    break;
+            }
+        }
+    }
 }
diff --git a/Dashboard/UpgradeAggregation.cs b/Dashboard/UpgradeAggregation.cs
new file mode 100644
index 00000000..ba50878a
--- /dev/null
+++ b/Dashboard/UpgradeAggregation.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+
+namespace PerformanceMonitorDashboard
+{
+    /// <summary>
+    /// Simple input DTO used by the aggregator.
+    /// </summary>
+    public sealed record AggregationInput(
+        bool Success,
+        int UpgradesSucceeded,
+        int UpgradesFailed,
+        int StepsSucceeded,
+        int StepsFailed);
+
+    /// <summary>
+    /// Aggregation result returned to callers and used by tests/UI.
+    /// </summary>
+    public sealed record AggregationResult(
+        int ServerSuccessCount,
+        int ServerFailCount,
+        int StepsSucceeded,
+        int StepsFailed,
+        string Summary);
+
+    /// <summary>
+    /// Aggregates per-server upgrade results into server counts and total step/file counts.
+    /// </summary>
+    public static class UpgradeAggregator
+    {
+        public static AggregationResult Aggregate(IEnumerable<AggregationInput> inputs)
+        {
+            if (inputs == null) throw new ArgumentNullException(nameof(inputs));
+
+            int serverSuccess = 0;
+            int serverFail = 0;
+            int stepsSucceeded = 0;
+            int stepsFailed = 0;
+
+            foreach (var it in inputs)
+            {
+                if (it.Success) serverSuccess++;
+                else serverFail++;
+
+                stepsSucceeded += it.UpgradesSucceeded + it.StepsSucceeded;
+                stepsFailed += it.UpgradesFailed + it.StepsFailed;
+            }
+
+            string serversPart = serverSuccess == 1 ? "1 server upgraded" : $"{serverSuccess} servers upgraded";
+            string stepsPart = stepsFailed == 1
+                ? $"{stepsSucceeded} steps succeeded, 1 step failed"
+                : $"{stepsSucceeded} steps succeeded, {stepsFailed} steps failed";
+
+            string summary = $"{serversPart} ({stepsPart})";
+
+            return new AggregationResult(serverSuccess, serverFail, stepsSucceeded, stepsFailed, summary);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Installer/packages.lock.json b/Installer/packages.lock.json
index 7dca489d..b0cf1bb5 100644
--- a/Installer/packages.lock.json
+++ b/Installer/packages.lock.json
@@ -22,9 +22,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[10.0.8, )",
-        "resolved": "10.0.8",
-        "contentHash": "dVbSXGIFNR5nZcv2tOLoWI+a9T4jtFd77IYjuND+QVe360qWgAF7H0WtoopYhRw/+SgpGUTyrkrh+65+ClNnfw=="
+        "requested": "[10.0.9, )",
+        "resolved": "10.0.9",
+        "contentHash": "4Iw41e2h7I4t70SJcX2GCmbyKJIlA273Cfm9RJMM050/3VBejGAG1KcthP5Z2L6SQcbfbf6BhNWO26+ZG+GzMg=="
       },
       "Azure.Core": {
         "type": "Transitive",