From 7df17a7da414dbb5b01cab1ba8984425ea6db6b3 Mon Sep 17 00:00:00 2001 From: Vasily Kirichenko Date: Sat, 20 Jan 2018 16:34:12 +0300 Subject: [PATCH] update Akka to 1.3.3 update all packages --- .gitignore | 3 +- .paket/Paket.Restore.targets | 13 +- paket.lock | 165 +++++++++--------- .../Akkling.Cluster.Sharding.fsproj | 43 ++++- .../Akkling.DistributedData.fsproj | 30 ++-- .../Akkling.Persistence.fsproj | 16 +- .../AtLeastOnceDelivery.fs | 4 +- src/Akkling.Streams/Akkling.Streams.fsproj | 3 + src/Akkling.Streams/Source.fs | 6 - src/Akkling.TestKit/Akkling.TestKit.fsproj | 7 +- src/Akkling/Akkling.fsproj | 6 + src/Akkling/Props.fs | 5 +- src/Akkling/Spawning.fs | 2 +- tests/Akkling.Tests/Akkling.Tests.fsproj | 37 +++- tests/Akkling.Tests/Api.fs | 2 +- tests/Akkling.Tests/StreamsApi.fs | 10 +- tests/Akkling.Tests/app.config | 36 +++- 17 files changed, 249 insertions(+), 139 deletions(-) diff --git a/.gitignore b/.gitignore index 769b6ca..bbaee25 100644 --- a/.gitignore +++ b/.gitignore @@ -187,4 +187,5 @@ paket-files docs/content/license.md docs/content/release-notes.md \.fake/ -release.cmd \ No newline at end of file +release.cmd +.idea/ \ No newline at end of file diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 98c71f9..830e569 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -18,6 +18,14 @@ $(PaketToolsPath)paket.exe "$(PaketExePath)" $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + + + <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) + dotnet "$(PaketExePath)" + + + "$(PaketExePath)" + $(PaketRootPath)paket.bootstrapper.exe $(PaketToolsPath)paket.bootstrapper.exe "$(PaketBootStrapperExePath)" @@ -114,9 +122,11 @@ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) %(PaketReferencesFileLinesInfo.PackageVersion) + All @@ -138,9 +148,10 @@ + diff --git a/paket.lock b/paket.lock index 3bbdcc9..9126585 100644 --- a/paket.lock +++ b/paket.lock @@ -2,72 +2,75 @@ REDIRECTS: ON RESTRICTION: || (== net40) (== net45) (== net451) (== net452) NUGET remote: https://www.nuget.org/api/v2 - Akka (1.3.1) + Akka (1.3.3) Newtonsoft.Json (>= 9.0.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) System.Collections.Immutable (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Cluster (1.3.1) - Akka.Remote (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Cluster.Sharding (1.3.1-beta52) - Akka.Cluster.Tools (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Cluster.Tools (1.3.1) - Akka.Cluster (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.DistributedData (1.3.1-beta52) - Akka.Cluster (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Cluster (1.3.3) + Akka.Remote (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Cluster.Sharding (1.3.3-beta56) + Akka.Cluster.Tools (>= 1.3.3-beta56) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.DistributedData (>= 1.3.3-beta56) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Persistence (>= 1.3.3-beta56) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Cluster.Tools (1.3.3) + Akka.Cluster (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.DistributedData (1.3.3-beta56) + Akka.Cluster (>= 1.3.3-beta56) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) Hyperion (>= 0.9.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence (1.3.1) - Akka (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Persistence (1.3.3) + Akka (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) Google.Protobuf (>= 3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence.Query (1.3.1) - Akka.Persistence (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Streams (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence.Query.Sql (1.3.1) - Akka.Persistence (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence.Query (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence.Sql.Common (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence.Sql.Common (1.3.1) - Akka.Persistence (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Persistence.Sqlite (1.3.1) - Akka.Persistence (>= 1.3.1) - restriction: || (&& (== net40) (>= net451)) (&& (== net40) (>= netstandard1.6)) (&& (== net45) (>= net451)) (&& (== net45) (>= netstandard1.6)) (== net451) (== net452) - Akka.Persistence.Sql.Common (>= 1.3.1) - restriction: || (&& (== net40) (>= net451)) (&& (== net40) (>= netstandard1.6)) (&& (== net45) (>= net451)) (&& (== net45) (>= netstandard1.6)) (== net451) (== net452) + Akka.Persistence.Query (1.3.3) + Akka.Persistence (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Streams (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Persistence.Query.Sql (1.3.3) + Akka.Persistence (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Persistence.Query (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Persistence.Sql.Common (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Persistence.Sql.Common (1.3.3) + Akka.Persistence (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Persistence.Sqlite (1.3.3) + Akka.Persistence (>= 1.3.3) - restriction: || (&& (== net40) (>= net451)) (&& (== net40) (>= netstandard1.6)) (&& (== net45) (>= net451)) (&& (== net45) (>= netstandard1.6)) (== net451) (== net452) + Akka.Persistence.Sql.Common (>= 1.3.3) - restriction: || (&& (== net40) (>= net451)) (&& (== net40) (>= netstandard1.6)) (&& (== net45) (>= net451)) (&& (== net45) (>= netstandard1.6)) (== net451) (== net452) Microsoft.Data.SQLite (>= 1.1.1) - restriction: || (&& (== net40) (>= net451)) (&& (== net40) (>= netstandard1.6)) (&& (== net45) (>= net451)) (&& (== net45) (>= netstandard1.6)) (== net451) (== net452) - Akka.Remote (1.3.1) - Akka (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Remote (1.3.3) + Akka (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) DotNetty.Handlers (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) Google.Protobuf (>= 3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Serialization.Hyperion (1.3.1-beta52) - Akka (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Hyperion (>= 0.9.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.Streams (1.3.1) - Akka (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Serialization.Hyperion (1.3.3-beta56) + Akka (>= 1.3.3-beta56) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Hyperion (>= 0.9.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.Streams (1.3.3) + Akka (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) Reactive.Streams (>= 1.0.2) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.TestKit (1.3.1) - Akka (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Akka.TestKit.Xunit2 (1.3.1) - Akka.TestKit (>= 1.3.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - xunit (>= 2.3.0-beta5-build3769) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - DotNetty.Buffers (0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - DotNetty.Common (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Codecs (0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - DotNetty.Buffers (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Common (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Transport (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Common (0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.TestKit (1.3.3) + Akka (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Akka.TestKit.Xunit2 (1.3.3) + Akka.TestKit (>= 1.3.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + xunit (>= 2.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + DotNetty.Buffers (0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + DotNetty.Common (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + System.Runtime.CompilerServices.Unsafe (>= 4.4) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Codecs (0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + DotNetty.Buffers (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Common (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Transport (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Common (0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) Microsoft.Extensions.Logging (>= 1.1.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Handlers (0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - DotNetty.Buffers (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Codecs (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Common (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Transport (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Transport (0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - DotNetty.Buffers (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - DotNetty.Common (>= 0.4.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) - FAKE (4.63) - FsCheck (2.10) - FSharp.Core (>= 4.1) - FsCheck.Xunit (2.1) - FsCheck (>= 2.1) - xunit.extensibility.execution (>= 2.1) + System.Runtime.CompilerServices.Unsafe (>= 4.4) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Handlers (0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + DotNetty.Buffers (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Codecs (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Common (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Transport (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Transport (0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + DotNetty.Buffers (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + DotNetty.Common (>= 0.4.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.3)) (== net45) (== net451) (== net452) + FAKE (4.64.4) + FsCheck (2.10.6) + FSharp.Core (>= 4.0.0.1) - restriction: || (&& (== net40) (>= net452)) (&& (== net40) (>= portable-net45+win8)) (&& (== net40) (>= portable-net45+win8+wp8)) (&& (== net40) (>= portable-net45+win8+wp8+wpa81)) (== net45) (== net451) (== net452) + FsCheck.Xunit (2.10.6) + FsCheck (2.10.6) - restriction: || (&& (== net40) (>= net452)) (&& (== net45) (>= net452)) (&& (== net451) (>= net452)) (== net452) + xunit.extensibility.execution (>= 2.2 < 3.0) - restriction: || (&& (== net40) (>= net452)) (&& (== net45) (>= net452)) (&& (== net451) (>= net452)) (== net452) FSharp.Compiler.Service (2.0.0.6) FSharp.Core (4.2.3) FSharp.Formatting (2.14.4) @@ -75,48 +78,52 @@ NUGET FSharpVSPowerTools.Core (>= 2.3 < 2.4) FSharpVSPowerTools.Core (2.3) FSharp.Compiler.Service (>= 2.0.0.3) - FsPickler (3.3) + FsPickler (4.6) + FSharp.Core (>= 3.1) FSPowerPack.Core.Community (3.0) FSPowerPack.Linq.Community (3.0) FSPowerPack.Core.Community - Google.Protobuf (3.4) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net40) (>= netstandard1.0)) (== net45) (&& (== net452) (< net451)) - Hyperion (0.9.6) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Google.Protobuf (3.5.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Hyperion (0.9.7) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + Microsoft.CodeCoverage (1.0.3) Microsoft.Data.SQLite (2.0) - restriction: || (&& (== net40) (>= net451)) (&& (== net40) (>= netstandard1.6)) (&& (== net45) (>= net451)) (&& (== net45) (>= netstandard1.6)) (== net451) (== net452) Microsoft.Extensions.Logging (2.0) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) - Microsoft.NET.Test.Sdk (15.3) - Microsoft.TestPlatform.TestHost (>= 15.3) + Microsoft.NET.Test.Sdk (15.5) + Microsoft.CodeCoverage (>= 1.0.3) + Microsoft.TestPlatform.TestHost (>= 15.5) Microsoft.NETCore.Platforms (2.0.1) - restriction: || (&& (== net40) (>= monotouch)) (&& (== net40) (>= net45)) (&& (== net40) (>= net451)) (&& (== net40) (>= net46)) (&& (== net40) (>= net461)) (&& (== net40) (>= netcoreapp2.0)) (&& (== net40) (>= netstandard1.1)) (&& (== net40) (>= netstandard1.2)) (&& (== net40) (>= netstandard1.3)) (&& (== net40) (>= netstandard1.4)) (&& (== net40) (>= netstandard1.5)) (&& (== net40) (>= netstandard1.6)) (&& (== net40) (>= netstandard2.0)) (&& (== net40) (>= uap10.0)) (&& (== net40) (>= wpa81)) (&& (== net40) (>= xamarinios)) (&& (== net40) (>= xamarinmac)) (&& (== net40) (>= xamarintvos)) (&& (== net40) (>= xamarinwatchos)) (== net45) (== net451) (== net452) - Microsoft.TestPlatform.TestHost (15.3) + Microsoft.TestPlatform.TestHost (15.5) NETStandard.Library (2.0.1) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.1)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net40) (>= monoandroid)) (&& (== net40) (>= monotouch)) (&& (== net40) (>= net45)) (&& (== net40) (>= net451)) (&& (== net40) (>= net46)) (&& (== net40) (>= net461)) (&& (== net40) (>= netcoreapp2.0)) (&& (== net40) (>= netstandard1.0)) (&& (== net40) (>= netstandard1.1)) (&& (== net40) (>= netstandard1.2)) (&& (== net40) (>= netstandard1.3)) (&& (== net40) (>= netstandard1.4)) (&& (== net40) (>= netstandard1.5)) (&& (== net40) (>= netstandard1.6)) (&& (== net40) (>= netstandard2.0)) (&& (== net40) (>= portable-net45+win8+wp8+wpa81)) (&& (== net40) (>= portable-net45+win8+wpa81)) (&& (== net40) (>= portable-net451+win81+wpa81)) (&& (== net40) (>= uap10.0)) (&& (== net40) (>= wpa81)) (&& (== net40) (>= xamarinios)) (&& (== net40) (>= xamarinmac)) (&& (== net40) (>= xamarintvos)) (&& (== net40) (>= xamarinwatchos)) (== net45) (== net451) (== net452) System.Runtime.InteropServices.RuntimeInformation (>= 4.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= net451)) (&& (== net40) (>= net46)) (&& (== net40) (>= netstandard1.1)) (&& (== net40) (>= netstandard1.2)) (&& (== net40) (>= netstandard1.3)) (&& (== net40) (>= netstandard1.4)) (&& (== net40) (>= netstandard1.5)) (&& (== net40) (>= netstandard1.6)) (&& (== net40) (>= portable-net45+win8+wpa81)) (&& (== net40) (>= portable-net451+win81+wpa81)) (&& (== net40) (>= uap10.0)) (&& (== net40) (>= wpa81)) (== net45) (== net451) (== net452) Newtonsoft.Json (10.0.3) - Octokit (0.26) + Octokit (0.28) Reactive.Streams (1.0.2) System.Collections.Immutable (1.4) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net40) (>= netstandard1.0)) (== net45) (== net451) (== net452) + System.Runtime.CompilerServices.Unsafe (4.4) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= netstandard1.6)) (== net45) (== net451) (== net452) + NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net40) (>= netstandard1.0)) (== net45) (== net451) (== net452) System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (&& (== net40) (>= net45)) (&& (== net40) (>= net451)) (&& (== net40) (>= net46)) (&& (== net40) (>= netstandard1.1)) (&& (== net40) (>= netstandard1.2)) (&& (== net40) (>= netstandard1.3)) (&& (== net40) (>= netstandard1.4)) (&& (== net40) (>= netstandard1.5)) (&& (== net40) (>= netstandard1.6)) (&& (== net40) (>= uap10.0)) (&& (== net40) (>= wpa81)) (== net45) (== net451) (== net452) - xunit (2.3.0-beta5-build3769) + xunit (2.3.1) xunit.analyzers (>= 0.7) - xunit.assert (2.3.0-beta5-build3769) - xunit.core (2.3.0-beta5-build3769) + xunit.assert (2.3.1) + xunit.core (2.3.1) xunit.abstractions (2.0.1) - xunit.analyzers (0.7) - xunit.assert (2.3.0-beta5-build3769) + xunit.analyzers (0.8) + xunit.assert (2.3.1) NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net40) (>= netstandard1.1)) (== net45) (== net451) - xunit.core (2.3.0-beta5-build3769) - xunit.extensibility.core (2.3.0-beta5-build3769) - xunit.extensibility.execution (2.3.0-beta5-build3769) - xunit.extensibility.core (2.3.0-beta5-build3769) + xunit.core (2.3.1) + xunit.extensibility.core (2.3.1) + xunit.extensibility.execution (2.3.1) + xunit.extensibility.core (2.3.1) NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net40) (>= netstandard1.1)) (== net45) (== net451) xunit.abstractions (>= 2.0.1) - restriction: || (&& (== net40) (>= netstandard1.1)) (== net45) (== net451) (== net452) - xunit.extensibility.execution (2.3.0-beta5-build3769) + xunit.extensibility.execution (2.3.1) NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net40) (>= netstandard1.1)) (== net45) (== net451) - xunit.extensibility.core (2.3.0-beta5-build3769) - restriction: || (&& (== net40) (>= netstandard1.1)) (== net45) (== net451) (== net452) - xunit.runner.console (2.3.0-beta5-build3769) - xunit.runner.visualstudio (2.3.0-beta5-build3769) + xunit.extensibility.core (2.3.1) - restriction: || (&& (== net40) (>= netstandard1.1)) (== net45) (== net451) (== net452) + xunit.runner.console (2.3.1) + xunit.runner.visualstudio (2.3.1) GITHUB remote: fsharp/FAKE - modules/Octokit/Octokit.fsx (642a01a5e17b870f816cdd7ee09115e018b786f0) + modules/Octokit/Octokit.fsx (51a7cae12acc7292db4623ae0e3cc3a2ce6ca1c9) Octokit (>= 0.20) \ No newline at end of file diff --git a/src/Akkling.Cluster.Sharding/Akkling.Cluster.Sharding.fsproj b/src/Akkling.Cluster.Sharding/Akkling.Cluster.Sharding.fsproj index 7d8509d..b51df57 100644 --- a/src/Akkling.Cluster.Sharding/Akkling.Cluster.Sharding.fsproj +++ b/src/Akkling.Cluster.Sharding/Akkling.Cluster.Sharding.fsproj @@ -87,6 +87,9 @@ + + True + ..\..\packages\Akka\lib\net45\Akka.dll True @@ -109,6 +112,9 @@ + + True + ..\..\packages\Akka.Cluster.Sharding\lib\net45\Akka.Cluster.Sharding.dll True @@ -128,6 +134,17 @@ + + + + + ..\..\packages\Akka.DistributedData\lib\net45\Akka.DistributedData.dll + True + True + + + + @@ -217,19 +234,24 @@ - + - ..\..\packages\Google.Protobuf\lib\net451\Google.Protobuf.dll + ..\..\packages\Google.Protobuf\lib\net45\Google.Protobuf.dll True True - + + + - - ..\..\packages\Google.Protobuf\lib\netstandard1.0\Google.Protobuf.dll + + True + + + ..\..\packages\Hyperion\lib\net45\Hyperion.dll True True @@ -267,6 +289,17 @@ + + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + diff --git a/src/Akkling.DistributedData/Akkling.DistributedData.fsproj b/src/Akkling.DistributedData/Akkling.DistributedData.fsproj index 4b18b9e..23afa73 100644 --- a/src/Akkling.DistributedData/Akkling.DistributedData.fsproj +++ b/src/Akkling.DistributedData/Akkling.DistributedData.fsproj @@ -78,6 +78,9 @@ + + True + ..\..\packages\Akka\lib\net45\Akka.dll True @@ -186,19 +189,10 @@ - - - - ..\..\packages\Google.Protobuf\lib\net451\Google.Protobuf.dll - True - True - - - - + - ..\..\packages\Google.Protobuf\lib\netstandard1.0\Google.Protobuf.dll + ..\..\packages\Google.Protobuf\lib\net45\Google.Protobuf.dll True True @@ -208,6 +202,9 @@ + + True + ..\..\packages\Hyperion\lib\net45\Hyperion.dll True @@ -247,6 +244,17 @@ + + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + diff --git a/src/Akkling.Persistence/Akkling.Persistence.fsproj b/src/Akkling.Persistence/Akkling.Persistence.fsproj index dfd0bf7..fbe135a 100644 --- a/src/Akkling.Persistence/Akkling.Persistence.fsproj +++ b/src/Akkling.Persistence/Akkling.Persistence.fsproj @@ -83,6 +83,9 @@ + + True + ..\..\packages\Akka\lib\net45\Akka.dll True @@ -136,19 +139,10 @@ - - - - ..\..\packages\Google.Protobuf\lib\net451\Google.Protobuf.dll - True - True - - - - + - ..\..\packages\Google.Protobuf\lib\netstandard1.0\Google.Protobuf.dll + ..\..\packages\Google.Protobuf\lib\net45\Google.Protobuf.dll True True diff --git a/src/Akkling.Persistence/AtLeastOnceDelivery.fs b/src/Akkling.Persistence/AtLeastOnceDelivery.fs index 3368fa1..a858ed3 100644 --- a/src/Akkling.Persistence/AtLeastOnceDelivery.fs +++ b/src/Akkling.Persistence/AtLeastOnceDelivery.fs @@ -51,8 +51,8 @@ type AtLeastOnceDeliverySemantic (semantic: Akka.Persistence.AtLeastOnceDelivery with | :? MaxUnconfirmedMessagesExceededException -> false /// Partial behavior responsible for handling the at-least-once-delivery semantics messages. - member __.Receive : Receive = - fun (ctx: 'Context) (msg: obj) -> + member __.Receive : Receive> = + fun (ctx: Actor) (msg: obj) -> match msg with | LifecycleEvent e -> match e with diff --git a/src/Akkling.Streams/Akkling.Streams.fsproj b/src/Akkling.Streams/Akkling.Streams.fsproj index 2c15e85..9882c0b 100644 --- a/src/Akkling.Streams/Akkling.Streams.fsproj +++ b/src/Akkling.Streams/Akkling.Streams.fsproj @@ -84,6 +84,9 @@ + + True + ..\..\packages\Akka\lib\net45\Akka.dll True diff --git a/src/Akkling.Streams/Source.fs b/src/Akkling.Streams/Source.fs index 9b10cd5..0579a28 100644 --- a/src/Akkling.Streams/Source.fs +++ b/src/Akkling.Streams/Source.fs @@ -401,12 +401,6 @@ module Source = let inline buffer (strategy: OverflowStrategy) (n: int) (source) : Source<'t, 'mat> = SourceOperations.Buffer(source, n, strategy) - /// Generic transformation of a stream with a custom processing stage. - /// This operator makes it possible to extend the flow API when there is no specialized - /// operator that performs the transformation. - let inline transform (stageFac: unit -> #IStage<'u, 't>) (source) : Source<'t, 'mat> = - SourceOperations.Transform(source, Func<_>(fun () -> upcast stageFac())) - /// Takes up to n elements from the stream and returns a pair containing a strict sequence of the taken element /// and a stream representing the remaining elements. If is zero or negative, then this will return a pair /// of an empty collection and a stream containing the whole upstream unchanged. diff --git a/src/Akkling.TestKit/Akkling.TestKit.fsproj b/src/Akkling.TestKit/Akkling.TestKit.fsproj index 1cdd5aa..f5e558c 100644 --- a/src/Akkling.TestKit/Akkling.TestKit.fsproj +++ b/src/Akkling.TestKit/Akkling.TestKit.fsproj @@ -79,6 +79,9 @@ + + True + ..\..\packages\Akka\lib\net45\Akka.dll True @@ -130,10 +133,10 @@ - + - ..\..\packages\FsCheck.Xunit\lib\net45\FsCheck.Xunit.dll + ..\..\packages\FsCheck.Xunit\lib\net452\FsCheck.Xunit.dll True True diff --git a/src/Akkling/Akkling.fsproj b/src/Akkling/Akkling.fsproj index ea88214..96ac666 100644 --- a/src/Akkling/Akkling.fsproj +++ b/src/Akkling/Akkling.fsproj @@ -89,6 +89,9 @@ + + True + ..\..\packages\Akka\lib\net45\Akka.dll True @@ -176,6 +179,9 @@ + + True + ..\..\packages\Hyperion\lib\net45\Hyperion.dll True diff --git a/src/Akkling/Props.fs b/src/Akkling/Props.fs index 333f4c3..a6f26a5 100644 --- a/src/Akkling/Props.fs +++ b/src/Akkling/Props.fs @@ -11,6 +11,7 @@ module Akkling.Props open System open Akka.Actor +open Akka.Routing open Microsoft.FSharp.Quotations open Microsoft.FSharp.Linq.QuotationEvaluation @@ -110,7 +111,7 @@ type Props<'Message> = Deploy = Some props.Deploy Dispatcher = if props.Dispatcher = Deploy.NoDispatcherGiven then None else Some props.Dispatcher Mailbox = if props.Mailbox = Deploy.NoMailboxGiven then None else Some props.Mailbox - Router = if props.RouterConfig = Akka.Routing.RouterConfig.NoRouter then None else Some props.RouterConfig + Router = if props.RouterConfig.Equals NoRouter.Instance then None else Some props.RouterConfig SupervisionStrategy = if props.SupervisorStrategy = null then None else Some props.SupervisorStrategy } @@ -120,7 +121,7 @@ type Props<'Message> = Deploy = Some props.Deploy Dispatcher = if props.Dispatcher = Deploy.NoDispatcherGiven then None else Some props.Dispatcher Mailbox = if props.Mailbox = Deploy.NoMailboxGiven then None else Some props.Mailbox - Router = if props.RouterConfig = Akka.Routing.RouterConfig.NoRouter then None else Some props.RouterConfig + Router = if props.RouterConfig.Equals NoRouter.Instance then None else Some props.RouterConfig SupervisionStrategy = if props.SupervisorStrategy = null then None else Some props.SupervisorStrategy } diff --git a/src/Akkling/Spawning.fs b/src/Akkling/Spawning.fs index fd8b23c..b182560 100644 --- a/src/Akkling/Spawning.fs +++ b/src/Akkling/Spawning.fs @@ -45,7 +45,7 @@ module System = let _ = Akka.Serialization.HyperionSerializer // I don't know why, but without this system cannot instantiate serializer let system = ActorSystem.Create(name, config.WithFallback Configuration.extendedConfig) let exprSerializer = Akkling.Serialization.ExprSerializer(system :?> ExtendedActorSystem) - system.Serialization.AddSerializer(exprSerializer) + system.Serialization.AddSerializer("ExpSerializer", exprSerializer) system.Serialization.AddSerializationMap(typeof, exprSerializer) system diff --git a/tests/Akkling.Tests/Akkling.Tests.fsproj b/tests/Akkling.Tests/Akkling.Tests.fsproj index 0d5b895..7638bd9 100644 --- a/tests/Akkling.Tests/Akkling.Tests.fsproj +++ b/tests/Akkling.Tests/Akkling.Tests.fsproj @@ -129,6 +129,9 @@ + + True + ..\..\packages\Akka\lib\net45\Akka.dll True @@ -279,10 +282,10 @@ - + - ..\..\packages\FsCheck.Xunit\lib\net45\FsCheck.Xunit.dll + ..\..\packages\FsCheck.Xunit\lib\net452\FsCheck.Xunit.dll True True @@ -301,19 +304,24 @@ - + - ..\..\packages\Google.Protobuf\lib\net451\Google.Protobuf.dll + ..\..\packages\Google.Protobuf\lib\net45\Google.Protobuf.dll True True - + + + - - ..\..\packages\Google.Protobuf\lib\netstandard1.0\Google.Protobuf.dll + + True + + + ..\..\packages\Hyperion\lib\net45\Hyperion.dll True True @@ -323,8 +331,8 @@ - - ..\..\packages\Hyperion\lib\net45\Hyperion.dll + + ..\..\packages\Microsoft.CodeCoverage\lib\netstandard1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll True True @@ -373,6 +381,17 @@ + + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + diff --git a/tests/Akkling.Tests/Api.fs b/tests/Akkling.Tests/Api.fs index 94e4654..924b6dc 100644 --- a/tests/Akkling.Tests/Api.fs +++ b/tests/Akkling.Tests/Api.fs @@ -99,7 +99,7 @@ let ``Typed actor refs are serializable/deserializable in both directions`` () : let ``Typed props are serializable/deserializable in both directions`` () : unit = testDefault <| fun tck -> let p = { (propse <@ Behaviors.echo @>) with Deploy = Some Deploy.Local; - Router = Some Akka.Routing.NoRouter.NoRouter; + Router = Some (upcast NoRouter.Instance) SupervisionStrategy = Some (SupervisorStrategy.StoppingStrategy :> SupervisorStrategy); Mailbox = Some "xyz123"; Dispatcher = Some "xyz" } diff --git a/tests/Akkling.Tests/StreamsApi.fs b/tests/Akkling.Tests/StreamsApi.fs index ffd567a..25b0fc7 100644 --- a/tests/Akkling.Tests/StreamsApi.fs +++ b/tests/Akkling.Tests/StreamsApi.fs @@ -42,7 +42,7 @@ let ``Graph DSL operators should work`` () = test config <| fun tck -> let zip1 = ZipWith.create max |> b.Add let zip2 = ZipWith.create max |> b.Add - b.From(zip1.Out) => zip2.In0 + b.From(zip1.Out) => zip2.In0 |> ignore UniformFanInShape(zip2.Out, zip1.In0, zip1.In1, zip2.In1)) @@ -68,11 +68,11 @@ let ``Graph DSL operators should work`` () = test config <| fun tck -> let s2 = Source.singleton 2 |> b.Add let s3 = Source.singleton 3 |> b.Add - b.From s1 => pm3.In(0) - b.From s2 => pm3.In(1) - b.From s3 => pm3.In(2) + b.From s1 => pm3.In(0) |> ignore + b.From s2 => pm3.In(1) |> ignore + b.From s3 => pm3.In(2) |> ignore - b.From(pm3.Out) => sink + b.From(pm3.Out) => sink |> ignore ClosedShape.Instance) |> Graph.runnable diff --git a/tests/Akkling.Tests/app.config b/tests/Akkling.Tests/app.config index 60756af..86af17a 100644 --- a/tests/Akkling.Tests/app.config +++ b/tests/Akkling.Tests/app.config @@ -18,6 +18,31 @@ + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True @@ -26,7 +51,7 @@ True - + True @@ -38,15 +63,20 @@ + + True + + + True - + True - +