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

[Maintenance] Project File Normalization #3715

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

[Maintenance] Project File Normalization #3715

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
a237c09
Fixed `project` files
cschuchardt88 Feb 5, 2025
464ed47
Merge branch 'master' into fix/neo-projects
shargon Feb 6, 2025
10b9f15
Update src/Plugins/Directory.Build.props
cschuchardt88 Feb 6, 2025
70e51b6
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 6, 2025
4a22173
revert
cschuchardt88 Feb 6, 2025
14270c5
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 9, 2025
e8d116a
Update .gitattributes
cschuchardt88 Feb 9, 2025
bb0e462
Merge branch 'master' into fix/neo-projects
shargon Feb 10, 2025
24a2ff6
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 11, 2025
020b96f
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 12, 2025
806c85c
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 13, 2025
dee7da6
add environment variable for nuget.yml
cschuchardt88 Feb 13, 2025
01e1c36
Added `<OptimizeImplicitlyTriggeredBuild>true</OptimizeImplicitlyTrig…
cschuchardt88 Feb 13, 2025
b80f4fc
Fix
cschuchardt88 Feb 13, 2025
0e45194
Revert "Fix"
cschuchardt88 Feb 13, 2025
a4af9a0
Revert "add environment variable for nuget.yml"
cschuchardt88 Feb 13, 2025
b0daeb3
Add `nuget.yml` changes from @shargon
cschuchardt88 Feb 13, 2025
83978f9
Merge branch 'master' into fix/neo-projects
shargon Feb 13, 2025
ffa3d84
Merge branch 'master' into fix/neo-projects
shargon Feb 13, 2025
a0498d1
fix filename
cschuchardt88 Feb 14, 2025
cce6253
Delete NuGet.Config
cschuchardt88 Feb 14, 2025
63ae111
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 14, 2025
6bdfc41
Merge branch 'master' into fix/neo-projects
shargon Feb 14, 2025
247e04e
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 15, 2025
70c6a00
Update src/Plugins/Directory.Build.props
Jim8y Feb 16, 2025
063f1bb
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 17, 2025
acac5df
Merge branch 'master' into fix/neo-projects
cschuchardt88 Feb 19, 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
5 changes: 3 additions & 2 deletions .github/workflows/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
env:
DOTNET_VERSION: 9.0.x
CONFIGURATION: Release
NEO_NUGET_DIR: ./pkgs

jobs:
nuget-release:
Expand All @@ -34,7 +35,7 @@ jobs:
run: |
dotnet pack ./neo.sln \
--configuration Release \
--output ./sbin \
--output ${{ env.NEO_NUGET_DIR }} \
--verbosity normal \
-p:VersionPrefix=${{ env.APP_VERSION }} \
-p:DebugSymbols=false \
Expand All @@ -47,7 +48,7 @@ jobs:

- name: Publish to NuGet.org
run: |
dotnet nuget push ./sbin/*.nupkg \
dotnet nuget push ${{ env.NEO_NUGET_DIR }}/*.nupkg \
--source https://api.nuget.org/v3/index.json \
--api-key ${{ secrets.NUGET_TOKEN }} \
--skip-duplicate
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,14 @@ PublishScripts/

# NuGet Packages
*.nupkg
*.snupkg

# The packages folder can be ignored because of Package Restore
**/packages/*

# except build/, which is used as an MSBuild target.
!**/packages/build/

# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
Expand Down
1 change: 1 addition & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<packageSources>
<clear />
<!-- <add key="github" value="https://nuget.pkg.github.com/neo-project/index.json" /> -->
<add key="Local" value="./pkgs/" />
<add key="MyGet-neo" value="https://www.myget.org/F/neo/api/v3/index.json" />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
Expand Down
Empty file added pkgs/.gitkeep
View file
Open in desktop
Empty file.
6 changes: 4 additions & 2 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
<Copyright>2015-2025 The Neo Project</Copyright>
<LangVersion>latest</LangVersion>
<Authors>The Neo Project</Authors>
<RootNamespace>$(PackageId)</RootNamespace>
<IsPackable>true</IsPackable>
<PackageId>$(MSBuildProjectName)</PackageId>
<PackageIcon>neo.png</PackageIcon>
<PackageOutputPath>../../pkgs/</PackageOutputPath>
Copy link
Contributor

Choose a reason for hiding this comment

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

well,, the output path is changed again.... the name is weird cause neogo has this folder as well for another purpose.

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.

This for building nuget packages. What would you like the name to be? Other than that everything else is the same. Just moved to the *.props files.

<PackageProjectUrl>https://github.com/neo-project/neo</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand All @@ -30,8 +32,8 @@
</PropertyGroup>

<ItemGroup>
<None Include="$(SolutionDir)/.neo/neo.png" Pack="true" Visible="false" PackagePath=""/>
<None Include="$(SolutionDir)/.neo/README.md" Pack="true" Visible="false" PackagePath=""/>
<None Include="../../.neo/neo.png" Pack="true" Visible="false" PackagePath=""/>
<None Include="../../.neo/README.md" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Plugins/ApplicationLogs/ApplicationLogs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Plugins.ApplicationLogs</PackageId>
<RootNamespace>Neo.Plugins</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 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 @@ -4,7 +4,6 @@
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Consensus.DBFT</PackageId>
<RootNamespace>Neo.Consensus</RootNamespace>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions src/Plugins/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<Import Project="../$(MSBuildThisFile)" />

<PropertyGroup>
<PackageId>Neo.Plugins.$(MSBuildProjectName)</PackageId>
<PackageOutputPath>../../../pkgs/</PackageOutputPath>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
<EnableDynamicLoading>true</EnableDynamicLoading>
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
</PropertyGroup>
Expand All @@ -12,4 +15,11 @@
<ProjectReference Include="../../Neo/Neo.csproj" />
</ItemGroup>

<ItemGroup>
<None Remove="../../.neo/neo.png" />
<None Remove="../../.neo/README.md" />
<None Include="../../../.neo/neo.png" Pack="true" Visible="false" PackagePath=""/>
<None Include="../../../.neo/README.md" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/Plugins/LevelDBStore/LevelDBStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<RootNamespace>Neo.Plugins.Storage</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<Target Name="DownloadNativeLibs">
Expand Down
1 change: 0 additions & 1 deletion src/Plugins/MPTTrie/MPTTrie.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<PackageId>Neo.Cryptography.MPT</PackageId>
<RootNamespace>Neo.Cryptography</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

</Project>
2 changes: 0 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 @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Plugins.OracleService</PackageId>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Plugins/RocksDBStore/RocksDBStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Plugins.Storage.RocksDBStore</PackageId>
<RootNamespace>Neo.Plugins.Storage</RootNamespace>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion src/Plugins/RpcClient/RpcClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Network.RPC.RpcClient</PackageId>
<RootNamespace>Neo.Network.RPC</RootNamespace>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Plugins/RpcServer/RpcServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<PackageId>Neo.Plugins.RpcServer</PackageId>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Plugins/SQLiteWallet/SQLiteWallet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<RootNamespace>Neo.Wallets.SQLite</RootNamespace>
<PackageId>Neo.Wallets.SQLite</PackageId>
<ImplicitUsings>enable</ImplicitUsings>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Plugins/StateService/StateService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Plugins.StateService</PackageId>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Plugins/StorageDumper/StorageDumper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Plugins.StorageDumper</PackageId>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Plugins/TokensTracker/TokensTracker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<PackageId>Neo.Plugins.TokensTracker</PackageId>
<OutputPath>../../../bin/$(PackageId)</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down