Target Eqx, Propulsion, FsCodec 2.0.0

jet · Feb 19, 2020 · 7319f1e · 7319f1e
1 parent 4c6d281
commit 7319f1e
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,9 @@ The `Unreleased` section name is replaced by the expected version of next releas
 - Add handling for `-T` TCP/IP switch on EventStore args [#46](https:/jet/dotnet-templates/pulls/46)
 
 ### Changed
+
+- Target `Propulsion`.*, `Equinox`.*, `FsCodec`.* v `2.0.0`
+
 ### Removed
 ### Fixed
 

diff --git a/equinox-testbed/Testbed.fsproj b/equinox-testbed/Testbed.fsproj
@@ -17,10 +17,10 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Equinox.Cosmos" Version="2.0.0-rc9" />
- <PackageReference Include="Equinox.EventStore" Version="2.0.0-rc9" />
- <PackageReference Include="Equinox.MemoryStore" Version="2.0.0-rc9" />
- <PackageReference Include="Equinox.Tools.TestHarness" Version="2.0.0-rc9" />
+ <PackageReference Include="Equinox.Cosmos" Version="2.0.0" />
+ <PackageReference Include="Equinox.EventStore" Version="2.0.0" />
+ <PackageReference Include="Equinox.MemoryStore" Version="2.0.0" />
+ <PackageReference Include="Equinox.Tools.TestHarness" Version="2.0.0" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />

diff --git a/equinox-web-csharp/Domain/Domain.csproj b/equinox-web-csharp/Domain/Domain.csproj
@@ -5,8 +5,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Equinox" Version="2.0.0-rc9" />
- <PackageReference Include="FsCodec" Version="2.0.0-rc3" />
+ <PackageReference Include="Equinox" Version="2.0.0" />
+ <PackageReference Include="FsCodec" Version="2.0.0" />
  <PackageReference Include="FSharp.Core" Version="4.5.4" />
  <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>

diff --git a/equinox-web-csharp/Web/Web.csproj b/equinox-web-csharp/Web/Web.csproj
@@ -6,9 +6,9 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Equinox.Cosmos" Version="2.0.0-rc9" />
- <PackageReference Include="Equinox.EventStore" Version="2.0.0-rc9" />
- <PackageReference Include="Equinox.MemoryStore" Version="2.0.0-rc9" />
+ <PackageReference Include="Equinox.Cosmos" Version="2.0.0" />
+ <PackageReference Include="Equinox.EventStore" Version="2.0.0" />
+ <PackageReference Include="Equinox.MemoryStore" Version="2.0.0" />
  <PackageReference Include="Microsoft.AspNetCore.App" />
  <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />

diff --git a/equinox-web/Domain/Domain.fsproj b/equinox-web/Domain/Domain.fsproj
@@ -12,8 +12,8 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Equinox" Version="2.0.0-rc9" />
- <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0-rc3" />
+ <PackageReference Include="Equinox" Version="2.0.0" />
+ <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0" />
  </ItemGroup>
 
 </Project>
diff --git a/equinox-web/Web/Web.fsproj b/equinox-web/Web/Web.fsproj
@@ -11,9 +11,9 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Equinox.Cosmos" Version="2.0.0-rc9" />
- <PackageReference Include="Equinox.EventStore" Version="2.0.0-rc9" />
- <PackageReference Include="Equinox.MemoryStore" Version="2.0.0-rc9" />
+ <PackageReference Include="Equinox.Cosmos" Version="2.0.0" />
+ <PackageReference Include="Equinox.EventStore" Version="2.0.0" />
+ <PackageReference Include="Equinox.MemoryStore" Version="2.0.0" />
  <PackageReference Include="Microsoft.AspNetCore.App" />
  <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />

diff --git a/propulsion-all-projector/AllProjector.fsproj b/propulsion-all-projector/AllProjector.fsproj
@@ -24,10 +24,10 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Equinox.Cosmos" Version="2.0.0-rc9" />
- <PackageReference Include="Propulsion.EventStore" Version="2.0.0-rc3" />
+ <PackageReference Include="Equinox.Cosmos" Version="2.0.0" />
+ <PackageReference Include="Propulsion.EventStore" Version="2.0.0" />
  <!--#if (kafka)-->
- <PackageReference Include="Propulsion.Kafka" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.Kafka" Version="2.0.0" />
  <!--#endif-->
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  </ItemGroup>

diff --git a/propulsion-all-projector/Todo.fs b/propulsion-all-projector/Todo.fs
@@ -59,7 +59,7 @@ type Service internal (log, resolve, maxAttempts) =
  member __.QueryWithVersion(clientId, render : Fold.State -> 'res) : Async<int64*'res> =
  let stream = resolve clientId
  // Establish the present state of the Stream, project from that (using QueryEx so we can determine the version in effect)
- stream.QueryEx(fun v s -> v, render s)
+ stream.QueryEx(fun c -> c.Version, render c.State)
 
 let create resolve = Service(Serilog.Log.ForContext<Service>(), resolve, maxAttempts = 3)
 

diff --git a/propulsion-consumer/Consumer.fsproj b/propulsion-consumer/Consumer.fsproj
@@ -16,7 +16,7 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Propulsion.Kafka" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.Kafka" Version="2.0.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  </ItemGroup>
 

diff --git a/propulsion-projector/Projector.fsproj b/propulsion-projector/Projector.fsproj
@@ -15,9 +15,9 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Propulsion.Cosmos" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.Cosmos" Version="2.0.0" />
  <!--#if (kafka)-->
- <PackageReference Include="Propulsion.Kafka" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.Kafka" Version="2.0.0" />
  <!--#endif-->
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  </ItemGroup>

diff --git a/propulsion-summary-consumer/SummaryConsumer.fsproj b/propulsion-summary-consumer/SummaryConsumer.fsproj
@@ -17,8 +17,8 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Propulsion.Cosmos" Version="2.0.0-rc3" />
- <PackageReference Include="Propulsion.Kafka" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.Cosmos" Version="2.0.0" />
+ <PackageReference Include="Propulsion.Kafka" Version="2.0.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  </ItemGroup>
 

diff --git a/propulsion-summary-projector/SummaryProjector.fsproj b/propulsion-summary-projector/SummaryProjector.fsproj
@@ -18,9 +18,9 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Propulsion.Cosmos" Version="2.0.0-rc3" />
- <PackageReference Include="Propulsion.EventStore" Version="2.0.0-rc3" />
- <PackageReference Include="Propulsion.Kafka" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.Cosmos" Version="2.0.0" />
+ <PackageReference Include="Propulsion.EventStore" Version="2.0.0" />
+ <PackageReference Include="Propulsion.Kafka" Version="2.0.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  </ItemGroup>
 

diff --git a/propulsion-summary-projector/Todo.fs b/propulsion-summary-projector/Todo.fs
@@ -59,7 +59,7 @@ type Service internal (log, resolve, maxAttempts) =
  member __.QueryWithVersion(clientId, render : Fold.State -> 'res) : Async<int64*'res> =
  let stream = resolve clientId
  // Establish the present state of the Stream, project from that (using QueryEx so we can determine the version in effect)
- stream.QueryEx(fun v s -> v, render s)
+ stream.QueryEx(fun c -> c.Version, render c.State)
 
 let create resolve = Service(Serilog.Log.ForContext<Service>(), resolve, maxAttempts = 3)
 

diff --git a/propulsion-sync/Program.fs b/propulsion-sync/Program.fs
@@ -503,6 +503,7 @@ module EventV0Parser =
  member x.EventType = x.t
  member x.Data = x.d
  member __.Meta = null
+ member __.EventId = Guid.Empty
  member x.Timestamp = x.c
  member __.CorrelationId = null
  member __.CausationId = null

diff --git a/propulsion-sync/Sync.fsproj b/propulsion-sync/Sync.fsproj
@@ -14,10 +14,10 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Propulsion.EventStore" Version="2.0.0-rc3" />
- <PackageReference Include="Propulsion.Cosmos" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.EventStore" Version="2.0.0" />
+ <PackageReference Include="Propulsion.Cosmos" Version="2.0.0" />
  <!--#if (kafka)-->
- <PackageReference Include="Propulsion.Kafka" Version="2.0.0-rc3" />
+ <PackageReference Include="Propulsion.Kafka" Version="2.0.0" />
  <!--#endif-->
  <PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />

diff --git a/propulsion-tracking-consumer/TrackingConsumer.fsproj b/propulsion-tracking-consumer/TrackingConsumer.fsproj
@@ -17,8 +17,8 @@
  <ItemGroup>
  <PackageReference Include="Argu" Version="5.4.0" />
  <PackageReference Include="Destructurama.FSharp" Version="1.1.1-dev-00033" />
- <PackageReference Include="Equinox.Cosmos" Version="2.0.0-rc9" />
- <PackageReference Include="Propulsion.Kafka" Version="2.0.0-rc3" />
+ <PackageReference Include="Equinox.Cosmos" Version="2.0.0" />
+ <PackageReference Include="Propulsion.Kafka" Version="2.0.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  </ItemGroup>