diff --git a/src/Akka.Persistence.Azure.Tests/Akka.Persistence.Azure.Tests.csproj b/src/Akka.Persistence.Azure.Tests/Akka.Persistence.Azure.Tests.csproj index 882ee1c..bf8250e 100644 --- a/src/Akka.Persistence.Azure.Tests/Akka.Persistence.Azure.Tests.csproj +++ b/src/Akka.Persistence.Azure.Tests/Akka.Persistence.Azure.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Akka.Persistence.Azure.Tests/AzurePersistenceConfigSpec.cs b/src/Akka.Persistence.Azure.Tests/AzurePersistenceConfigSpec.cs index e71043a..bd48dc6 100644 --- a/src/Akka.Persistence.Azure.Tests/AzurePersistenceConfigSpec.cs +++ b/src/Akka.Persistence.Azure.Tests/AzurePersistenceConfigSpec.cs @@ -10,7 +10,6 @@ using Akka.Persistence.Azure.Query; using Akka.Persistence.Azure.Snapshot; using FluentAssertions; -using FluentAssertions.Equivalency; using Xunit; namespace Akka.Persistence.Azure.Tests @@ -98,8 +97,7 @@ public void ShouldThrowArgumentExceptionForIllegalTableNames(string tableName, s table-name = " + tableName + @" }").WithFallback(AzurePersistence.DefaultConfig) .GetConfig("akka.persistence.journal.azure-table")); - - createJournalSettings.Should().Throw(reason); + createJournalSettings.ShouldThrow(reason); } [Theory] @@ -115,7 +113,7 @@ public void ShouldThrowArgumentExceptionForIllegalContainerNames(string containe }").WithFallback(AzurePersistence.DefaultConfig) .GetConfig("akka.persistence.snapshot-store.azure-blob-store")); - createSnapshotSettings.Should().Throw(reason); + createSnapshotSettings.ShouldThrow(reason); } } } \ No newline at end of file diff --git a/src/Akka.Persistence.Azure/Journal/AzureTableStorageJournal.cs b/src/Akka.Persistence.Azure/Journal/AzureTableStorageJournal.cs index 94f4d88..18fbc97 100644 --- a/src/Akka.Persistence.Azure/Journal/AzureTableStorageJournal.cs +++ b/src/Akka.Persistence.Azure/Journal/AzureTableStorageJournal.cs @@ -173,7 +173,8 @@ public override async Task ReplayMessagesAsync( deserialized.Manifest, deserialized.IsDeleted, ActorRefs.NoSender, - deserialized.WriterGuid); + deserialized.WriterGuid, + timestamp: savedEvent.UtcTicks); if (_log.IsDebugEnabled && _settings.VerboseLogging) { @@ -831,7 +832,8 @@ private async Task ReplayTaggedMessagesAsync( deserialized.Manifest, deserialized.IsDeleted, ActorRefs.NoSender, - deserialized.WriterGuid); + deserialized.WriterGuid, + timestamp: entry.UtcTicks); foreach (var adapted in AdaptFromJournal(persistent)) { diff --git a/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByPersistenceIdPublisher.cs b/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByPersistenceIdPublisher.cs index 4be44c7..ee6e29e 100644 --- a/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByPersistenceIdPublisher.cs +++ b/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByPersistenceIdPublisher.cs @@ -83,7 +83,8 @@ protected Receive Replaying(int limit) offset: new Sequence(seqNr), persistenceId: PersistenceId, sequenceNr: seqNr, - @event: replayed.Persistent.Payload)); + @event: replayed.Persistent.Payload, + timestamp: replayed.Persistent.Timestamp)); CurrentSequenceNr = seqNr + 1; Buffer.DeliverBuffer(TotalDemand); }) diff --git a/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByTagPublisher.cs b/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByTagPublisher.cs index 1000874..4b0dcf3 100644 --- a/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByTagPublisher.cs +++ b/src/Akka.Persistence.Azure/Query/Publishers/AbstractEventsByTagPublisher.cs @@ -68,6 +68,7 @@ protected Receive Replaying(int limit) offset: new Sequence(replayed.Offset), persistenceId: replayed.Persistent.PersistenceId, sequenceNr: replayed.Persistent.SequenceNr, + timestamp: replayed.Persistent.Timestamp, @event: replayed.Persistent.Payload)); CurrentOffset = replayed.Offset; diff --git a/src/common.props b/src/common.props index beaee1c..0e535ea 100644 --- a/src/common.props +++ b/src/common.props @@ -16,7 +16,8 @@ 2.4.1 - 1.4.13 + 1.4.14 + 4.14.0 16.8.3 netcoreapp3.1 net461