Skip to content

Commit 3560a28

Browse files
bartelinkbartelink
committed
net6.0 update stragglers
1 parent 96f2dac commit 3560a28

File tree

15 files changed

+31
-48
lines changed

15 files changed

+31
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The `Unreleased` section name is replaced by the expected version of next releas
1919

2020
### Changed
2121

22-
- Targeted `net6.0` with `6.0.300` SDK
22+
- Targeted `net6.0` with `6.0.300` SDK, `FSharp.Control.AsyncSeq` v `3.2.1`, `MathNet.Numerics` v `4.15.0`
2323
- `Propulsion.CosmosStore`: Changed to target `Equinox.CosmosStore` v `4.0.0` [#139](https://github.com/jet/propulsion/pull/139)
2424
- `Propulsion.CosmosStore.CosmosSource`: Changed parsing to use `System.Text.Json` [#139](https://github.com/jet/propulsion/pull/139)
2525
- `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)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ If you're looking for a good discussion forum on these kinds of topics, look no
66

77
## Components
88

9-
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+)
9+
The components within this repository are delivered as a multi-targeted Nuget package targeting `net6.0`
1010

1111
- `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`
1212

‎src/Propulsion.Cosmos/Propulsion.Cosmos.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<DefineConstants>COSMOSV2</DefineConstants>
66
</PropertyGroup>
77

@@ -30,8 +30,6 @@
3030
<ItemGroup>
3131
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
3232

33-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
34-
3533
<PackageReference Include="Equinox.Cosmos" Version="[2.6.0, 2.99.0]" />
3634
<PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.4.0" />
3735
</ItemGroup>

‎src/Propulsion.CosmosStore/ChangeFeedProcessor.fs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,37 +61,37 @@ type ChangeFeedProcessor =
6161

6262
static member Start
6363
( log : ILogger, monitored : Container,
64-
/// The non-partitioned (i.e., PartitionKey is "id") Container holding the partition leases.
64+
// The non-partitioned (i.e., PartitionKey is "id") Container holding the partition leases.
6565
// Should always read from the write region to keep the number of write conflicts to a minimum when the sdk
6666
// updates the leases. Since the non-write region(s) might lag behind due to us using non-strong consistency, during
6767
// failover we are likely to reprocess some messages, but that's okay since processing has to be idempotent in any case
6868
leases : Container,
69-
/// Identifier to disambiguate multiple independent feed processor positions (akin to a 'consumer group')
69+
// Identifier to disambiguate multiple independent feed processor positions (akin to a 'consumer group')
7070
processorName : string,
71-
/// Observers to forward documents to (Disposal is tied to stopping of the Source)
71+
// Observers to forward documents to (Disposal is tied to stopping of the Source)
7272
observer : IChangeFeedObserver,
7373
?leaseOwnerId : string,
74-
/// (NB Only applies if this is the first time this leasePrefix is presented)
75-
/// Specify `true` to request starting of projection from the present write position.
76-
/// Default: false (projecting all events from start beforehand)
74+
// (NB Only applies if this is the first time this leasePrefix is presented)
75+
// Specify `true` to request starting of projection from the present write position.
76+
// Default: false (projecting all events from start beforehand)
7777
?startFromTail : bool,
78-
/// Frequency to check for partitions without a processor. Default 1s
78+
// Frequency to check for partitions without a processor. Default 1s
7979
?leaseAcquireInterval : TimeSpan,
80-
/// Frequency to renew leases held by processors under our control. Default 3s
80+
// Frequency to renew leases held by processors under our control. Default 3s
8181
?leaseRenewInterval : TimeSpan,
82-
/// Duration to take lease when acquired/renewed. Default 10s
82+
// Duration to take lease when acquired/renewed. Default 10s
8383
?leaseTtl : TimeSpan,
84-
/// Delay before re-polling a partition after backlog has been drained
84+
// Delay before re-polling a partition after backlog has been drained
8585
?feedPollDelay : TimeSpan,
86-
/// Limit on items to take in a batch when querying for changes (in addition to 4MB response size limit). Default Unlimited.
87-
/// Max Items is not emphasized as a control mechanism as it can only be used meaningfully when events are highly regular in size.
86+
// Limit on items to take in a batch when querying for changes (in addition to 4MB response size limit). Default Unlimited.
87+
// Max Items is not emphasized as a control mechanism as it can only be used meaningfully when events are highly regular in size.
8888
?maxItems : int,
89-
/// Continuously fed per-partition lag information until parent Async completes
90-
/// callback should Async.Sleep until next update is desired
89+
// Continuously fed per-partition lag information until parent Async completes
90+
// callback should Async.Sleep until next update is desired
9191
?reportLagAndAwaitNextEstimation,
92-
/// Enables reporting or other processing of Exception conditions as per <c>WithErrorNotification</c>
92+
// Enables reporting or other processing of Exception conditions as per <c>WithErrorNotification</c>
9393
?notifyError : int -> exn -> unit,
94-
/// Admits customizations in the ChangeFeedProcessorBuilder chain
94+
// Admits customizations in the ChangeFeedProcessorBuilder chain
9595
?customize) =
9696
let leaseOwnerId = defaultArg leaseOwnerId (ChangeFeedProcessor.mkLeaseOwnerIdForProcess())
9797
let feedPollDelay = defaultArg feedPollDelay (TimeSpan.FromSeconds 1.)
@@ -154,7 +154,7 @@ type ChangeFeedProcessor =
154154
let rec emitLagMetrics () = async {
155155
let feedIteratorMap (map : 't -> 'u) (query : FeedIterator<'t>) : AsyncSeq<'u> =
156156
let rec loop () : AsyncSeq<'u> = asyncSeq {
157-
if not query.HasMoreResults then return None else
157+
if not query.HasMoreResults then () else
158158
let! ct = Async.CancellationToken
159159
let! (res : FeedResponse<'t>) = query.ReadNextAsync(ct) |> Async.AwaitTaskCorrect
160160
for x in res do yield map x

‎src/Propulsion.CosmosStore/CosmosStoreSource.fs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ open Microsoft.Azure.Cosmos
1111
#endif
1212

1313
open Equinox.Core // Stopwatch.Time
14-
open Propulsion.Infrastructure // AwaitTaskCorrect
1514
open Serilog
1615
open System
1716
open System.Collections.Generic

‎src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -21,8 +21,6 @@
2121
<ItemGroup>
2222
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
2323

24-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
25-
2624
<PackageReference Include="Equinox.CosmosStore" Version="4.0.0-beta.10.3" />
2725
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.4" />
2826
</ItemGroup>

‎src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<DefineConstants>COSMOSV3</DefineConstants>
66
</PropertyGroup>
77

@@ -38,7 +38,6 @@
3838
<ItemGroup>
3939
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
4040

41-
<PackageReference Include="FSharp.Core" Version="4.3.4" />
4241
<PackageReference Include="Equinox.CosmosStore" Version="[3.0.7, 3.99.0]" />
4342
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.27.0" />
4443
</ItemGroup>

‎src/Propulsion.DynamoStore/DynamoDbExport.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module Propulsion.DynamoStore.DynamoDbExport
22

3-
open FSharp.Control
43
open System.Collections.Generic
54
open System.IO
65
open System.Text.Json
@@ -25,7 +24,7 @@ module DynamoDbJsonParser =
2524
yield item.p.S, { i = index; c = eventTypes }
2625
more <- not r.EndOfStream }
2726

28-
/// Manages import of DynamoDB JSON files (extracted from data/*.json.gz in a DyanmoDB S3 export)
27+
/// Manages import of DynamoDB JSON files (extracted from data/*.json.gz in a DynamoDB S3 export)
2928
type Importer(buffer : DynamoStoreIndex.Buffer, emit, dump) =
3029

3130
let pending = Dictionary<string, DynamoStoreIndex.EventSpan>()

‎src/Propulsion.EventStore/Propulsion.EventStore.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<DefineConstants>EVENTSTORE_LEGACY</DefineConstants>
66
</PropertyGroup>
77

@@ -19,8 +19,6 @@
1919
<ItemGroup>
2020
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
2121

22-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
23-
2422
<PackageReference Include="Equinox.EventStore" Version="[3.0.7, 3.99.0]" />
2523
<PackageReference Include="TypeShape" Version="8.0.1" />
2624
</ItemGroup>

‎src/Propulsion.EventStore/StripedIngester.fs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
namespace Propulsion.EventStore
22

3-
open Propulsion.Infrastructure // AwaitTaskCorrect
43
open Propulsion.Internal
54
open Propulsion.Streams
65
open Serilog

0 commit comments

Comments
 (0)