prepare-for-core-upgrade

src/Directory.Packages.props

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup Label="Versions for direct package references">
     <PackageVersion Include="Autofac" Version="9.1.0" />
-    <PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.10.4" />
+    <PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.10.1" />
     <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="Azure.Monitor.Query.Metrics" Version="1.0.0" />
     <PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
@@ -34,11 +34,10 @@
     <PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.5" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="6.1.3" />
-    <PackageVersion Include="NServiceBus" Version="10.1.4" />
-    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.1.4" />
+    <PackageVersion Include="NServiceBus" Version="10.2.0-alpha.13" />
+    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.2.0-alpha.13" />
     <PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.1" />
     <PackageVersion Include="NServiceBus.CustomChecks" Version="6.0.1" />
-    <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="4.0.1" />
     <PackageVersion Include="NServiceBus.Extensions.Logging" Version="4.0.1" />
     <PackageVersion Include="NServiceBus.Heartbeat" Version="6.0.1" />
     <PackageVersion Include="NServiceBus.Metrics" Version="6.0.1" />
@@ -94,4 +93,4 @@
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.334" />
     <GlobalPackageReference Include="Particular.Packaging" Version="4.5.0" />
   </ItemGroup>
-</Project>
+</Project>

src/Particular.LicensingComponent.Contracts/AuditServiceMetadata.cs

@@ -1,5 +1,3 @@
 namespace Particular.LicensingComponent.Contracts;
 
-public record AuditServiceMetadata(Dictionary<string, int> Versions, Dictionary<string, int> Transports)
-{
-}
+public record AuditServiceMetadata(Dictionary<string, int> Versions, Dictionary<string, int> Transports);

src/Particular.LicensingComponent.Contracts/BrokerMetadata.cs

@@ -1,5 +1,3 @@
 namespace Particular.LicensingComponent.Contracts;
 
-public record BrokerMetadata(string? ScopeType, Dictionary<string, string> Data)
-{
-}
+public record BrokerMetadata(string? ScopeType, Dictionary<string, string> Data);

src/Particular.LicensingComponent.UnitTests/AuditQuery_Tests.cs

@@ -39,11 +39,11 @@ public async Task Should_return_known_endpoints_if_any()
         //Assert
         Assert.That(endpoints, Is.Not.Null, "Endpoints should be found");
         Assert.That(endpoints.Count, Is.EqualTo(2), "Invalid number of on known endpoints");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(endpoints.Any(a => a.Name == "Endpoint1"), Is.True, "Should have found Endpoint1");
             Assert.That(endpoints.Any(a => a.Name == "Endpoint2"), Is.True, "Should have found Endpoint2");
-        });
+        }
     }
 
     [Test]
@@ -58,20 +58,20 @@ public async Task Should_return_audit_remotes()
         //Assert
         Assert.That(remotes, Is.Not.Null, "Remotes should be found");
         Assert.That(remotes, Has.Count.EqualTo(1), "Invalid number of remotes");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(remotes[0].ApiUri, Is.EqualTo("http://localhost:44444/api/"), "Invalid ApiUri on remote");
             Assert.That(remotes[0].VersionString, Is.EqualTo("5.1.0"), "Invalid VersionString on remote");
             Assert.That(remotes[0].Retention, Is.EqualTo(new TimeSpan(7, 0, 0, 0)), "Invalid Retention on remote");
             Assert.That(remotes[0].Queues, Is.Not.Null, "Queues should be reported on remote");
-        });
+        }
 
         Assert.That(remotes[0].Queues, Has.Count.EqualTo(2), "Invalid number of queues reported on remote");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(remotes[0].Queues, Does.Contain("audit"), "Should have foind audit queue");
             Assert.That(remotes[0].Queues, Does.Contain("audit.log"), "Should have found audit.log queue");
-        });
+        }
     }
 
     [Test]
@@ -85,11 +85,11 @@ public async Task Should_return_successful_audit_connection_if_instances_exist_a
 
         //Assert
         Assert.That(connectionSettingsResult, Is.Not.Null, "connectionSettingsResult should be returned");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(connectionSettingsResult.ConnectionSuccessful, Is.True, "Connection status should be successful");
             Assert.That(connectionSettingsResult.ConnectionErrorMessages.Count, Is.EqualTo(0), "Unexpected ConnectionErrorMessages");
-        });
+        }
 
         Approver.Verify(connectionSettingsResult.Diagnostics);
     }
@@ -107,11 +107,11 @@ public async Task Should_return_diagnostics_and_no_errors_when_no_remotes_define
 
         //Assert
         Assert.That(connectionSettingsResult, Is.Not.Null, "connectionSettingsResult should be returned");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(connectionSettingsResult.ConnectionSuccessful, Is.True, "Connection status should be successful");
             Assert.That(connectionSettingsResult.ConnectionErrorMessages.Count, Is.EqualTo(0), "Unexpected ConnectionErrorMessages");
-        });
+        }
 
         Approver.Verify(connectionSettingsResult.Diagnostics);
     }
@@ -132,11 +132,11 @@ public async Task Should_always_return_diagnostics_and_relevant_errors_when_inva
 
         //Assert
         Assert.That(connectionSettingsResult, Is.Not.Null, "connectionSettingsResult should be returned");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(connectionSettingsResult.ConnectionSuccessful, Is.False, "Connection status should not be successful");
             Assert.That(connectionSettingsResult.ConnectionErrorMessages.Count, Is.Not.EqualTo(0), "Expected ConnectionErrorMessages");
-        });
+        }
 
         Approver.Verify(connectionSettingsResult.Diagnostics, scenario: $"status_{remoteStatus}.version_{remoteVersion?.Replace(".", "") ?? "null"}.retention_{retensionPeriod[0]}");
     }

src/Particular.LicensingComponent.UnitTests/AuditThroughputCollectorHostedService_Tests.cs

@@ -188,19 +188,19 @@ await Task.Run(async () =>
 
         // Assert
         Assert.That(foundEndpoint, Is.Not.Null, $"Expected to find endpoint {endpointName}");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(foundEndpoint.Id.Name, Is.EqualTo(endpointName), $"Expected name to be {endpointName}");
             Assert.That(foundEndpointThroughput, Is.Not.Null, "Expected endpoint throughput");
-        });
+        }
         Assert.That(foundEndpointThroughput.ContainsKey(endpointName), Is.True, $"Expected throughput for {endpointName}");
 
         Assert.That(throughputData.Length, Is.EqualTo(1), $"Expected 1 throughput data for {endpointName}");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(throughputData[0].ContainsKey(throughputDate), Is.True, $"Expected throughput for {throughputDate}");
             Assert.That(throughputData[0][throughputDate], Is.EqualTo(throughputCount), $"Expected throughput for {throughputDate} to be {throughputCount}");
-        });
+        }
     }
 
     class AuditQuery_NoAuditRemotes : IAuditQuery

src/Particular.LicensingComponent.UnitTests/BrokerThroughputCollectorHostedServiceTests.cs

@@ -98,11 +98,11 @@ await Task.Run(async () =>
             } while (!token.IsCancellationRequested);
         });
 
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(mockedBrokerThroughputQueryThatThrowsExceptions.GetQueueNamesCalls, Is.GreaterThan(1));
             Assert.That(mockedBrokerThroughputQueryThatThrowsExceptions.GetGetThroughputPerDay, Is.GreaterThan(1));
-        });
+        }
     }
 
     [Test]

src/Particular.LicensingComponent.UnitTests/Infrastructure/ThroughputCollectorTestFixture.cs

@@ -33,8 +33,6 @@ public virtual Task Setup()
         protected ThroughputTestsConfiguration configuration = new();
 
         [AttributeUsage(AttributeTargets.Method)]
-        public class UseNonBrokerTransportAttribute : Attribute
-        {
-        }
+        public class UseNonBrokerTransportAttribute : Attribute;
     }
 }

src/Particular.LicensingComponent.UnitTests/MonitoringService_Tests.cs

@@ -47,27 +47,27 @@ public async Task Should_record_new_endpoint_and_throughput()
 
         // Assert
         Assert.That(foundEndpoint, Is.Not.Null, "Expected to find Endpoint1");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(foundEndpoint.Id.Name, Is.EqualTo("Endpoint1"), "Expected name to be Endpoint1");
             Assert.That(foundEndpoint.EndpointIndicators, Is.Not.Null, "Expected to find endpoint indicators");
-        });
+        }
         Assert.That(foundEndpoint.EndpointIndicators, Does.Contain(EndpointIndicator.KnownEndpoint.ToString()),
                     "Expected KnownEndpoint indicator");
 
         Assert.That(foundEndpointThroughput, Is.Not.Null, "Expected endpoint throughput");
         Assert.That(foundEndpointThroughput.ContainsKey("Endpoint1"), Is.True, "Expected throughput for Endpoint1");
 
         Assert.That(throughputData.Length, Is.EqualTo(1), "Expected 1 throughput data for Endpoint1");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(throughputData[0].ThroughputSource, Is.EqualTo(ThroughputSource.Monitoring),
                     "Expected ThroughputSource to be Monitoring for Endpoint1");
             Assert.That(throughputData[0].Keys.Contains(DateOnly.FromDateTime(message.EndDateTime.Date)), Is.True,
                 $"Expected throughput for {message.StartDateTime.Date} for Endpoint1");
             Assert.That(throughputData[0][DateOnly.FromDateTime(message.EndDateTime.Date)], Is.EqualTo(15),
                 $"Expected throughput for {message.StartDateTime.Date} to be 15 for Endpoint1");
-        });
+        }
     }
 
     [Test]
@@ -113,12 +113,12 @@ public async Task Should_return_successful_monitoring_connection_and_diagnostics
 
         // Assert
         Assert.That(connectionSettingsResult, Is.Not.Null, "connectionSettingsResult should be returned");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(connectionSettingsResult.ConnectionSuccessful, Is.True, "Connection status should be successful");
             Assert.That(connectionSettingsResult.ConnectionErrorMessages.Count, Is.EqualTo(0),
                 "Unexpected ConnectionErrorMessages");
-        });
+        }
 
         Assert.That(connectionSettingsResult.Diagnostics, Is.Not.Null, "Expected diagnostic");
         Assert.That(
@@ -143,13 +143,13 @@ public async Task Should_return_error_monitoring_connection_and_diagnostics_if_n
 
         // Assert
         Assert.That(connectionSettingsResult, Is.Not.Null, "connectionSettingsResult should be returned");
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(connectionSettingsResult.ConnectionSuccessful, Is.False,
                     "Connection status should be unsuccessful");
             Assert.That(connectionSettingsResult.ConnectionErrorMessages.Count, Is.EqualTo(0),
                 "Unexpected ConnectionErrorMessages");
-        });
+        }
 
         Assert.That(connectionSettingsResult.Diagnostics, Is.Not.Null, "Expected diagnostic");
         Assert.That(

src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_GenerationStatus_Tests.cs

@@ -28,11 +28,11 @@ await DataStore.CreateBuilder()
         var reportGenerationState = await ThroughputCollector.GetReportGenerationState(default);
 
         // Assert
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(reportGenerationState.ReportCanBeGenerated, Is.True);
             Assert.That(reportGenerationState.Reason, Is.EqualTo(""));
-        });
+        }
     }
 
 
@@ -48,11 +48,11 @@ await DataStore.CreateBuilder()
         var reportGenerationState = await ThroughputCollector.GetReportGenerationState(default);
 
         // Assert
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(reportGenerationState.ReportCanBeGenerated, Is.True);
             Assert.That(reportGenerationState.Reason, Is.EqualTo(""));
-        });
+        }
     }
 
     [Test]
@@ -69,11 +69,11 @@ await DataStore.CreateBuilder()
         var reportGenerationState = await ThroughputCollector.GetReportGenerationState(default);
 
         // Assert
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(reportGenerationState.ReportCanBeGenerated, Is.False);
             Assert.That(reportGenerationState.Reason, Does.Contain("one day"), "Report generation failure reason does not contain 'one day'");
-        });
+        }
         Assert.That(reportGenerationState.Reason, Does.Contain("broker"), "Report generation failure reason does not contain 'broker'");
     }
 
@@ -90,11 +90,11 @@ await DataStore.CreateBuilder().AddEndpoint()
         var reportGenerationState = await ThroughputCollector.GetReportGenerationState(default);
 
         // Assert
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(reportGenerationState.ReportCanBeGenerated, Is.False);
             Assert.That(reportGenerationState.Reason, Does.Contain("one day"), "Report generation failure reason does not contain 'one day'");
-        });
+        }
         Assert.That(reportGenerationState.Reason, Does.Contain("broker"), "Report generation failure reason does not contain 'broker'");
     }
 }

src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Dates_Tests.cs

@@ -48,12 +48,12 @@ await DataStore.CreateBuilder()
         var reportEndDate = new DateTimeOffset(maxDate.ToDateTime(TimeOnly.MinValue, DateTimeKind.Utc));
 
         Assert.That(report, Is.Not.Null);
-        Assert.Multiple(() =>
+        using (Assert.EnterMultipleScope())
         {
             Assert.That(report.ReportData.Queues.Count, Is.EqualTo(3));
             Assert.That(report.ReportData.StartTime, Is.EqualTo(minDateInReport), $"Incorrect StartTime for report");
             Assert.That(report.ReportData.EndTime, Is.EqualTo(reportEndDate), $"Incorrect StartTime for report");
             Assert.That(report.ReportData.ReportDuration, Is.EqualTo(reportEndDate - minDateInReport), $"Incorrect ReportDuration for report");
-        });
+        }
     }
 }