From c21db88260c0b2bacd15a35fd20c41468e8cc942 Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Fri, 4 Oct 2019 18:09:42 -0500
Subject: [PATCH] Upgrade to Hyperion v0.9.9 (#3960)

* upgraded to Hyperion v0.9.9

* force Hyperion specs to run

* force DData to run

* removed v1.3.0-era cruft
---
 src/common.props                                                | 2 +-
 .../cluster/Akka.DistributedData/Akka.DistributedData.csproj    | 1 -
 .../Akka.Serialization.Hyperion.csproj                          | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common.props b/src/common.props
index d9b5639c068..c271b89a48e 100644
--- a/src/common.props
+++ b/src/common.props
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <XunitVersion>2.3.1</XunitVersion>
     <TestSdkVersion>15.9.0</TestSdkVersion>
-    <HyperionVersion>0.9.8</HyperionVersion>
+    <HyperionVersion>0.9.9</HyperionVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
     <NBenchVersion>1.2.2</NBenchVersion>
     <ProtobufVersion>3.9.1</ProtobufVersion>
diff --git a/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj b/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj
index 078bab4bcca..6207388139b 100644
--- a/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj
+++ b/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj
@@ -8,7 +8,6 @@
     <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
     <PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj b/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj
index c8c99e51230..58fb049ed54 100644
--- a/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj
+++ b/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj
@@ -18,6 +18,8 @@
     <PackageReference Include="System.Runtime" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkLibVersion)' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>