Revert #5180, switching back to original LightningDB packages. (#5286)

akkadotnet · Sep 27, 2021 · 084156e · 084156e
1 parent 6101fea
commit 084156e
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 67 deletions.
diff --git a/...luster/Akka.Cluster.Sharding.Tests.MultiNode/Akka.Cluster.Sharding.Tests.MultiNode.csproj b/...luster/Akka.Cluster.Sharding.Tests.MultiNode/Akka.Cluster.Sharding.Tests.MultiNode.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\..\common.props" />
 
-    <!-- Needed to resolve https://github.com/akkadotnet/akka.net/pull/5180 and https://github.com/akkadotnet/akka.net/issues/5174 -->
-    <Import Project="../lib-hack/LightningDB.targets" />
-
   <PropertyGroup>
     <AssemblyTitle>Akka.Cluster.Sharding.Tests.MultiNode</AssemblyTitle>
     <TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion);$(NetCoreTestVersion)</TargetFrameworks>

diff --git a/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj b/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <AssemblyTitle>Akka.DistributedData.LightningDB</AssemblyTitle>
     <Description>Replicated data using CRDT structures</Description>
-    <TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
+    <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
     <PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication;lightningdb;lmdb</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LightningDB.Vendored.Akka" Version="0.14.0" />
+    <PackageReference Include="LightningDB" Version="0.14.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/.../cluster/Akka.DistributedData.Tests.MultiNode/Akka.DistributedData.Tests.MultiNode.csproj b/.../cluster/Akka.DistributedData.Tests.MultiNode/Akka.DistributedData.Tests.MultiNode.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\..\common.props" />
 
-    <!-- Needed to resolve https://github.com/akkadotnet/akka.net/pull/5180 and https://github.com/akkadotnet/akka.net/issues/5174 -->
-    <Import Project="../lib-hack/LightningDB.targets" />
-
   <PropertyGroup>
     <AssemblyTitle>Akka.DistributedData.Tests.MultiNode</AssemblyTitle>
     <TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion);$(NetCoreTestVersion)</TargetFrameworks>

diff --git a/src/contrib/cluster/lib-hack/LightningDB.targets b/src/contrib/cluster/lib-hack/LightningDB.targets
diff --git a/src/contrib/cluster/lib-hack/runtimes/linux-arm/native/liblmdb.so b/src/contrib/cluster/lib-hack/runtimes/linux-arm/native/liblmdb.so
diff --git a/src/contrib/cluster/lib-hack/runtimes/linux-arm64/native/liblmdb.so b/src/contrib/cluster/lib-hack/runtimes/linux-arm64/native/liblmdb.so
diff --git a/src/contrib/cluster/lib-hack/runtimes/linux-x64/native/liblmdb.so b/src/contrib/cluster/lib-hack/runtimes/linux-x64/native/liblmdb.so
diff --git a/src/contrib/cluster/lib-hack/runtimes/osx/native/lmdb.dylib b/src/contrib/cluster/lib-hack/runtimes/osx/native/lmdb.dylib
diff --git a/src/contrib/cluster/lib-hack/runtimes/win-x64/native/lmdb.dll b/src/contrib/cluster/lib-hack/runtimes/win-x64/native/lmdb.dll
diff --git a/src/contrib/cluster/lib-hack/runtimes/win-x64/native/lmdbautoresize.dll b/src/contrib/cluster/lib-hack/runtimes/win-x64/native/lmdbautoresize.dll
diff --git a/src/contrib/cluster/lib-hack/runtimes/win-x86/native/lmdb.dll b/src/contrib/cluster/lib-hack/runtimes/win-x86/native/lmdb.dll
diff --git a/src/contrib/cluster/lib-hack/runtimes/win-x86/native/lmdbautoresize.dll b/src/contrib/cluster/lib-hack/runtimes/win-x86/native/lmdbautoresize.dll