Skip to content

Commit

Permalink
Merge branch 'dev' into wiretap-combinator
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaronontheweb authored Nov 1, 2021
2 parents 7c66035 + fd458b6 commit 8424825
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,7 @@ namespace Akka.Streams
}
public class StreamDetachedException : System.Exception
{
public static readonly Akka.Streams.StreamDetachedException Instance;
public StreamDetachedException() { }
public StreamDetachedException(string message) { }
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="FsCheck.Xunit" Version="$(FsCheckVersion)" />
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="Fsharp.Core" Version="5.0.2" />
<PackageReference Include="Fsharp.Core" Version="6.0.1" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
2 changes: 1 addition & 1 deletion src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="5.0.2" />
<PackageReference Include="FSharp.Core" Version="6.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion src/core/Akka.FSharp/Akka.FSharp.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="FSharp.Quotations.Evaluator" Version="2.1.0" />
<PackageReference Include="FsPickler" Version="5.3.2" />
<PackageReference Include="FSharp.Core" Version="5.0.2" />
<PackageReference Include="FSharp.Core" Version="6.0.1" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
5 changes: 5 additions & 0 deletions src/core/Akka.Streams/StreamTcpException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ protected StreamTcpException(SerializationInfo info, StreamingContext context) :
/// </summary>
public class StreamDetachedException : Exception
{
/// <summary>
/// Initializes a single instance of the <see cref="StreamDetachedException"/> class.
/// </summary>
public static readonly StreamDetachedException Instance = new StreamDetachedException();

public StreamDetachedException()
: this("Stream is terminated. Materialized value is detached.")
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="FsCheck.Xunit" Version="$(FsCheckVersion)" />
<PackageReference Include="Fsharp.Core" Version="5.0.2" />
<PackageReference Include="Fsharp.Core" Version="6.0.1" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down

0 comments on commit 8424825

Please sign in to comment.