Prepare for RTM

Particular · Feb 21, 2024 · 33d0fae · 33d0fae
1 parent caa5f56
commit 33d0fae
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,6 @@ jobs:
         uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages

diff --git a/src/NServiceBus.Metrics.ServiceControl.AcceptanceTests/EndpointTemplates/DefaultServer.cs b/src/NServiceBus.Metrics.ServiceControl.AcceptanceTests/EndpointTemplates/DefaultServer.cs
@@ -31,6 +31,7 @@ public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescr
 
             var storageDir = Path.Combine(NServiceBusAcceptanceTest.StorageRootDir, NUnit.Framework.TestContext.CurrentContext.Test.ID);
 
+            configuration.UseSerialization<SystemJsonSerializer>();
             configuration.UseTransport(new LearningTransport { StorageDirectory = storageDir });
 
             configuration.RegisterComponentsAndInheritanceHierarchy(runDescriptor);

diff --git a/....ServiceControl.AcceptanceTests/NServiceBus.Metrics.ServiceControl.AcceptanceTests.csproj b/....ServiceControl.AcceptanceTests/NServiceBus.Metrics.ServiceControl.AcceptanceTests.csproj
@@ -9,10 +9,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.Metrics" Version="5.0.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.1" />
-    <PackageReference Include="NServiceBus.Metrics" Version="5.0.0-alpha.1" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/NServiceBus.Metrics.ServiceControl.Tests/NServiceBus.Metrics.ServiceControl.Tests.csproj b/src/NServiceBus.Metrics.ServiceControl.Tests/NServiceBus.Metrics.ServiceControl.Tests.csproj
@@ -9,13 +9,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="NServiceBus" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.Metrics" Version="5.0.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Particular.Approvals" Version="1.0.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NServiceBus.Metrics.ServiceControl/Guard.cs b/src/NServiceBus.Metrics.ServiceControl/Guard.cs
diff --git a/src/NServiceBus.Metrics.ServiceControl/MetricsOptionsExtensions.cs b/src/NServiceBus.Metrics.ServiceControl/MetricsOptionsExtensions.cs
@@ -15,8 +15,8 @@ public static class MetricsOptionsExtensions
         /// <param name="instanceId">Unique, human-readable, stable between restarts, identifier for running endpoint instance.</param>
         public static void SendMetricDataToServiceControl(this MetricsOptions options, string serviceControlMetricsAddress, TimeSpan interval, string instanceId = null)
         {
-            Guard.AgainstNullAndEmpty(nameof(serviceControlMetricsAddress), serviceControlMetricsAddress);
-            Guard.AgainstNegativeAndZero(nameof(interval), interval);
+            ArgumentException.ThrowIfNullOrWhiteSpace(serviceControlMetricsAddress);
+            ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(interval, TimeSpan.Zero);
 
             var reporting = ReportingOptions.Get(options);
 
@@ -32,6 +32,8 @@ public static void SendMetricDataToServiceControl(this MetricsOptions options, s
         /// <param name="timeToBeReceived">Time to be received.</param>
         public static void SetServiceControlMetricsMessageTTBR(this MetricsOptions options, TimeSpan timeToBeReceived)
         {
+            ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(timeToBeReceived, TimeSpan.Zero);
+
             var reporting = ReportingOptions.Get(options);
 
             reporting.TimeToBeReceived = timeToBeReceived;

diff --git a/src/NServiceBus.Metrics.ServiceControl/NServiceBus.Metrics.ServiceControl.csproj b/src/NServiceBus.Metrics.ServiceControl/NServiceBus.Metrics.ServiceControl.csproj
@@ -3,13 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
-    <Description>Plugin for sending endpoint monitoring data to a ServiceControl Monitoring instance</Description>
+    <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.1" />
-    <PackageReference Include="NServiceBus.Metrics" Version="5.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
+    <PackageReference Include="NServiceBus.Metrics" Version="[5.0.0, 6.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="4.0.0" PrivateAssets="All" />
     <PackageReference Include="ServiceControl.Monitoring.Data" Version="3.0.0" PrivateAssets="All" />
   </ItemGroup>