Update to Propulsion 2.12.0-rc.3 (#111)

jet · Dec 24, 2021 · e98205b · e98205b
1 parent 67e298a
commit e98205b
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ The `Unreleased` section name is replaced by the expected version of next releas
 
 ### Added
 ### Changed
+
+- Target `Propulsion` v `2.12.0-rc.3` [#111](https://github.com/jet/dotnet-templates/pull/111)
+
 ### Removed
 ### Fixed
 

diff --git a/equinox-shipping/Watchdog/Watchdog.fsproj b/equinox-shipping/Watchdog/Watchdog.fsproj
@@ -16,7 +16,7 @@
     <ItemGroup>
         <PackageReference Include="Argu" Version="6.1.1" />
         <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
-        <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
+        <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
     </ItemGroup>
 

diff --git a/feed-consumer/FeedConsumer.fsproj b/feed-consumer/FeedConsumer.fsproj
@@ -19,8 +19,8 @@
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
     <PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
     <PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
-    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
-    <PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
+    <PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.3" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
   </ItemGroup>

diff --git a/periodic-ingester/PeriodicIngester.fsproj b/periodic-ingester/PeriodicIngester.fsproj
@@ -20,8 +20,8 @@
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
     <PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
-    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
-    <PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
+    <PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.3" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
   </ItemGroup>

diff --git a/propulsion-archiver/Archiver.fsproj b/propulsion-archiver/Archiver.fsproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Argu" Version="6.1.1" />
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
     <PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
-	<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
+	<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
 	<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />

diff --git a/propulsion-consumer/Consumer.fsproj b/propulsion-consumer/Consumer.fsproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Argu" Version="6.1.1" />
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
-    <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
   </ItemGroup>
 

diff --git a/propulsion-cosmos-reactor/Reactor.fsproj b/propulsion-cosmos-reactor/Reactor.fsproj
@@ -23,7 +23,7 @@
         <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
         <PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
         <PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
-        <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
+        <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
     </ItemGroup>

diff --git a/propulsion-projector/Projector.fsproj b/propulsion-projector/Projector.fsproj
@@ -20,17 +20,17 @@
     <PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
     <!--#endif-->
     <!--#if cosmos-->
-    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
     <!--#endif-->
     <!--#if (esdb)-->
-    <PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.3" />
     <!--#endif-->
     <!--#if (sss)-->
     <PackageReference Include="Equinox.SqlStreamStore.MsSql" Version="3.0.5" />
-    <PackageReference Include="Propulsion.SqlStreamStore" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.SqlStreamStore" Version="2.12.0-rc.3" />
     <!--#endif-->
     <!--#if kafka-->
-    <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
     <!--#endif-->
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
   </ItemGroup>

diff --git a/propulsion-pruner/Pruner.fsproj b/propulsion-pruner/Pruner.fsproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
     <PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
-    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />

diff --git a/propulsion-reactor/Config.fs b/propulsion-reactor/Config.fs
@@ -22,12 +22,12 @@ module Esdb =
 
     let create codec initial fold (context, cache) =
         let cacheStrategy = Equinox.EventStore.CachingStrategy.SlidingWindow (cache, System.TimeSpan.FromMinutes 20.)
-        Equinox.EventStore.Resolver(context, codec, fold, initial, cacheStrategy)
+        Equinox.EventStore.EventStoreCategory(context, codec, fold, initial, cacheStrategy)
 
 //#endif
 [<NoComparison; NoEquality; RequireQualifiedAccess>]
 type Store =
     | Cosmos of Equinox.CosmosStore.CosmosStoreContext * Equinox.Core.ICache
 //#if multiSource
-    | Esdb of Equinox.EventStore.Context * Equinox.Core.ICache
+    | Esdb of Equinox.EventStore.EventStoreContext * Equinox.Core.ICache
 //#endif
diff --git a/propulsion-reactor/Program.fs b/propulsion-reactor/Program.fs
@@ -487,7 +487,7 @@ module Checkpoints =
 module EventStoreContext =
 
     let create connection =
-        Equinox.EventStore.Context(connection, Equinox.EventStore.BatchingPolicy(maxBatchSize=500))
+        Equinox.EventStore.EventStoreContext(connection, Equinox.EventStore.BatchingPolicy(maxBatchSize=500))
 
 //#endif
 
@@ -575,10 +575,11 @@ let build (args : Args.Arguments) =
 
 #if (!kafka)
 #if (!blank) //!kafka && !blank -> wire up a cosmos context to an ingester
-        let cosmosStore =
-            let context = source.Cosmos.Connect() |> Async.RunSynchronously |> CosmosStoreContext.create
-            let cache = Equinox.Cache(AppName, sizeMb = 10)
-            Config.Store.Cosmos (context, cache)
+#if kafkaEventSpans
+        let context = source.Cosmos.Connect() |> Async.RunSynchronously |> CosmosStoreContext.create
+#endif // kafkaEventSpans
+        let cache = Equinox.Cache(AppName, sizeMb = 10)
+        let cosmosStore = Config.Store.Cosmos (context, cache)
         let srcService = Todo.Config.create cosmosStore
         let dstService = TodoSummary.Config.create cosmosStore
         let handle = Ingester.handle srcService dstService
@@ -643,14 +644,13 @@ let build (args : Args.Arguments) =
         [ Async.AwaitKeyboardInterruptAsTaskCancelledException(); source.AwaitWithStopOnCancellation(); sink.AwaitWithStopOnCancellation() ]
 #endif // !kafkaEventSpans
 
-let run args = async {
+let run args =
 #if (!kafkaEventSpans)
-    return! Async.Parallel (build args) |> Async.Ignore<unit array>
+    Async.Parallel (build args) |> Async.Ignore<unit array>
 #else
     let sink = build args
-    return! sink.AwaitWithStopOnCancellation()
+    sink.AwaitWithStopOnCancellation()
 #endif
-}
 
 [<EntryPoint>]
 let main argv =

diff --git a/propulsion-reactor/Reactor.fsproj b/propulsion-reactor/Reactor.fsproj
@@ -36,13 +36,13 @@
         <!--#if (kafkaEventSpans) -->
         <PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
         <!--#else-->
-        <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
+        <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
         <!--#endif-->
         <!--#if (multiSource) -->
-        <PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.2" />
+        <PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.3" />
         <!--#endif-->
         <!--#if (kafka || kafkaEventSpans) -->
-        <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
+        <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
         <!--#endif-->
         <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
     </ItemGroup>

diff --git a/propulsion-summary-consumer/SummaryConsumer.fsproj b/propulsion-summary-consumer/SummaryConsumer.fsproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Argu" Version="6.1.1" />
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
     <PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
-    <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
   </ItemGroup>
 

diff --git a/propulsion-sync/Sync.fsproj b/propulsion-sync/Sync.fsproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Argu" Version="6.1.1" />
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
     <PackageReference Include="Propulsion.EventStore" Version="2.10.0" />
-    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
+    <PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
     <!--#if (kafka)-->
     <PackageReference Include="Propulsion.Kafka" Version="2.10.0" />
     <!--#endif-->

diff --git a/propulsion-tracking-consumer/TrackingConsumer.fsproj b/propulsion-tracking-consumer/TrackingConsumer.fsproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Argu" Version="6.1.1" />
     <PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
 	<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
-	<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
+	<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
   </ItemGroup>