Merge branch 'master' into release/v2.1

Author: devhawk

CHANGELOG.md

@@ -16,7 +16,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 - Creating a Java smart contract automatically targets the latest version of neow3j (per Maven Central)
 - Make use of the ms-dotnettools.vscode-dotnet-sdk extension to acquire a path to dotnet
   (instead of requiring a global installation accessible in the PATH)
-- Updated Neo Express to latest RC1 build
+- Updated Neo Express to latest RC2 build
+- Updated @cityofzion/neon-core to version 5.0.0-next.10 (latest RC2 build)
 - Outdated npm package dependencies have been updated (now using TypeScript 4, Node 14, React 17, webpack 5)
 
 ## [2.0-preview] - 2021-03-24

package-lock.json

@@ -321,7 +321,7 @@
   },
   "scripts": {
     "bundle-nxp": "npm run bundle-nxp-download && npm run bundle-nxp-extract",
-    "bundle-nxp-download": "shx rm -rf deps/nxp && shx mkdir -p deps/nxp && nwget \"https://github.com/neo-project/neo-express/releases/download/2.0.23-preview/Neo.Express.2.0.23-preview.nupkg\" -O deps/nxp/nxp.nupkg",
+    "bundle-nxp-download": "shx rm -rf deps/nxp && shx mkdir -p deps/nxp && nwget \"https://github.com/neo-project/neo-express/releases/download/2.0.32-preview/Neo.Express.2.0.32-preview.nupkg\" -O deps/nxp/nxp.nupkg",
     "bundle-nxp-extract": "cd deps/nxp && extract-zip nxp.nupkg",
     "compile": "npm run compile-ext && npm run compile-panel",
     "compile-ext": "webpack --config src/extension/webpack.config.js --mode development",
@@ -341,7 +341,7 @@
     "ms-dotnettools.vscode-dotnet-sdk"
   ],
   "devDependencies": {
-    "@cityofzion/neon-core": "^5.0.0-next.7",
+    "@cityofzion/neon-core": "^5.0.0-next.10",
     "@types/crypto-js": "^4.0.1",
     "@types/glob": "^7.1.3",
     "@types/gulp": "^4.0.7",

package.json

@@ -3,8 +3,7 @@ using System.ComponentModel;
 using System.Numerics;
 
 using Neo.SmartContract.Framework;
-using Neo.SmartContract.Framework.Services.Neo;
-using Neo.SmartContract.Framework.Services.System;
+using Neo.SmartContract.Framework.Services;
 
 namespace $_CONTRACTNAME_$
 {
@@ -26,9 +25,9 @@ namespace $_CONTRACTNAME_$
                 throw new Exception("Only positive numbers are allowed.");
             }
 
-            var tx = (Transaction) ExecutionEngine.ScriptContainer;
+            var tx = (Transaction) Runtime.ScriptContainer;
 
-            var storageMap = Storage.CurrentContext.CreateMap(MAP_NAME);
+            var storageMap = new StorageMap(Storage.CurrentContext, MAP_NAME);
 
             storageMap.Put(tx.Sender, positiveNumber);
 
@@ -39,9 +38,9 @@ namespace $_CONTRACTNAME_$
 
         public static ByteString GetNumber()
         {
-            var tx = (Transaction) ExecutionEngine.ScriptContainer;
+            var tx = (Transaction) Runtime.ScriptContainer;
 
-            var storageMap = Storage.CurrentContext.CreateMap(MAP_NAME);
+            var storageMap = new StorageMap(Storage.CurrentContext, MAP_NAME);
 
             return storageMap.Get(tx.Sender);
         }

resources/new-contract/csharp/$_CLASSNAME_$.cs.template.txt

@@ -5,15 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo.SmartContract.Framework" Version="3.0.0-rc1" />
+    <PackageReference Include="Neo.SmartContract.Framework" Version="3.0.0-rc2" />
   </ItemGroup>
 
   <Target 
-      Name="NeonBuild"
-      AfterTargets="Build"
-      Inputs="$(TargetPath)" 
-      Outputs="$(TargetDir)$(TargetName).nef;$(TargetDir)$(TargetName).nefdbgnfo;$(TargetDir)$(TargetName).manifest.json;$(TargetDir)$(TargetName).abi.json;">
-    <Exec WorkingDirectory="$(TargetDir)" Command="neon -f $(TargetFileName)"/>
+    Name="NccsBuild" 
+    AfterTargets="Build" 
+    Inputs="$(MSBuildProjectFullPath);@(Compile);" 
+    Outputs="$(TargetDir)/sc/$(TargetName).nef;$(TargetDir)/sc/$(TargetName).nefdbgnfo;$(TargetDir)/sc/$(TargetName).manifest.json;">
+    <PropertyGroup>
+      <_NccsDebugArguments Condition="'$(Configuration)'=='Debug'">--debug --no-optimize</_NccsDebugArguments>
+      <_NccsDebugArguments Condition="'$(Configuration)'!='Debug'"></_NccsDebugArguments>
+    </PropertyGroup>
+    <Exec WorkingDirectory="$(ProjectDir)" Command="nccs $(_NccsDebugArguments) $(MSBuildProjectFullPath)" />
   </Target>
 
 </Project>