diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d9db4b0..274ca104 100644 --- 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 index 4b845ba1..60a0b61c 100644 --- 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.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj b/src/NServiceBus.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj index a67350b3..7fc0b171 100644 --- a/src/NServiceBus.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj @@ -11,10 +11,10 @@ - + - + diff --git a/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.ClusterWide.AcceptanceTests.csproj b/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.ClusterWide.AcceptanceTests.csproj index 04ea1d24..d3dcd6f3 100644 --- a/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.ClusterWide.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.ClusterWide.AcceptanceTests.csproj @@ -12,14 +12,17 @@ - + - + + + + @@ -45,10 +48,4 @@ - - - - - - diff --git a/src/NServiceBus.RavenDB.ClusterWide.Tests/NServiceBus.RavenDB.ClusterWide.Tests.csproj b/src/NServiceBus.RavenDB.ClusterWide.Tests/NServiceBus.RavenDB.ClusterWide.Tests.csproj index bff3a4ec..7732fbca 100644 --- a/src/NServiceBus.RavenDB.ClusterWide.Tests/NServiceBus.RavenDB.ClusterWide.Tests.csproj +++ b/src/NServiceBus.RavenDB.ClusterWide.Tests/NServiceBus.RavenDB.ClusterWide.Tests.csproj @@ -13,19 +13,16 @@ - + - + - + - - - diff --git a/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/NServiceBus.RavenDB.Optimistic.AcceptanceTests.csproj b/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/NServiceBus.RavenDB.Optimistic.AcceptanceTests.csproj index b8567055..74def8ad 100644 --- a/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/NServiceBus.RavenDB.Optimistic.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/NServiceBus.RavenDB.Optimistic.AcceptanceTests.csproj @@ -12,14 +12,18 @@ - + - + + + + + @@ -45,11 +49,4 @@ - - - - - - - diff --git a/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests.csproj b/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests.csproj index b8567055..74def8ad 100644 --- a/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests.csproj @@ -12,14 +12,18 @@ - + - + + + + + @@ -45,11 +49,4 @@ - - - - - - - diff --git a/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj b/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj index 939995ca..e389373a 100644 --- a/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj +++ b/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj @@ -13,10 +13,10 @@ - + - + diff --git a/src/NServiceBus.RavenDB.Tests/API/OutboxApprovals.cs b/src/NServiceBus.RavenDB.Tests/API/OutboxApprovals.cs index 08b360c5..333f5882 100644 --- a/src/NServiceBus.RavenDB.Tests/API/OutboxApprovals.cs +++ b/src/NServiceBus.RavenDB.Tests/API/OutboxApprovals.cs @@ -1,11 +1,10 @@ using System; -using System.Collections.Generic; using NServiceBus.RavenDB.Outbox; using NUnit.Framework; using Particular.Approvals; [TestFixture] -public class OutboxAprovals +public class OutboxApprovals { [Test] public void ApproveOutboxSchema() diff --git a/src/NServiceBus.RavenDB.Tests/ApprovalFiles/OutboxAprovals.ApproveOutboxSchema.approved.txt b/src/NServiceBus.RavenDB.Tests/ApprovalFiles/OutboxApprovals.ApproveOutboxSchema.approved.txt similarity index 100% rename from src/NServiceBus.RavenDB.Tests/ApprovalFiles/OutboxAprovals.ApproveOutboxSchema.approved.txt rename to src/NServiceBus.RavenDB.Tests/ApprovalFiles/OutboxApprovals.ApproveOutboxSchema.approved.txt diff --git a/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj b/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj index 6428ca58..3ff3d9ef 100644 --- a/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj +++ b/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj @@ -13,12 +13,12 @@ - + - + - + diff --git a/src/NServiceBus.RavenDB.Tests/When_providing_a_custom_document_store.cs b/src/NServiceBus.RavenDB.Tests/When_providing_a_custom_document_store.cs index 744d0d7d..4aeca611 100644 --- a/src/NServiceBus.RavenDB.Tests/When_providing_a_custom_document_store.cs +++ b/src/NServiceBus.RavenDB.Tests/When_providing_a_custom_document_store.cs @@ -23,6 +23,7 @@ public void Should_not_resolve_until_start() transport.TransportTransactionMode = TransportTransactionMode.ReceiveOnly; endpointConfiguration.UseTransport(transport); endpointConfiguration.EnableOutbox(); + endpointConfiguration.UseSerialization(); endpointConfiguration.UsePersistence() .SetDefaultDocumentStore((_, __) => diff --git a/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/TransactionSessionDefaultServer.cs b/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/TransactionSessionDefaultServer.cs index 805c3a37..c227bc7e 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/TransactionSessionDefaultServer.cs +++ b/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/TransactionSessionDefaultServer.cs @@ -10,25 +10,26 @@ namespace NServiceBus.TransactionalSession.AcceptanceTests public class TransactionSessionDefaultServer : IEndpointSetupTemplate { - public virtual async Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, + public virtual async Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointCustomization, Func configurationBuilderCustomization) { - var builder = new EndpointConfiguration(endpointConfiguration.EndpointName); - builder.EnableInstallers(); + var endpointConfiguration = new EndpointConfiguration(endpointCustomization.EndpointName); - builder.Recoverability() + endpointConfiguration.EnableInstallers(); + endpointConfiguration.UseSerialization(); + endpointConfiguration.Recoverability() .Delayed(delayed => delayed.NumberOfRetries(0)) .Immediate(immediate => immediate.NumberOfRetries(0)); - builder.SendFailedMessagesTo("error"); + endpointConfiguration.SendFailedMessagesTo("error"); var storageDir = Path.Combine(Path.GetTempPath(), "learn", TestContext.CurrentContext.Test.ID); - builder.UseTransport(new AcceptanceTestingTransport + endpointConfiguration.UseTransport(new AcceptanceTestingTransport { StorageLocation = storageDir }); - var persistence = builder.UsePersistence(); + var persistence = endpointConfiguration.UsePersistence(); persistence.EnableTransactionalSession(); persistence.SetDefaultDocumentStore(SetupFixture.DocumentStore); persistence.SetMessageToDatabaseMappingConvention(headers => @@ -41,14 +42,14 @@ public virtual async Task GetConfiguration(RunDescriptor return SetupFixture.DefaultDatabaseName; }); - builder.RegisterStartupTask(sp => new CaptureServiceProviderStartupTask(sp, runDescriptor.ScenarioContext)); + endpointConfiguration.RegisterStartupTask(sp => new CaptureServiceProviderStartupTask(sp, runDescriptor.ScenarioContext)); - await configurationBuilderCustomization(builder).ConfigureAwait(false); + await configurationBuilderCustomization(endpointConfiguration).ConfigureAwait(false); // scan types at the end so that all types used by the configuration have been loaded into the AppDomain - builder.TypesToIncludeInScan(endpointConfiguration.GetTypesScopedByTestClass()); + endpointConfiguration.TypesToIncludeInScan(endpointCustomization.GetTypesScopedByTestClass()); - return builder; + return endpointConfiguration; } } } \ No newline at end of file diff --git a/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj b/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj index c6908c6c..8d1fd5e2 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj @@ -7,18 +7,17 @@ - - - + + - + diff --git a/src/NServiceBus.RavenDB.TransactionalSession.Tests/NServiceBus.RavenDB.TransactionalSession.Tests.csproj b/src/NServiceBus.RavenDB.TransactionalSession.Tests/NServiceBus.RavenDB.TransactionalSession.Tests.csproj index 27d459a5..3d6de5ec 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession.Tests/NServiceBus.RavenDB.TransactionalSession.Tests.csproj +++ b/src/NServiceBus.RavenDB.TransactionalSession.Tests/NServiceBus.RavenDB.TransactionalSession.Tests.csproj @@ -11,13 +11,13 @@ - - + + - + - + diff --git a/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj b/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj index 0e255638..3d352878 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj +++ b/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj @@ -1,11 +1,11 @@ - + net8.0 NServiceBus.TransactionalSession true ..\NServiceBus.snk - Transactional Session for the RavenDB persistence. + Transactional Session for the RavenDB persistence @@ -13,7 +13,7 @@ - + diff --git a/src/NServiceBus.RavenDB.TransactionalSession/RavenDbOpenSessionOptions.cs b/src/NServiceBus.RavenDB.TransactionalSession/RavenDbOpenSessionOptions.cs index 1190472d..065d4e03 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession/RavenDbOpenSessionOptions.cs +++ b/src/NServiceBus.RavenDB.TransactionalSession/RavenDbOpenSessionOptions.cs @@ -15,7 +15,7 @@ public sealed class RavenDbOpenSessionOptions : OpenSessionOptions /// The connection context when multi-tenancy is used. public RavenDbOpenSessionOptions(IDictionary multiTenantConnectionContext = null) { - var headers = multiTenantConnectionContext != null ? new Dictionary(multiTenantConnectionContext) : new Dictionary(0); + var headers = multiTenantConnectionContext != null ? new Dictionary(multiTenantConnectionContext) : []; // order matters because instantiating IncomingMessage is modifying the headers foreach (var header in headers) diff --git a/src/NServiceBus.RavenDB.sln b/src/NServiceBus.RavenDB.sln index b849425b..e34fabe7 100644 --- a/src/NServiceBus.RavenDB.sln +++ b/src/NServiceBus.RavenDB.sln @@ -11,7 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.RavenDB.Accepta EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CB700990-944C-4B38-9ABF-D00EC464A5E2}" ProjectSection(SolutionItems) = preProject + ..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml Custom.Build.props = Custom.Build.props + ..\.github\workflows\release.yml = ..\.github\workflows\release.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.RavenDB.Optimistic.AcceptanceTests", "NServiceBus.RavenDB.Optimistic.AcceptanceTests\NServiceBus.RavenDB.Optimistic.AcceptanceTests.csproj", "{57785D1B-193C-4B59-86C2-F8E1E6B50A0E}" @@ -28,11 +30,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcceptanceTests", "Acceptan EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EverythingButAcceptanceTests", "EverythingButAcceptanceTests", "{B1AD16CA-050B-4BE6-A25E-DB00A067DE26}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.RavenDB.TransactionalSession", "NServiceBus.RavenDB.TransactionalSession\NServiceBus.RavenDB.TransactionalSession.csproj", "{825E3D62-7AF0-42C6-91F6-A4908FC1BFA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.RavenDB.TransactionalSession", "NServiceBus.RavenDB.TransactionalSession\NServiceBus.RavenDB.TransactionalSession.csproj", "{825E3D62-7AF0-42C6-91F6-A4908FC1BFA6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.RavenDB.TransactionalSession.Tests", "NServiceBus.RavenDB.TransactionalSession.Tests\NServiceBus.RavenDB.TransactionalSession.Tests.csproj", "{1E6A7363-BD51-4D54-9A9A-5522F98678F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.RavenDB.TransactionalSession.Tests", "NServiceBus.RavenDB.TransactionalSession.Tests\NServiceBus.RavenDB.TransactionalSession.Tests.csproj", "{1E6A7363-BD51-4D54-9A9A-5522F98678F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.RavenDB.TransactionalSession.AcceptanceTests", "NServiceBus.RavenDB.TransactionalSession.AcceptanceTests\NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj", "{03083C28-E0FA-4B05-BB09-B6D96EC05F74}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.RavenDB.TransactionalSession.AcceptanceTests", "NServiceBus.RavenDB.TransactionalSession.AcceptanceTests\NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj", "{03083C28-E0FA-4B05-BB09-B6D96EC05F74}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/NServiceBus.RavenDB/Internal/DocumentStoreManager.cs b/src/NServiceBus.RavenDB/Internal/DocumentStoreManager.cs index d0620391..5fd03bc2 100644 --- a/src/NServiceBus.RavenDB/Internal/DocumentStoreManager.cs +++ b/src/NServiceBus.RavenDB/Internal/DocumentStoreManager.cs @@ -103,7 +103,7 @@ internal static DocumentStoreInitializer GetUninitializedDocumentStore(featureSettingsKeys[typeof(TStorageType)]); - // Next try finding a shared DocumentStore + // Next try finding a shared DocumentStore docStoreInitializer ??= settings.GetOrDefault(defaultDocStoreSettingsKey); if (docStoreInitializer == null) diff --git a/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj b/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj index d4f5491e..509f9aa9 100644 --- a/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj +++ b/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -10,12 +10,15 @@ - - + + + + + + - diff --git a/src/NServiceBus.RavenDB/RavenDBPersistence.cs b/src/NServiceBus.RavenDB/RavenDBPersistence.cs index 12eb98f7..6f7ed923 100644 --- a/src/NServiceBus.RavenDB/RavenDBPersistence.cs +++ b/src/NServiceBus.RavenDB/RavenDBPersistence.cs @@ -5,7 +5,7 @@ using NServiceBus.Persistence.RavenDB; /// - /// Specifies the capabilities of the ravendb suite of storages + /// Specifies the capabilities of the RavenDB suite of storages /// public class RavenDBPersistence : PersistenceDefinition { diff --git a/src/NServiceBus.RavenDB/RavenDbSettingsExtensions.cs b/src/NServiceBus.RavenDB/RavenDbSettingsExtensions.cs index 9269f378..6dbd9c06 100644 --- a/src/NServiceBus.RavenDB/RavenDbSettingsExtensions.cs +++ b/src/NServiceBus.RavenDB/RavenDbSettingsExtensions.cs @@ -9,7 +9,7 @@ using Raven.Client.Documents.Session; /// - /// Provides configurations methods for the Raven storage + /// Provides configurations methods for the RavenDB storage /// public static class RavenDbSettingsExtensions {