Merge branch 'dev' into feature/persistence-testkit

akkadotnet · Aug 13, 2019 · 17ac3b3 · 17ac3b3
2 parents e32dfff + 826194d
commit 17ac3b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/common.props b/src/common.props
@@ -12,8 +12,8 @@
     <XunitVersion>2.3.1</XunitVersion>
     <TestSdkVersion>15.9.0</TestSdkVersion>
     <HyperionVersion>0.9.8</HyperionVersion>
+    <NewtonsoftJsonVersion>12.0.2</NewtonsoftJsonVersion>
     <NBenchVersion>1.2.2</NBenchVersion>
-    <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
     <NetCoreTestVersion>netcoreapp2.1</NetCoreTestVersion>
     <NetFrameworkTestVersion>net461</NetFrameworkTestVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>

diff --git a/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec.template b/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec.template
@@ -15,7 +15,7 @@
     <tags>akka actors actor model Akka concurrency</tags>
   </metadata>
   <files>
-    <file src="bin\Release\net461\win7-x64\publish\*.*" target="lib\net452\" />
-    <file src="bin\Release\netcoreapp2.1\win7-x64\publish\*.*" target="lib\netcoreapp1.1\" />
+    <file src="bin\Release\net461\win7-x64\publish\*.*" target="lib\net461\" />
+    <file src="bin\Release\netcoreapp2.1\win7-x64\publish\*.*" target="lib\netcoreapp2.1\" />
   </files>
 </package>