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

[Fix] Plugins Output Files #3723

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[Fix] Plugins Output Files #3723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fef1b2d
Fixed Plugins
cschuchardt88 Feb 7, 2025
85e139e
Fixed github builds
cschuchardt88 Feb 7, 2025
8538508
fix
cschuchardt88 Feb 7, 2025
6ae07a7
Merge branch 'master' into fix/plugins-output
cschuchardt88 Feb 7, 2025
344e050
Merge `neo/master` Into `this`
cschuchardt88 Feb 13, 2025
e861759
fixes
cschuchardt88 Feb 13, 2025
3778dd0
revert some changes
cschuchardt88 Feb 13, 2025
f984104
Merge branch 'master' into fix/plugins-output
cschuchardt88 Feb 14, 2025
ed629c1
Merge branch 'master' into fix/plugins-output
shargon Feb 15, 2025
44cce8c
Merge branch 'master' into fix/plugins-output
cschuchardt88 Feb 15, 2025
70b8292
Merge branch 'master' into fix/plugins-output
cschuchardt88 Feb 18, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
working-directory: ${{ env.OUTPUT_PATH }}/${{ matrix.runtime }}/Plugins/LevelDBStore
run: |
rm -v -R runtimes
rm -v Neo*
rm -v *.pdb

# Create the distribution directory
- name: Create Distribution Directory
Expand Down
8 changes: 6 additions & 2 deletions src/Neo.CLI/Neo.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@
</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" />
<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="rocksdb" Version="9.7.3.54622" />
<PackageReference Include="NeoFS.API" Version="3.5.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are included because they're dependencies for plugins.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't add all the dependencies, this break the plugin's idea... we need a different solution

Copy link
Member Author

@cschuchardt88 cschuchardt88 Feb 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have see below in neo-cli that is a dependency for RcpServer to work. I can just remove these lines and deployment would be the same.

  <ItemGroup>
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
  </ItemGroup>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't add all the dependencies, this break the plugin's idea... we need a different solution

I am also in agreement with @shargon

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well Ill plugins class so this isn't an issue.

</ItemGroup>

<Target Name="MoveLevelDbForBuild" BeforeTargets="PostBuildEvent">
Expand Down
6 changes: 4 additions & 2 deletions src/Plugins/ApplicationLogs/ApplicationLogs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
</PropertyGroup>

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

Expand All @@ -25,3 +26,4 @@
<InternalsVisibleTo Include="$(PackageId).Tests" />
</ItemGroup>
</Project>

4 changes: 3 additions & 1 deletion src/Plugins/DBFTPlugin/DBFTPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj" />
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj">
<Private>false</Private>
</ProjectReference>
</ItemGroup>

<ItemGroup>
Expand Down
21 changes: 20 additions & 1 deletion src/Plugins/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,31 @@
<Import Project="../$(MSBuildThisFile)" />

<PropertyGroup>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<GenerateDependencyFile>false</GenerateDependencyFile>
<EnableDynamicLoading>true</EnableDynamicLoading>
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="../../Neo/Neo.csproj" />
<ProjectReference Include="../../Neo/Neo.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="../../Neo.IO/Neo.IO.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="../../Neo.Extensions/Neo.Extensions.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="../../Neo.Cryptography.BLS12_381/Neo.Cryptography.BLS12_381.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\..\Neo.Json\Neo.Json.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\..\Neo.VM\Neo.VM.csproj">
<Private>false</Private>
</ProjectReference>
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions src/Plugins/OracleService/OracleService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj" />
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\RpcServer\RpcServer.csproj">
<Private>false</Private>
<ExcludeAssets>runtime</ExcludeAssets>
</ProjectReference>
</ItemGroup>

Expand Down
4 changes: 0 additions & 4 deletions src/Plugins/RpcClient/RpcClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Neo\Neo.csproj" />
</ItemGroup>

</Project>
12 changes: 9 additions & 3 deletions src/Plugins/StateService/StateService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj" />
<ProjectReference Include="..\MPTTrie\MPTTrie.csproj" />
<ProjectReference Include="..\RpcServer\RpcServer.csproj" />
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\MPTTrie\MPTTrie.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\RpcServer\RpcServer.csproj">
<Private>false</Private>
</ProjectReference>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Plugins/StorageDumper/StorageDumper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj" />
<ProjectReference Include="..\..\Neo.ConsoleService\Neo.ConsoleService.csproj">
<Private>false</Private>
</ProjectReference>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Plugins/TokensTracker/TokensTracker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\RpcServer\RpcServer.csproj" />
<ProjectReference Include="..\RpcServer\RpcServer.csproj">
<Private>false</Private>
</ProjectReference>
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion tests/Neo.VM.Tests/Neo.VM.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Neo.VM\Neo.VM.csproj" />
<ProjectReference Include="..\..\src\Neo.VM\Neo.VM.csproj">
<Private>true</Private>
</ProjectReference>
</ItemGroup>

<ItemGroup>
Expand All @@ -21,4 +23,8 @@
<PackageReference Include="MSTest" Version="3.7.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Remove="..\..\src\Neo\Neo.csproj" />
</ItemGroup>

</Project>