Merge branch 'master' into Blockchain-display

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

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>

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>

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>