From da786195cfb6d70236bb37611c37d7016bbc3aae Mon Sep 17 00:00:00 2001
From: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Date: Thu, 16 Nov 2023 17:35:38 +0800
Subject: [PATCH] v3.6.2 (#907)

---
 CHANGELOG.md                                          | 11 +++++++++++
 neo-cli/neo-cli.csproj                                |  4 ++--
 neo-gui/neo-gui.csproj                                |  2 +-
 .../Neo.ConsoleService.Tests.csproj                   |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6861acf5a..9367e9cd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+
+## [3.6.2]
+
+### Changed
+- ([#893](https://github.com/neo-project/neo-node/pull/893/)) Validate before deploy update
+- ([#904](https://github.com/neo-project/neo-node/pull/904/)) Change Cancel Scope
+- ([#902](https://github.com/neo-project/neo-node/pull/902/)) Update Dockerfile to properly enable multi platform
+
+### Added
+- ([#903](https://github.com/neo-project/neo-node/pull/903/)) add cancel command for conflict attribute
+
 ## [3.6.0]
 
 ### Changed
diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj
index 5d2d8b226..d78536549 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.6.0</Version>
+    <Version>3.6.2</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.6.0" />
+    <PackageReference Include="Neo" Version="3.6.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/neo-gui/neo-gui.csproj b/neo-gui/neo-gui.csproj
index 4b7bed834..9ff07c77b 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.6.0</Version>
+    <Version>3.6.2</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 8ad753a97..c75c71e4b 100644
--- a/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj
+++ b/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>