Merge branch 'develop'

eventflow · Apr 30, 2018 · ebc0df2 · ebc0df2
2 parents 47ef8b5 + 1ec1c72
commit ebc0df2
Show file tree

Hide file tree

Showing 25 changed files with 305 additions and 67 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,10 @@
-### New in 0.56 (not released yet)
+### New in 0.57 (not released yet)
+
+* Fixed: AggregateException/InvalidOperationException when reading and updating
+  an aggregate from different threads at the same time using `InMemoryEventPersistence`
+* New: .NET standard 1.6 and 2.0 support for `EventFlow.MsSql` package
+
+### New in 0.56.3328 (released 2018-04-24)
 
 * New: Allow enums to be used in `SingleValueObject<T>` and protect from
   undefined enum values

diff --git a/Source/EventFlow.Autofac.Tests/EventFlow.Autofac.Tests.csproj b/Source/EventFlow.Autofac.Tests/EventFlow.Autofac.Tests.csproj
@@ -12,4 +12,7 @@
     <ProjectReference Include="..\EventFlow.Autofac\EventFlow.Autofac.csproj" />
     <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.Elasticsearch.Tests/EventFlow.Elasticsearch.Tests.csproj b/Source/EventFlow.Elasticsearch.Tests/EventFlow.Elasticsearch.Tests.csproj
@@ -12,4 +12,7 @@
     <ProjectReference Include="..\EventFlow.Elasticsearch\EventFlow.Elasticsearch.csproj" />
     <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.EventStores.EventStore.Tests/EventFlow.EventStores.EventStore.Tests.csproj b/Source/EventFlow.EventStores.EventStore.Tests/EventFlow.EventStores.EventStore.Tests.csproj
@@ -12,4 +12,7 @@
     <ProjectReference Include="..\EventFlow.EventStores.EventStore\EventFlow.EventStores.EventStore.csproj" />
     <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.Examples.Shipping.Tests/EventFlow.Examples.Shipping.Tests.csproj b/Source/EventFlow.Examples.Shipping.Tests/EventFlow.Examples.Shipping.Tests.csproj
@@ -13,4 +13,7 @@
     <ProjectReference Include="..\EventFlow.Examples.Shipping\EventFlow.Examples.Shipping.csproj" />
     <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.Hangfire.Tests/EventFlow.Hangfire.Tests.csproj b/Source/EventFlow.Hangfire.Tests/EventFlow.Hangfire.Tests.csproj
@@ -22,4 +22,7 @@
   <ItemGroup>
     <Reference Include="System.Net.Http" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.MsSql.Tests/EventFlow.MsSql.Tests.csproj b/Source/EventFlow.MsSql.Tests/EventFlow.MsSql.Tests.csproj
@@ -19,4 +19,7 @@
     <EmbeddedResource Include="IntegrationTests\ReadStores\Scripts\0001 - Create table ReadModel-ThingyAggregate.sql" />
     <EmbeddedResource Include="IntegrationTests\ReadStores\Scripts\0002 - Create table ReadModel-ThingyMessage.sql" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.MsSql/EventFlow.MsSql.csproj b/Source/EventFlow.MsSql/EventFlow.MsSql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFrameworks>net451;netstandard1.6;netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
@@ -23,6 +23,9 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="dbup-sqlserver" Version="4.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EventFlow.Sql\EventFlow.Sql.csproj" />
   </ItemGroup>

diff --git a/Source/EventFlow.MsSql/EventStores/EventFlowEventStoresMsSql.cs b/Source/EventFlow.MsSql/EventStores/EventFlowEventStoresMsSql.cs
@@ -30,7 +30,7 @@ namespace EventFlow.MsSql.EventStores
 {
     public static class EventFlowEventStoresMsSql
     {
-        public static Assembly Assembly { get; } = typeof(EventFlowEventStoresMsSql).Assembly;
+        public static Assembly Assembly { get; } = typeof(EventFlowEventStoresMsSql).GetTypeInfo().Assembly;
 
         public static IEnumerable<SqlScript> GetSqlScripts()
         {

diff --git a/Source/EventFlow.MsSql/MsSqlDatabaseMigrator.cs b/Source/EventFlow.MsSql/MsSqlDatabaseMigrator.cs
@@ -21,6 +21,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+using DbUp.Builder;
 using EventFlow.Logs;
 using EventFlow.Sql.Migrations;
 
@@ -34,5 +35,10 @@ public class MsSqlDatabaseMigrator : SqlDatabaseMigrator<IMsSqlConfiguration>, I
             : base(log, sqlConfiguration)
         {
         }
+
+        protected override UpgradeEngineBuilder For(SupportedDatabases supportedDatabases, string connectionString)
+        {
+            return supportedDatabases.SqlDatabase(connectionString);
+        }
     }
 }
diff --git a/Source/EventFlow.MsSql/SnapshotStores/EventFlowSnapshotStoresMsSql.cs b/Source/EventFlow.MsSql/SnapshotStores/EventFlowSnapshotStoresMsSql.cs
@@ -30,7 +30,7 @@ namespace EventFlow.MsSql.SnapshotStores
 {
     public static class EventFlowSnapshotStoresMsSql
     {
-        public static Assembly Assembly { get; } = typeof(EventFlowSnapshotStoresMsSql).Assembly;
+        public static Assembly Assembly { get; } = typeof(EventFlowSnapshotStoresMsSql).GetTypeInfo().Assembly;
 
         public static IEnumerable<SqlScript> GetSqlScripts()
         {

diff --git a/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj b/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj
@@ -20,4 +20,7 @@
     <ProjectReference Include="..\EventFlow.Owin\EventFlow.Owin.csproj" />
     <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.RabbitMQ.Tests/EventFlow.RabbitMQ.Tests.csproj b/Source/EventFlow.RabbitMQ.Tests/EventFlow.RabbitMQ.Tests.csproj
@@ -12,4 +12,7 @@
     <ProjectReference Include="..\EventFlow.RabbitMQ\EventFlow.RabbitMQ.csproj" />
     <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.SQLite.Tests/EventFlow.SQLite.Tests.csproj b/Source/EventFlow.SQLite.Tests/EventFlow.SQLite.Tests.csproj
@@ -15,4 +15,7 @@
     <ProjectReference Include="..\EventFlow.SQLite\EventFlow.SQLite.csproj" />
     <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.SQLite/EventFlow.SQLite.csproj b/Source/EventFlow.SQLite/EventFlow.SQLite.csproj
@@ -24,6 +24,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="dbup-sqlserver" Version="4.0.0" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.105" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/EventFlow.Sql.Tests/EventFlow.Sql.Tests.csproj b/Source/EventFlow.Sql.Tests/EventFlow.Sql.Tests.csproj
@@ -15,4 +15,7 @@
   <ItemGroup>
     <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
diff --git a/Source/EventFlow.Sql/EventFlow.Sql.csproj b/Source/EventFlow.Sql/EventFlow.Sql.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.2" />
-    <PackageReference Condition="'$(TargetFramework)' == 'net451'" Include="dbup" Version="3.3.5" />
+    <PackageReference Include="dbup-core" Version="4.0.0" />
     <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>

diff --git a/Source/EventFlow.Sql/Integrations/DbUpUpgradeLog.cs b/Source/EventFlow.Sql/Integrations/DbUpUpgradeLog.cs
@@ -21,8 +21,6 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET451
-
 using DbUp.Engine.Output;
 using EventFlow.Logs;
 
@@ -53,5 +51,3 @@ public void WriteWarning(string format, params object[] args)
         }
     }
 }
-
-#endif
diff --git a/Source/EventFlow.Sql/Migrations/SqlDatabaseMigrator.cs b/Source/EventFlow.Sql/Migrations/SqlDatabaseMigrator.cs
@@ -21,13 +21,12 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET451
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using DbUp;
+using DbUp.Builder;
 using DbUp.Engine;
 using EventFlow.Logs;
 using EventFlow.Sql.Connections;
@@ -36,13 +35,13 @@
 
 namespace EventFlow.Sql.Migrations
 {
-    public class SqlDatabaseMigrator<TConfiguration> : ISqlDatabaseMigrator
+    public abstract class SqlDatabaseMigrator<TConfiguration> : ISqlDatabaseMigrator
         where TConfiguration : ISqlConfiguration<TConfiguration>
     {
         private readonly ILog _log;
         private readonly TConfiguration _sqlConfiguration;
 
-        public SqlDatabaseMigrator(
+        protected SqlDatabaseMigrator(
             ILog log,
             TConfiguration sqlConfiguration)
         {
@@ -57,8 +56,7 @@ public void MigrateDatabaseUsingEmbeddedScripts(Assembly assembly)
 
         public void MigrateDatabaseUsingEmbeddedScripts(Assembly assembly, string connectionString)
         {
-            var upgradeEngine = DeployChanges.To
-                .SqlDatabase(connectionString)
+            var upgradeEngine = For(DeployChanges.To, connectionString)
                 .WithScriptsEmbeddedInAssembly(assembly)
                 .WithExecutionTimeout(TimeSpan.FromMinutes(5))
                 .WithTransaction()
@@ -76,8 +74,7 @@ public void MigrateDatabaseUsingScripts(IEnumerable<SqlScript> sqlScripts)
         public void MigrateDatabaseUsingScripts(IEnumerable<SqlScript> sqlScripts, string connectionString)
         {
             var dbUpSqlScripts = sqlScripts.Select(s => new DbUp.Engine.SqlScript(s.Name, s.Content));
-            var upgradeEngine = DeployChanges.To
-                .SqlDatabase(connectionString)
+            var upgradeEngine = For(DeployChanges.To, connectionString)
                 .WithScripts(dbUpSqlScripts)
                 .WithExecutionTimeout(TimeSpan.FromMinutes(5))
                 .WithTransaction()
@@ -103,7 +100,7 @@ private void Upgrade(UpgradeEngine upgradeEngine)
                 throw new SqlMigrationException(scripts, result.Error.Message, result.Error);
             }
         }
+
+        protected abstract UpgradeEngineBuilder For(SupportedDatabases supportedDatabases, string connectionString);
     }
 }
-
-#endif
diff --git a/Source/EventFlow.TestHelpers/MsSql/MsSqlHelpz.cs b/Source/EventFlow.TestHelpers/MsSql/MsSqlHelpz.cs
@@ -53,7 +53,7 @@ public static MsSqlConnectionString CreateConnectionString(string label)
             var envrionmentUsername = Environment.GetEnvironmentVariable("HELPZ_MSSQL_USER");
 
             connectionstringParts.Add(string.IsNullOrEmpty(environmentServer)
-                ? @"Server=localhost\SQLEXPRESS"
+                ? @"Server=."
                 : $"Server={environmentServer}");
             connectionstringParts.Add(string.IsNullOrEmpty(envrionmentUsername)
                 ? @"Integrated Security=True"

diff --git a/Source/EventFlow.TestHelpers/Suites/TestSuiteForScheduler.cs b/Source/EventFlow.TestHelpers/Suites/TestSuiteForScheduler.cs
@@ -78,7 +78,7 @@ public async Task AsynchronousSubscribesGetInvoked()
             var pingId = await PublishPingCommandAsync(A<ThingyId>()).ConfigureAwait(false);
 
             // Assert
-            var receivedPingId = _testAsynchronousSubscriber.PingIds.Take();
+            var receivedPingId = await Task.Run(() => _testAsynchronousSubscriber.PingIds.Take()).ConfigureAwait(false);
             receivedPingId.Should().IsSameOrEqualTo(pingId);
         }