[Fix] Output Only Needed Dependencies For Plugins

.github/workflows/docker.yml

@@ -6,7 +6,6 @@ on:
 
 env:
   DOTNET_VERSION: 9.0.x
-  DIST_DIR: ./dist
 
 jobs:
   neo-cli-build:
@@ -29,16 +28,18 @@ jobs:
     - name: Build (neo-cli)
       run: |
         dotnet publish ./src/Neo.CLI \
+          --disable-parallel \
+          -m:1 \
           --framework net9.0 \
           --configuration Release \
           --runtime linux-x64 \
           --self-contained true \
-          --output ${{ env.DIST_DIR }} \
+          --output ${{ github.workspace }}/dist \
           --verbosity normal \
           -p:VersionPrefix=${{ env.APP_VERSION }} \
-          -p:RuntimeIdentifier=linux-x64 \
           -p:SelfContained=true \
           -p:IncludeNativeLibrariesForSelfExtract=false \
+          -p:RuntimeIdentifier=linux-x64 \
           -p:PublishTrimmed=false \
           -p:PublishSingleFile=true \
           -p:PublishReadyToRun=true \
@@ -54,15 +55,19 @@ jobs:
           -p:PublishReferencesDocumentationFiles=false \
           -p:GITHUB_ACTIONS=true
 
-    - name: Build (LevelDbStore)
+    - name: Build (All Plugins)
       run: |
-        dotnet build ./src/Plugins/LevelDBStore \
+        dotnet publish ./neo.sln \
+          --disable-parallel \
+          -m:1 \
           --framework net9.0 \
           --configuration Release \
           --runtime linux-x64 \
-          --output ${{ env.DIST_DIR }}/Plugins/LevelDBStore \
           --verbosity normal \
+          -p:PluginOutDir=${{ github.workspace }}/dist/Plugins \
           -p:VersionPrefix=${{ env.APP_VERSION }} \
+          -p:RuntimeIdentifier=linux-x64 \
+          -p:PublishTrimmed=false \
           -p:DebugSymbols=false \
           -p:DebugType=none \
           -p:ServerGarbageCollection=true \
@@ -72,15 +77,9 @@ jobs:
           -p:GenerateDocumentationFile=false \
           -p:PublishDocumentationFiles=false \
           -p:PublishReferencesDocumentationFiles=false \
+          -p:IncludeNativeLibrariesForSelfExtract=false \
           -p:GITHUB_ACTIONS=true
 
-    - name: Remove (junk)
-      working-directory: ${{ env.DIST_DIR }}/Plugins/LevelDBStore
-      run: |
-        rm -v -R runtimes
-        rm -v Neo*
-        rm -v $(ls *.dll | grep -v "LevelDBStore.dll")
-
     - name: Docker Login
       run: |
         docker login ghcr.io \

.github/workflows/main.yml

@@ -46,6 +46,13 @@ jobs:
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
 
+    - name: Cache NuGet packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key         : ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
+        restore-keys: ${{ runner.os }}-nuget-
+
     - name: Restore
       run: dotnet restore
 
@@ -112,20 +119,20 @@ jobs:
       run: |
         brew install leveldb
         brew install gperftools
-        dotnet build --disable-parallel -p:GITHUB_ACTIONS=true -bl:build-macos.binlog
+        dotnet build --disable-parallel -m:1 -p:GITHUB_ACTIONS=true -bl:build-macos.binlog
         dotnet test --no-build -p:GITHUB_ACTIONS=true -bl:test-macos.binlog
 
     - name: Test (windows)
       if: matrix.os == 'windows-latest'
       run: |
-        dotnet build --disable-parallel -p:GITHUB_ACTIONS=true -bl:build-windows.binlog
+        dotnet build --disable-parallel -m:1 -p:GITHUB_ACTIONS=true -bl:build-windows.binlog
         dotnet test --no-build -p:GITHUB_ACTIONS=true -bl:test-windows.binlog
 
     - name: Test for coverall
       if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get --assume-yes install libleveldb-dev librocksdb-dev
-        dotnet build --disable-parallel -p:GITHUB_ACTIONS=true -bl:build-ubuntu.binlog
+        dotnet build --disable-parallel -m:1 -p:GITHUB_ACTIONS=true -bl:build-ubuntu.binlog
         dotnet test --no-build -p:GITHUB_ACTIONS=true -p:Exclude="[Neo.UnitTests]*" -bl:test-ubuntu.binlog
 
     - uses: actions/[email protected]

.github/workflows/release.yml

@@ -43,6 +43,8 @@ jobs:
     - name: .NET Publish (neo-cli)
       run: |
         dotnet publish ./src/Neo.CLI \
+        --disable-parallel \
+        -m:1 \
         --version-suffix ${{ matrix.runtime }} \
         --framework net9.0 \
         --configuration ${{ env.CONFIGURATION }} \
@@ -69,40 +71,41 @@ jobs:
         -p:PublishReferencesDocumentationFiles=false \
         -p:GITHUB_ACTIONS=true
 
-    # Copy 'libleveldb' library file
-    - name: Native Content (neo-cli)
-      working-directory: ${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}
-      run: |
-        mv -v ./runtimes/${{ matrix.runtime }}/native/* .
-        rm -v -R runtimes
-
-    # Build the LevelDBStore plugin
-    - name: .NET Build (LevelDBStore)
+    # Build the plugins
+    - name: .NET Build (Plugins)
       run: |
-        dotnet build ./src/Plugins/LevelDBStore \
+        dotnet publish ./neo.sln \
+        --disable-parallel \
+        -m:1 \
         --version-suffix ${{ matrix.runtime }} \
         --framework net9.0 \
         --configuration ${{ env.CONFIGURATION }} \
         --runtime ${{ matrix.runtime }} \
-        --output ${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}/Plugins/LevelDBStore \
         --verbosity normal \
+        -p:PluginOutDir=${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}/Plugins \
         -p:VersionPrefix=${{ env.APP_VERSION }} \
+        -p:RuntimeIdentifier=${{ matrix.runtime }} \
+        -p:PublishTrimmed=false \
         -p:DebugSymbols=false \
         -p:DebugType=none \
         -p:ServerGarbageCollection=true \
         -p:TieredCompilation=true \
         -p:TieredCompilationQuickJitForLoops=false \
         -p:TieredPGO=true \
         -p:GenerateDocumentationFile=false \
+        -p:PublishDocumentationFiles=false \
+        -p:PublishReferencesDocumentationFiles=false \
+        -p:IncludeNativeLibrariesForSelfExtract=false \
         -p:GITHUB_ACTIONS=true
 
-    # Remove unnecessary files from the LevelDBStore plugin output
-    - name: Remove files (junk)
-      working-directory: ${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}/Plugins/LevelDBStore
-      run: |
-        rm -v -R runtimes
-        rm -v Neo*
-        rm -v $(ls *.dll | grep -v "LevelDBStore.dll") 
+    # Cache binary build files for macOS
+    - name: Cache Distribution
+      if: ${{ startsWith(matrix.runtime, 'osx') }}
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}/*
+        key: neo-${{ matrix.runtime }}
+        enableCrossOsArchive: true
 
     # Create the distribution directory
     - name: Create Distribution Directory
@@ -114,14 +117,6 @@ jobs:
       working-directory: ${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}
       run: tar -czvf ${{ env.DIST_PATH }}/neo-cli.v${{ env.APP_VERSION }}-${{ matrix.runtime }}.tar.gz .
 
-    # Create a tarball file for macOS distributions
-    - name: Cache Distribution
-      uses: actions/cache/save@v4
-      with:
-        path: ${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}/*
-        key: neo-${{ matrix.runtime }}
-        enableCrossOsArchive: true
-
     # Create a zip file for Windows distributions
     - name: Create Zip File (win)
       if: ${{ startsWith(matrix.runtime, 'win') }}
@@ -190,7 +185,7 @@ jobs:
 
   code-sign:
     needs: [build-neo-cli]
-    name: CodeSign & Publish (neo-cli) ${{ matrix.arch }}
+    name: CodeSign & Publish ${{ matrix.runtime }}
     runs-on: macos-latest
     strategy:
       matrix:
@@ -265,6 +260,7 @@ jobs:
 
           echo "Fetching list of cache key"
           cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
+          echo $cacheKeysForPR
 
           ## Setting this to not fail the workflow while deleting cache keys. 
           set +e

.neo/docker/neo-cli/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:stable-slim
 
-LABEL org.opencontainers.image.description "neo-cli -- full node, no plugins"
+LABEL org.opencontainers.image.description "Neo N3 full node with All plugins."
 
 # Install the apt-get packages
 RUN apt-get update

benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj

@@ -9,9 +9,12 @@
 
   <ItemGroup>
     <PackageReference Include="System.IO.Hashing" Version="9.0.7" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.*" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\..\src\Neo\Neo.csproj" />
     <ProjectReference Include="..\..\src\Plugins\LevelDBStore\LevelDBStore.csproj" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
 
   <ItemGroup>

benchmarks/Neo.Cryptography.MPTTrie.Benchmarks/Neo.Cryptography.MPTTrie.Benchmarks.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.*" />
   </ItemGroup>
 
   <ItemGroup>

benchmarks/Neo.Extensions.Benchmarks/Neo.Extensions.Benchmarks.csproj

@@ -8,9 +8,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.*" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Neo.Extensions\Neo.Extensions.csproj" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
 
 </Project>

benchmarks/Neo.Json.Benchmarks/Neo.Json.Benchmarks.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.*" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

benchmarks/Neo.VM.Benchmarks/Neo.VM.Benchmarks.csproj

@@ -8,11 +8,14 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.*" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Neo.Extensions\Neo.Extensions.csproj" />
     <ProjectReference Include="..\..\src\Neo.Json\Neo.Json.csproj" />
     <ProjectReference Include="..\..\src\Neo.VM\Neo.VM.csproj" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
 
 </Project>

src/Directory.Build.props

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
@@ -29,6 +28,7 @@
     <AnalysisLevel>latest</AnalysisLevel>
     <OutputPath>../../bin/$(PackageId)</OutputPath>
     <OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
+    <BuildInParallel>false</BuildInParallel>
   </PropertyGroup>
 
   <ItemGroup>

src/Neo.CLI/Neo.CLI.csproj

@@ -16,33 +16,52 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="neo.ico" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="config*.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </None>
+    <PackageReference Include="Akka" Version="1.5.46" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
+    <PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.13.0" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.7" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Neo.ConsoleService\Neo.ConsoleService.csproj" />
     <ProjectReference Include="..\Neo.Extensions\Neo.Extensions.csproj" />
     <ProjectReference Include="..\Neo\Neo.csproj" />
-    <ProjectReference Include="..\Plugins\LevelDBStore\LevelDBStore.csproj" />
-    <ProjectReference Include="..\Plugins\RocksDBStore\RocksDBStore.csproj" />
+    <ProjectReference Include="..\Neo.Json\Neo.Json.csproj" />
+    <ProjectReference Include="..\Neo.VM\Neo.VM.csproj" />
+    <ProjectReference Include="..\Neo.IO\Neo.IO.csproj" />
     <ProjectReference Include="..\Neo.Cryptography.MPTTrie\Neo.Cryptography.MPTTrie.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-      <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
+    <Content Include="neo.ico" />
   </ItemGroup>
 
-  <Target Name="MoveLevelDbForBuild" BeforeTargets="PostBuildEvent">
-    <Move SourceFiles="$(OutputPath)/LevelDBStore.dll" DestinationFolder="$(OutDir)/Plugins/LevelDBStore" />
-    <Move SourceFiles="$(OutputPath)/RocksDBStore.dll" DestinationFolder="$(OutDir)/Plugins/RocksDBStore" />
+  <ItemGroup>
+    <None Update="config*.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+
+  <Target Name="OnRunExecutable" BeforeTargets="PrepareForRun">
+    <ItemGroup>
+      <PluginFiles Include="$(MSBuildStartupDirectory)/bin/Plugins/**/*.*" />
+    </ItemGroup>
+
+    <Copy
+      SourceFiles="%(PluginFiles.Identity)"
+      DestinationFolder="$(OutDir)/Plugins/%(PluginFiles.RecursiveDir)"
+      OverwriteReadOnlyFiles="false"
+      ContinueOnError="true"
+      SkipUnchangedFiles="true" />
+
+    <Message
+        Condition=" '%(PluginFiles.Identity)' != '' "
+        Text="$(MSBuildProjectName) -> Copied '%(PluginFiles.FullPath)'"
+        Importance="high" />
   </Target>
 
 </Project>

src/Neo.Cryptography.BLS12_381/Neo.Cryptography.BLS12_381.csproj

@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Neo.Extensions\Neo.Extensions.csproj" />
+    <ProjectReference Include="..\Neo.Extensions\Neo.Extensions.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

src/Neo.Cryptography.MPTTrie/Neo.Cryptography.MPTTrie.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
@@ -8,7 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Neo\Neo.csproj" />
+    <ProjectReference Include="..\Neo.Extensions\Neo.Extensions.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Neo.IO\Neo.IO.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Neo\Neo.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>