Prevent correct connection string being overwritten during upgrade of primary instance

.reposync.yml

@@ -1,2 +1 @@
-exclusions:
-- src/NServiceBus.snk
+

src/Directory.Packages.props

@@ -38,7 +38,7 @@
     <PackageVersion Include="NServiceBus.Metrics" Version="5.0.1" />
     <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="5.0.0" />
     <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="2.0.1" />
-    <PackageVersion Include="NServiceBus.RabbitMQ" Version="9.2.0" />
+    <PackageVersion Include="NServiceBus.RabbitMQ" Version="10.0.0" />
     <PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.2" />
     <PackageVersion Include="NServiceBus.Testing" Version="9.0.1" />
     <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="5.0.0" />

src/ServiceControl.Config/Framework/Modules/InstallerModule.cs

@@ -137,6 +137,14 @@ internal ReportCard Upgrade(ServiceControlBaseService instance, ServiceControlUp
             {
                 progress.Report(currentStep++, totalSteps, "Restoring app.config...");
                 instance.RestoreAppConfig(backupFile);
+
+                var restoredConnectionString = instance.AppConfig.Config.ConnectionStrings.ConnectionStrings["NServiceBus/Transport"];
+
+                if (restoredConnectionString is not null &&
+                    !string.Equals(instance.ConnectionString, restoredConnectionString.ConnectionString, StringComparison.OrdinalIgnoreCase))
+                {
+                    upgradeOptions.UpgradedConnectionString = restoredConnectionString.ConnectionString;
+                }
             }
 
             UpgradeOptions(upgradeOptions, instance);