Upgrade Akka.NET (#137)

* Upgrade Akka.NET * FluentAssertions * Fix FluentAssert Throw no defined
petabridge · Jan 8, 2021 · 66b1207 · 66b1207
1 parent 1af7223
commit 66b1207
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git 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 @@
 
   <ItemGroup>
     <PackageReference Include="Akka.Persistence.TCK" Version="$(AkkaVersion)" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git 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<ArgumentException>(reason);
+            createJournalSettings.ShouldThrow<ArgumentException>(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<ArgumentException>(reason);
+            createSnapshotSettings.ShouldThrow<ArgumentException>(reason);
         }
     }
 }
diff --git 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<long> 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
@@ -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
@@ -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
@@ -16,7 +16,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <XunitVersion>2.4.1</XunitVersion>
-    <AkkaVersion>1.4.13</AkkaVersion>
+    <AkkaVersion>1.4.14</AkkaVersion>
+    <FluentAssertionsVersion>4.14.0</FluentAssertionsVersion>
     <TestSdkVersion>16.8.3</TestSdkVersion>
     <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
     <NetFrameworkTestVersion>net461</NetFrameworkTestVersion>