diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa3449cc..deaa96aa5 100644 --- 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 index 1380cb861..f66e298b3 100644 --- a/equinox-shipping/Watchdog/Watchdog.fsproj +++ b/equinox-shipping/Watchdog/Watchdog.fsproj @@ -16,7 +16,7 @@ - + diff --git a/feed-consumer/FeedConsumer.fsproj b/feed-consumer/FeedConsumer.fsproj index b6b83f2e5..7b0ac293b 100644 --- a/feed-consumer/FeedConsumer.fsproj +++ b/feed-consumer/FeedConsumer.fsproj @@ -19,8 +19,8 @@ - - + + diff --git a/periodic-ingester/PeriodicIngester.fsproj b/periodic-ingester/PeriodicIngester.fsproj index 25605fa03..4046abd5b 100644 --- a/periodic-ingester/PeriodicIngester.fsproj +++ b/periodic-ingester/PeriodicIngester.fsproj @@ -20,8 +20,8 @@ - - + + diff --git a/propulsion-archiver/Archiver.fsproj b/propulsion-archiver/Archiver.fsproj index dac6cf921..e6e89dda4 100644 --- a/propulsion-archiver/Archiver.fsproj +++ b/propulsion-archiver/Archiver.fsproj @@ -16,7 +16,7 @@ - + diff --git a/propulsion-consumer/Consumer.fsproj b/propulsion-consumer/Consumer.fsproj index 645d0294d..66ea84cb0 100644 --- a/propulsion-consumer/Consumer.fsproj +++ b/propulsion-consumer/Consumer.fsproj @@ -16,7 +16,7 @@ - + diff --git a/propulsion-cosmos-reactor/Reactor.fsproj b/propulsion-cosmos-reactor/Reactor.fsproj index 42b084361..b3cd61f85 100644 --- a/propulsion-cosmos-reactor/Reactor.fsproj +++ b/propulsion-cosmos-reactor/Reactor.fsproj @@ -23,7 +23,7 @@ - + diff --git a/propulsion-projector/Projector.fsproj b/propulsion-projector/Projector.fsproj index fe3e59d2e..c86f6cef1 100644 --- a/propulsion-projector/Projector.fsproj +++ b/propulsion-projector/Projector.fsproj @@ -20,17 +20,17 @@ - + - + - + - + diff --git a/propulsion-pruner/Pruner.fsproj b/propulsion-pruner/Pruner.fsproj index c81feccfb..89bc802ef 100644 --- a/propulsion-pruner/Pruner.fsproj +++ b/propulsion-pruner/Pruner.fsproj @@ -17,7 +17,7 @@ - + diff --git a/propulsion-reactor/Config.fs b/propulsion-reactor/Config.fs index 3716aa5c1..268938a40 100644 --- 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 [] 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 index 89790c55a..27ef0c804 100644 --- 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 + Async.Parallel (build args) |> Async.Ignore #else let sink = build args - return! sink.AwaitWithStopOnCancellation() + sink.AwaitWithStopOnCancellation() #endif -} [] let main argv = diff --git a/propulsion-reactor/Reactor.fsproj b/propulsion-reactor/Reactor.fsproj index 1ca1a081d..f085f8889 100644 --- a/propulsion-reactor/Reactor.fsproj +++ b/propulsion-reactor/Reactor.fsproj @@ -36,13 +36,13 @@ - + - + - + diff --git a/propulsion-summary-consumer/SummaryConsumer.fsproj b/propulsion-summary-consumer/SummaryConsumer.fsproj index c5a7c764a..fbc6228e8 100644 --- a/propulsion-summary-consumer/SummaryConsumer.fsproj +++ b/propulsion-summary-consumer/SummaryConsumer.fsproj @@ -19,7 +19,7 @@ - + diff --git a/propulsion-sync/Sync.fsproj b/propulsion-sync/Sync.fsproj index de7034a9b..a74055b5b 100644 --- a/propulsion-sync/Sync.fsproj +++ b/propulsion-sync/Sync.fsproj @@ -16,7 +16,7 @@ - + diff --git a/propulsion-tracking-consumer/TrackingConsumer.fsproj b/propulsion-tracking-consumer/TrackingConsumer.fsproj index f91c43a46..e370b946f 100644 --- a/propulsion-tracking-consumer/TrackingConsumer.fsproj +++ b/propulsion-tracking-consumer/TrackingConsumer.fsproj @@ -19,7 +19,7 @@ - +