Merge tag '9.0.0' into develop

9.0.0
NEventStore · Dec 2, 2021 · 4f332c1 · 4f332c1
2 parents dc420a9 + 34ad7c0
commit 4f332c1
Show file tree

Hide file tree

Showing 47 changed files with 658 additions and 711 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # NEventStore Versions
 
+## 9.0.0
+
+- Added support for .net 6 [#493](https://github.com/NEventStore/NEventStore/issues/493).
+- Change / Optimization: Commit and CommitAttempt do not create internal readonly collections anymore, it can be useless given the fact we can change properties of events.
+- NEventStore.Serialization.Json: accepts a JsonSerializerSettings to configure the serializer.
+
 ## 8.0.0
 
 - Added support for .net 5 [#489](https://github.com/NEventStore/NEventStore/issues/489).

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 version: 1.0.{build}
-image: Visual Studio 2019 Preview
+image: Visual Studio 2022
 configuration: Release
 assembly_info:
   patch: true

diff --git a/readme.markdown b/readme.markdown
@@ -7,7 +7,8 @@ This library is developed with a specific focus on [DDD](http://en.wikipedia.org
 
 NEventStore currently supports:
 
-- .net 5
+- .net 6.0
+- .net 5.0
 - .net standard 2.0
 - .net framework 4.6.1
 

diff --git a/src/NEventStore.Benchmark/Benchmarks/Md5VsSha256.cs b/src/NEventStore.Benchmark/Benchmarks/Md5VsSha256.cs
diff --git a/src/NEventStore.Benchmark/Benchmarks/PersistenceBenchmarks.cs b/src/NEventStore.Benchmark/Benchmarks/PersistenceBenchmarks.cs
@@ -5,7 +5,7 @@
 namespace NEventStore.Benchmark.Benchmarks
 {
     [Config(typeof(AllowNonOptimized))]
-    [SimpleJob(launchCount: 3, warmupCount: 3, targetCount: 20, invocationCount: -1)]
+    [SimpleJob(launchCount: 3, warmupCount: 3, targetCount: 3, invocationCount: 1)]
     [MemoryDiagnoser]
     [MeanColumn, StdErrorColumn, StdDevColumn, MinColumn, MaxColumn, IterationsColumn]
     public class PersistenceBenchmarks
@@ -18,6 +18,9 @@ public PersistenceBenchmarks()
             _eventStore = EventStoreHelpers.WireupEventStore();
         }
 
+        [Params(100, 1000, 10000, 100000)]
+        public int CommitsToWrite { get; set; }
+
         [Benchmark]
         public void WriteToStream()
         {
@@ -26,8 +29,7 @@ public void WriteToStream()
             // if no commits exist then it creates a new stream for us.
             using (var stream = _eventStore.OpenStream(StreamId, 0, int.MaxValue))
             {
-                // add XXX commits to the stream
-                for (int i = 0; i < 500; i++)
+                for (int i = 0; i < CommitsToWrite; i++)
                 {
                     var @event = new SomeDomainEvent { Value = i.ToString() };
                     stream.Add(new EventMessage { Body = @event });
@@ -41,8 +43,7 @@ public void ReadSetup()
         {
             using (var stream = _eventStore.OpenStream(StreamId, 0, int.MaxValue))
             {
-                // add XXX commits to the stream
-                for (int i = 0; i < 500; i++)
+                for (int i = 0; i < CommitsToWrite; i++)
                 {
                     var @event = new SomeDomainEvent { Value = i.ToString() };
                     stream.Add(new EventMessage { Body = @event });

diff --git a/src/NEventStore.Benchmark/NEventStore.Benchmark.csproj b/src/NEventStore.Benchmark/NEventStore.Benchmark.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-      <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
+      <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
       <ApplicationIcon />
       <OutputTypeEx>exe</OutputTypeEx>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NEventStore.Example/NEventStore.Example.csproj b/src/NEventStore.Example/NEventStore.Example.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-      <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
+      <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
       <ApplicationIcon />
       <OutputTypeEx>exe</OutputTypeEx>
@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NEventStore.Persistence.AcceptanceTests/ExtensionMethods.cs b/src/NEventStore.Persistence.AcceptanceTests/ExtensionMethods.cs
@@ -54,7 +54,7 @@ public static CommitAttempt BuildAttempt(this string streamId, DateTime? now = n
             now = now ?? SystemTime.UtcNow;
             bucketId = bucketId ?? Bucket.Default;
 
-            var messages = new List<EventMessage>
+            var messages = new EventMessage[]
             {
                 new EventMessage {Body = new SomeDomainEvent {SomeProperty = "Test"}},
                 new EventMessage {Body = new SomeDomainEvent {SomeProperty = "Test2"}},
@@ -74,15 +74,15 @@ public static CommitAttempt BuildAttempt(this string streamId, DateTime? now = n
 
         public static CommitAttempt BuildNextAttempt(this ICommit commit)
         {
-            var messages = new List<EventMessage>
+            var messages = new EventMessage[]
             {
                 new EventMessage {Body = new SomeDomainEvent {SomeProperty = "Another test"}},
                 new EventMessage {Body = new SomeDomainEvent {SomeProperty = "Another test2"}},
             };
 
             return new CommitAttempt(commit.BucketId,
                 commit.StreamId,
-                commit.StreamRevision + messages.Count,
+                commit.StreamRevision + messages.Length,
                 Guid.NewGuid(),
                 commit.CommitSequence + 1,
                 commit.CommitStamp.AddSeconds(1),
@@ -92,7 +92,7 @@ public static CommitAttempt BuildNextAttempt(this ICommit commit)
 
         public static CommitAttempt BuildNextAttempt(this CommitAttempt commit)
         {
-            var messages = new List<EventMessage>
+            var messages = new EventMessage[]
             {
                 new EventMessage {Body = new SomeDomainEvent {SomeProperty = "Another test"}},
                 new EventMessage {Body = new SomeDomainEvent {SomeProperty = "Another test2"}},
@@ -142,7 +142,7 @@ public static CommitAttempt BuildCommit(this string streamId)
                 }
             };
 
-            return new CommitAttempt(streamId, streamRevision, commitId, commitSequence, SystemTime.UtcNow, headers, events.ToList());
+            return new CommitAttempt(streamId, streamRevision, commitId, commitSequence, SystemTime.UtcNow, headers, events);
         }
 
         [Serializable]

diff --git a/...ventStore.Persistence.AcceptanceTests/NEventStore.Persistence.AcceptanceTests.Core.csproj b/...ventStore.Persistence.AcceptanceTests/NEventStore.Persistence.AcceptanceTests.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <RootNamespace>NEventStore.Persistence.AcceptanceTests</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -13,9 +13,9 @@
     <DefineConstants>NUNIT</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
   </ItemGroup>  
   <ItemGroup>
     <Compile Remove="ConfigurationExtensions.cs" />

diff --git a/src/NEventStore.Persistence.AcceptanceTests/PersistenceTests.cs b/src/NEventStore.Persistence.AcceptanceTests/PersistenceTests.cs
@@ -1,6 +1,6 @@
+
 #pragma warning disable 169 // ReSharper disable InconsistentNaming
 #pragma warning disable IDE1006 // Naming Styles
-#pragma warning disable S101 // Types should be named in PascalCase
 
 namespace NEventStore.Persistence.AcceptanceTests
 {
@@ -38,9 +38,9 @@ protected override void Context()
                 2,
                 Guid.NewGuid(),
                 1,
-                DateTime.Now,
+                DateTime.UtcNow,
                 new Dictionary<string, object> { { "key.1", "value" } },
-                new List<EventMessage> { new EventMessage { Body = new ExtensionMethods.SomeDomainEvent { SomeProperty = "Test" } } });
+                new EventMessage[] { new EventMessage { Body = new ExtensionMethods.SomeDomainEvent { SomeProperty = "Test" } } });
             Persistence.Commit(attempt);
         }
 
@@ -130,9 +130,7 @@ public void should_correctly_persist_the_events()
         [Fact]
         public void should_cause_the_stream_to_be_found_in_the_list_of_streams_to_snapshot()
         {
-#pragma warning disable RCS1202 // Avoid NullReferenceException.
             Persistence.GetStreamsToSnapshot(1).FirstOrDefault(x => x.StreamId == _streamId).Should().NotBeNull();
-#pragma warning restore RCS1202 // Avoid NullReferenceException.
         }
     }
 
@@ -330,8 +328,8 @@ protected override void Context()
                 commit.CommitId,
                 commit.CommitSequence,
                 commit.CommitStamp,
-                commit.Headers,
-                commit.Events);
+                commit.Headers.ToDictionary(k => k.Key, v => v.Value),
+                commit.Events.ToArray());
         }
 
         protected override void Because()
@@ -364,8 +362,8 @@ protected override void Context()
                 commit.CommitId,
                 commit.CommitSequence + 1,
                 commit.CommitStamp,
-                commit.Headers,
-                commit.Events
+                commit.Headers.ToDictionary(k => k.Key, v => v.Value),
+                commit.Events.ToArray()
             );
         }
 
@@ -611,9 +609,7 @@ protected override void Because()
         [Fact]
         public void should_find_the_stream_in_the_set_of_streams_to_be_snapshot_when_within_the_threshold()
         {
-#pragma warning disable RCS1202 // Avoid NullReferenceException.
             Persistence.GetStreamsToSnapshot(WithinThreshold).FirstOrDefault(x => x.StreamId == _streamId).Should().NotBeNull();
-#pragma warning restore RCS1202 // Avoid NullReferenceException.
         }
 
         [Fact]
@@ -1227,7 +1223,7 @@ public void can_commit()
                 1,
                 DateTime.UtcNow,
                 new Dictionary<string, object>(),
-                new List<EventMessage> { new EventMessage { Body = new string('a', bodyLength) } });
+                new EventMessage[] { new EventMessage { Body = new string('a', bodyLength) } });
             Persistence.Commit(attempt);
 
             ICommit commits = Persistence.GetFrom(0).Single();
@@ -1288,7 +1284,7 @@ protected virtual void Dispose(bool disposing)
         /// This code was meant to be run right before every test in the fixture to give time
         /// to do further initialization before the PersistenceEngineFixture was created.
         /// Unfortunately the 3 frameworks
-        /// have very different ways of doing this: 
+        /// have very different ways of doing this:
         /// - NUnit: TestFixtureSetUp
         /// - MSTest: ClassInitialize (not inherited, will be ignored if defined on a base class)
         /// - xUnit: IUseFixture + SetFixture
@@ -1380,6 +1376,5 @@ protected virtual void Dispose(bool disposing)
     }
 }
 
-#pragma warning restore S101 // Types should be named in PascalCase
 #pragma warning restore 169 // ReSharper disable InconsistentNaming
 #pragma warning restore IDE1006 // Naming Styles
diff --git a/src/NEventStore.PollingClient/NEventStore.PollingClient.csproj b/src/NEventStore.PollingClient/NEventStore.PollingClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.0;net461</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>NEventStore.PollingClient</RootNamespace>
     <AssemblyName>NEventStore.PollingClient</AssemblyName>

diff --git a/src/NEventStore.PollingClientExample/NEventStore.PollingClientExample.csproj b/src/NEventStore.PollingClientExample/NEventStore.PollingClientExample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-      <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
+      <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
       <ApplicationIcon />
       <OutputTypeEx>exe</OutputTypeEx>
@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...NEventStore.Serialization.Binary.Tests/NEventStore.Serialization.Binary.Core.Tests.csproj b/...NEventStore.Serialization.Binary.Tests/NEventStore.Serialization.Binary.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ApplicationIcon />
     <OutputTypeEx>exe</OutputTypeEx>
@@ -18,11 +18,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NEventStore.Serialization.Binary.Tests/SerializerFixture.cs b/src/NEventStore.Serialization.Binary.Tests/SerializerFixture.cs
@@ -7,9 +7,11 @@ namespace NEventStore.Serialization.AcceptanceTests
     public partial class SerializerFixture
     {
         public SerializerFixture()
-        {
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
             _createSerializer = () =>
-                new BinarySerializer();
+                new BinarySerializer();
+#pragma warning restore CS0618 // Type or member is obsolete
         }
     }
 }
diff --git a/src/NEventStore.Serialization.Bson.Tests/NEventStore.Serialization.Bson.Core.Tests.csproj b/src/NEventStore.Serialization.Bson.Tests/NEventStore.Serialization.Bson.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ApplicationIcon />
     <OutputTypeEx>exe</OutputTypeEx>
@@ -18,11 +18,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NEventStore.Serialization.Bson/NEventStore.Serialization.Bson.Core.csproj b/src/NEventStore.Serialization.Bson/NEventStore.Serialization.Bson.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.0;net461</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>NEventStore.Serialization.Bson</RootNamespace>
     <AssemblyName>NEventStore.Serialization.Bson</AssemblyName>