From 8901d89e4de6311bfcb0f0f3c2e71248eaf39c0e Mon Sep 17 00:00:00 2001
From: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Date: Tue, 5 Sep 2023 17:30:20 +0800
Subject: [PATCH] 3.6.0 (#900)

* 3.6.0

* remove Travis logo
---
 CHANGELOG.md                                             | 9 +++++++++
 README.md                                                | 3 ---
 neo-cli/config.json                                      | 3 ++-
 neo-cli/config.mainnet.json                              | 3 ++-
 neo-cli/config.testnet.json                              | 3 ++-
 neo-cli/neo-cli.csproj                                   | 4 ++--
 neo-gui/neo-gui.csproj                                   | 2 +-
 .../Neo.ConsoleService.Tests.csproj                      | 6 +++---
 8 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e17b9b12..6861acf5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+## [3.6.0]
+
+### Changed
+- ([#848](https://github.com/neo-project/neo-node/pull/848/)) Featured log
+- ([#888](https://github.com/neo-project/neo-node/pull/888/)) Update to net7.0
+- ([#891](https://github.com/neo-project/neo-node/pull/891/)) Update Dockerfile to use dotnet 7.0
+
+### Added
+- ([#895](https://github.com/neo-project/neo-node/pull/895/)) add codeql
 
 ## [3.5.0]
 
diff --git a/README.md b/README.md
index 42c938359..001338854 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,6 @@
 </p>
 
 <p align="center">      
-  <a href="https://travis-ci.org/neo-project/neo-node">
-    <img src="https://travis-ci.org/neo-project/neo-node.svg?branch=master" alt="Current TravisCI build status.">
-  </a>
   <a href="https://github.com/neo-project/neo-node/blob/master/LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License">
   </a>
diff --git a/neo-cli/config.json b/neo-cli/config.json
index 53523ae0d..6c9423ed0 100644
--- a/neo-cli/config.json
+++ b/neo-cli/config.json
@@ -30,7 +30,8 @@
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
     "Hardforks": {
-      "HF_Aspidochelone": 1730000
+      "HF_Aspidochelone": 1730000,
+      "HF_Basilisk": 4120000
     },
     "InitialGasDistribution": 5200000000000000,
     "ValidatorsCount": 7,
diff --git a/neo-cli/config.mainnet.json b/neo-cli/config.mainnet.json
index 53523ae0d..6c9423ed0 100644
--- a/neo-cli/config.mainnet.json
+++ b/neo-cli/config.mainnet.json
@@ -30,7 +30,8 @@
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
     "Hardforks": {
-      "HF_Aspidochelone": 1730000
+      "HF_Aspidochelone": 1730000,
+      "HF_Basilisk": 4120000
     },
     "InitialGasDistribution": 5200000000000000,
     "ValidatorsCount": 7,
diff --git a/neo-cli/config.testnet.json b/neo-cli/config.testnet.json
index 7408f897c..1d118016a 100644
--- a/neo-cli/config.testnet.json
+++ b/neo-cli/config.testnet.json
@@ -30,7 +30,8 @@
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
     "Hardforks": {
-      "HF_Aspidochelone": 210000
+      "HF_Aspidochelone": 210000,
+      "HF_Basilisk": 2680000
     },
     "InitialGasDistribution": 5200000000000000,
     "ValidatorsCount": 7,
diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj
index 331b60d8b..5d2d8b226 100644
--- a/neo-cli/neo-cli.csproj
+++ b/neo-cli/neo-cli.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Copyright>2016-2023 The Neo Project</Copyright>
     <AssemblyTitle>Neo.CLI</AssemblyTitle>
-    <Version>3.5.0</Version>
+    <Version>3.6.0</Version>
     <Authors>The Neo Project</Authors>
     <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>neo-cli</AssemblyName>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.5.0" />
+    <PackageReference Include="Neo" Version="3.6.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/neo-gui/neo-gui.csproj b/neo-gui/neo-gui.csproj
index 05c2bcc46..4b7bed834 100644
--- a/neo-gui/neo-gui.csproj
+++ b/neo-gui/neo-gui.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Copyright>2016-2023 The Neo Project</Copyright>
     <AssemblyTitle>Neo.GUI</AssemblyTitle>
-    <Version>3.5.0</Version>
+    <Version>3.6.0</Version>
     <Authors>The Neo Project</Authors>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
diff --git a/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj b/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj
index 65c0300d1..8ad753a97 100644
--- a/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj
+++ b/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>