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.

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

[**Part-1**] neo-module/master #3232

Merged
merged 30 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
40614dd
Moved `neo-modules` to `neo`
cschuchardt88 May 14, 2024
b1bad7c
Configured module projects
cschuchardt88 May 14, 2024
69c8ded
Configured Test Projects
cschuchardt88 May 14, 2024
5ffd0b1
Dotnet format
cschuchardt88 May 14, 2024
143db61
Update github workflow for tests
cschuchardt88 May 14, 2024
fc17bed
removed dupes in `.editorconfig`
cschuchardt88 May 14, 2024
c66a438
remove dupe file
cschuchardt88 May 14, 2024
d185b7a
Fixed waarning
cschuchardt88 May 14, 2024
0453f0a
fixed `macOS` workflow for leveldb
cschuchardt88 May 14, 2024
4e9f0d8
Added `EXCLUDED_TESTS` for `Neo.Plugins.Storage` on `macOS` and `Wind…
cschuchardt88 May 14, 2024
483c831
Fixed workflow tests for `windows`
cschuchardt88 May 14, 2024
3902acf
Fixed `char` ecsape for tests on `windows`
cschuchardt88 May 14, 2024
e354cbd
Fixed tests
cschuchardt88 May 14, 2024
71105dd
Fixed tests
cschuchardt88 May 14, 2024
e13b8a2
Apply suggestions from code review
shargon May 14, 2024
79fe63f
Apply suggestions from code review
shargon May 14, 2024
f80b145
Update .editorconfig
cschuchardt88 May 14, 2024
3289c9c
Update .editorconfig
cschuchardt88 May 14, 2024
9e3017b
Changed for @vncoelho request
cschuchardt88 May 16, 2024
cac59ae
Merge branch 'neo-module/master' of https://github.com/cschuchardt88/…
cschuchardt88 May 16, 2024
5871878
Merge branch 'master' into neo-module/master
cschuchardt88 May 16, 2024
d8fc1c4
Added @vncoelho changes
cschuchardt88 May 16, 2024
b728ef3
Merge branch 'neo-module/master' of https://github.com/cschuchardt88/…
cschuchardt88 May 16, 2024
cb014ff
Moved `RpcClient` to `src\plugins`
cschuchardt88 May 17, 2024
2144e0b
fixed rpc tests
cschuchardt88 May 18, 2024
19502d9
Merge branch 'master' into neo-module/master
shargon May 20, 2024
4db6165
Update .github/workflows/main.yml
cschuchardt88 May 20, 2024
81ad31a
Update .github/workflows/main.yml
cschuchardt88 May 20, 2024
68e4146
Update .github/workflows/main.yml
cschuchardt88 May 20, 2024
232092f
Merge branch 'master' into neo-module/master
vncoelho May 20, 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
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ spelling_exclusion_path = SpellingExclusions.dic
# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8

# XML project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2
insert_final_newline = false
cschuchardt88 marked this conversation as resolved.
Show resolved Hide resolved

# XML config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
indent_size = 2
insert_final_newline = false

# JSON files
[*.json]
indent_size = 2
insert_final_newline = false

# Powershell files
[*.ps1]
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* text eol=lf
*.cs eol=lf
*.csproj eol=lf
*.props eol=lf
vncoelho marked this conversation as resolved.
Show resolved Hide resolved
*.json eol=lf

###############################################################################
# Set default behavior for command prompt diff.
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,25 @@ jobs:
- name: Test
if: matrix.os != 'ubuntu-latest'
cschuchardt88 marked this conversation as resolved.
Show resolved Hide resolved
run: |
dotnet sln neo.sln remove ./tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj
cschuchardt88 marked this conversation as resolved.
Show resolved Hide resolved
dotnet test
- name: Test for coverall
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get --assume-yes install libleveldb-dev librocksdb-dev
shargon marked this conversation as resolved.
Show resolved Hide resolved
dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/'
dotnet test ./tests/Neo.ConsoleService.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'
dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'
dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'
dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json' /p:CoverletOutputFormat='lcov'
dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'

# Plugins
dotnet test ./tests/Neo.Cryptography.MPTTrie.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'
dotnet test ./tests/Neo.Network.RPC.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'
dotnet test ./tests/Neo.Plugins.OracleService.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'
dotnet test ./tests/Neo.Plugins.RpcServer.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json'
dotnet test ./tests/Neo.Plugins.Storage.Tests /p:CollectCoverage=true /p:CoverletOutput='${{ github.workspace }}/TestResults/coverage/' /p:MergeWith='${{ github.workspace }}/TestResults/coverage/coverage.json' /p:CoverletOutputFormat='lcov'

- name: Coveralls
if: matrix.os == 'ubuntu-latest'
uses: coverallsapp/[email protected]
Expand Down Expand Up @@ -154,24 +164,28 @@ jobs:
dotnet pack ./src/Neo.Json \
--configuration Release \
--output ./out

shargon marked this conversation as resolved.
Show resolved Hide resolved
- name : Pack (Neo.VM)
if: steps.check_tag.outputs.statusCode == '404'
run: |
dotnet pack ./src/Neo.VM \
--configuration Release \
--output ./out

shargon marked this conversation as resolved.
Show resolved Hide resolved
- name : Pack (Neo.ConsoleService)
if: steps.check_tag.outputs.statusCode == '404'
run: |
dotnet pack ./src/Neo.ConsoleService \
--configuration Release \
--output ./out

shargon marked this conversation as resolved.
Show resolved Hide resolved
- name : Pack (Neo.Cryptography.BLS12_381)
if: steps.check_tag.outputs.statusCode == '404'
run: |
dotnet pack ./src/Neo.Cryptography.BLS12_381 \
--configuration Release \
--output ./out

shargon marked this conversation as resolved.
Show resolved Hide resolved
- name: Publish to NuGet
if: steps.check_tag.outputs.statusCode == '404'
run: |
Expand Down
File renamed without changes.
File renamed without changes
15 changes: 15 additions & 0 deletions modules/ApplicationLogs/ApplicationLogs.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>Neo.Plugins.ApplicationLogs</PackageId>
<RootNamespace>Neo.Plugins</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\RpcServer\RpcServer.csproj" AdditionalProperties="IncludeSettingsFileOutput=False">
<Private>false</Private>
<ExcludeAssets>runtime</ExcludeAssets>
</ProjectReference>
</ItemGroup>
</Project>
Loading