Target FsCodec 2.0.0-rc3

jet · Jan 31, 2020 · 6996dfb · 6996dfb
1 parent b46c9f5
commit 6996dfb
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 13 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
 
 - `SqlStreamStore`.*: Target `SqlStreamStore` v `1.2.0-beta.8`
-- Target `FsCodec` v `2.0.0-rc2`
+- Target `FsCodec` v `2.0.0-rc3`
 - Target `Microsoft.SourceLink.GitHub`, `Microsoft.NETFramework.ReferenceAssemblies` v `1.0.0`
 - Samples etc target `Argu` v `6.0.0`
 - `eqx dump`'s `-J` switch now turns off JSON rendering

diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
@@ -316,8 +316,8 @@ A final consideration to mention is that, even when correct idempotent handling
 type Service(log, resolve, ?maxAttempts) =
 
     let streamFor (clientId: string) =
-        let aggregateId = Equinox.AggregateId("Favorites", clientId)
-        let stream = resolve aggregateId
+        let streamName = FsCodec.StreamName.create "Favorites" clientId
+        let stream = resolve streamName
         Equinox.Stream(log, stream, defaultArg maxAttempts 3)
 
     let execute clientId command : Async<unit> =

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="2.0.0-rc2" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0-rc3" />
     <PackageReference Include="FSharp.UMX" Version="1.0.0" />
   </ItemGroup>
 

diff --git a/samples/Tutorial/AsAt.fsx b/samples/Tutorial/AsAt.fsx
@@ -20,6 +20,7 @@
 #r "Serilog.dll"
 #r "Serilog.Sinks.Console.dll"
 #r "Newtonsoft.Json.dll"
+#r "FSharp.UMX.dll"
 #r "FsCodec.dll"
 #r "Equinox.Core.dll"
 #r "Equinox.dll"

diff --git a/samples/Tutorial/Cosmos.fsx b/samples/Tutorial/Cosmos.fsx
@@ -10,6 +10,7 @@
 #r "TypeShape.dll"
 #r "Equinox.dll"
 #r "Equinox.Core.dll"
+#r "FSharp.UMX.dll"
 #r "FsCodec.dll"
 #r "FsCodec.NewtonsoftJson.dll"
 #r "FSharp.Control.AsyncSeq.dll"

diff --git a/samples/Tutorial/Counter.fsx b/samples/Tutorial/Counter.fsx
@@ -7,6 +7,7 @@
 #r "Equinox.dll"
 #r "Equinox.MemoryStore.dll"
 #r "TypeShape.dll"
+#r "FSharp.UMX.dll"
 #r "FsCodec.dll"
 #r "FsCodec.NewtonsoftJson.dll"
 

diff --git a/samples/Tutorial/Favorites.fsx b/samples/Tutorial/Favorites.fsx
@@ -5,6 +5,7 @@
 #r "Serilog.Sinks.Console.dll"
 #r "Equinox.dll"
 #r "Equinox.MemoryStore.dll"
+#r "FSharp.UMX.dll"
 #r "FSCodec.dll"
 
 (*
@@ -86,8 +87,8 @@ open Serilog
 let log = LoggerConfiguration().WriteTo.Console().CreateLogger()
 
 // related streams are termed a Category; Each client will have it's own Stream.
-let categoryName = "Favorites"
-let clientAFavoritesStreamId = Equinox.AggregateId(categoryName,"ClientA")
+let categoryId = "Favorites"
+let clientAFavoritesStreamId = FsCodec.StreamName.create categoryId "ClientA"
 
 // For test purposes, we use the in-memory store
 let store = Equinox.MemoryStore.VolatileStore()
@@ -133,8 +134,8 @@ handler.Read |> Async.RunSynchronously
 type Service(log, resolve) =
     (* See Counter.fsx and Cosmos.fsx for a more compact representation which makes the Handler wiring less obtrusive *)
     let streamFor (clientId: string) =
-        let aggregateId = Equinox.AggregateId("Favorites", clientId)
-        let stream = resolve aggregateId
+        let streamName = FsCodec.StreamName.create "Favorites" clientId
+        let stream = resolve streamName
         Handler(log, stream)
 
     member __.Favorite(clientId, sku) =

diff --git a/samples/Tutorial/Todo.fsx b/samples/Tutorial/Todo.fsx
@@ -10,6 +10,7 @@
 #r "TypeShape.dll"
 #r "Equinox.Core.dll"
 #r "Equinox.dll"
+#r "FSharp.UMX.dll"
 #r "FsCodec.dll"
 #r "FsCodec.NewtonsoftJson.dll"
 #r "FSharp.Control.AsyncSeq.dll"

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="2.0.0-rc2" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0-rc3" />
     <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="2.0.0-rc2" />
+    <PackageReference Include="FsCodec" Version="2.0.0-rc3" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.21" />
   </ItemGroup>
 

diff --git a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj
@@ -24,7 +24,7 @@
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
 
 <!--    only uses FsCodec.Box, which happens to be houses in the NewtonsoftJson package-->
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0-rc2" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0-rc3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj b/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj
@@ -24,7 +24,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" Version="2.0.0-rc2" />
+    <PackageReference Include="FsCodec" Version="2.0.0-rc3" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.21" />
     <PackageReference Include="SqlStreamStore" Version="1.2.0-beta.8" />
   </ItemGroup>

diff --git a/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj b/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="FsCheck.xUnit" Version="2.14.0" />
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0-rc2" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.0-rc3" />
     <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'" />