upgraded to Akka.NET v1.5 (#284)

akkadotnet · Feb 21, 2023 · b8d07b5 · b8d07b5
1 parent 3cc4a46
commit b8d07b5
Show file tree

Hide file tree

Showing 26 changed files with 174 additions and 97 deletions.
diff --git a/Akka.Persistence.SqlServer.sln b/Akka.Persistence.SqlServer.sln
@@ -8,14 +8,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D8BAD8E8
 		build.cmd = build.cmd
 		build.fsx = build.fsx
 		build.sh = build.sh
-		src\common.props = src\common.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{85A25CFE-0B51-45FC-9C5E-271F9557F8D3}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
-		src\common.props = src\common.props
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Packages.props = src\Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.SqlServer", "src\Akka.Persistence.SqlServer\Akka.Persistence.SqlServer.csproj", "{424D7800-6417-498D-A645-0E5EAF16C6D6}"

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,27 +1,3 @@
-#### 1.4.35 March 23 2022 ####
+#### 1.5.0-beta1 February 21 2023 ####
 
-* [Update Akka.NET to v1.4.35](https://github.com/akkadotnet/akka.net/releases/tag/1.4.35)
-
-#### 1.4.32 January 19 2022 ####
-
-* [Update Akka.NET to v1.4.32](https://github.com/akkadotnet/akka.net/releases/tag/1.4.32)
-
-#### 1.4.31 December 20 2021 ####
-
-* [Update Akka.NET to v1.4.31](https://github.com/akkadotnet/akka.net/releases/tag/1.4.31)
-
-#### 1.4.29 December 15 2021 ####
-
-* [Update Akka.NET to v1.4.29](https://github.com/akkadotnet/akka.net/releases/tag/1.4.29)
-* [Update Microsoft.Data.SqlClient to v3.0.1](https://github.com/akkadotnet/Akka.Persistence.SqlServer/pull/223)
-
-#### 1.4.25 September 9 2021 ####
-
-* [Update Akka.NET to v1.4.25](https://github.com/akkadotnet/akka.net/releases/tag/1.4.25)
-* [Update Microsoft.Data.SqlClient to v3.0.0](https://github.com/akkadotnet/Akka.Persistence.SqlServer/pull/212)
-
-#### 1.4.18 May 12 2020 ####
-
-* Upgrades to [Akka.NET v1.4.18](https://github.com/akkadotnet/akka.net/releases/tag/1.4.18)
-* [Added Support for Microsoft AD Authentication](https://github.com/akkadotnet/Akka.Persistence.SqlServer/issues/203)
-* [Load string parameters column sizes to reduce SqlServer query plans count](https://github.com/akkadotnet/Akka.Persistence.SqlServer/pull/197)
+* [Update Akka.NET to v1.5.0-beta1](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0-beta1)
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerAllEventsSpec : AllEventsSpec
+    public class BatchingSqlServerAllEventsSpec : AllEventsSpec, IDisposable
     {
         public BatchingSqlServerAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -41,10 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentAllEventsSpec : CurrentAllEventsSpec
+    public class BatchingSqlServerCurrentAllEventsSpec : CurrentAllEventsSpec, IDisposable
     {
         public BatchingSqlServerCurrentAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -41,10 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/...Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs b/...Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec
+    public class BatchingSqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec, IDisposable
     {
         public BatchingSqlServerCurrentEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentEventsByPersistenceIdSpec), output)
@@ -43,10 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentEventsByTagSpec : EventsByTagSpec
+    public class BatchingSqlServerCurrentEventsByTagSpec : EventsByTagSpec, IDisposable
     {
         public BatchingSqlServerCurrentEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentEventsByTagSpec), output)
@@ -49,10 +50,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec
+    public class BatchingSqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec, IDisposable
     {
         public BatchingSqlServerCurrentPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentPersistenceIdsSpec), output)
@@ -43,10 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec
+    public class BatchingSqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec, IDisposable
     {
         public BatchingSqlServerEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerEventsByPersistenceIdSpec), output)
@@ -43,10 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerEventsByTagSpec : EventsByTagSpec
+    public class BatchingSqlServerEventsByTagSpec : EventsByTagSpec, IDisposable
     {
         public BatchingSqlServerEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerEventsByTagSpec), output)
@@ -49,10 +50,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs
@@ -13,7 +13,7 @@
 namespace Akka.Persistence.SqlServer.Tests
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerJournalPerfSpec : JournalPerfSpec
+    public class BatchingSqlServerJournalPerfSpec : JournalPerfSpec, IDisposable
     {
         public BatchingSqlServerJournalPerfSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), "BatchingSqlServerJournalPerfSpec", output)
@@ -47,10 +47,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return ConfigurationFactory.ParseString(specString);
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerPersistenceIdsSpec : PersistenceIdsSpec
+    public class BatchingSqlServerPersistenceIdsSpec : PersistenceIdsSpec, IDisposable
     {
         public BatchingSqlServerPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerPersistenceIdsSpec), output)
@@ -43,10 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -14,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerAllEventsSpec : AllEventsSpec
+    public class SqlServerAllEventsSpec : AllEventsSpec, IDisposable
     {
         public SqlServerAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(InitConfig(fixture),
             nameof(SqlServerAllEventsSpec), output)
@@ -47,10 +48,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected override void Dispose(bool disposing)
+        protected void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
             DbUtils.Clean();
         }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
+        }
     }
 }