Tweaks

src/NServiceBus.NHibernate.AcceptanceTests/NServiceBus.NHibernate.AcceptanceTests.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NHibernate" Version="5.5.0" />
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0" GeneratePathProperty="true" />

src/NServiceBus.NHibernate.PersistenceTests/NServiceBus.NHibernate.PersistenceTests.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NHibernate" Version="5.5.0" />
     <PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="9.0.0" GeneratePathProperty="true" />

src/NServiceBus.NHibernate.Tests/GenerateScriptsTest.cs

@@ -1,10 +1,9 @@
 namespace NServiceBus.NHibernate.Tests
 {
-    using global::NHibernate.Dialect;
     using System;
     using System.Collections.Generic;
-    using System.Runtime.CompilerServices;
     using System.Threading.Tasks;
+    using global::NHibernate.Dialect;
     using NServiceBus;
     using NServiceBus.NHibernate;
     using NUnit.Framework;
@@ -14,47 +13,41 @@
     public class DDL
     {
         [Test]
-        [MethodImpl(MethodImplOptions.NoInlining)]
         public void Outbox_MsSql2012()
         {
             var script = ScriptGenerator<MsSql2012Dialect>.GenerateOutboxScript();
             Approver.Verify(script);
         }
 
         [Test]
-        [MethodImpl(MethodImplOptions.NoInlining)]
         public void Outbox_Oracle10g()
         {
             var script = ScriptGenerator<Oracle10gDialect>.GenerateOutboxScript();
             Approver.Verify(script);
         }
 
         [Test]
-        [MethodImpl(MethodImplOptions.NoInlining)]
         public void Subscriptions_MsSql2012()
         {
             var script = ScriptGenerator<MsSql2012Dialect>.GenerateSubscriptionStoreScript();
             Approver.Verify(script);
         }
 
         [Test]
-        [MethodImpl(MethodImplOptions.NoInlining)]
         public void Subscriptions_Oracle10g()
         {
             var script = ScriptGenerator<Oracle10gDialect>.GenerateSubscriptionStoreScript();
             Approver.Verify(script);
         }
 
         [Test]
-        [MethodImpl(MethodImplOptions.NoInlining)]
         public void Sagas_MsSql2012()
         {
             var script = ScriptGenerator<MsSql2012Dialect>.GenerateSagaScript<MySaga>();
             Approver.Verify(script);
         }
 
         [Test]
-        [MethodImpl(MethodImplOptions.NoInlining)]
         public void Sagas_Oracle10g()
         {
             var script = ScriptGenerator<Oracle10gDialect>.GenerateSagaScript<MySaga>();

src/NServiceBus.NHibernate.Tests/NServiceBus.NHibernate.Tests.csproj

@@ -12,14 +12,14 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NHibernate" Version="5.5.0" />
     <PackageReference Include="NServiceBus" Version="9.0.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Particular.Approvals" Version="0.6.0" />
+    <PackageReference Include="Particular.Approvals" Version="1.0.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
   </ItemGroup>
 

src/NServiceBus.NHibernate.Tests/Persistence/NHibernateConfigurationBuilderTests.cs

@@ -41,12 +41,10 @@ public void Should_assign_default_properties()
         {
             NHibernateSettingRetriever.AppSettings = () => [];
 
-#pragma warning disable IDE0028 // Simplify collection initialization
-            NHibernateSettingRetriever.ConnectionStrings = () => new ConnectionStringSettingsCollection
-            {
+            NHibernateSettingRetriever.ConnectionStrings = () =>
+            [
                     new ConnectionStringSettings("NServiceBus/Persistence", connectionString)
-            };
-#pragma warning restore IDE0028 // Simplify collection initialization
+            ];
 
             var builder = new NHibernateConfigurationBuilder(new SettingsHolder(), new ExpandoObject(), "NotUsed", "NotUsed");
 
@@ -64,14 +62,12 @@ public void Should_assign_overridden_connectionString_if_specified()
         {
             NHibernateSettingRetriever.AppSettings = () => [];
 
-#pragma warning disable IDE0028 // Simplify collection initialization
-            NHibernateSettingRetriever.ConnectionStrings = () => new ConnectionStringSettingsCollection
-                {
+            NHibernateSettingRetriever.ConnectionStrings = () =>
+                [
                     new ConnectionStringSettings("NServiceBus/Persistence", connectionString),
                     new ConnectionStringSettings("NServiceBus/Persistence/NHibernate/Timeout",
                                                  "timeout_connection_string")
-                };
-#pragma warning restore IDE0028 // Simplify collection initialization
+                ];
 
             var builder = new NHibernateConfigurationBuilder(new SettingsHolder(), new ExpandoObject(), "Timeout", "NotUsed");
 
@@ -92,12 +88,10 @@ public void Should_assign_all_optional_properties()
                     {"NServiceBus/Persistence/NHibernate/connection.driver_class", "driver_class"},
                 };
 
-#pragma warning disable IDE0028 // Simplify collection initialization
-            NHibernateSettingRetriever.ConnectionStrings = () => new ConnectionStringSettingsCollection
-                {
+            NHibernateSettingRetriever.ConnectionStrings = () =>
+                [
                     new ConnectionStringSettings("NServiceBus/Persistence", connectionString)
-                };
-#pragma warning restore IDE0028 // Simplify collection initialization
+                ];
 
             var builder = new NHibernateConfigurationBuilder(new SettingsHolder(), new ExpandoObject(), "NotUsed", "NotUsed");
 
@@ -120,12 +114,10 @@ public void Should_skip_settings_that_are_not_for_persistence()
                     {"myOtherSetting2", "driver_class"},
                 };
 
-#pragma warning disable IDE0028 // Simplify collection initialization
-            NHibernateSettingRetriever.ConnectionStrings = () => new ConnectionStringSettingsCollection
-                {
+            NHibernateSettingRetriever.ConnectionStrings = () =>
+                [
                     new ConnectionStringSettings("NServiceBus/Persistence", connectionString)
-                };
-#pragma warning restore IDE0028 // Simplify collection initialization
+                ];
 
             var builder = new NHibernateConfigurationBuilder(new SettingsHolder(), new ExpandoObject(), "NotUsed", "NotUsed");
 

src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests.csproj

@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     <PackageReference Include="NHibernate" Version="5.5.0" />
     <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
     <PackageReference Include="NServiceBus.TransactionalSession" Version="3.0.0" />

src/NServiceBus.NHibernate.TransactionalSession.Tests/NServiceBus.NHibernate.TransactionalSession.Tests.csproj

@@ -13,17 +13,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NHibernate" Version="5.5.0" />
     <PackageReference Include="NServiceBus" Version="9.0.0" />
     <PackageReference Include="NServiceBus.TransactionalSession" Version="3.0.0" />
     <PackageReference Include="Nunit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Include="Particular.Approvals" Version="0.6.0" />
+    <PackageReference Include="Particular.Approvals" Version="1.0.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
   </ItemGroup>
 

src/NServiceBus.NHibernate.TransactionalSession/NServiceBus.NHibernate.TransactionalSession.csproj

@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="NServiceBus.TransactionalSession" Version="[3.0.0, 4.0.0)" />
-    <PackageReference Include="Particular.Packaging" Version="4.0.0" PrivateAssets="All" />
+    <PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/NServiceBus.NHibernate/NServiceBus.NHibernate.csproj

@@ -8,15 +8,15 @@
   </PropertyGroup>
 
   <ItemGroup Label="Public dependencies">
-    <PackageReference Include="NHibernate" Version="[5.4.6, 6.0.0)" />
+    <PackageReference Include="NHibernate" Version="[5.5.0, 6.0.0)" />
     <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
   </ItemGroup>
 
   <ItemGroup Label="Private dependencies">
     <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="All" />
     <PackageReference Include="Janitor.Fody" Version="1.9.0" PrivateAssets="All" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
-    <PackageReference Include="Particular.Packaging" Version="4.0.0" PrivateAssets="All" />
+    <PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

src/NServiceBus.NHibernate/SagaPersisters/LockModes.cs

@@ -6,7 +6,7 @@ namespace NServiceBus.SagaPersisters.NHibernate
     public enum LockModes
     {
         /// <summary>
-        /// No lock required. 
+        /// No lock required.
         /// </summary>
         /// <remarks>
         /// If an object is requested with this lock mode, a <c>Read</c> lock
@@ -15,15 +15,15 @@ public enum LockModes
         None = 1,
 
         /// <summary>
-        /// A shared lock. 
+        /// A shared lock.
         /// </summary>
         /// <remarks>
         /// Objects are loaded in <c>Read</c> mode by default
         /// </remarks>
         Read = 2,
 
         /// <summary>
-        /// An upgrade lock. 
+        /// An upgrade lock.
         /// </summary>
         /// <remarks>
         /// Objects loaded in this lock mode are materialized using an
@@ -33,7 +33,7 @@ public enum LockModes
 
         /// <summary>
         /// Attempt to obtain an upgrade lock, using an Oracle-style
-        /// <c>SELECT ... FOR UPGRADE NOWAIT</c>. 
+        /// <c>SELECT ... FOR UPGRADE NOWAIT</c>.
         /// </summary>
         /// <remarks>
         /// The semantics of this lock mode, once obtained, are the same as <c>Upgrade</c>
@@ -48,7 +48,7 @@ public enum LockModes
         /// </remarks>
         Write = 5,
 
-        /// <summary> 
+        /// <summary>
         /// Similar to <see cref="Upgrade"/> except that, for versioned entities,
         /// it results in a forced version increment.
         /// </summary>