Skip to content

Commit

Permalink
bump: Add libplanet based on 5.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
s2quake committed Dec 17, 2024
1 parent be10442 commit 1eec69c
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
[submodule "NineChronicles.RPC.Shared"]
path = NineChronicles.RPC.Shared
url = https://github.com/planetarium/NineChronicles.RPC.Shared.git
[submodule "Libplanet"]
path = Libplanet
url = https://github.com/planetarium/libplanet.git
branch = public-validator-test
9 changes: 9 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<Project>
<PropertyGroup>
<LibplanetVersion>5.4.2</LibplanetVersion>

<!-- Fill with Libplanet's absolute path to debug with local Libplanet.
Example: $(MSBuildThisFileDirectory).Libplanet -->
<LibplanetDirectory>$(MSBuildThisFileDirectory)Libplanet</LibplanetDirectory>
</PropertyGroup>

<PropertyGroup>
<UseLocalLibplanet Condition="Exists('$(LibplanetDirectory)')">true</UseLocalLibplanet>
<UseLocalLibplanet Condition=" '$(UseLocalLibplanet)' == '' ">false</UseLocalLibplanet>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions Libplanet
Submodule Libplanet added at de3091
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ItemGroup Condition="!$(UseLocalLibplanet)">
<PackageReference Include="Libplanet.Action" Version="$(LibplanetVersion)" />
</ItemGroup>

<ItemGroup Condition="$(UseLocalLibplanet)">
<ProjectReference Include="$(LibplanetDirectory)\src\Libplanet.Action\Libplanet.Action.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@
<ProjectReference Include="..\Lib9c\.Libplanet.Extensions.ActionEvaluatorCommonComponents\Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj" />
</ItemGroup>

<ItemGroup>
<ItemGroup Condition="!$(UseLocalLibplanet)">
<PackageReference Include="Libplanet.Action" Version="$(LibplanetVersion)" />
</ItemGroup>

<ItemGroup Condition="$(UseLocalLibplanet)">
<ProjectReference Include="$(LibplanetDirectory)\src\Libplanet.Action\Libplanet.Action.csproj" />
</ItemGroup>

</Project>
15 changes: 12 additions & 3 deletions Libplanet.Headless/Libplanet.Headless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Libplanet.Explorer" Version="$(LibplanetVersion)" />
<PackageReference Include="Libplanet.Net" Version="$(LibplanetVersion)" />
<PackageReference Include="Libplanet.RocksDBStore" Version="$(LibplanetVersion)" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.49.0.57237">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -21,6 +18,18 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition="!$(UseLocalLibplanet)">
<PackageReference Include="Libplanet.Explorer" Version="$(LibplanetVersion)" />
<PackageReference Include="Libplanet.Net" Version="$(LibplanetVersion)" />
<PackageReference Include="Libplanet.RocksDBStore" Version="$(LibplanetVersion)" />
</ItemGroup>

<ItemGroup Condition="$(UseLocalLibplanet)">
<ProjectReference Include="$(LibplanetDirectory)\tools\Libplanet.Explorer\Libplanet.Explorer.csproj" />
<ProjectReference Include="$(LibplanetDirectory)\src\Libplanet.Net\Libplanet.Net.csproj" />
<ProjectReference Include="$(LibplanetDirectory)\src\Libplanet.RocksDBStore\Libplanet.RocksDBStore.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NineChronicles.RPC.Shared\NineChronicles.RPC.Shared\NineChronicles.RPC.Shared.csproj" />
<ProjectReference Include="..\Libplanet.Extensions.ForkableActionEvaluator\Libplanet.Extensions.ForkableActionEvaluator.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<PackageReference Include="GraphQL.Client" Version="5.1.1" />
<PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="5.1.1" />
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
<PackageReference Include="Libplanet.Extensions.Cocona" Version="$(LibplanetVersion)" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.9.0-beta.1" />
Expand All @@ -47,6 +46,14 @@
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="!$(UseLocalLibplanet)">
<PackageReference Include="Libplanet.Extensions.Cocona" Version="$(LibplanetVersion)" />
</ItemGroup>

<ItemGroup Condition="$(UseLocalLibplanet)">
<ProjectReference Include="$(LibplanetDirectory)\tools\Libplanet.Extensions.Cocona\Libplanet.Extensions.Cocona.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Lib9c\Lib9c.Utils\Lib9c.Utils.csproj" />
<ProjectReference Include="..\Lib9c\Lib9c.Abstractions\Lib9c.Abstractions.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Libplanet.Mocks" Version="$(LibplanetVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.49.0.57237">
Expand All @@ -41,6 +40,14 @@
<PackageReference Include="coverlet.collector" Version="3.2.0" />
</ItemGroup>

<ItemGroup Condition="!$(UseLocalLibplanet)">
<PackageReference Include="Libplanet.Mocks" Version="$(LibplanetVersion)" />
</ItemGroup>

<ItemGroup Condition="$(UseLocalLibplanet)">
<ProjectReference Include="$(LibplanetDirectory)\test\Libplanet.Mocks\Libplanet.Mocks.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NineChronicles.Headless.Executable.Tests\NineChronicles.Headless.Executable.Tests.csproj" />
<ProjectReference Include="..\NineChronicles.Headless.Executable\NineChronicles.Headless.Executable.csproj" />
Expand Down
10 changes: 9 additions & 1 deletion NineChronicles.Headless/NineChronicles.Headless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<PackageReference Include="GraphQL.Server.Transports.Subscriptions.WebSockets" Version="5.1.1" />
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="5.1.1" />
<PackageReference Include="GraphQL.SystemTextJson" Version="4.7.1" />
<PackageReference Include="Libplanet.Store.Remote" Version="$(LibplanetVersion)" />
<PackageReference Include="MagicOnion" Version="6.1.3" />
<PackageReference Include="MagicOnion.Abstractions" Version="6.1.3" />
<PackageReference Include="MagicOnion.Server" Version="6.1.3" />
Expand Down Expand Up @@ -64,6 +63,15 @@
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
</ItemGroup>


<ItemGroup Condition="!$(UseLocalLibplanet)">
<PackageReference Include="Libplanet.Store.Remote" Version="$(LibplanetVersion)" />
</ItemGroup>

<ItemGroup Condition="$(UseLocalLibplanet)">
<ProjectReference Include="$(LibplanetDirectory)\src\Libplanet.Store.Remote\Libplanet.Store.Remote.csproj" />
</ItemGroup>

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

0 comments on commit 1eec69c

Please sign in to comment.