Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert to Neo.Json and Neo.ConsoleService to dotnet standard 2.1 #3044

Merged
merged 45 commits into from
Jan 10, 2024
Merged

Convert to Neo.Json and Neo.ConsoleService to dotnet standard 2.1 #3044

merged 45 commits into from
Jan 10, 2024

Conversation

cschuchardt88
Copy link
Member

Change Log

  • Converted Neo.Json to dotnet standard 2.1
  • Converted Neo.ConsoleService to dotnet standard 2.1

@cschuchardt88
Copy link
Member Author

Waiting on neo-project/Neo.Cryptography.BLS12_381#6 and #3039

@Jim8y
Copy link
Contributor

Jim8y commented Dec 31, 2023

please create an issue to explain why you want to switch dotnet core to standard.

@cschuchardt88
Copy link
Member Author

cschuchardt88 commented Dec 31, 2023 •
edited
Loading

#1866 #2898 #3001 #3005

shargon
shargon reviewed Jan 4, 2024
View reviewed changes
src/Neo.CLI/Settings.cs Outdated Show resolved Hide resolved
@cschuchardt88 cschuchardt88 mentioned this pull request Jan 4, 2024
Merged
@shargon
Copy link
Member

shargon commented Jan 10, 2024

@shargon @Jim8y I am having problem converting https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ContractTaskAwaiter.cs file. I dont know the systems process to well yet. It's the last thing needed. A little help?

image

Library by library will be easier, also the description doesn't mention that neo will be changed

@cschuchardt88
Copy link
Member Author

@shargon

@vncoelho changed the title for some reason.

@vncoelho
Copy link
Member

@shargon

@vncoelho changed the title for some reason.

I changed when I reviewed and saw the console and json changes first.

If you want to change it again, but maybe better to divide the PR if there is no conflict.

@cschuchardt88
Copy link
Member Author

It would be a pain to remove all the commits i did already. But still can be done if you would like.

@vncoelho
Copy link
Member

It would be a pain to remove all the commits i did already. But still can be done if you would like.

I see that you added new commits.
Just change the tittle

@shargon
Copy link
Member

shargon commented Jan 10, 2024

It would be a pain to remove all the commits i did already. But still can be done if you would like.

It's easier to copy the current neo folder into this branch

@cschuchardt88
Copy link
Member Author

There all done. Did a git hard rest.

@vncoelho
Copy link
Member

I think this is a great choice. Otherwise the PR becomes too much big.

shargon
shargon previously approved these changes Jan 10, 2024
View reviewed changes
@shargon shargon merged commit cfffe4f into neo-project:master Jan 10, 2024
2 checks passed
@shargon shargon deleted the standard/neo branch January 10, 2024 14:36
Jim8y added a commit to Jim8y/neo that referenced this pull request Jan 12, 2024
@Jim8y
Merge branch 'master' into fix-build
c426977 
* 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
@roman-khimov roman-khimov added this to the v3.7.0 milestone Feb 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vncoelho vncoelho vncoelho left review comments

@shargon shargon shargon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.7.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@cschuchardt88 @Jim8y @vncoelho @shargon @roman-khimov