From 4afc804a017fe12a1543c329a4ec0b945105d99e Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Fri, 22 Sep 2023 10:59:38 -0400 Subject: [PATCH] Prepare repo for .NET 8 (#1208) * Bump major version * Update to NServiceBus 9 * Update Microsoft packages * Remove ifdefs and pragmas * Update workflows * Clean up project files * Remove dependency that is provided by Core * Clean up project file * Update API approval file --- .github/workflows/ci.yml | 9 +- .github/workflows/release.yml | 9 +- src/Custom.Build.props | 2 +- .../ConfigureEndpointRavenDBPersistence.cs | 4 +- .../HasUnwrappedSagaListenerRegistered.cs | 6 +- ...NServiceBus.RavenDB.AcceptanceTests.csproj | 10 +- .../ConfigureEndpointRavenDBPersistence.cs | 4 +- ...RavenDB.ClusterWide.AcceptanceTests.csproj | 12 +- ...erviceBus.RavenDB.ClusterWide.Tests.csproj | 11 +- .../ConfigureEndpointRavenDBPersistence.cs | 4 +- ....RavenDB.Optimistic.AcceptanceTests.csproj | 12 +- .../ConfigureEndpointRavenDBPersistence.cs | 4 +- ...imistic.ClusterWide.AcceptanceTests.csproj | 12 +- ...ServiceBus.RavenDB.PersistenceTests.csproj | 16 +-- ...dating_saga_concurrently_on_same_thread.cs | 87 ------------ ...a_concurrently_twice_on_the_same_thread.cs | 132 ------------------ ...als.ApproveRavenDBPersistence.approved.txt | 7 +- .../NServiceBus.RavenDB.Tests.csproj | 11 +- .../RavenDBPersistenceTestBase.cs | 6 +- .../NServiceBusAcceptanceTest.cs | 5 - ...ransactionalSession.AcceptanceTests.csproj | 15 +- ....RavenDB.TransactionalSession.Tests.csproj | 16 +-- ...iceBus.RavenDB.TransactionalSession.csproj | 11 +- src/NServiceBus.RavenDB/AssemblyInfo.cs | 6 - .../NServiceBus.RavenDB.csproj | 16 ++- src/Test.snk | Bin 596 -> 0 bytes 26 files changed, 87 insertions(+), 340 deletions(-) delete mode 100644 src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_on_same_thread.cs delete mode 100644 src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_twice_on_the_same_thread.cs delete mode 100644 src/NServiceBus.RavenDB/AssemblyInfo.cs delete mode 100644 src/Test.snk diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3233a5fa0..1f845d4d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: strategy: matrix: include: - - os: windows-2019 + - os: windows-2022 name: Windows - - os: ubuntu-20.04 + - os: ubuntu-22.04 name: Linux fail-fast: false steps: @@ -33,9 +33,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: | - 7.0.x - 6.0.x + 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 636237501..8685602e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,16 +8,17 @@ env: DOTNET_NOLOGO: true jobs: release: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v4.0.0 with: - fetch-depth: 0 + fetch-depth: 0 - name: Setup .NET SDK uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x + dotnet-quality: 'preview' - name: Build run: dotnet build src --configuration Release - name: Sign NuGet packages @@ -36,4 +37,4 @@ jobs: - name: Deploy uses: Particular/push-octopus-package-action@v1.1.0 with: - octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }} + octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }} diff --git a/src/Custom.Build.props b/src/Custom.Build.props index 273235154..d9072ffb5 100644 --- a/src/Custom.Build.props +++ b/src/Custom.Build.props @@ -1,7 +1,7 @@ - 8.1 + 9.0 minor diff --git a/src/NServiceBus.RavenDB.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs b/src/NServiceBus.RavenDB.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs index f37d9cc26..313d041ce 100644 --- a/src/NServiceBus.RavenDB.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs +++ b/src/NServiceBus.RavenDB.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs @@ -82,9 +82,7 @@ public static async Task DeleteDatabase(string dbName, CancellationToken cancell break; } } -#pragma warning disable IDE0083 - catch (Exception ex) when (!(ex is OperationCanceledException) || !cancellationToken.IsCancellationRequested) -#pragma warning restore IDE0083 + catch (Exception ex) when (ex is not OperationCanceledException || !cancellationToken.IsCancellationRequested) { if (triesLeft == 0) { diff --git a/src/NServiceBus.RavenDB.AcceptanceTests/HasUnwrappedSagaListenerRegistered.cs b/src/NServiceBus.RavenDB.AcceptanceTests/HasUnwrappedSagaListenerRegistered.cs index 50a135f7c..a0bfe1a40 100644 --- a/src/NServiceBus.RavenDB.AcceptanceTests/HasUnwrappedSagaListenerRegistered.cs +++ b/src/NServiceBus.RavenDB.AcceptanceTests/HasUnwrappedSagaListenerRegistered.cs @@ -64,14 +64,10 @@ static bool ListenerIsRegistered(IDocumentStore store) { var eventField = typeof(DocumentStoreBase).GetField("OnBeforeConversionToEntity", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.GetField); -#pragma warning disable IDE0078 -#pragma warning disable IDE0083 - if (!(eventField.GetValue(store) is EventHandler eventDelegate)) + if (eventField.GetValue(store) is not EventHandler eventDelegate) { return false; } -#pragma warning restore IDE0083 -#pragma warning restore IDE0078 foreach (var existingHandler in eventDelegate.GetInvocationList()) { diff --git a/src/NServiceBus.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj b/src/NServiceBus.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj index d7ae9651d..8c8cec00f 100644 --- a/src/NServiceBus.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.AcceptanceTests/NServiceBus.RavenDB.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - + - net472;net6.0;net7.0 + net8.0 @@ -10,14 +10,14 @@ - - + + - + diff --git a/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs b/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs index e5f9d9fcb..67347bfa7 100644 --- a/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs +++ b/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs @@ -89,9 +89,7 @@ public static async Task DeleteDatabase(string dbName, CancellationToken cancell break; } } -#pragma warning disable IDE0083 - catch (Exception ex) when (!(ex is OperationCanceledException) || !cancellationToken.IsCancellationRequested) -#pragma warning restore IDE0083 + catch (Exception ex) when (ex is not OperationCanceledException || !cancellationToken.IsCancellationRequested) { if (triesLeft == 0) { 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 f6d64aefb..1709ab1af 100644 --- a/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.ClusterWide.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.ClusterWide.AcceptanceTests/NServiceBus.RavenDB.ClusterWide.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - + - net472;net6.0;net7.0 + net8.0 NServiceBus.RavenDB.AcceptanceTests @@ -11,8 +11,8 @@ - - + + @@ -22,7 +22,7 @@ - + @@ -43,7 +43,9 @@ + + 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 5afceff0b..55520032e 100644 --- a/src/NServiceBus.RavenDB.ClusterWide.Tests/NServiceBus.RavenDB.ClusterWide.Tests.csproj +++ b/src/NServiceBus.RavenDB.ClusterWide.Tests/NServiceBus.RavenDB.ClusterWide.Tests.csproj @@ -1,9 +1,9 @@ - + - net472;net6.0;net7.0 + net8.0 true - ..\NServiceBus.snk + ..\NServiceBusTests.snk @@ -12,9 +12,8 @@ - - - + + diff --git a/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs b/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs index 189ae4bea..d0f341002 100644 --- a/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs +++ b/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs @@ -84,9 +84,7 @@ public static async Task DeleteDatabase(string dbName, CancellationToken cancell break; } } -#pragma warning disable IDE0083 - catch (Exception ex) when (!(ex is OperationCanceledException) || !cancellationToken.IsCancellationRequested) -#pragma warning restore IDE0083 + catch (Exception ex) when (ex is not OperationCanceledException || !cancellationToken.IsCancellationRequested) { if (triesLeft == 0) { 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 1361d515c..b0ceff54f 100644 --- a/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/NServiceBus.RavenDB.Optimistic.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.Optimistic.AcceptanceTests/NServiceBus.RavenDB.Optimistic.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - + - net472;net6.0;net7.0 + net8.0 NServiceBus.RavenDB.AcceptanceTests @@ -11,8 +11,8 @@ - - + + @@ -22,7 +22,7 @@ - + @@ -43,7 +43,9 @@ + + diff --git a/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs b/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs index fd6f1cea4..bcad79ecb 100644 --- a/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs +++ b/src/NServiceBus.RavenDB.Optimistic.ClusterWide.AcceptanceTests/ConfigureEndpointRavenDBPersistence.cs @@ -90,9 +90,7 @@ public static async Task DeleteDatabase(string dbName, CancellationToken cancell break; } } -#pragma warning disable IDE0083 - catch (Exception ex) when (!(ex is OperationCanceledException) || !cancellationToken.IsCancellationRequested) -#pragma warning restore IDE0083 + catch (Exception ex) when (ex is not OperationCanceledException || !cancellationToken.IsCancellationRequested) { if (triesLeft == 0) { 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 1361d515c..b0ceff54f 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 @@ -1,7 +1,7 @@ - + - net472;net6.0;net7.0 + net8.0 NServiceBus.RavenDB.AcceptanceTests @@ -11,8 +11,8 @@ - - + + @@ -22,7 +22,7 @@ - + @@ -43,7 +43,9 @@ + + diff --git a/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj b/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj index 5bb99277e..fe90f4769 100644 --- a/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj +++ b/src/NServiceBus.RavenDB.PersistenceTests/NServiceBus.RavenDB.PersistenceTests.csproj @@ -1,10 +1,9 @@ - + - net472;net6.0;net7.0 + net8.0 true - ..\Test.snk - 10.0 + ..\NServiceBusTests.snk @@ -13,16 +12,11 @@ - - + + - - - - - diff --git a/src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_on_same_thread.cs b/src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_on_same_thread.cs deleted file mode 100644 index 5b49910a5..000000000 --- a/src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_on_same_thread.cs +++ /dev/null @@ -1,87 +0,0 @@ -namespace NServiceBus.PersistenceTesting.Sagas -{ - using System; - using System.Threading.Tasks; - using Extensibility; - using NUnit.Framework; - using Persistence; - - public class When_updating_saga_concurrently_on_same_thread : SagaPersisterTests - { - [Test] - public async Task Save_should_fail_when_data_changes_between_read_and_update() - { - configuration.RequiresOptimisticConcurrencySupport(); - - var correlationPropertyData = Guid.NewGuid().ToString(); - var sagaData = new TestSagaData { SomeId = correlationPropertyData, DateTimeProperty = DateTime.UtcNow }; - await SaveSaga(sagaData); - var generatedSagaId = sagaData.Id; - - ContextBag losingContext; - ICompletableSynchronizedStorageSession losingSaveSession; - TestSagaData staleRecord; - var persister = configuration.SagaStorage; - - var winningContext = configuration.GetContextBagForSagaStorage(); - using (var winningSaveSession = configuration.CreateStorageSession()) - { - await winningSaveSession.Open(winningContext); - - var record = await persister.Get(generatedSagaId, winningSaveSession, winningContext); - - losingContext = configuration.GetContextBagForSagaStorage(); - losingSaveSession = configuration.CreateStorageSession(); - await losingSaveSession.Open(losingContext); - staleRecord = await persister.Get("SomeId", correlationPropertyData, losingSaveSession, losingContext); - - record.DateTimeProperty = DateTime.UtcNow; - await persister.Update(record, winningSaveSession, winningContext); - await winningSaveSession.CompleteAsync(); - } - - try - { - staleRecord.DateTimeProperty = DateTime.UtcNow.AddHours(1); - Assert.CatchAsync(async () => - { - await persister.Update(staleRecord, losingSaveSession, losingContext); - await losingSaveSession.CompleteAsync(); - }); - } - finally - { - losingSaveSession.Dispose(); - } - } - - public class TestSaga : Saga, IAmStartedByMessages - { - public Task Handle(StartMessage message, IMessageHandlerContext context) - { - throw new NotImplementedException(); - } - - protected override void ConfigureHowToFindSaga(SagaPropertyMapper mapper) - { - mapper.ConfigureMapping(msg => msg.SomeId).ToSaga(saga => saga.SomeId); - } - } - - public class StartMessage - { - public string SomeId { get; set; } - } - - public class TestSagaData : ContainSagaData - { - public string SomeId { get; set; } = "Test"; - - public DateTime DateTimeProperty { get; set; } - } - - public When_updating_saga_concurrently_on_same_thread(TestVariant param) : base(param) - { - } - } -} \ No newline at end of file diff --git a/src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_twice_on_the_same_thread.cs b/src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_twice_on_the_same_thread.cs deleted file mode 100644 index 3d36c1d84..000000000 --- a/src/NServiceBus.RavenDB.PersistenceTests/When_updating_saga_concurrently_twice_on_the_same_thread.cs +++ /dev/null @@ -1,132 +0,0 @@ -namespace NServiceBus.PersistenceTesting.Sagas -{ - using System; - using System.Threading.Tasks; - using Extensibility; - using NUnit.Framework; - using Persistence; - - public class When_updating_saga_concurrently_twice_on_the_same_thread : SagaPersisterTests - { - [Test] - public async Task Save_process_is_repeatable() - { - configuration.RequiresOptimisticConcurrencySupport(); - - var correlationPropertyData = Guid.NewGuid().ToString(); - var saga = new TestSagaData { SomeId = correlationPropertyData, DateTimeProperty = DateTime.UtcNow }; - await SaveSaga(saga); - - ContextBag losingContext1; - ICompletableSynchronizedStorageSession losingSaveSession1; - TestSagaData staleRecord1; - var persister = configuration.SagaStorage; - - var winningContext1 = configuration.GetContextBagForSagaStorage(); - var winningSaveSession1 = configuration.CreateStorageSession(); - await winningSaveSession1.Open(winningContext1); - - try - { - var record1 = await persister.Get(saga.Id, winningSaveSession1, winningContext1); - - losingContext1 = configuration.GetContextBagForSagaStorage(); - losingSaveSession1 = configuration.CreateStorageSession(); - await losingSaveSession1.Open(losingContext1); - - staleRecord1 = await persister.Get("SomeId", correlationPropertyData, losingSaveSession1, losingContext1); - - record1.DateTimeProperty = DateTime.UtcNow; - await persister.Update(record1, winningSaveSession1, winningContext1); - await winningSaveSession1.CompleteAsync(); - } - finally - { - winningSaveSession1.Dispose(); - } - - try - { - staleRecord1.DateTimeProperty = DateTime.UtcNow.AddHours(1); - Assert.That(async () => - { - await persister.Update(staleRecord1, losingSaveSession1, losingContext1); - await losingSaveSession1.CompleteAsync(); - }, Throws.InstanceOf()); - } - finally - { - losingSaveSession1.Dispose(); - } - - ContextBag losingContext2; - ICompletableSynchronizedStorageSession losingSaveSession2; - TestSagaData staleRecord2; - - var winningContext2 = configuration.GetContextBagForSagaStorage(); - var winningSaveSession2 = configuration.CreateStorageSession(); - await winningSaveSession2.Open(winningContext2); - try - { - var record2 = await persister.Get(saga.Id, winningSaveSession2, winningContext2); - - losingContext2 = configuration.GetContextBagForSagaStorage(); - losingSaveSession2 = configuration.CreateStorageSession(); - await losingSaveSession2.Open(losingContext2); - - staleRecord2 = await persister.Get("SomeId", correlationPropertyData, losingSaveSession2, losingContext2); - - record2.DateTimeProperty = DateTime.UtcNow; - await persister.Update(record2, winningSaveSession2, winningContext2); - await winningSaveSession2.CompleteAsync(); - } - finally - { - winningSaveSession2.Dispose(); - } - - try - { - staleRecord2.DateTimeProperty = DateTime.UtcNow.AddHours(1); - Assert.That(async () => - { - await persister.Update(staleRecord2, losingSaveSession2, losingContext2); - await losingSaveSession2.CompleteAsync(); - }, Throws.InstanceOf()); - } - finally - { - losingSaveSession2.Dispose(); - } - } - - public class TestSaga : Saga, IAmStartedByMessages - { - public Task Handle(StartMessage message, IMessageHandlerContext context) - { - throw new NotImplementedException(); - } - - protected override void ConfigureHowToFindSaga(SagaPropertyMapper mapper) - { - mapper.ConfigureMapping(msg => msg.SomeId).ToSaga(saga => saga.SomeId); - } - } - - public class StartMessage - { - public string SomeId { get; set; } - } - - public class TestSagaData : ContainSagaData - { - public string SomeId { get; set; } = "Test"; - - public DateTime DateTimeProperty { get; set; } - } - - public When_updating_saga_concurrently_twice_on_the_same_thread(TestVariant param) : base(param) - { - } - } -} \ No newline at end of file diff --git a/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt b/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt index 5ee6e3a21..c1a9f6800 100644 --- a/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt +++ b/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt @@ -1,7 +1,6 @@ -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.PersistersCompatibilityTests.NServiceBus5, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.RavenDB.ClusterWide.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.RavenDB.PersistenceTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001005d260426d6b11e39b77d27f81c791c8555233e4b04a6d18cca992ca16975652184fbc0bda57eceb6f1415850d8542f4976f7f79f2f8e60c5fe4039979f7bc3d16b42c06acc0d17c3b3a7a5e2f1a1c7f83a3aafec11e20c152317728cce5d6e98179a1cf162983cbf3671502583969292a644ad548a9d8df155d6818ab545f29e")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.RavenDB.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.RavenDB.ClusterWide.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.RavenDB.PersistenceTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.RavenDB.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")] namespace NServiceBus.Persistence.RavenDB { public interface IAsyncSessionProvider diff --git a/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj b/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj index 2206707dc..9602b8643 100644 --- a/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj +++ b/src/NServiceBus.RavenDB.Tests/NServiceBus.RavenDB.Tests.csproj @@ -1,9 +1,9 @@ - + - net472;net6.0;net7.0 + net8.0 true - ..\NServiceBus.snk + ..\NServiceBusTests.snk @@ -12,9 +12,8 @@ - - - + + diff --git a/src/NServiceBus.RavenDB.Tests/RavenDBPersistenceTestBase.cs b/src/NServiceBus.RavenDB.Tests/RavenDBPersistenceTestBase.cs index 6a1e2a487..a6cfde52f 100644 --- a/src/NServiceBus.RavenDB.Tests/RavenDBPersistenceTestBase.cs +++ b/src/NServiceBus.RavenDB.Tests/RavenDBPersistenceTestBase.cs @@ -73,11 +73,7 @@ protected static async Task Catch(Func(), new byte[0]); diff --git a/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs b/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs index 3d4c4b290..f907e7a5c 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs +++ b/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs @@ -14,11 +14,6 @@ public abstract class NServiceBusAcceptanceTest [SetUp] public void SetUp() { -#if NETFRAMEWORK - // Hack: prevents SerializationException ... Type 'x' in assembly 'y' is not marked as serializable. - // https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/mitigation-deserialization-of-objects-across-app-domains - System.Configuration.ConfigurationManager.GetSection("X"); -#endif Conventions.EndpointNamingConvention = t => { string classAndEndpoint = t.FullName.Split('.').Last(); 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 0c2465a95..e0bdb5918 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj +++ b/src/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests/NServiceBus.RavenDB.TransactionalSession.AcceptanceTests.csproj @@ -1,24 +1,21 @@ - + - net472;net6.0;net7.0 - true - ..\NServiceBusTests.snk - 10.0 + net8.0 NServiceBus.TransactionalSession.AcceptanceTests - + - - - + + + 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 dd0e539f8..2993e14c6 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession.Tests/NServiceBus.RavenDB.TransactionalSession.Tests.csproj +++ b/src/NServiceBus.RavenDB.TransactionalSession.Tests/NServiceBus.RavenDB.TransactionalSession.Tests.csproj @@ -1,9 +1,7 @@ - + - net472;net6.0;net7.0 - true - ..\NServiceBus.snk + net8.0 @@ -12,16 +10,14 @@ - + + + - - - - - + diff --git a/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj b/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj index 7857f74f8..6a46823db 100644 --- a/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj +++ b/src/NServiceBus.RavenDB.TransactionalSession/NServiceBus.RavenDB.TransactionalSession.csproj @@ -1,21 +1,20 @@ - + - net472;net6.0 + net8.0 NServiceBus.TransactionalSession true ..\NServiceBus.snk Transactional Session for the RavenDB persistence. - 10.0 - - + - + + \ No newline at end of file diff --git a/src/NServiceBus.RavenDB/AssemblyInfo.cs b/src/NServiceBus.RavenDB/AssemblyInfo.cs deleted file mode 100644 index 1efda763c..000000000 --- a/src/NServiceBus.RavenDB/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("NServiceBus.RavenDB.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")] -[assembly: InternalsVisibleTo("NServiceBus.RavenDB.ClusterWide.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")] -[assembly: InternalsVisibleTo("NServiceBus.RavenDB.PersistenceTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001005d260426d6b11e39b77d27f81c791c8555233e4b04a6d18cca992ca16975652184fbc0bda57eceb6f1415850d8542f4976f7f79f2f8e60c5fe4039979f7bc3d16b42c06acc0d17c3b3a7a5e2f1a1c7f83a3aafec11e20c152317728cce5d6e98179a1cf162983cbf3671502583969292a644ad548a9d8df155d6818ab545f29e")] -[assembly: InternalsVisibleTo("NServiceBus.PersistersCompatibilityTests.NServiceBus5, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")] diff --git a/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj b/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj index 2b1a51141..0d2a0fe77 100644 --- a/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj +++ b/src/NServiceBus.RavenDB/NServiceBus.RavenDB.csproj @@ -1,23 +1,27 @@ - + - net472;net6.0 + net8.0 NServiceBus.Persistence.RavenDB true ..\NServiceBus.snk RavenDB persistence support for NServiceBus - 10.0 true - - + - + + + + + + + diff --git a/src/Test.snk b/src/Test.snk deleted file mode 100644 index 4a339007f9b49fd4e69de737a4fd0a7a8f6888e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa500979CIlwdu^u_MeJA)Fc^rjRBR)$6rqPVb znJl4cb!8!h`@p@We$KY>L0C}OR4++(_xGPKj$p<9KslG6d&ALdLcnUw4Hv_+r={ZY zp~v_-Iz;tUld7jlfwU2d2cnjGm8KidKhT4OG{vYEm+@;WB62a05#fXM z^vl_8w%Jpy%9nmiORZ}{EnSpOt}&)&&~>}=?^4ZdFkLOl*J+_At~1A=^|7bsnztRs zL1-PP^3_=1xo~&P=LGV>z}HvB+HY!o?jp7xyN&bTOJKOeU13F3Z`+Is=qwmB^-9Rn zLiy?~(JMHInVwwc)9IF!M--BhLlZNa9VoS$MroR%=_J^pZ4`+95LDoqDG|&he;K*P;HvvM<>PA^V5)J= zl_$43IwJ8p^-J%p_ty;+rHBuT$DM6aXoUFqgxW4XSK(%@WLcl|-2+y+?fv3Gd+<+Q i$)8y;Jes(PX%*Xw{%U=ic=0Ae?0<#4j)x;q%SmKw1uXXf