Skip to content

Commit

Permalink
Merge pull request #3003 from Aaronontheweb/fix-2976-hyperion
Browse files Browse the repository at this point in the history
fix Akka.Serialization.Hyperion dependency
  • Loading branch information
Danthar authored Aug 18, 2017
2 parents 07129ec + 0ee351b commit 520c0f3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Hyperion" version="0.9.5" />
<PackageReference Include="Hyperion" version="0.9.6" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="reference.conf" />
<PackageReference Include="Hyperion" Version="0.9.5" />
<PackageReference Include="Hyperion" Version="0.9.6" />
<ProjectReference Include="..\..\..\core\Akka\Akka.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public HyperionSerializer(ExtendedActorSystem system, HyperionSerializerSettings
preserveObjectReferences: settings.PreserveObjectReferences,
versionTolerance: settings.VersionTolerance,
surrogates: new[] { akkaSurrogate },
knownTypes: provider.GetKnownTypes()));
knownTypes: provider.GetKnownTypes(),
ignoreISerializable:true));
}

/// <summary>
Expand Down

0 comments on commit 520c0f3

Please sign in to comment.