From 1416bb986fa44ed258a7b314b3cff55c9f93af1f Mon Sep 17 00:00:00 2001
From: Shargon <shargon@gmail.com>
Date: Tue, 5 Sep 2023 12:18:52 +0200
Subject: [PATCH] Fix 3.6 (#816)

* Fix 3.6

* Update nuget

* Fix version
---
 src/DBFTPlugin/Consensus/ConsensusService.cs         |  2 +-
 src/Directory.Build.props                            |  4 ++--
 src/RocksDBStore/RocksDBStore.csproj                 |  2 +-
 src/SQLiteWallet/SQLiteWallet.csproj                 |  2 +-
 .../Neo.Cryptography.MPTTrie.Tests.csproj            |  6 ++++++
 .../Neo.Network.RPC.Tests.csproj                     | 12 +++++++++---
 .../Neo.Plugins.OracleService.Tests.csproj           | 10 ++++++++--
 .../Neo.Plugins.RpcServer.Tests.csproj               |  8 +++++++-
 .../Neo.Plugins.Storage.Tests.csproj                 |  6 ++++++
 9 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/DBFTPlugin/Consensus/ConsensusService.cs b/src/DBFTPlugin/Consensus/ConsensusService.cs
index dc8f66ff1..dcf17f84f 100644
--- a/src/DBFTPlugin/Consensus/ConsensusService.cs
+++ b/src/DBFTPlugin/Consensus/ConsensusService.cs
@@ -45,7 +45,7 @@ private class Timer { public uint Height; public byte ViewNumber; }
         /// This will be cleared every block (so it will not grow out of control, but is used to prevent repeatedly
         /// responding to the same message.
         /// </summary>
-        private readonly HashSet<UInt256> knownHashes = new HashSet<UInt256>();
+        private readonly HashSet<UInt256> knownHashes = new();
         /// <summary>
         /// This variable is only true during OnRecoveryMessageReceived
         /// </summary>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index edf759437..cc6740f46 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <VersionPrefix>3.5.0</VersionPrefix>
+    <VersionPrefix>3.6.0</VersionPrefix>
     <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
     <Authors>The Neo Project</Authors>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.5.0" />
+    <PackageReference Include="Neo" Version="3.6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj
index 4ab704d0e..d098bb8d3 100644
--- a/src/RocksDBStore/RocksDBStore.csproj
+++ b/src/RocksDBStore/RocksDBStore.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="rocksdb" Version="7.7.3.33461" />
+    <PackageReference Include="rocksdb" Version="8.3.2.39829" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SQLiteWallet/SQLiteWallet.csproj b/src/SQLiteWallet/SQLiteWallet.csproj
index 49b8de1e8..e1d77a3f1 100644
--- a/src/SQLiteWallet/SQLiteWallet.csproj
+++ b/src/SQLiteWallet/SQLiteWallet.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj b/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj
index 1b75c6025..aec30cd98 100644
--- a/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj
+++ b/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj
@@ -7,4 +7,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\MPTTrie\MPTTrie.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
 </Project>
diff --git a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj b/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj
index 03a168e92..9815f51e9 100644
--- a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj
+++ b/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Moq" Version="4.18.3" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -23,4 +23,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj b/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj
index ca84e4303..f2a836e3c 100644
--- a/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj
+++ b/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj
@@ -6,12 +6,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit" Version="1.4.46" />
-    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.4.46" />
+    <PackageReference Include="Akka.TestKit" Version="1.5.12" />
+    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.12" />
   </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\..\src\OracleService\OracleService.csproj" AdditionalProperties="IncludeSettingsFileOutput=False" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj b/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj
index 422b0ae28..6105eaf11 100644
--- a/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj
+++ b/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj
@@ -10,7 +10,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj b/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj
index c6798b71a..2cdcc8345 100644
--- a/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj
+++ b/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj
@@ -9,4 +9,10 @@
     <ProjectReference Include="..\..\src\RocksDBStore\RocksDBStore.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
+
 </Project>