net6.0 update stragglers

jet · Jul 28, 2022 · 444926d · 444926d
1 parent 96f2dac
commit 444926d
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 33 deletions.
diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DefineConstants>COSMOSV2</DefineConstants>
   </PropertyGroup>
 
@@ -30,8 +30,6 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FSharp.Core" Version="4.5.4" />
-
     <PackageReference Include="Equinox.Cosmos" Version="[2.6.0, 2.99.0]" />
     <PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.4.0" />
   </ItemGroup>

diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,8 +21,6 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FSharp.Core" Version="4.5.4" />
-
     <PackageReference Include="Equinox.CosmosStore" Version="4.0.0-beta.10.3" />
     <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.4" />
   </ItemGroup>

diff --git a/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj b/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DefineConstants>COSMOSV3</DefineConstants>
   </PropertyGroup>
 
@@ -38,7 +38,6 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FSharp.Core" Version="4.3.4" />
     <PackageReference Include="Equinox.CosmosStore" Version="[3.0.7, 3.99.0]" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.27.0" />
   </ItemGroup>

diff --git 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<string, DynamoStoreIndex.EventSpan>()

diff --git a/src/Propulsion.EventStore/Propulsion.EventStore.fsproj b/src/Propulsion.EventStore/Propulsion.EventStore.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DefineConstants>EVENTSTORE_LEGACY</DefineConstants>
   </PropertyGroup>
 
@@ -19,8 +19,6 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FSharp.Core" Version="4.5.4" />
-
     <PackageReference Include="Equinox.EventStore" Version="[3.0.7, 3.99.0]" />
     <PackageReference Include="TypeShape" Version="8.0.1" />
   </ItemGroup>

diff --git 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
@@ -18,8 +18,6 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FSharp.Core" Version="4.5.4" />
-
     <PackageReference Include="Equinox.EventStoreDb" Version="4.0.0-beta.10.3" />
   </ItemGroup>
 

diff --git a/src/Propulsion.Feed/Propulsion.Feed.fsproj b/src/Propulsion.Feed/Propulsion.Feed.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,9 +17,7 @@
     <ItemGroup>
         <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-        <PackageReference Include="FSharp.Core" Version="4.3.4" />
-
-        <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
+        <PackageReference Include="FSharp.Control.AsyncSeq" Version="3.2.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Propulsion.Kafka/Propulsion.Kafka.fsproj b/src/Propulsion.Kafka/Propulsion.Kafka.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,8 +17,6 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FSharp.Core" Version="4.5.4" />
-
     <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.2.2" />
     <PackageReference Include="FsKafka" Version="[1.7.0, 1.9.99)" />
   </ItemGroup>

diff --git a/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj b/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj
@@ -16,8 +16,6 @@
     <ItemGroup>
         <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-        <PackageReference Include="FSharp.Core" Version="4.7.2" />
-
         <PackageReference Include="Dapper" Version="2.0.30" />
         <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
         <PackageReference Include="SqlStreamStore" Version="1.2.0-beta.8" />

diff --git a/src/Propulsion/Propulsion.fsproj b/src/Propulsion/Propulsion.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,14 +18,15 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FSharp.Core" Version="4.3.4" />
+    <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
     <!-- We only depend on the ITimelineEvent contracts, so going to v3 is not useful/necessary -->
     <PackageReference Include="FsCodec" Version="2.0.0" />
-    <PackageReference Include="MathNet.Numerics" Version="4.7.0" />
+    <PackageReference Include="MathNet.Numerics" Version="4.15.0" />
     <!--    NB TEMP; needs to be shipped out-->
     <PackageReference Include="prometheus-net" Version="3.6.0" />
     <PackageReference Include="Serilog" Version="2.7.1" />
+    <PackageReference Include="System.Threading.Channels" Version="6.0.0" />
   </ItemGroup>
 
 </Project>