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 upgrade net8.0 #896

Merged
merged 27 commits into from
Apr 5, 2024
Merged

Dotnet upgrade net8.0 #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d3c37c0
submodule
cschuchardt88 Mar 25, 2024
aed9340
Merge branch 'neo-project:master' into dotnet-upgrade
cschuchardt88 Mar 25, 2024
03af375
Upgrade `net8.0`
cschuchardt88 Mar 25, 2024
aaac6be
`github` action needed to be updated to different version.
cschuchardt88 Mar 25, 2024
a2eb63b
coverage path change
cschuchardt88 Mar 25, 2024
dd6904c
main.yml
cschuchardt88 Mar 25, 2024
9dbeda4
main.yml fixes
cschuchardt88 Mar 25, 2024
46f0ab8
Test configuration
cschuchardt88 Mar 25, 2024
8afd210
Coveralls
cschuchardt88 Mar 25, 2024
b67c8fd
fix test
cschuchardt88 Mar 25, 2024
21508db
file to `net8.0`
cschuchardt88 Mar 25, 2024
f7c1248
Update main.yml
vncoelho Mar 25, 2024
9485afa
Update main.yml
vncoelho Mar 25, 2024
692c5ab
Update main.yml
vncoelho Mar 25, 2024
da22fdb
Update main.yml
vncoelho Mar 25, 2024
16b20f1
Update main.yml
cschuchardt88 Mar 25, 2024
af0eae7
Update main.yml
cschuchardt88 Mar 25, 2024
232282a
Update global.json
cschuchardt88 Mar 25, 2024
4e1b166
Update main.yml
cschuchardt88 Mar 25, 2024
c08eecc
Update main.yml
cschuchardt88 Mar 30, 2024
0d851b7
Add `<IsTestProject>true</IsTestProject>` to projects
cschuchardt88 Mar 30, 2024
321da69
Fixed coverages
cschuchardt88 Mar 30, 2024
3b515c8
Update `neo` repo
cschuchardt88 Mar 30, 2024
6431321
Fixes
cschuchardt88 Mar 30, 2024
0d71519
fixes
cschuchardt88 Mar 30, 2024
da29890
fixes
cschuchardt88 Mar 30, 2024
60116f7
Update global.json
shargon Apr 2, 2024
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
19 changes: 9 additions & 10 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: 7.0.x
DOTNET_VERSION: 8.0.202

jobs:

Expand All @@ -26,20 +26,19 @@ jobs:
run: dotnet format --verify-no-changes --verbosity diagnostic
- name: Test
run: |
sudo apt-get --assume-yes install libleveldb-dev libsnappy-dev libc6-dev
find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild
sudo apt-get --assume-yes install libleveldb-dev
EXCLUDED_TESTS=\"[Neo]*,[Neo.IO]*,[Neo.Json]*,[Neo.VM]*,[Neo.Extensions]*,[Neo.Cryptography.BLS12_381]*\"
dotnet test tests/Neo.Network.RPC.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ -p:Exclude=${EXCLUDED_TESTS}
dotnet test tests/Neo.Plugins.RpcServer.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.json -p:Exclude=${EXCLUDED_TESTS}
dotnet test tests/Neo.Plugins.Storage.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.json -p:Exclude=${EXCLUDED_TESTS}
dotnet test tests/Neo.Cryptography.MPTTrie.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.json -p:Exclude=${EXCLUDED_TESTS}
dotnet test tests/Neo.Plugins.OracleService.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.json /p:CoverletOutputFormat=lcov -p:Exclude=${EXCLUDED_TESTS}
dotnet test ./tests/Neo.Cryptography.MPTTrie.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:Exclude=${EXCLUDED_TESTS}
dotnet test ./tests/Neo.Network.RPC.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.net8.0.json' /p:Exclude=${EXCLUDED_TESTS}
dotnet test ./tests/Neo.Plugins.OracleService.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.net8.0.json' /p:Exclude=${EXCLUDED_TESTS}
dotnet test ./tests/Neo.Plugins.RpcServer.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.net8.0.json' /p:Exclude=${EXCLUDED_TESTS}
dotnet test ./tests/Neo.Plugins.Storage.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.net8.0.json' /p:CoverletOutputFormat='lcov' /p:Exclude=${EXCLUDED_TESTS}
- name: Coveralls
uses: coverallsapp/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
format: lcov
file: ${GITHUB_WORKSPACE}/coverage/lcov.info
file: ${{ github.workspace }}/TestResults/coverage/coverage.net8.0.info

Review:
needs: Test
Expand Down Expand Up @@ -81,7 +80,7 @@ jobs:
prerelease: ${{ contains(steps.get_version.outputs.version, '-') }}
- name: Setup .NET Core
if: steps.check_tag.outputs.statusCode == '404'
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: Publish to NuGet
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>3.6.3</VersionPrefix>
<TargetFramework>net7.0</TargetFramework>
<TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Neo.Plugins</RootNamespace>
<Authors>The Neo Project</Authors>
<PackageTags>NEO;Blockchain</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.404",
"version": "8.0.202",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
2 changes: 1 addition & 1 deletion neo
Open in desktop
Submodule neo updated 42 files
+3 −3 .devcontainer/devcontainer.json
+12 −10 .github/workflows/main.yml
+1 −1 benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj
+1 −1 benchmarks/Neo.VM.Benchmarks/Neo.VM.Benchmarks.csproj
+2 −2 global.json
+1 −1 src/Directory.Build.props
+1 −1 src/Neo.CLI/Neo.CLI.csproj
+1 −1 src/Neo.ConsoleService/Neo.ConsoleService.csproj
+1 −2 src/Neo.Cryptography.BLS12_381/Neo.Cryptography.BLS12_381.csproj
+2 −2 src/Neo.Extensions/Neo.Extensions.csproj
+1 −1 src/Neo.GUI/GUI/SigningDialog.cs
+1 −1 src/Neo.GUI/Neo.GUI.csproj
+1 −1 src/Neo.IO/Neo.IO.csproj
+2 −2 src/Neo.Json/Neo.Json.csproj
+1 −1 src/Neo.VM/Neo.VM.csproj
+74 −34 src/Neo/Cryptography/Crypto.cs
+1 −0 src/Neo/Cryptography/ECC/ECPoint.cs
+32 −0 src/Neo/IO/Caching/ECDsaCache.cs
+3 −3 src/Neo/Neo.csproj
+1 −1 src/Neo/SmartContract/ApplicationEngine.Contract.cs
+9 −4 src/Neo/SmartContract/ContractState.cs
+29 −0 src/Neo/SmartContract/IInteroperableVerifiable.cs
+5 −5 src/Neo/SmartContract/Native/ContractManagement.cs
+20 −9 src/Neo/SmartContract/Native/NativeContract.cs
+22 −1 src/Neo/SmartContract/Native/NeoToken.cs
+6 −1 src/Neo/SmartContract/Native/Role.cs
+22 −3 src/Neo/SmartContract/NefFile.cs
+18 −0 src/Neo/SmartContract/StorageItem.cs
+1 −1 src/Neo/Wallets/Helper.cs
+0 −17 tests/Directory.Build.props
+12 −1 tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj
+12 −1 tests/Neo.Cryptography.BLS12_381.Tests/Neo.Cryptography.BLS12_381.Tests.csproj
+12 −1 tests/Neo.Json.UnitTests/Neo.Json.UnitTests.csproj
+2 −2 tests/Neo.UnitTests/Cryptography/ECC/UT_ECPoint.cs
+6 −6 tests/Neo.UnitTests/Cryptography/UT_Crypto.cs
+14 −3 tests/Neo.UnitTests/Neo.UnitTests.csproj
+3 −3 tests/Neo.UnitTests/SmartContract/Manifest/UT_ContractGroup.cs
+3 −0 tests/Neo.UnitTests/SmartContract/Native/UT_NeoToken.cs
+54 −42 tests/Neo.UnitTests/SmartContract/Native/UT_RoleManagement.cs
+18 −18 tests/Neo.UnitTests/SmartContract/UT_InteropService.NEO.cs
+1 −1 tests/Neo.UnitTests/SmartContract/UT_InteropService.cs
+12 −1 tests/Neo.VM.Tests/Neo.VM.Tests.csproj
2 changes: 1 addition & 1 deletion src/OracleService/OracleService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ private static async Task SendContentAsync(Uri url, string content)
private async Task SendResponseSignatureAsync(ulong requestId, byte[] txSign, KeyPair keyPair)
{
var message = Neo.Helper.Concat(keyPair.PublicKey.ToArray(), BitConverter.GetBytes(requestId), txSign);
var sign = Crypto.Sign(message, keyPair.PrivateKey, keyPair.PublicKey.EncodePoint(false)[1..]);
var sign = Crypto.Sign(message, keyPair.PrivateKey);
var param = "\"" + Convert.ToBase64String(keyPair.PublicKey.ToArray()) + "\", " + requestId + ", \"" + Convert.ToBase64String(txSign) + "\",\"" + Convert.ToBase64String(sign) + "\"";
var content = "{\"id\":" + Interlocked.Increment(ref counter) + ",\"jsonrpc\":\"2.0\",\"method\":\"submitoracleresponse\",\"params\":[" + param + "]}";

Expand Down
2 changes: 1 addition & 1 deletion src/RocksDBStore/RocksDBStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="rocksdb" Version="8.8.1.43919" />
<PackageReference Include="rocksdb" Version="8.11.3.46984" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/SQLiteWallet/SQLiteWallet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.15" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
</ItemGroup>

</Project>
15 changes: 0 additions & 15 deletions tests/Directory.Build.props
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Neo.Cryptography.MPT.Tests</RootNamespace>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\MPTTrie\MPTTrie.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
</ItemGroup>
</Project>
14 changes: 13 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,11 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Neo.Network.RPC.Tests</RootNamespace>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -18,4 +25,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
</ItemGroup>
</Project>
17 changes: 15 additions & 2 deletions tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>OracleService.Tests</PackageId>
<RootNamespace>Neo.Plugins</RootNamespace>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Akka.TestKit" Version="1.5.14" />
<PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.14" />
<PackageReference Include="Akka.TestKit" Version="1.5.18" />
<PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.18" />
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\OracleService\OracleService.csproj" />
Expand All @@ -21,4 +28,10 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
</ItemGroup>
</Project>
12 changes: 12 additions & 0 deletions tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Neo.Plugins.RpcServer.Tests</RootNamespace>
<AssemblyName>Neo.Plugins.RpcServer.Tests</AssemblyName>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\RpcServer\RpcServer.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
</ItemGroup>
</Project>
12 changes: 12 additions & 0 deletions 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,9 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Neo.Plugins.Storage.Tests</RootNamespace>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\LevelDBStore\LevelDBStore.csproj" />
<ProjectReference Include="..\..\src\RocksDBStore\RocksDBStore.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
</ItemGroup>
</Project>
Loading