Prepare for RTM (#539)

* Prepare for RTM * Tweaks * Update to raven6 (#540) * Simplify * Revert to raven5
Particular · Mar 1, 2024 · 8f7c278 · 8f7c278
1 parent c1a2fae
commit 8f7c278
Showing 10 changed files with 19 additions and 104 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,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: Azure login

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.Gateway.RavenDB.AcceptanceTests/GatewayTestSuiteConstraints.cs b/src/NServiceBus.Gateway.RavenDB.AcceptanceTests/GatewayTestSuiteConstraints.cs
@@ -97,11 +97,7 @@ public async Task Cleanup()
 
         static DocumentStore GetInitializedDocumentStore(string defaultDatabase)
         {
-            var url = Environment.GetEnvironmentVariable("RavenSingleNodeUrl");
-            if (url == null)
-            {
-                throw new Exception("RavenDB URL must be specified in an environment variable named RavenSingleNodeUrl.");
-            }
+            var url = Environment.GetEnvironmentVariable("RavenSingleNodeUrl") ?? throw new Exception("RavenDB URL must be specified in an environment variable named RavenSingleNodeUrl.");
 
             var documentStore = new DocumentStore
             {

diff --git a/...iceBus.Gateway.RavenDB.AcceptanceTests/NServiceBus.Gateway.RavenDB.AcceptanceTests.csproj b/...iceBus.Gateway.RavenDB.AcceptanceTests/NServiceBus.Gateway.RavenDB.AcceptanceTests.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.4" />
-    <PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.0.0-alpha.1" />
-    <PackageReference Include="RavenDB.Client" Version="5.4.110" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.0.0" />
+    <PackageReference Include="RavenDB.Client" Version="5.4.116" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...erWideTx.AcceptanceTests/NServiceBus.Gateway.RavenDB.ClusterWideTx.AcceptanceTests.csproj b/...erWideTx.AcceptanceTests/NServiceBus.Gateway.RavenDB.ClusterWideTx.AcceptanceTests.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.4" />
-    <PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.0.0-alpha.1" />
-    <PackageReference Include="RavenDB.Client" Version="5.4.110" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.0.0" />
+    <PackageReference Include="RavenDB.Client" Version="5.4.116" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NServiceBus.Gateway.RavenDB.Tests/API/APIApprovals.cs b/src/NServiceBus.Gateway.RavenDB.Tests/API/APIApprovals.cs
@@ -12,7 +12,7 @@ public void ApproveNServiceBusGatewayRavenDB()
         {
             var publicApi = typeof(RavenGatewayDeduplicationConfiguration).Assembly.GeneratePublicApi(new ApiGeneratorOptions
             {
-                ExcludeAttributes = new[] { "System.Runtime.Versioning.TargetFrameworkAttribute", "System.Reflection.AssemblyMetadataAttribute" }
+                ExcludeAttributes = ["System.Runtime.Versioning.TargetFrameworkAttribute", "System.Reflection.AssemblyMetadataAttribute"]
             });
             Approver.Verify(publicApi);
         }

diff --git a/src/NServiceBus.Gateway.RavenDB.Tests/NServiceBus.Gateway.RavenDB.Tests.csproj b/src/NServiceBus.Gateway.RavenDB.Tests/NServiceBus.Gateway.RavenDB.Tests.csproj
@@ -2,20 +2,18 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.Gateway.RavenDB\NServiceBus.Gateway.RavenDB.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.4" />
-    <PackageReference Include="NServiceBus.Gateway" Version="5.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.Gateway" Version="5.0.0" />
     <PackageReference Include="Particular.Approvals" Version="1.0.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
-    <PackageReference Include="RavenDB.Client" Version="5.4.110" />
+    <PackageReference Include="RavenDB.Client" Version="5.4.116" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NServiceBus.Gateway.RavenDB/NServiceBus.Gateway.RavenDB.csproj b/src/NServiceBus.Gateway.RavenDB/NServiceBus.Gateway.RavenDB.csproj
@@ -3,14 +3,17 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.4" />
-    <PackageReference Include="NServiceBus.Gateway" Version="5.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
+    <PackageReference Include="NServiceBus.Gateway" Version="[5.0.0, 6.0.0)" />
+    <PackageReference Include="RavenDB.Client" Version="[5.4.116, 6.0.0)" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
-    <PackageReference Include="RavenDB.Client" Version="[5.4.102, 6.0.0)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NServiceBus.Gateway.RavenDB/RavenGatewayDeduplicationConfiguration.cs b/src/NServiceBus.Gateway.RavenDB/RavenGatewayDeduplicationConfiguration.cs
@@ -19,7 +19,7 @@ public class RavenGatewayDeduplicationConfiguration : GatewayDeduplicationConfig
         /// </summary>
         public RavenGatewayDeduplicationConfiguration(Func<IServiceProvider, IReadOnlySettings, IDocumentStore> documentStoreFactory)
         {
-            Guard.AgainstNull(nameof(documentStoreFactory), documentStoreFactory);
+            ArgumentNullException.ThrowIfNull(documentStoreFactory);
 
             this.documentStoreFactory = documentStoreFactory;
         }

diff --git a/src/NServiceBus.Gateway.RavenDB/Utils/Guard.cs b/src/NServiceBus.Gateway.RavenDB/Utils/Guard.cs