Merged
Conversation
shargon
approved these changes
Jan 6, 2024
Jim8y
added a commit
to Jim8y/neo
that referenced
this pull request
Jan 10, 2024
* master: Fixed asp.net core project (neo-project#3067) Updated BLS12_381 (neo-project#3074) avoid nonsense exception messages. (neo-project#3063) Removed `MyGet` (neo-project#3071) Updated unit-test (neo-project#3073) add hash verification for OnImport (neo-project#3070) Make public ReadUserInput (neo-project#3068) Removed asp.net core (neo-project#3065) Enforce Line Endings in `.editorconfig` (neo-project#3060) Remove some warnings (neo-project#3057) Fixed workflow timeout-minutes (neo-project#3048) Fix: specify the error message (neo-project#3030) Removes `WebSocket`s from the network layer (neo-project#3039) set timeout for tests (neo-project#3046) Fix: Editconfig (neo-project#3023) Set project as nullable (neo-project#3042) Fix: fix equal (neo-project#3028) # Conflicts: # src/Neo.CLI/CLI/MainService.cs # src/Neo.CLI/Settings.cs # src/Neo/ProtocolSettings.cs
Jim8y
added a commit
to Jim8y/neo
that referenced
this pull request
Jan 12, 2024
* master: Made `MemoryStore` the default whithout `config.json` for `neo-cli` (neo-project#3085) Adding Devcontainer and link to codespace (neo-project#3075) Update & Consolidate nugets (neo-project#3083) Adding NNS to `neo-cli` (neo-project#3032) Add: add pull request template (neo-project#3081) Move to monorepo: Neo.Cryptography.BLS12_381 (neo-project#3077) Add: add a new verify result status code (neo-project#3076) Convert to Neo.Json and Neo.ConsoleService to `dotnet` standard 2.1 (neo-project#3044) Avoid IsExternalInit (neo-project#3079) Clean usings (neo-project#3078) Fixed asp.net core project (neo-project#3067) Updated BLS12_381 (neo-project#3074) avoid nonsense exception messages. (neo-project#3063) Removed `MyGet` (neo-project#3071) Updated unit-test (neo-project#3073) add hash verification for OnImport (neo-project#3070) Make public ReadUserInput (neo-project#3068) Removed asp.net core (neo-project#3065) Enforce Line Endings in `.editorconfig` (neo-project#3060) # Conflicts: # src/Neo.CLI/CLI/MainService.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This was forgotten in #3039
Change Log
asp.netcore@shargon @Jim8y