From 329dfbfe5546c3b1a80fe235ce31b9080f095a4b Mon Sep 17 00:00:00 2001 From: Harry Pierson Date: Mon, 2 Aug 2021 10:12:52 -0700 Subject: [PATCH] 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 --- CHANGELOG.md | 105 ++++++++++++++++++ Directory.Build.props | 2 +- blockchain-toolkit-library.sln | 4 +- eng/azure-ci.yml | 11 +- src/{bctklib-3 => bctklib}/Constants.cs | 0 .../ContractParameterParser.cs | 0 src/{bctklib-3 => bctklib}/Extensions.cs | 0 .../FileNameUtilities.cs | 0 .../bctklib.csproj} | 12 +- .../models/DebugInfo.cs | 0 .../models/ExpressChain.cs | 0 .../models/ExpressConsensusNode.cs | 0 .../models/ExpressWallet.cs | 0 .../models/ExpressWalletAccount.cs | 0 .../persistence/ByteArrayComparer.cs | 0 .../CheckpointStorageProvider.NullStore.cs | 0 .../CheckpointStorageProvider.Snapshot.cs | 0 .../CheckpointStorageProvider.Store.cs | 0 .../persistence/CheckpointStorageProvider.cs | 0 .../persistence/IDisposableStorageProvider.cs | 0 .../RocksDbStorageProvider.Snapshot.cs | 0 .../RocksDbStorageProvider.Store.cs | 0 .../persistence/RocksDbStorageProvider.cs | 0 .../smart-contract/Extensions.cs | 0 .../smart-contract/TestApplicationEngine.cs | 0 .../trace-models/FaultRecord.cs | 0 .../Formatters/ScriptFormatter.cs | 0 .../Formatters/StackItemFormatter.cs | 0 .../Formatters/StorageItemFormatter.cs | 0 .../Formatters/TraceDebugResolver.cs | 0 .../Formatters/TraceRecordFormatter.cs | 0 .../Formatters/UInt160Formatter.cs | 0 .../trace-models/ITraceDebugRecord.cs | 0 .../trace-models/LogRecord.cs | 0 .../trace-models/NotifyRecord.cs | 0 .../trace-models/ProtocolSettingsRecord.cs | 0 .../trace-models/ResultsRecord.cs | 0 .../trace-models/ScriptRecord.cs | 0 .../trace-models/StorageRecord.cs | 0 .../trace-models/TraceInteropInterface.cs | 0 .../trace-models/TraceRecord.StackFrame.cs | 0 .../trace-models/TraceRecord.cs | 0 .../ContractParameterParserTest.cs | 0 .../DebugInfoTest.cs | 2 +- .../ExpressChainTest.cs | 0 .../PersistenceTest.cs | 0 .../TraceDebugTests.cs | 0 .../_testFiles/Registrar.debug.json | 0 .../_testFiles/invalidSequencePoints.json | 0 .../_testFiles/nccs_rc3.json | 0 .../test.bctklib.csproj} | 4 +- version.json | 2 +- 52 files changed, 125 insertions(+), 17 deletions(-) create mode 100644 CHANGELOG.md rename src/{bctklib-3 => bctklib}/Constants.cs (100%) rename src/{bctklib-3 => bctklib}/ContractParameterParser.cs (100%) rename src/{bctklib-3 => bctklib}/Extensions.cs (100%) rename src/{bctklib-3 => bctklib}/FileNameUtilities.cs (100%) rename src/{bctklib-3/bctklib-3.csproj => bctklib/bctklib.csproj} (86%) rename src/{bctklib-3 => bctklib}/models/DebugInfo.cs (100%) rename src/{bctklib-3 => bctklib}/models/ExpressChain.cs (100%) rename src/{bctklib-3 => bctklib}/models/ExpressConsensusNode.cs (100%) rename src/{bctklib-3 => bctklib}/models/ExpressWallet.cs (100%) rename src/{bctklib-3 => bctklib}/models/ExpressWalletAccount.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/ByteArrayComparer.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/CheckpointStorageProvider.NullStore.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/CheckpointStorageProvider.Snapshot.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/CheckpointStorageProvider.Store.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/CheckpointStorageProvider.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/IDisposableStorageProvider.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/RocksDbStorageProvider.Snapshot.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/RocksDbStorageProvider.Store.cs (100%) rename src/{bctklib-3 => bctklib}/persistence/RocksDbStorageProvider.cs (100%) rename src/{bctklib-3 => bctklib}/smart-contract/Extensions.cs (100%) rename src/{bctklib-3 => bctklib}/smart-contract/TestApplicationEngine.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/FaultRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/Formatters/ScriptFormatter.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/Formatters/StackItemFormatter.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/Formatters/StorageItemFormatter.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/Formatters/TraceDebugResolver.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/Formatters/TraceRecordFormatter.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/Formatters/UInt160Formatter.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/ITraceDebugRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/LogRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/NotifyRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/ProtocolSettingsRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/ResultsRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/ScriptRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/StorageRecord.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/TraceInteropInterface.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/TraceRecord.StackFrame.cs (100%) rename src/{bctklib-3 => bctklib}/trace-models/TraceRecord.cs (100%) rename test/{test.bctklib-3 => test.bctklib}/ContractParameterParserTest.cs (100%) rename test/{test.bctklib-3 => test.bctklib}/DebugInfoTest.cs (99%) rename test/{test.bctklib-3 => test.bctklib}/ExpressChainTest.cs (100%) rename test/{test.bctklib-3 => test.bctklib}/PersistenceTest.cs (100%) rename test/{test.bctklib-3 => test.bctklib}/TraceDebugTests.cs (100%) rename test/{test.bctklib-3 => test.bctklib}/_testFiles/Registrar.debug.json (100%) rename test/{test.bctklib-3 => test.bctklib}/_testFiles/invalidSequencePoints.json (100%) rename test/{test.bctklib-3 => test.bctklib}/_testFiles/nccs_rc3.json (100%) rename test/{test.bctklib-3/test.bctklib-3.csproj => test.bctklib/test.bctklib.csproj} (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..2e70aa0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 4c4d052..23d82da 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,7 +15,7 @@ - 3.4.220 + 3.4.231 all diff --git a/blockchain-toolkit-library.sln b/blockchain-toolkit-library.sln index 62520d7..dd8aede 100644 --- a/blockchain-toolkit-library.sln +++ b/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 diff --git a/eng/azure-ci.yml b/eng/azure-ci.yml index 00af987..b66ab5b 100644 --- a/eng/azure-ci.yml +++ b/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)' diff --git a/src/bctklib-3/Constants.cs b/src/bctklib/Constants.cs similarity index 100% rename from src/bctklib-3/Constants.cs rename to src/bctklib/Constants.cs diff --git a/src/bctklib-3/ContractParameterParser.cs b/src/bctklib/ContractParameterParser.cs similarity index 100% rename from src/bctklib-3/ContractParameterParser.cs rename to src/bctklib/ContractParameterParser.cs diff --git a/src/bctklib-3/Extensions.cs b/src/bctklib/Extensions.cs similarity index 100% rename from src/bctklib-3/Extensions.cs rename to src/bctklib/Extensions.cs diff --git a/src/bctklib-3/FileNameUtilities.cs b/src/bctklib/FileNameUtilities.cs similarity index 100% rename from src/bctklib-3/FileNameUtilities.cs rename to src/bctklib/FileNameUtilities.cs diff --git a/src/bctklib-3/bctklib-3.csproj b/src/bctklib/bctklib.csproj similarity index 86% rename from src/bctklib-3/bctklib-3.csproj rename to src/bctklib/bctklib.csproj index dcad5fc..789a3d7 100644 --- a/src/bctklib-3/bctklib-3.csproj +++ b/src/bctklib/bctklib.csproj @@ -1,6 +1,6 @@ - neo-bctklib-3 + neo-bctklib The Neo Project The Neo Project 2015-2021 The Neo Project @@ -10,7 +10,7 @@ 9 enable ngdsea.png - Neo.BlockchainToolkit3 + Neo.BlockchainToolkit.Library MIT https://github.com/ngdenterprise/neo-blockchaintoolkit-library true @@ -27,18 +27,18 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + - + \ No newline at end of file diff --git a/src/bctklib-3/models/DebugInfo.cs b/src/bctklib/models/DebugInfo.cs similarity index 100% rename from src/bctklib-3/models/DebugInfo.cs rename to src/bctklib/models/DebugInfo.cs diff --git a/src/bctklib-3/models/ExpressChain.cs b/src/bctklib/models/ExpressChain.cs similarity index 100% rename from src/bctklib-3/models/ExpressChain.cs rename to src/bctklib/models/ExpressChain.cs diff --git a/src/bctklib-3/models/ExpressConsensusNode.cs b/src/bctklib/models/ExpressConsensusNode.cs similarity index 100% rename from src/bctklib-3/models/ExpressConsensusNode.cs rename to src/bctklib/models/ExpressConsensusNode.cs diff --git a/src/bctklib-3/models/ExpressWallet.cs b/src/bctklib/models/ExpressWallet.cs similarity index 100% rename from src/bctklib-3/models/ExpressWallet.cs rename to src/bctklib/models/ExpressWallet.cs diff --git a/src/bctklib-3/models/ExpressWalletAccount.cs b/src/bctklib/models/ExpressWalletAccount.cs similarity index 100% rename from src/bctklib-3/models/ExpressWalletAccount.cs rename to src/bctklib/models/ExpressWalletAccount.cs diff --git a/src/bctklib-3/persistence/ByteArrayComparer.cs b/src/bctklib/persistence/ByteArrayComparer.cs similarity index 100% rename from src/bctklib-3/persistence/ByteArrayComparer.cs rename to src/bctklib/persistence/ByteArrayComparer.cs diff --git a/src/bctklib-3/persistence/CheckpointStorageProvider.NullStore.cs b/src/bctklib/persistence/CheckpointStorageProvider.NullStore.cs similarity index 100% rename from src/bctklib-3/persistence/CheckpointStorageProvider.NullStore.cs rename to src/bctklib/persistence/CheckpointStorageProvider.NullStore.cs diff --git a/src/bctklib-3/persistence/CheckpointStorageProvider.Snapshot.cs b/src/bctklib/persistence/CheckpointStorageProvider.Snapshot.cs similarity index 100% rename from src/bctklib-3/persistence/CheckpointStorageProvider.Snapshot.cs rename to src/bctklib/persistence/CheckpointStorageProvider.Snapshot.cs diff --git a/src/bctklib-3/persistence/CheckpointStorageProvider.Store.cs b/src/bctklib/persistence/CheckpointStorageProvider.Store.cs similarity index 100% rename from src/bctklib-3/persistence/CheckpointStorageProvider.Store.cs rename to src/bctklib/persistence/CheckpointStorageProvider.Store.cs diff --git a/src/bctklib-3/persistence/CheckpointStorageProvider.cs b/src/bctklib/persistence/CheckpointStorageProvider.cs similarity index 100% rename from src/bctklib-3/persistence/CheckpointStorageProvider.cs rename to src/bctklib/persistence/CheckpointStorageProvider.cs diff --git a/src/bctklib-3/persistence/IDisposableStorageProvider.cs b/src/bctklib/persistence/IDisposableStorageProvider.cs similarity index 100% rename from src/bctklib-3/persistence/IDisposableStorageProvider.cs rename to src/bctklib/persistence/IDisposableStorageProvider.cs diff --git a/src/bctklib-3/persistence/RocksDbStorageProvider.Snapshot.cs b/src/bctklib/persistence/RocksDbStorageProvider.Snapshot.cs similarity index 100% rename from src/bctklib-3/persistence/RocksDbStorageProvider.Snapshot.cs rename to src/bctklib/persistence/RocksDbStorageProvider.Snapshot.cs diff --git a/src/bctklib-3/persistence/RocksDbStorageProvider.Store.cs b/src/bctklib/persistence/RocksDbStorageProvider.Store.cs similarity index 100% rename from src/bctklib-3/persistence/RocksDbStorageProvider.Store.cs rename to src/bctklib/persistence/RocksDbStorageProvider.Store.cs diff --git a/src/bctklib-3/persistence/RocksDbStorageProvider.cs b/src/bctklib/persistence/RocksDbStorageProvider.cs similarity index 100% rename from src/bctklib-3/persistence/RocksDbStorageProvider.cs rename to src/bctklib/persistence/RocksDbStorageProvider.cs diff --git a/src/bctklib-3/smart-contract/Extensions.cs b/src/bctklib/smart-contract/Extensions.cs similarity index 100% rename from src/bctklib-3/smart-contract/Extensions.cs rename to src/bctklib/smart-contract/Extensions.cs diff --git a/src/bctklib-3/smart-contract/TestApplicationEngine.cs b/src/bctklib/smart-contract/TestApplicationEngine.cs similarity index 100% rename from src/bctklib-3/smart-contract/TestApplicationEngine.cs rename to src/bctklib/smart-contract/TestApplicationEngine.cs diff --git a/src/bctklib-3/trace-models/FaultRecord.cs b/src/bctklib/trace-models/FaultRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/FaultRecord.cs rename to src/bctklib/trace-models/FaultRecord.cs diff --git a/src/bctklib-3/trace-models/Formatters/ScriptFormatter.cs b/src/bctklib/trace-models/Formatters/ScriptFormatter.cs similarity index 100% rename from src/bctklib-3/trace-models/Formatters/ScriptFormatter.cs rename to src/bctklib/trace-models/Formatters/ScriptFormatter.cs diff --git a/src/bctklib-3/trace-models/Formatters/StackItemFormatter.cs b/src/bctklib/trace-models/Formatters/StackItemFormatter.cs similarity index 100% rename from src/bctklib-3/trace-models/Formatters/StackItemFormatter.cs rename to src/bctklib/trace-models/Formatters/StackItemFormatter.cs diff --git a/src/bctklib-3/trace-models/Formatters/StorageItemFormatter.cs b/src/bctklib/trace-models/Formatters/StorageItemFormatter.cs similarity index 100% rename from src/bctklib-3/trace-models/Formatters/StorageItemFormatter.cs rename to src/bctklib/trace-models/Formatters/StorageItemFormatter.cs diff --git a/src/bctklib-3/trace-models/Formatters/TraceDebugResolver.cs b/src/bctklib/trace-models/Formatters/TraceDebugResolver.cs similarity index 100% rename from src/bctklib-3/trace-models/Formatters/TraceDebugResolver.cs rename to src/bctklib/trace-models/Formatters/TraceDebugResolver.cs diff --git a/src/bctklib-3/trace-models/Formatters/TraceRecordFormatter.cs b/src/bctklib/trace-models/Formatters/TraceRecordFormatter.cs similarity index 100% rename from src/bctklib-3/trace-models/Formatters/TraceRecordFormatter.cs rename to src/bctklib/trace-models/Formatters/TraceRecordFormatter.cs diff --git a/src/bctklib-3/trace-models/Formatters/UInt160Formatter.cs b/src/bctklib/trace-models/Formatters/UInt160Formatter.cs similarity index 100% rename from src/bctklib-3/trace-models/Formatters/UInt160Formatter.cs rename to src/bctklib/trace-models/Formatters/UInt160Formatter.cs diff --git a/src/bctklib-3/trace-models/ITraceDebugRecord.cs b/src/bctklib/trace-models/ITraceDebugRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/ITraceDebugRecord.cs rename to src/bctklib/trace-models/ITraceDebugRecord.cs diff --git a/src/bctklib-3/trace-models/LogRecord.cs b/src/bctklib/trace-models/LogRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/LogRecord.cs rename to src/bctklib/trace-models/LogRecord.cs diff --git a/src/bctklib-3/trace-models/NotifyRecord.cs b/src/bctklib/trace-models/NotifyRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/NotifyRecord.cs rename to src/bctklib/trace-models/NotifyRecord.cs diff --git a/src/bctklib-3/trace-models/ProtocolSettingsRecord.cs b/src/bctklib/trace-models/ProtocolSettingsRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/ProtocolSettingsRecord.cs rename to src/bctklib/trace-models/ProtocolSettingsRecord.cs diff --git a/src/bctklib-3/trace-models/ResultsRecord.cs b/src/bctklib/trace-models/ResultsRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/ResultsRecord.cs rename to src/bctklib/trace-models/ResultsRecord.cs diff --git a/src/bctklib-3/trace-models/ScriptRecord.cs b/src/bctklib/trace-models/ScriptRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/ScriptRecord.cs rename to src/bctklib/trace-models/ScriptRecord.cs diff --git a/src/bctklib-3/trace-models/StorageRecord.cs b/src/bctklib/trace-models/StorageRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/StorageRecord.cs rename to src/bctklib/trace-models/StorageRecord.cs diff --git a/src/bctklib-3/trace-models/TraceInteropInterface.cs b/src/bctklib/trace-models/TraceInteropInterface.cs similarity index 100% rename from src/bctklib-3/trace-models/TraceInteropInterface.cs rename to src/bctklib/trace-models/TraceInteropInterface.cs diff --git a/src/bctklib-3/trace-models/TraceRecord.StackFrame.cs b/src/bctklib/trace-models/TraceRecord.StackFrame.cs similarity index 100% rename from src/bctklib-3/trace-models/TraceRecord.StackFrame.cs rename to src/bctklib/trace-models/TraceRecord.StackFrame.cs diff --git a/src/bctklib-3/trace-models/TraceRecord.cs b/src/bctklib/trace-models/TraceRecord.cs similarity index 100% rename from src/bctklib-3/trace-models/TraceRecord.cs rename to src/bctklib/trace-models/TraceRecord.cs diff --git a/test/test.bctklib-3/ContractParameterParserTest.cs b/test/test.bctklib/ContractParameterParserTest.cs similarity index 100% rename from test/test.bctklib-3/ContractParameterParserTest.cs rename to test/test.bctklib/ContractParameterParserTest.cs diff --git a/test/test.bctklib-3/DebugInfoTest.cs b/test/test.bctklib/DebugInfoTest.cs similarity index 99% rename from test/test.bctklib-3/DebugInfoTest.cs rename to test/test.bctklib/DebugInfoTest.cs index 109c6a6..44d2463 100644 --- a/test/test.bctklib-3/DebugInfoTest.cs +++ b/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(); diff --git a/test/test.bctklib-3/ExpressChainTest.cs b/test/test.bctklib/ExpressChainTest.cs similarity index 100% rename from test/test.bctklib-3/ExpressChainTest.cs rename to test/test.bctklib/ExpressChainTest.cs diff --git a/test/test.bctklib-3/PersistenceTest.cs b/test/test.bctklib/PersistenceTest.cs similarity index 100% rename from test/test.bctklib-3/PersistenceTest.cs rename to test/test.bctklib/PersistenceTest.cs diff --git a/test/test.bctklib-3/TraceDebugTests.cs b/test/test.bctklib/TraceDebugTests.cs similarity index 100% rename from test/test.bctklib-3/TraceDebugTests.cs rename to test/test.bctklib/TraceDebugTests.cs diff --git a/test/test.bctklib-3/_testFiles/Registrar.debug.json b/test/test.bctklib/_testFiles/Registrar.debug.json similarity index 100% rename from test/test.bctklib-3/_testFiles/Registrar.debug.json rename to test/test.bctklib/_testFiles/Registrar.debug.json diff --git a/test/test.bctklib-3/_testFiles/invalidSequencePoints.json b/test/test.bctklib/_testFiles/invalidSequencePoints.json similarity index 100% rename from test/test.bctklib-3/_testFiles/invalidSequencePoints.json rename to test/test.bctklib/_testFiles/invalidSequencePoints.json diff --git a/test/test.bctklib-3/_testFiles/nccs_rc3.json b/test/test.bctklib/_testFiles/nccs_rc3.json similarity index 100% rename from test/test.bctklib-3/_testFiles/nccs_rc3.json rename to test/test.bctklib/_testFiles/nccs_rc3.json diff --git a/test/test.bctklib-3/test.bctklib-3.csproj b/test/test.bctklib/test.bctklib.csproj similarity index 92% rename from test/test.bctklib-3/test.bctklib-3.csproj rename to test/test.bctklib/test.bctklib.csproj index 48ec9b1..01c8970 100644 --- a/test/test.bctklib-3/test.bctklib-3.csproj +++ b/test/test.bctklib/test.bctklib.csproj @@ -11,7 +11,7 @@ - + @@ -22,7 +22,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/version.json b/version.json index ff0330b..606e77d 100644 --- a/version.json +++ b/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+)?$"