Target FsCodec 3rc10; Revert CI timing hacks

Author: bartelink

samples/Store/Domain/Domain.fsproj

@@ -17,8 +17,8 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.9.6" />
-    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.10" />
+    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.10" />
 
     <ProjectReference Include="..\..\..\src\Equinox\Equinox.fsproj" />
   </ItemGroup>

samples/Tutorial/Tutorial.fsproj

@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.9.6" />
-    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.10" />
+    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.10" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.0" />
   </ItemGroup>

src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj

@@ -20,7 +20,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.30.1" />
     <PackageReference Include="System.Text.Json" Version="6.0.1" />

src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj

@@ -19,7 +19,7 @@
       <ExcludeAssets>contentFiles</ExcludeAssets>
     </PackageReference>
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.AWS.DynamoDB" Version="0.11.2-beta" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
   </ItemGroup>

src/Equinox.EventStore/Equinox.EventStore.fsproj

@@ -20,7 +20,7 @@
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
     <PackageReference Include="EventStore.Client" Version="22.0.0-preview" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
   </ItemGroup>
 

src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj

@@ -20,7 +20,7 @@
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
     <PackageReference Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
   </ItemGroup>
 

src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj

@@ -17,7 +17,7 @@
     <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
 
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
   </ItemGroup>
 
 </Project>

src/Equinox.MessageDb/Equinox.MessageDb.fsproj

@@ -25,7 +25,7 @@
     <ItemGroup>
         <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
         <PackageReference Include="FSharp.Core" Version="6.0.7" />
-        <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+        <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
         <PackageReference Include="Npgsql" Version="7.0.0" />
     </ItemGroup>
 

src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj

@@ -19,7 +19,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
     <PackageReference Include="SqlStreamStore" Version="1.2.0-beta.8" />
   </ItemGroup>

tests/Equinox.Core.Tests/CachingTests.fs

@@ -112,9 +112,9 @@ type Tests() =
     let [<Fact>] ``requireLoad does not unify loads``  () = task {
         cat.Delay <- TimeSpan.FromMilliseconds 50
         let t1 = requireLoad ()
-        do! Task.Delay 20
+        do! Task.Delay 10
         test <@ (1, 0) = (cat.Loads, cat.Reloads) @>
-        do! Task.Delay 50 // wait for the loaded value to get cached
+        do! Task.Delay 60 // wait for the loaded value to get cached (50 should do, but MacOS CI...)
         let! struct (_token, state) = requireLoad ()
         test <@ 2 = state && (1, 1) = (cat.Loads, cat.Reloads) @>
         let! struct (_token, state) = t1
@@ -166,7 +166,7 @@ type Tests() =
         test <@ (2, 1, 1) = (state, cat.Loads, cat.Reloads) @>
         cat.Delay <- TimeSpan.FromMilliseconds 50
         let t3 = requireLoad ()
-        do! Task.Delay 10 // Make the main read enter a delay state (of 50); ensure readThrough values are expired
+        do! Task.Delay 2 // Make the main read enter a delay state (of 500); ensure readThrough values are expired
         cat.Delay <- TimeSpan.FromMilliseconds 75 // Next read picks up the longer delay
         // These reads start after the first read so replace the older value in the cache
         let t1 = loadReadThrough 1
@@ -178,7 +178,7 @@ type Tests() =
         let! struct (_token, state) = loadReadThrough 150 // Delay of 75 overlapped with delay of 50 should not have expired the entry
         test <@ (4, 1, 3) = (state, cat.Loads, cat.Reloads) @> // The newer cache entry won
         cat.Delay <- TimeSpan.FromMilliseconds 10 // Reduce the delay, but we do want to overlap a write
-        let t4 = loadReadThrough 100 // Delay of 75 in t1/t2 should have aged the read result, so should trigger a read
+        let t4 = loadReadThrough 1000 // Delay of 1000 in t1/t2 should have aged the read result, so should trigger a read
         do! Task.Delay 2
         cat.Delay <- TimeSpan.Zero // no further delays required for the rest of the tests