chore(Deps): Docker updates, polish deps/tests (#490)

Author: bartelink

CHANGELOG.md

@@ -10,9 +10,10 @@ The `Unreleased` section name is replaced by the expected version of next releas
 
 ### Changed
 
-- `Equinox.SqlStreamStore.MsSql`: Update `System.IdentityModel.Tokens.Jwt` and `Microsoft.Data.SqlClient` to remove transitive vulnerable defaults [#489](https://github.com/jet/equinox/pull/489)
-- `Equinox.CosmosStore`: Update `Microsoft.Azure.Cosmos` to remove transitive vulnerable default [#489](https://github.com/jet/equinox/pull/489)
+- .NET 10 SDK update & build optimizations; Docker image update to MSSQL 2025
+- `Equinox.CosmosStore`: Update `Microsoft.Azure.Cosmos` to >= `3.58.0` to remove transitive vulnerable default [#489](https://github.com/jet/equinox/pull/489)
 - `Equinox.DynamoStore`: Update `AWSSDK` dependencies to 4.x (knock-on effect of updating `FSharp.AWS.DynamoDB` dependency to `0.13.0-beta`) [#480](https://github.com/jet/equinox/pull/480) :pray: [@njlr](https://github.com/njlr)
+- `Equinox.SqlStreamStore.MsSql`: Update `System.IdentityModel.Tokens.Jwt` to remove transitive vulnerable defaults [#489](https://github.com/jet/equinox/pull/489)
 
 ### Added
 

Equinox.sln

@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{7E
 		global.json = global.json
 		nuget.config = nuget.config
 		docker-compose-cosmos.sh = docker-compose-cosmos.sh
+		docker-compose-cosmos.ps1 = docker-compose-cosmos.ps1
 	EndProjectSection
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Domain", "samples\Store\Domain\Domain.fsproj", "{37B4A45F-039E-4515-8A84-D242DDE12D22}"

README.md

@@ -170,7 +170,7 @@ The components within this repository are delivered as multi-targeted Nuget pack
 
 - `Equinox.Core` [![NuGet](https://img.shields.io/nuget/v/Equinox.Core.svg)](https://www.nuget.org/packages/Equinox.Core/): Hosts generic utility types frequently useful alongside Equinox: [`TaskCell`](https://github.com/jet/equinox/blob/master/src/Equinox.Core/TaskCell.fs#L36), [`Batcher`, `BatcherCache`, `BatcherDictionary`](https://github.com/jet/equinox/blob/master/src/Equinox.Core/Batching.fs#L44). ([depends](https://www.fuget.org/packages/Equinox.Core) on `System.Runtime.Caching`)
 - `Equinox.MemoryStore` [![MemoryStore NuGet](https://img.shields.io/nuget/v/Equinox.MemoryStore.svg)](https://www.nuget.org/packages/Equinox.MemoryStore/): In-memory store for integration testing/performance base-lining/providing out-of-the-box zero dependency storage for examples. ([depends](https://www.fuget.org/packages/Equinox.MemoryStore) on `Equinox`)
-- `Equinox.CosmosStore` [![CosmosStore NuGet](https://img.shields.io/nuget/v/Equinox.CosmosStore.svg)](https://www.nuget.org/packages/Equinox.CosmosStore/): Azure CosmosDB Adapter with integrated 'unfolds' feature, facilitating optimal read performance in terms of latency and RU costs, instrumented to meet Jet's production monitoring requirements. ([depends](https://www.fuget.org/packages/Equinox.CosmosStore) on `Equinox`, `Equinox`, `Microsoft.Azure.Cosmos` >= `3.57.1`, `System.Text.Json`, `FSharp.Control.TaskSeq`)
+- `Equinox.CosmosStore` [![CosmosStore NuGet](https://img.shields.io/nuget/v/Equinox.CosmosStore.svg)](https://www.nuget.org/packages/Equinox.CosmosStore/): Azure CosmosDB Adapter with integrated 'unfolds' feature, facilitating optimal read performance in terms of latency and RU costs, instrumented to meet Jet's production monitoring requirements. ([depends](https://www.fuget.org/packages/Equinox.CosmosStore) on `Equinox`, `Equinox`, `Microsoft.Azure.Cosmos` >= `3.58.0`, `System.Text.Json`, `FSharp.Control.TaskSeq`)
 - `Equinox.CosmosStore.Prometheus` [![CosmosStore.Prometheus NuGet](https://img.shields.io/nuget/v/Equinox.CosmosStore.Prometheus.svg)](https://www.nuget.org/packages/Equinox.CosmosStore.Prometheus/): Integration package providing a `Serilog.Core.ILogEventSink` that extracts detailed metrics information attached to the `LogEvent`s and feeds them to the `prometheus-net`'s `Prometheus.Metrics` static instance. ([depends](https://www.fuget.org/packages/Equinox.CosmosStore.Prometheus) on `Equinox.CosmosStore`, `prometheus-net >= 3.6.0`)
 - `Equinox.DynamoStore` [![DynamoStore NuGet](https://img.shields.io/nuget/v/Equinox.DynamoStore.svg)](https://www.nuget.org/packages/Equinox.DynamoStore/): Amazon DynamoDB Adapter with integrated 'unfolds' feature, facilitating optimal read performance in terms of latency and RC costs, patterned after `Equinox.CosmosStore`. ([depends](https://www.fuget.org/packages/Equinox.DynamoStore) on `Equinox`, `FSharp.AWS.DynamoDB` >= `0.12.3-beta`, `FSharp.Control.TaskSeq`)
 - `Equinox.DynamoStore.Prometheus` [![DynamoStore.Prometheus NuGet](https://img.shields.io/nuget/v/Equinox.DynamoStore.Prometheus.svg)](https://www.nuget.org/packages/Equinox.DynamoStore.Prometheus/): Integration package providing a `Serilog.Core.ILogEventSink` that extracts detailed metrics information attached to the `LogEvent`s and feeds them to the `prometheus-net`'s `Prometheus.Metrics` static instance. ([depends](https://www.fuget.org/packages/Equinox.CosmosStore.Prometheus) on `Equinox.DynamoStore`, `prometheus-net >= 3.6.0`)

docker-compose-cosmos.ps1

@@ -0,0 +1,34 @@
+#requires -Version 7
+param(
+    [alias("sc")][Switch][bool]$skipCert = $false,
+    [alias("l")][Switch][bool]$bootstrapEqx = $false,
+    [alias("si")][Switch][bool]$skipInit = $false
+)
+
+if (-not $skipCert) {
+    Write-Host "Please click on the cert import popup to confirm..."
+    $rgs = @{
+        Uri = 'https://localhost:8081/_explorer/emulator.pem'
+        Method = 'GET'
+        OutFile = "$env:TEMP/emulatorcert.crt"
+        SkipCertificateCheck = $True
+    }
+    Invoke-WebRequest @rgs
+    $rgs = @{
+        FilePath = "$env:TEMP/emulatorcert.crt"
+        CertStoreLocation = 'Cert:\CurrentUser\Root'
+    }
+    Import-Certificate @rgs
+}
+
+$env:EQUINOX_COSMOS_CONNECTION = "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==;"
+$env:EQUINOX_COSMOS_DATABASE = "equinox-test"
+$env:EQUINOX_COSMOS_CONTAINER = "equinox-test"
+
+if (-not $skipInit)
+{
+    $local:cmd = $bootstrapEqx ? "dotnet run -c Release --project tools/Equinox.Tool --" : "eqx"
+    Invoke-Expression "$cmd init cosmos"
+    Invoke-Expression "$cmd init cosmos -c equinox-test-archive"
+}
+# Explorer URL: https://localhost:8081/_explorer/index.html, see https://learn.microsoft.com/en-us/azure/cosmos-db/how-to-develop-emulator

docker-compose.yml

@@ -17,16 +17,16 @@ services:
 
   equinox-mssql:
     container_name: equinox-mssql
-    image: mcr.microsoft.com/mssql/server:2022-latest
+    image: mcr.microsoft.com/mssql/server:2025-latest
     restart: unless-stopped
     ports:
       - 1433:1433
     environment:
-      - SA_PASSWORD=mssql1Ipw
+      - MSSQL_SA_PASSWORD=mssql1Ipw
       - ACCEPT_EULA=Y
   # see https://github.com/microsoft/mssql-docker/issues/2#issuecomment-1683956282
   equinox-mssql-init:
-    image: mcr.microsoft.com/mssql/server:2022-latest
+    image: mcr.microsoft.com/mssql-tools
     network_mode: service:equinox-mssql
     command: bash -c 'until /opt/mssql-tools/bin/sqlcmd -U sa -P mssql1Ipw -Q "CREATE DATABASE EQUINOX_TEST_DB"; do echo retry && sleep 1; done'
     depends_on:
@@ -41,7 +41,7 @@ services:
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=1
       - MYSQL_DATABASE=EQUINOX_TEST_DB
-# it _almost_ (but doesnt) works with the default mysql using the following
+# it _almost_ (but doesn't) works with the default mysql using the following
 #    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
 
   setup.eventstore:

samples/Tutorial/Tutorial.fsproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AzureCosmosDisableNewtonsoftJsonCheck>true</AzureCosmosDisableNewtonsoftJsonCheck>
   </PropertyGroup>
 
   <ItemGroup>

src/Equinox.CosmosStore.Prometheus/Equinox.CosmosStore.Prometheus.fsproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <AzureCosmosDisableNewtonsoftJsonCheck>true</AzureCosmosDisableNewtonsoftJsonCheck>
   </PropertyGroup>
 
   <ItemGroup>

src/Equinox.CosmosStore/CosmosStore.fs

@@ -1192,8 +1192,11 @@ type CosmosClientFactory(options) =
             MaxRetryWaitTimeOnRateLimitedRequests = maxRetryWaitTimeOnRateLimitedRequests,
             RequestTimeout = requestTimeout,
             UseSystemTextJsonSerializerWithOptions = JsonSerializerOptions())
-    /// Default when rendering/parsing Batch/Tip/Event/Unfold - omitting null values
-    static member val DefaultJsonSerializerOptions = JsonSerializerOptions(DefaultIgnoreCondition = Serialization.JsonIgnoreCondition.WhenWritingNull)
+    /// Default when rendering/parsing Batch/Tip/Event/Unfold
+    static member val DefaultJsonSerializerOptions =
+        JsonSerializerOptions(
+            DefaultIgnoreCondition = Serialization.JsonIgnoreCondition.WhenWritingNull, // omitting null values
+            Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping) // don't need HTML-safe escaping for Cosmos Service invocations in this context
     /// CosmosClientOptions for this CosmosClientFactory as configured (NOTE while the Options object is not immutable, it should not have setters called on it)
     member val Options = options
     /// Creates an instance of CosmosClient without actually validating or establishing the connection

src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <PackageValidationBaselineVersion>4.1.0</PackageValidationBaselineVersion>
-    <AzureCosmosDisableNewtonsoftJsonCheck>true</AzureCosmosDisableNewtonsoftJsonCheck>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,7 +24,8 @@
     <PackageReference Include="FSharp.Core" Version="6.0.7" ExcludeAssets="contentfiles" />
 
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.4.0" />
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.57.1" />
+    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.58.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Text.Json" Version="6.0.10" />
   </ItemGroup>
 

tests/Equinox.CosmosStore.Integration/CosmosCoreIntegration.fs

@@ -144,8 +144,10 @@ type Tests(testOutputHelper) =
 
         (* Demonstrate benefit/mechanism for using the Position-based API to avail of the etag tracking *)
 
-        let extrasCount = match extras with x when x > 50 -> 5000 | x when x < 1 -> 1 | x -> x*100
-        let! _pos = Async.call (fun ct -> ctx.NonIdempotentAppend(streamName, TestEvents.Create (int pos,extrasCount), ct))
+        // NOTE limiting to 5000 also works, but makes things flaky with the Cosmos emulator
+        let range lower upper = max lower >> min upper
+        let extrasCount = extras |> range 1 50
+        let! _pos = Async.call (fun ct -> ctx.NonIdempotentAppend(streamName, TestEvents.Create (int pos, extrasCount), ct))
         test <@ [EqxAct.Append] = capture.ExternalCalls @>
         if eventsInTip then verifyRequestChargesMax 451 // 450.03
         else verifyRequestChargesMax 448 // 447.5 // 463.01 observed