Merge branch 'develop'

eventflow · Apr 24, 2018 · dd8457f · dd8457f
2 parents 46a52cb + 482fc44
commit dd8457f
Show file tree

Hide file tree

Showing 48 changed files with 407 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
     </td>
     <td  width="25%">
       <p>
-        <a href="https://ci.appveyor.com/project/rasmusnu/eventflow"><img src="https://ci.appveyor.com/api/projects/status/51yvhvbd909e4o82/branch/develop?svg=true" /></a>
+        <a href="https://ci.appveyor.com/project/eventflow/eventflow"><img src="https://ci.appveyor.com/api/projects/status/51yvhvbd909e4o82/branch/develop?svg=true" /></a>
       </p>
       <p>
         <a href="https://codecov.io/github/eventflow/EventFlow?branch=develop"><img src="https://codecov.io/github/eventflow/EventFlow/coverage.svg?branch=develop" /></a>

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,21 @@
-### New in 0.54 (not released yet)
-
-- **Critical fix:** `SagaAggregateStore` was incorrectly putting a object reference
+### New in 0.55 (not released yet)
+
+* Fixed: Re-populating events to read models that span multiple aggregates
+  now has events orderd by timestamp instead of sequence numbers, i.e., events
+  from aggregates with higher sequences numbers isn't forced last
+* New: Trigger sagas without the need of any domain events by using
+  `ISagaStore.UpdateAsync(...)`
+* New: .NET standard 2.0 (still supports 1.6) support added to these
+  NuGet packages
+  - EventFlow
+  - EventFlow.Autofac
+  - EventFlow.Elasticsearch
+  - EventFlow.Hangfire
+  - EventFlow.Sql
+
+### New in 0.54.3261 (released 2018-02-25)
+
+- **Critical fix:** `SagaAggregateStore` was incorrectly putting an object reference
   into its memory cache causing an object already disposed exception when working with
   sagas
 - New: Added [LibLog](https://github.com/damianh/LibLog), enable by

diff --git a/Source/EventFlow.AspNetCore/Middlewares/CommandPublishMiddleware.cs b/Source/EventFlow.AspNetCore/Middlewares/CommandPublishMiddleware.cs
@@ -107,7 +107,7 @@ await WriteAsync(
             }
             catch (ArgumentException e)
             {
-                _log.Debug(e, $"Failed to publish serilized command '{name}' v{version} due to: {e.Message}");
+                _log.Debug(e, $"Failed to publish serialized command '{name}' v{version} due to: {e.Message}");
                 await WriteErrorAsync(e.Message, HttpStatusCode.BadRequest, context).ConfigureAwait(false);
             }
             catch (DomainError e)

diff --git a/Source/EventFlow.Autofac/EventFlow.Autofac.csproj b/Source/EventFlow.Autofac/EventFlow.Autofac.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Common.props" />  
   <PropertyGroup>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net451;netstandard1.6;netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

diff --git a/Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj b/Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net451;netstandard1.6;netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

diff --git a/Source/EventFlow.Examples.Shipping/Domain/Model/CargoModel/CargoAggregate.cs b/Source/EventFlow.Examples.Shipping/Domain/Model/CargoModel/CargoAggregate.cs
@@ -42,14 +42,14 @@ public CargoAggregate(CargoId id) : base(id)
 
         public void Book(Route route)
         {
-            Specs.AggregateIsNew.ThrowDomainErrorIfNotStatisfied(this);
+            Specs.AggregateIsNew.ThrowDomainErrorIfNotSatisfied(this);
             Emit(new CargoBookedEvent(route));
         }
 
         public void SetItinerary(Itinerary itinerary)
         {
-            Specs.AggregateIsCreated.ThrowDomainErrorIfNotStatisfied(this);
-            Route.Specification().ThrowDomainErrorIfNotStatisfied(itinerary);
+            Specs.AggregateIsCreated.ThrowDomainErrorIfNotSatisfied(this);
+            Route.Specification().ThrowDomainErrorIfNotSatisfied(itinerary);
 
             Emit(new CargoItinerarySetEvent(itinerary));
         }

diff --git a/.../EventFlow.Examples.Shipping/Domain/Model/CargoModel/Specifications/RouteSpecification.cs b/.../EventFlow.Examples.Shipping/Domain/Model/CargoModel/Specifications/RouteSpecification.cs
@@ -49,7 +49,7 @@ protected override IEnumerable<string> IsNotSatisfiedBecause(Itinerary obj)
             var itineraryDepartureTime = obj.DepartureTime();
             if (Route.DepartureTime.IsAfter(itineraryDepartureTime))
             {
-                yield return $"Route origin depature '{Route.DepartureTime}' is after itinerary depature '{itineraryDepartureTime}'";
+                yield return $"Route origin departure '{Route.DepartureTime}' is after itinerary departure '{itineraryDepartureTime}'";
             }
 
             var itineraryArrivalLocation = obj.ArrivalLocation();

diff --git a/Source/EventFlow.Examples.Shipping/Domain/Model/CargoModel/ValueObjects/Itinerary.cs b/Source/EventFlow.Examples.Shipping/Domain/Model/CargoModel/ValueObjects/Itinerary.cs
@@ -40,7 +40,7 @@ public Itinerary(
             var legsList = (transportLegs ?? Enumerable.Empty<TransportLeg>()).ToList();
 
             if (!legsList.Any()) throw new ArgumentException(nameof(transportLegs));
-            (new TransportLegsAreConnectedSpecification()).ThrowDomainErrorIfNotStatisfied(legsList);
+            (new TransportLegsAreConnectedSpecification()).ThrowDomainErrorIfNotSatisfied(legsList);
 
             TransportLegs = legsList;
         }

diff --git a/Source/EventFlow.Examples.Shipping/Domain/Model/VoyageModel/VoyageAggregate.cs b/Source/EventFlow.Examples.Shipping/Domain/Model/VoyageModel/VoyageAggregate.cs
@@ -42,14 +42,14 @@ public VoyageAggregate(VoyageId id) : base(id)
 
         public void Create(Schedule schedule)
         {
-            Specs.AggregateIsNew.ThrowDomainErrorIfNotStatisfied(this);
+            Specs.AggregateIsNew.ThrowDomainErrorIfNotSatisfied(this);
 
             Emit(new VoyageCreatedEvent(schedule));
         }
 
         public void Delay(TimeSpan delay)
         {
-            Specs.AggregateIsCreated.ThrowDomainErrorIfNotStatisfied(this);
+            Specs.AggregateIsCreated.ThrowDomainErrorIfNotSatisfied(this);
 
             if (delay == TimeSpan.Zero) return;
 

diff --git a/Source/EventFlow.Hangfire.Tests/Integration/HangfireJobSchedulerTests.cs b/Source/EventFlow.Hangfire.Tests/Integration/HangfireJobSchedulerTests.cs
@@ -73,7 +73,7 @@ public void OneTimeSetUp()
         [OneTimeTearDown]
         public void OneTimeTearDown()
         {
-            _backgroundJobServer.DisposeSafe("Hangfire backgroung job server");
+            _backgroundJobServer.DisposeSafe("Hangfire background job server");
             _webApp.DisposeSafe("Web APP");
             _msSqlDatabase.DisposeSafe("MSSQL database");
         }

diff --git a/Source/EventFlow.Hangfire/EventFlow.Hangfire.csproj b/Source/EventFlow.Hangfire/EventFlow.Hangfire.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net451;netstandard1.6;netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

diff --git a/Source/EventFlow.MsSql/Integrations/TableParameter.cs b/Source/EventFlow.MsSql/Integrations/TableParameter.cs
@@ -41,7 +41,7 @@ internal class TableParameter<TRow> : SqlMapper.IDynamicParameters
         private readonly SqlMapper.IDynamicParameters _otherParameters;
 
         // ReSharper disable StaticMemberInGenericType
-        // The PropertyInfos and SqlMetaDatas static fields are dependant on the TRow type
+        // The PropertyInfos and SqlMetaDatas static fields are dependent on the TRow type
         private static readonly Dictionary<SqlDbType, Action<SqlDataRecord, int, object>> SqlDataRecordSetters = new Dictionary<SqlDbType, Action<SqlDataRecord, int, object>>
             {
                 {SqlDbType.Text, (r, i, o) => r.SetString(i, (string)o)},

diff --git a/Source/EventFlow.MsSql/ReadStores/MssqlReadModelStore.cs b/Source/EventFlow.MsSql/ReadStores/MssqlReadModelStore.cs
@@ -165,7 +165,7 @@ public override async Task<ReadModelEnvelope<TReadModel>> GetAsync(string id, Ca
 
             var readModelVersion = GetVersion(readModel);
 
-            Log.Verbose(() => $"Foud MSSQL read model '{readModelType.PrettyPrint()}' with ID '{readModelVersion}'");
+            Log.Verbose(() => $"Found MSSQL read model '{readModelType.PrettyPrint()}' with ID '{readModelVersion}'");
 
             return readModelVersion.HasValue
                 ? ReadModelEnvelope<TReadModel>.With(id, readModel, readModelVersion.Value)

diff --git a/Source/EventFlow.MsSql/SnapshotStores/MsSqlSnapshotPersistence.cs b/Source/EventFlow.MsSql/SnapshotStores/MsSqlSnapshotPersistence.cs
@@ -95,7 +95,7 @@ await _msSqlConnection.ExecuteAsync(
             }
             catch (SqlException sqlException) when (sqlException.Number == 2601)
             {
-                // If we have a dublicate key exception, then the snapshot has already been created
+                // If we have a duplicate key exception, then the snapshot has already been created
             }
         }
 

diff --git a/Source/EventFlow.Owin/Middlewares/CommandPublishMiddleware.cs b/Source/EventFlow.Owin/Middlewares/CommandPublishMiddleware.cs
@@ -106,7 +106,7 @@ await WriteAsync(
             }
             catch (ArgumentException e)
             {
-                _log.Debug(e, $"Failed to publish serilized command '{name}' v{version} due to: {e.Message}");
+                _log.Debug(e, $"Failed to publish serialized command '{name}' v{version} due to: {e.Message}");
                 await WriteErrorAsync(e.Message, HttpStatusCode.BadRequest, context).ConfigureAwait(false);
             }
             catch (DomainError e)

diff --git a/Source/EventFlow.RabbitMQ.Tests/Integration/RabbitMqTests.cs b/Source/EventFlow.RabbitMQ.Tests/Integration/RabbitMqTests.cs
@@ -54,7 +54,7 @@ public void SetUp()
             var url = Environment.GetEnvironmentVariable("RABBITMQ_URL");
             if (string.IsNullOrEmpty(url))
             {
-                Assert.Inconclusive("The environment variabel named 'RABBITMQ_URL' isn't set. Set it to e.g. 'amqp://localhost'");
+                Assert.Inconclusive("The environment variable named 'RABBITMQ_URL' isn't set. Set it to e.g. 'amqp://localhost'");
             }
 
             _uri = new Uri(url);

diff --git a/Source/EventFlow.RabbitMQ.Tests/RabbitMqConsumer.cs b/Source/EventFlow.RabbitMQ.Tests/RabbitMqConsumer.cs
@@ -88,7 +88,7 @@ public IReadOnlyCollection<RabbitMqMessage> GetMessages(TimeSpan timeout, int co
             {
                 if (stopwatch.Elapsed >= timeout)
                 {
-                    throw new TimeoutException($"Timedout after {stopwatch.Elapsed.TotalSeconds:0.##} seconds");
+                    throw new TimeoutException($"Timed out after {stopwatch.Elapsed.TotalSeconds:0.##} seconds");
                 }
 
                 BasicDeliverEventArgs basicDeliverEventArgs;

diff --git a/Source/EventFlow.RabbitMQ/Integrations/RabbitMqPublisher.cs b/Source/EventFlow.RabbitMQ/Integrations/RabbitMqPublisher.cs
@@ -115,7 +115,7 @@ private Task<int> PublishAsync(
             IReadOnlyCollection<RabbitMqMessage> messages)
         {
             _log.Verbose(
-                "Publishing {0} domain domain events to RabbitMQ host '{1}'",
+                "Publishing {0} domain events to RabbitMQ host '{1}'",
                 messages.Count,
                 _configuration.Uri.Host);
 

diff --git a/Source/EventFlow.Sql/EventFlow.Sql.csproj b/Source/EventFlow.Sql/EventFlow.Sql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net451;netstandard1.6;netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
@@ -27,11 +27,12 @@
     <PackageReference Include="Dapper" Version="1.50.2" />
     <PackageReference Condition="'$(TargetFramework)' == 'net451'" Include="dbup" Version="3.3.5" />
     <PackageReference Condition="'$(TargetFramework)' == 'netstandard1.6'" Include="System.ComponentModel.Annotations" Version="4.3.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.ComponentModel.Annotations" Version="4.4.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EventFlow\EventFlow.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Condition="'$(TargetFramework)' == 'net451'" Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.Sql/ReadModels/SqlReadModelStore.cs b/Source/EventFlow.Sql/ReadModels/SqlReadModelStore.cs
@@ -158,7 +158,7 @@ public override async Task<ReadModelEnvelope<TReadModel>> GetAsync(string id, Ca
 
             var readModelVersion = GetVersion(readModel);
 
-            Log.Verbose(() => $"Foud SQL read model '{readModelType.PrettyPrint()}' with ID '{readModelVersion}'");
+            Log.Verbose(() => $"Found SQL read model '{readModelType.PrettyPrint()}' with ID '{readModelVersion}'");
 
             return readModelVersion.HasValue
                 ? ReadModelEnvelope<TReadModel>.With(id, readModel, readModelVersion.Value)

diff --git a/Source/EventFlow.Tests/EventFlow.Tests.csproj b/Source/EventFlow.Tests/EventFlow.Tests.csproj
@@ -12,4 +12,7 @@
     <PackageReference Include="Serilog" Version="2.6.0" />
     <PackageReference Include="WindowsBase" Version="4.6.1055" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ await _msSqlConnection.ExecuteAsync( @@
                 }
                 catch (SqlException sqlException) when (sqlException.Number == 2601)
                 {
-                    // If we have a dublicate key exception, then the snapshot has already been created
+                    // If we have a duplicate key exception, then the snapshot has already been created
                 }
             }
@@ Expand Down @@