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

dotnet 5.0 #407

Merged
merged 38 commits into from
Dec 22, 2020
Merged

dotnet 5.0 #407

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4b18582
Merge pull request #4 from neo-project/master
Oct 13, 2020
330b158
Merge pull request #5 from neo-project/master
Oct 15, 2020
120f52c
Merge pull request #6 from neo-project/master
Oct 21, 2020
c7997a9
fixed-bug-1021
Oct 21, 2020
7c9f02b
Update src/RpcServer/RpcServer.SmartContract.cs
shargon Oct 21, 2020
1079aa3
😂
Oct 21, 2020
9852652
Merge pull request #7 from neo-project/master
Nov 6, 2020
9b26f9b
Merge pull request #8 from neo-project/master
Nov 16, 2020
6828062
Object reference not set to an instance of an object.
Nov 16, 2020
a59d9ae
Merge pull request #9 from neo-project/master
Nov 23, 2020
938312a
a
Nov 23, 2020
eab56dd
Upgrade target framework.
Nov 23, 2020
b53daab
Update main.yml
Nov 23, 2020
80b92da
Update main.yml
Nov 23, 2020
daebefe
Merge branch 'master' into net5
Nov 23, 2020
4a73e92
update
Nov 23, 2020
ab53cde
update
Nov 23, 2020
4ca3610
update
Nov 23, 2020
512aefc
Merge branch 'master' into net5
superboyiii Nov 25, 2020
19866ff
Merge pull request #14 from neo-project/master
Nov 25, 2020
6dd0c37
[RpcServer] Querying contracts by ID/name (#378)
Nov 26, 2020
c7d1961
MPT in StateService from core (#410)
Nov 27, 2020
0799d85
Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal (#413)
superboyiii Nov 27, 2020
b522dce
Fixed UT (Neo CI01089) (#416)
Dec 2, 2020
bd80d9e
Nep17 (#412)
Dec 7, 2020
3f1e022
a
Dec 17, 2020
0cb8a83
merge
Dec 17, 2020
f05644f
clear
Dec 17, 2020
615b974
Transfer bug fix (#429)
Dec 17, 2020
33141c1
Preview4 (#430)
superboyiii Dec 18, 2020
43afead
Merge branch 'origin3' into net5
Dec 22, 2020
c5af4ea
Merge pull request #22 from neo-project/master
chenzhitong Dec 22, 2020
0e490b0
Merge branch 'origin3' into net5
Dec 22, 2020
ae42b94
CI01122
erikzhang Dec 22, 2020
c777eba
Keep up to date with neo
Dec 22, 2020
37aab2a
merge
Dec 22, 2020
350ae19
1122
Dec 22, 2020
550d38e
Update Directory.Build.props
erikzhang Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:

env:
DOTNET_VERSION: 3.1.100
DOTNET_VERSION: 5.0.100

jobs:

Expand All @@ -21,8 +21,8 @@ jobs:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: Check format
run: |
dotnet tool install --version 3.2.111002 --tool-path ./ dotnet-format --add-source https://dotnet.myget.org/F/format/api/v3/index.json
./dotnet-format --check --dry-run -v diagnostic
dotnet tool install --version 5.0.142902 --tool-path ./ dotnet-format --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
./dotnet-format . --check -v diagnostic
- name: Test
run: |
sudo apt-get --assume-yes install libleveldb-dev libsnappy-dev libc6-dev
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props → Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<VersionPrefix>3.0.0</VersionPrefix>
<VersionSuffix>preview3</VersionSuffix>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>Neo.Plugins</RootNamespace>
<Authors>The Neo Project</Authors>
<PackageTags>NEO;Blockchain</PackageTags>
Expand Down
1 change: 0 additions & 1 deletion tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>Neo.Network.RPC.Tests</RootNamespace>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace>Neo.Plugins.Storage.Tests</RootNamespace>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down