Merge branch 'dev'

akkadotnet · Dec 15, 2021 · 8c1942c · 8c1942c
2 parents 66a1e88 + c3ecfe7
commit 8c1942c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+### 1.4.29 December 15 2021 ###
+- Upgraded to [Akka.NET v1.4.29](https://github.com/akkadotnet/akka.net/releases/tag/1.4.29)
+- [Upgraded Npgsql to 5.0.10](https://github.com/akkadotnet/Akka.Persistence.PostgreSql/pull/106)
+
+
 ### 1.4.25 September 9 2021 ###
 - Upgraded to [Akka.NET v1.4.25](https://github.com/akkadotnet/akka.net/releases/tag/1.4.25)
 

diff --git a/build-system/pr-validation.yaml b/build-system/pr-validation.yaml
@@ -27,8 +27,8 @@ jobs:
     parameters:
       name: 'linux_pr'
       displayName: 'Linux PR Validation'
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-20.04'
       scriptFileName: './build.sh'
       scriptArgs: RunTestsNetCore
       outputDirectory: 'TestResults'
-      artifactName: 'net_core_tests-$(Build.BuildId)'
+      artifactName: 'net_core_tests-$(Build.BuildId)'
diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentAllEventsSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentAllEventsSpec.cs
@@ -15,7 +15,7 @@
 namespace Akka.Persistence.PostgreSql.Tests.Query
 {
     [Collection("PostgreSqlSpec")]
-    public class PostgreSqlCurrentAllEventsSpec : AllEventsSpec
+    public class PostgreSqlCurrentAllEventsSpec : CurrentAllEventsSpec
     {
         private static Config Initialize(PostgresFixture fixture)
         {
@@ -50,4 +50,4 @@ protected override void Dispose(bool disposing)
             DbUtils.Clean();
         }
     }
-}
+}
diff --git a/src/Akka.Persistence.PostgreSql/Journal/PostgreSqlQueryExecutor.cs b/src/Akka.Persistence.PostgreSql/Journal/PostgreSqlQueryExecutor.cs
@@ -153,15 +153,6 @@ protected override void WriteEvent(DbCommand command, IPersistentRepresentation
 
             command.Parameters.Add(new NpgsqlParameter("@Payload", serializationResult.DbType) { Value = serializationResult.Payload });
 
-            if (serializer != null)
-            {
-                AddParameter(command, "@SerializerId", DbType.Int32, serializer.Identifier);
-            }
-            else
-            {
-                AddParameter(command, "@SerializerId", DbType.Int32, DBNull.Value);
-            }
-
             if (tags.Count != 0)
             {
                 var tagBuilder = new StringBuilder(";", tags.Sum(x => x.Length) + tags.Count + 1);
@@ -286,4 +277,4 @@ public PostgreSqlQueryConfiguration(
             };
         }
     }
-}
+}
diff --git a/src/common.props b/src/common.props
@@ -14,11 +14,11 @@
   <PropertyGroup>
     <XunitVersion>2.4.1</XunitVersion>
     <XunitRunnerVersion>2.4.3</XunitRunnerVersion>
-    <AkkaVersion>1.4.25</AkkaVersion>
-    <PostgresVersion>5.0.7</PostgresVersion>
+    <AkkaVersion>1.4.29</AkkaVersion>
+    <PostgresVersion>6.0.1</PostgresVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
     <NetFrameworkVersion>net45</NetFrameworkVersion>
-    <TestSdkVersion>16.11.0</TestSdkVersion>
+    <TestSdkVersion>17.0.0</TestSdkVersion>
     <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
     <NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
   </PropertyGroup>