devhawk/updates (#40)

* update dependencies

* rename projects and core package

* add changelog

* update version to 3.0

* update changelog

* fix changelog wording

* fix ci build YAML for directory renames

* Fix pack command + $(dotNetSdkVersion) variable

Co-authored-by: Harry <[email protected]>

CHANGELOG.md

@@ -0,0 +1,105 @@
+# Neo Blockchain Toolkit Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+This project uses [NerdBank.GitVersioning](https://github.com/dotnet/Nerdbank.GitVersioning)
+to manage version numbers. This tool automatically sets the Semantic Versioning Patch
+value based on the [Git height](https://github.com/dotnet/Nerdbank.GitVersioning#what-is-git-height)
+of the commit that generated the build. As such, released versions of this package
+will not have contiguous patch numbers. Initial major and minor releases will be documented
+in this file without a patch number. Patch version will be included for bug fixes, but
+may not exactly match a publicly released version.
+
+## [3.0] - 2021-08-02
+
+### Changed
+
+* Neo N3 release support
+* Bumped major version to 3 for consistency with Neo N3 release
+* Changed package name from Neo.BlockchainToolkit3 to Neo.BlockchainToolkit.Library
+
+## [1.0.56-preview] - 2021-07-21
+
+### Changed
+
+* Neo N3 RC4 support
+* Update trace models (#34)
+
+### Fixed
+
+* correctly update immutable tracking map (#37)
+* move read array/map header out of for loop in StackItemFormatter.Deserialize (#38)
+* support empty string param in TrimStartDirectorySeparators (f271ac0e745cc2da00f59452364ce90aaa04d260)
+* Ensure operation field is not null (#39)
+
+
+## [1.0.51-preview] - 2021-06-15
+
+### Changed
+
+* Update GitHub + Azure Pipeline Build files
+
+### Fixed
+
+* Create test transactions for TestApplicationEngine (#33)
+
+## [1.0.47-preview] - 2021-06-06
+
+### Fixed
+
+* Cross Platform Path Handling (#31)
+
+## [1.0.46-preview] - 2021-06-04
+
+### Changed
+
+* Neo N3 RC3 support
+
+### Fixed
+
+* Handle sequence points with negative document index values (#27)
+* Resolve Slot Indexes when loading debug info (#28)
+* Work around https://github.com/neo-project/neo-devpack-dotnet/issues/637 (#29)
+
+## [1.0.42-preview] - 2021-05-17
+
+### Added
+
+* file:// URI support (#17)
+* Debug Info Static Variables (#21)
+* added ProtocolSettingsRecord (#22)
+* support optional explicit slot indexes (#25)
+
+### Fixed
+
+* ensure length before accessing string char by index + test (#16) fixes https://github.com/neo-project/neo-express/issues/136
+
+## [1.0.34-preview] - 2021-05-04
+
+### Changed
+
+* Neo N3 RC2 support
+
+### Added
+
+* Debug Info Parsing
+* Disassembly Helper Methods (`EnumerateInstructions`, `GetOperandString` and `GetComment`)
+
+## [1.0.28-preview] - 2021-03-18
+
+### Changed
+
+* Neo N3 RC1 support
+
+## [1.0.9-preview] - 2021-02-08
+
+### Changed
+
+* Neo 3 Preview 5 support
+
+## [0.4.67-preview] - 2020-12-28
+
+Initial Release

Directory.Build.props

@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning">
-      <Version>3.4.220</Version>
+      <Version>3.4.231</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

blockchain-toolkit-library.sln

@@ -5,11 +5,11 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E0E95C85-6FA9-43D8-BD96-6E022F628C0D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bctklib-3", "src\bctklib-3\bctklib-3.csproj", "{B223299A-B83B-4D16-98EB-6A12CE940386}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bctklib", "src\bctklib\bctklib.csproj", "{B223299A-B83B-4D16-98EB-6A12CE940386}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{91A23DE6-FADC-42AB-8266-898C6445BAB1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.bctklib-3", "test\test.bctklib-3\test.bctklib-3.csproj", "{85ED10D1-DBC5-44D8-A76D-A3A296257FC8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.bctklib", "test\test.bctklib\test.bctklib.csproj", "{85ED10D1-DBC5-44D8-A76D-A3A296257FC8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

eng/azure-ci.yml

@@ -2,6 +2,8 @@ variables:
   isMasterBranch: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
   isReleaseBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')]
   azureArtifactsBranch: $[or(eq(variables.isMasterBranch, true), eq(variables.isReleaseBranch, true))]
+  dotNetSdkVersion: '5.0.x'
+
 
 trigger:
   batch: false
@@ -37,11 +39,12 @@ stages:
     - script: |
         sudo apt-get update
         sudo apt-get install libsnappy-dev libc6-dev librocksdb-dev -y
+      displayName: 'install rocksdb dependencies (ubuntu only)'
       condition: startsWith(variables['image'], 'ubuntu-')
     - task: UseDotNet@2
       inputs:
         packageType: 'sdk'
-        version: '5.0.x'
+        version: $(dotNetSdkVersion)
     - task: DotNetCoreCLI@2
       displayName: 'dotnet build'
       inputs:
@@ -53,7 +56,7 @@ stages:
       displayName: 'dotnet test'
       inputs:
         command: 'test'
-        projects: 'test/test.bctklib-3/test.bctklib-3.csproj'
+        projects: 'test/**/*.csproj'
         arguments: '-c $(buildConfiguration) --no-build --collect:"XPlat Code Coverage" /p:CoverletOutputFormat=cobertura /p:CoverletOutput=$(Build.SourcesDirectory)/TestResults/Coverage/'
   - job: publish
     dependsOn: build
@@ -65,12 +68,12 @@ stages:
     - task: UseDotNet@2
       inputs:
         packageType: 'sdk'
-        version: '5.0.x'
+        version: $(dotNetSdkVersion)
     - task: DotNetCoreCLI@2
       displayName: 'dotnet pack'
       inputs:
         command: 'pack'
-        packagesToPack: 'src/bctklib-3/bctklib-3.csproj'
+        packagesToPack: 'src/bctklib/bctklib.csproj'
         includesymbols: true
         versioningScheme: 'off'
     - publish: '$(Build.ArtifactStagingDirectory)'

src/bctklib-3/bctklib-3.csproj → src/bctklib/bctklib.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <AssemblyName>neo-bctklib-3</AssemblyName>
+    <AssemblyName>neo-bctklib</AssemblyName>
     <Authors>The Neo Project</Authors>
     <Company>The Neo Project</Company>
     <Copyright>2015-2021 The Neo Project</Copyright>
@@ -10,7 +10,7 @@
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
     <PackageIcon>ngdsea.png</PackageIcon>
-    <PackageId>Neo.BlockchainToolkit3</PackageId>
+    <PackageId>Neo.BlockchainToolkit.Library</PackageId>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/ngdenterprise/neo-blockchaintoolkit-library</PackageProjectUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -27,18 +27,18 @@
     <None Include="../ngdsea.png" Pack="true" Visible="false" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <InternalsVisibleTo Include="test.bctklib-3" />
+    <InternalsVisibleTo Include="test.bctklib" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="InternalsVisibleTo.MSBuild" Version="1.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MessagePack" Version="2.2.113" />
+    <PackageReference Include="MessagePack" Version="2.3.75" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Neo" Version="3.0.0-rc4" />
+    <PackageReference Include="Neo" Version="3.0.0" />
     <PackageReference Include="OneOf" Version="3.0.190" />
     <PackageReference Include="rocksdb" Version="6.19.3.19494" />
-    <PackageReference Include="System.IO.Abstractions" Version="13.2.41" />
+    <PackageReference Include="System.IO.Abstractions" Version="13.2.43" />
   </ItemGroup>
 </Project>

test/test.bctklib-3/DebugInfoTest.cs → test/test.bctklib/DebugInfoTest.cs

@@ -268,7 +268,7 @@ static string GetResource(string name)
         {
             var assembly = typeof(DebugInfoTest).Assembly;
             using var resource = assembly.GetManifestResourceStream(name)
-                ?? assembly.GetManifestResourceStream($"test.bctklib-3._testFiles.{name}")
+                ?? assembly.GetManifestResourceStream($"test.bctklib._testFiles.{name}")
                 ?? throw new FileNotFoundException();
             using var streamReader = new System.IO.StreamReader(resource);
             return streamReader.ReadToEnd();

test/test.bctklib-3/test.bctklib-3.csproj → test/test.bctklib/test.bctklib.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\bctklib-3\bctklib-3.csproj" />
+    <ProjectReference Include="..\..\src\bctklib\bctklib.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -22,7 +22,7 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Nito.Disposables" Version="2.2.0" />
-    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.41" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.43" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-preview",
+  "version": "3.0-preview",
   "publicReleaseRefSpec": [
     "^refs/heads/master$",
     "^refs/heads/release/v\\d+(?:\\.\\d+)?$"