From 444926d60abf55ba80e9e97bf556957e75b364b3 Mon Sep 17 00:00:00 2001 From: Ruben Bartelink Date: Thu, 28 Jul 2022 16:37:43 +0100 Subject: [PATCH] net6.0 update stragglers --- CHANGELOG.md | 2 +- README.md | 2 +- src/Propulsion.Cosmos/Propulsion.Cosmos.fsproj | 4 +--- src/Propulsion.CosmosStore/ChangeFeedProcessor.fs | 3 +-- src/Propulsion.CosmosStore/CosmosStoreSource.fs | 1 - src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj | 4 +--- src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj | 3 +-- src/Propulsion.DynamoStore/DynamoDbExport.fs | 3 +-- src/Propulsion.EventStore/Propulsion.EventStore.fsproj | 4 +--- src/Propulsion.EventStore/StripedIngester.fs | 1 - src/Propulsion.EventStoreDb/Propulsion.EventStoreDb.fsproj | 2 -- src/Propulsion.Feed/Propulsion.Feed.fsproj | 6 ++---- src/Propulsion.Kafka/Propulsion.Kafka.fsproj | 4 +--- .../Propulsion.SqlStreamStore.fsproj | 2 -- src/Propulsion/Propulsion.fsproj | 7 ++++--- 15 files changed, 15 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72153d72..a7a69358 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ The `Unreleased` section name is replaced by the expected version of next releas ### Changed -- Targeted `net6.0` with `6.0.300` SDK +- Targeted `net6.0` with `6.0.300` SDK, `FSharp.Control.AsyncSeq` v `3.2.1`, `MathNet.Numerics`, `4.15.0` - `Propulsion.CosmosStore`: Changed to target `Equinox.CosmosStore` v `4.0.0` [#139](https://github.com/jet/propulsion/pull/139) - `Propulsion.CosmosStore.CosmosSource`: Changed parsing to use `System.Text.Json` [#139](https://github.com/jet/propulsion/pull/139) - `Propulsion.EventStore`: Pinned to target `Equinox.EventStore` v `[3.0.7`-`3.99.0]` **Deprecated; Please migrate to `Propulsion.EventStoreDb`** [#139](https://github.com/jet/propulsion/pull/139) diff --git a/README.md b/README.md index b8259006..ed5271e4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ If you're looking for a good discussion forum on these kinds of topics, look no ## Components -The components within this repository are delivered as a multi-targeted Nuget package targeting `netstandard2.0`/`1` (internally it targets FSharp.Core >= 4.5.4, which works with SDKs back to F# 4.5+) +The components within this repository are delivered as a multi-targeted Nuget package targeting `net6.0` - `Propulsion` [![NuGet](https://img.shields.io/nuget/v/Propulsion.svg)](https://www.nuget.org/packages/Propulsion/) Implements core functionality in a channel-independent fashion including `ParallelProjector`, `StreamsProjector`. [Depends](https://www.fuget.org/packages/Propulsion) on `MathNet.Numerics`, `Serilog` diff --git a/src/Propulsion.Cosmos/Propulsion.Cosmos.fsproj b/src/Propulsion.Cosmos/Propulsion.Cosmos.fsproj index 95283fee..a278c9d2 100644 --- a/src/Propulsion.Cosmos/Propulsion.Cosmos.fsproj +++ b/src/Propulsion.Cosmos/Propulsion.Cosmos.fsproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 COSMOSV2 @@ -30,8 +30,6 @@ - - diff --git a/src/Propulsion.CosmosStore/ChangeFeedProcessor.fs b/src/Propulsion.CosmosStore/ChangeFeedProcessor.fs index 90b06d40..0bd6c1cd 100644 --- a/src/Propulsion.CosmosStore/ChangeFeedProcessor.fs +++ b/src/Propulsion.CosmosStore/ChangeFeedProcessor.fs @@ -1,6 +1,5 @@ namespace Propulsion.CosmosStore -open FSharp.Control open Microsoft.Azure.Cosmos open Propulsion.Infrastructure // AwaitTaskCorrect open Serilog @@ -154,7 +153,7 @@ type ChangeFeedProcessor = let rec emitLagMetrics () = async { let feedIteratorMap (map : 't -> 'u) (query : FeedIterator<'t>) : AsyncSeq<'u> = let rec loop () : AsyncSeq<'u> = asyncSeq { - if not query.HasMoreResults then return None else + if not query.HasMoreResults then () else let! ct = Async.CancellationToken let! (res : FeedResponse<'t>) = query.ReadNextAsync(ct) |> Async.AwaitTaskCorrect for x in res do yield map x diff --git a/src/Propulsion.CosmosStore/CosmosStoreSource.fs b/src/Propulsion.CosmosStore/CosmosStoreSource.fs index e13d5b3d..fbe1e5e3 100644 --- a/src/Propulsion.CosmosStore/CosmosStoreSource.fs +++ b/src/Propulsion.CosmosStore/CosmosStoreSource.fs @@ -11,7 +11,6 @@ open Microsoft.Azure.Cosmos #endif open Equinox.Core // Stopwatch.Time -open Propulsion.Infrastructure // AwaitTaskCorrect open Serilog open System open System.Collections.Generic diff --git a/src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj b/src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj index 26d02ea9..bced2c2d 100644 --- a/src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj +++ b/src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj @@ -1,7 +1,7 @@  - netstandard2.1 + net6.0 @@ -21,8 +21,6 @@ - - diff --git a/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj b/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj index c6dadb85..5656c2f4 100644 --- a/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj +++ b/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj @@ -1,7 +1,7 @@  - netstandard2.1 + net6.0 COSMOSV3 @@ -38,7 +38,6 @@ - diff --git a/src/Propulsion.DynamoStore/DynamoDbExport.fs b/src/Propulsion.DynamoStore/DynamoDbExport.fs index d81c93ef..8a6658b4 100644 --- a/src/Propulsion.DynamoStore/DynamoDbExport.fs +++ b/src/Propulsion.DynamoStore/DynamoDbExport.fs @@ -1,6 +1,5 @@ module Propulsion.DynamoStore.DynamoDbExport -open FSharp.Control open System.Collections.Generic open System.IO open System.Text.Json @@ -25,7 +24,7 @@ module DynamoDbJsonParser = yield item.p.S, { i = index; c = eventTypes } more <- not r.EndOfStream } -/// Manages import of DynamoDB JSON files (extracted from data/*.json.gz in a DyanmoDB S3 export) +/// Manages import of DynamoDB JSON files (extracted from data/*.json.gz in a DynamoDB S3 export) type Importer(buffer : DynamoStoreIndex.Buffer, emit, dump) = let pending = Dictionary() diff --git a/src/Propulsion.EventStore/Propulsion.EventStore.fsproj b/src/Propulsion.EventStore/Propulsion.EventStore.fsproj index 6353b043..2cc10aab 100644 --- a/src/Propulsion.EventStore/Propulsion.EventStore.fsproj +++ b/src/Propulsion.EventStore/Propulsion.EventStore.fsproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 EVENTSTORE_LEGACY @@ -19,8 +19,6 @@ - - diff --git a/src/Propulsion.EventStore/StripedIngester.fs b/src/Propulsion.EventStore/StripedIngester.fs index 57bb6d28..ae45adba 100755 --- a/src/Propulsion.EventStore/StripedIngester.fs +++ b/src/Propulsion.EventStore/StripedIngester.fs @@ -1,6 +1,5 @@ namespace Propulsion.EventStore -open Propulsion.Infrastructure // AwaitTaskCorrect open Propulsion.Internal open Propulsion.Streams open Serilog diff --git a/src/Propulsion.EventStoreDb/Propulsion.EventStoreDb.fsproj b/src/Propulsion.EventStoreDb/Propulsion.EventStoreDb.fsproj index fa4c29a5..05083ae4 100644 --- a/src/Propulsion.EventStoreDb/Propulsion.EventStoreDb.fsproj +++ b/src/Propulsion.EventStoreDb/Propulsion.EventStoreDb.fsproj @@ -18,8 +18,6 @@ - - diff --git a/src/Propulsion.Feed/Propulsion.Feed.fsproj b/src/Propulsion.Feed/Propulsion.Feed.fsproj index 6e1125f3..ec05e5a0 100644 --- a/src/Propulsion.Feed/Propulsion.Feed.fsproj +++ b/src/Propulsion.Feed/Propulsion.Feed.fsproj @@ -1,7 +1,7 @@  - netstandard2.1 + net6.0 @@ -17,9 +17,7 @@ - - - + diff --git a/src/Propulsion.Kafka/Propulsion.Kafka.fsproj b/src/Propulsion.Kafka/Propulsion.Kafka.fsproj index e5d6c862..53c8d61a 100644 --- a/src/Propulsion.Kafka/Propulsion.Kafka.fsproj +++ b/src/Propulsion.Kafka/Propulsion.Kafka.fsproj @@ -1,7 +1,7 @@  - netstandard2.1 + net6.0 @@ -17,8 +17,6 @@ - - diff --git a/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj b/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj index 35a8a1ad..ecfa3449 100644 --- a/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj +++ b/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj @@ -16,8 +16,6 @@ - - diff --git a/src/Propulsion/Propulsion.fsproj b/src/Propulsion/Propulsion.fsproj index 55d86c8e..f8b70510 100644 --- a/src/Propulsion/Propulsion.fsproj +++ b/src/Propulsion/Propulsion.fsproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 @@ -18,14 +18,15 @@ - + - + +