Target sdk 8

Author: bartelink

.github/workflows/ci.yaml

@@ -25,10 +25,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
       - name: Install message-db
         env:
           MESSAGE_DB_VERSION: 1.3.0

Directory.Build.props

@@ -10,13 +10,13 @@
 
     <!-- Global Project config flags -->
     <WarningLevel>5</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
     <!-- suppress false positive warning FS2003 about invalid version of AssemblyInformationalVersionAttribute -->
     <!-- supress NU5105 triggered by trailing dotted elements such as .43 and .2 in e.g.: pr.43-rc1.2: The package version '<X>' uses SemVer 2.0.0 or components of SemVer 1.0.0 that are not supported on legacy clients. Change the package version to a SemVer 1.0.0 string. If the version contains a release label it must start with a letter. This message can be ignored if the package is not intended for older clients. -->
     <NoWarn>$(NoWarn);FS2003;NU5105</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <!-- SourceLink etc -->

azure-pipelines.yml

@@ -47,10 +47,5 @@ jobs:
   pool:
     vmImage: 'macOS-latest'
   steps:
-  - task: UseDotNet@2
-    displayName: 'Install .NET Core sdk'
-    inputs:
-      packageType: sdk
-      version: 6.x
   - script: dotnet pack build.proj
     displayName: dotnet pack build.proj

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.300",
+    "version": "8.0.101",
     "rollForward": "latestMajor"
   }
 }

src/Propulsion.CosmosStore/EquinoxSystemTextJsonParser.fs

@@ -4,8 +4,8 @@ open Equinox.CosmosStore.Core
 
 open Propulsion.Sinks
 
-/// Maps fields in an Event within an Equinox.Cosmos V1+ Event (in a Batch or Tip) to the interface defined by Propulsion.Streams
-/// <remarks>NOTE No attempt is made to filter out Tip (`id=-1`) batches from the ChangeFeed; Equinox versions >= 3, Tip batches can bear events.</remarks>
+/// <summary>Maps fields in an Event within an Equinox.Cosmos V1+ Event (in a Batch or Tip) to the interface defined by Propulsion.Streams.</summary>
+/// <remarks>NOTE No attempt is made to filter out Tip (`id=-1`) batches from the ChangeFeed, as in Equinox versions >= 3, Tip batches can bear events.</remarks>
 [<RequireQualifiedAccess>]
 #if !COSMOSV3
 module EquinoxSystemTextJsonParser =

src/Propulsion.DynamoStore/AppendsEpoch.fs

@@ -45,7 +45,7 @@ module Events =
 let next (x: Events.StreamSpan) = int x.i + x.c.Length
 /// Aggregates all spans per stream into a single Span from the lowest index to the highest
 let flatten: Events.StreamSpan seq -> Events.StreamSpan seq =
-    Seq.groupBy (fun x -> x.p)
+    Seq.groupBy _.p
     >> Seq.map (fun (p, xs) ->
         let mutable i = -1L
         let c = ResizeArray()
@@ -175,7 +175,7 @@ module Reader =
 
         member _.ReadVersion(partitionId, epochId): Async<int64> =
             let decider = resolve (partitionId, epochId, System.Int64.MaxValue)
-            decider.QueryEx(fun c -> c.Version)
+            decider.QueryEx _.Version
 
     module Factory =
 

src/Propulsion.DynamoStore/DynamoDbExport.fs

@@ -47,7 +47,7 @@ type Importer(buffer: DynamoStoreIndex.Buffer, emit, dump) =
             let _ok, _ = buffer.LogIndexed(string streamSpan.p, { i = int streamSpan.i; c = streamSpan.c })
             pending.Remove(string streamSpan.p) |> ignore
         totalIngestedSpans <- totalIngestedSpans + batch.LongLength
-        return pending.Values |> Seq.sumBy (fun x -> x.c.Length) }
+        return pending.Values |> Seq.sumBy _.c.Length }
 
     /// Ingest a file worth of data, flushing whenever we've accumulated enough pending data to be written
     member _.IngestDynamoDbJsonFile(file, bufferedEventsFlushThreshold) = async {

src/Propulsion.DynamoStore/DynamoStoreIndex.fs

@@ -100,7 +100,7 @@ module Reader =
         let! maybeStreamBytes, _version, state = epochs.Read(partitionId, epochId, 0)
         let sizeB, loadS = defaultValueArg maybeStreamBytes 0L, Stopwatch.elapsedSeconds ts
         let spans = state.changes |> Array.collect (fun struct (_i, spans) -> spans)
-        let totalEvents = spans |> Array.sumBy (fun x -> x.c.Length)
+        let totalEvents = spans |> Array.sumBy _.c.Length
         let totalStreams = spans |> AppendsEpoch.flatten |> Seq.length
         log.Information("Epoch {epochId} {totalE} events {totalS} streams ({spans} spans, {batches} batches, {k:n3} MiB) {loadS:n1}s",
                         string epochId, totalEvents, totalStreams, spans.Length, state.changes.Length, Log.miB sizeB, loadS)

src/Propulsion.EventStoreDb/EventStoreSource.fs

@@ -16,7 +16,7 @@ module private Impl =
     let readBatch withData batchSize streamFilter (store: EventStoreClient) pos ct = task {
         let pos = let p = pos |> Propulsion.Feed.Position.toInt64 |> uint64 in Position(p, p)
         let res = store.ReadAllAsync(Direction.Forwards, pos, batchSize, withData, cancellationToken = ct)
-        let! batch = res |> TaskSeq.map (fun e -> e.Event) |> TaskSeq.toArrayAsync
+        let! batch = res |> TaskSeq.map _.Event |> TaskSeq.toArrayAsync
         return ({ checkpoint = checkpointPos batch; items = toItems streamFilter batch; isTail = batch.LongLength <> batchSize }: Propulsion.Feed.Core.Batch<_>) }
 
     // @scarvel8: event_global_position = 256 x 1024 x 1024 x chunk_number + chunk_header_size (128) + event_position_offset_in_chunk

src/Propulsion.MemoryStore/MemoryStoreLogger.fs

@@ -19,7 +19,7 @@ let renderSubmit (log: Serilog.ILogger) struct (epoch, categoryName, streamId, e
             if (not << log.IsEnabled) Serilog.Events.LogEventLevel.Debug then log
             elif typedefof<'F> <> typeof<ReadOnlyMemory<byte>> then log
             else log |> propEventJsonUtf8 "Json" (unbox events)
-        let types = events |> Seq.map (fun e -> e.EventType)
+        let types = events |> Seq.map (fun x -> x.EventType)
         log.ForContext("types", types).Debug("Submit #{epoch} {categoryName}-{streamId}x{count}", epoch, categoryName, streamId, events.Length)
     elif log.IsEnabled Serilog.Events.LogEventLevel.Debug then
         let types = seq { for e in events -> e.EventType } |> Seq.truncate 5