Target FsCodec 1.2.0; sundry tidying

jet · Oct 26, 2019 · 8a7bdac · 8a7bdac
1 parent 458dda2
commit 8a7bdac
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ The `Unreleased` section name is replaced by the expected version of next releas
 
 ### Changed
 
+- Targeted `FsCodec` v `1.2.0`
 - `Cosmos`: renamed `Connector`'s `maxRetryAttemptsOnThrottledRequests` and `maxRetryWaitTimeInSeconds` to maxRetryAttemptsOnRateLimitedRequests` and `maxRetryWaitTimeOnRateLimitedRequests` and changed latter to `TimeSpan` to match V3 SDK [#171](https://github.com/jet/equinox/pull/171) 
 
 ### Removed

diff --git a/samples/Store/Domain/Domain.fsproj b/samples/Store/Domain/Domain.fsproj
@@ -21,7 +21,7 @@
     <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
 
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.2.0" />
     <PackageReference Include="FSharp.UMX" Version="1.0.0" />
   </ItemGroup>
 

diff --git a/samples/Store/Integration/CartIntegration.fs b/samples/Store/Integration/CartIntegration.fs
@@ -14,7 +14,7 @@ let snapshot = Domain.Cart.Folds.isOrigin, Domain.Cart.Folds.compact
 let createMemoryStore () =
     new VolatileStore ()
 let createServiceMemory log store =
-    Backend.Cart.Service(log, fun (id,opt) -> Resolver(store, fold, initial).Resolve(id,?option=opt))
+    Backend.Cart.Service(log, fun (id,opt) -> MemoryStore.Resolver(store, fold, initial).Resolve(id,?option=opt))
 
 let codec = Domain.Cart.Events.codec
 

diff --git a/samples/Store/Integration/FavoritesIntegration.fs b/samples/Store/Integration/FavoritesIntegration.fs
@@ -3,7 +3,6 @@
 open Equinox
 open Equinox.Cosmos.Integration
 open Swensen.Unquote
-open Xunit
 
 #nowarn "1182" // From hereon in, we may have some 'unused' privates (the tests)
 

diff --git a/samples/Tutorial/AsAt.fsx b/samples/Tutorial/AsAt.fsx
@@ -152,7 +152,7 @@ module Cosmos =
     open Equinox.Cosmos
     let read key = System.Environment.GetEnvironmentVariable key |> Option.ofObj |> Option.get
 
-    let connector = Connector(requestTimeout=TimeSpan.FromSeconds 5., maxRetryAttemptsOnThrottledRequests=2, maxRetryWaitTimeInSeconds=5, log=Log.log, mode=ConnectionMode.Gateway)
+    let connector = Connector(TimeSpan.FromSeconds 5., 2, TimeSpan.FromSeconds 5., log=Log.log, mode=ConnectionMode.Gateway)
     let conn = connector.Connect(appName, Discovery.FromConnectionString (read "EQUINOX_COSMOS_CONNECTION")) |> Async.RunSynchronously
     let context = Context(conn, read "EQUINOX_COSMOS_DATABASE", read "EQUINOX_COSMOS_CONTAINER")
     let cacheStrategy = CachingStrategy.SlidingWindow (cache, TimeSpan.FromMinutes 20.) // OR CachingStrategy.NoCaching

diff --git a/samples/Tutorial/Cosmos.fsx b/samples/Tutorial/Cosmos.fsx
@@ -71,7 +71,7 @@ let cache = Equinox.Cache(appName, 20)
 module Store =
     let read key = System.Environment.GetEnvironmentVariable key |> Option.ofObj |> Option.get
 
-    let connector = Connector(requestTimeout=TimeSpan.FromSeconds 5., maxRetryAttemptsOnThrottledRequests=2, maxRetryWaitTimeInSeconds=5, log=Log.log)
+    let connector = Connector(TimeSpan.FromSeconds 5., 2, TimeSpan.FromSeconds 5., log=Log.log)
     let conn = connector.Connect(appName, Discovery.FromConnectionString (read "EQUINOX_COSMOS_CONNECTION")) |> Async.RunSynchronously
     let gateway = Gateway(conn, BatchingPolicy())
 

diff --git a/samples/Tutorial/Favorites.fsx b/samples/Tutorial/Favorites.fsx
@@ -18,9 +18,7 @@
 type Event =
     | Added of string  
     | Removed of string
-// No IUnionContract or Codec required as we're using MemoryStore in this part
-//    interface TypeShape.UnionContract.IUnionContract
-//let codec = FsCodec.NewtonsoftJson.Codec.Create<Event>()
+// No IUnionContract or Codec required as we're using MemoryStore in this example
 
 let initial : string list = []
 let evolve state = function

diff --git a/samples/Tutorial/Todo.fsx b/samples/Tutorial/Todo.fsx
@@ -112,7 +112,7 @@ let cache = Equinox.Cache(appName, 20)
 module Store =
     let read key = System.Environment.GetEnvironmentVariable key |> Option.ofObj |> Option.get
 
-    let connector = Connector(requestTimeout=TimeSpan.FromSeconds 5., maxRetryAttemptsOnThrottledRequests=2, maxRetryWaitTimeInSeconds=5, log=log)
+    let connector = Connector(TimeSpan.FromSeconds 5., 2, TimeSpan.FromSeconds 5., log=log)
     let conn = connector.Connect(appName, Discovery.FromConnectionString (read "EQUINOX_COSMOS_CONNECTION")) |> Async.RunSynchronously
     let gateway = Gateway(conn, BatchingPolicy())
 

diff --git a/src/Equinox.Cosmos/Equinox.Cosmos.fsproj b/src/Equinox.Cosmos/Equinox.Cosmos.fsproj
@@ -25,7 +25,7 @@
     <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
 
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.2.0" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.21" />
     <PackageReference Include="Microsoft.Azure.DocumentDB" Version="2.2.0" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
     <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.2.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />

diff --git a/src/Equinox.EventStore/Equinox.EventStore.fsproj b/src/Equinox.EventStore/Equinox.EventStore.fsproj
@@ -26,7 +26,7 @@
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
 
     <PackageReference Include="EventStore.Client" Version="5.0.1" />
-    <PackageReference Include="FsCodec" Version="1.0.0" />
+    <PackageReference Include="FsCodec" Version="1.2.0" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.21" />
   </ItemGroup>
 

diff --git a/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj b/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="FsCheck.xUnit" Version="2.14.0" />
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
     <Reference Include="System.Runtime.Caching" Condition=" '$(TargetFramework)' != 'netstandard2.0'" />