From 5aebf6cdefa3952e51b3af198ffc421c7d83ce04 Mon Sep 17 00:00:00 2001 From: s2quake Date: Tue, 10 Sep 2024 15:18:43 +0900 Subject: [PATCH 1/2] fix: Revert libplanet to 5.1.3 --- libplanet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libplanet b/libplanet index bbe7ba9..4aadf2c 160000 --- a/libplanet +++ b/libplanet @@ -1 +1 @@ -Subproject commit bbe7ba922c35c2106c700ef0771d4d0e3ee04a4a +Subproject commit 4aadf2c9919f93a283ec0f9883089a3dfd56f36c From 513dd5ad8c7ee583c126c5be55b74d4ec4cc2cc0 Mon Sep 17 00:00:00 2001 From: s2quake Date: Tue, 10 Sep 2024 15:20:55 +0900 Subject: [PATCH 2/2] fix: Fix build errors with docker builds --- Dockerfile | 4 ++++ Dockerfile.amd64 | 4 ++++ Dockerfile.arm64v8 | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index 49dc38e..9a54e3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,10 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /app ARG COMMIT +COPY ./libplanet/Directory.Build.props ./ +COPY ./libplanet/Menees.Analyzers.Settings.xml ./ +COPY ./libplanet/stylecop.json ./ +COPY ./libplanet/src/Directory.Build.props ./src/ COPY ./libplanet/src/Libplanet/Libplanet.csproj ./Libplanet/ COPY ./libplanet/src/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/ COPY ./NineChronicles.Snapshot/NineChronicles.Snapshot.csproj ./NineChronicles.Snapshot/ diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 49dc38e..9a54e3c 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -2,6 +2,10 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /app ARG COMMIT +COPY ./libplanet/Directory.Build.props ./ +COPY ./libplanet/Menees.Analyzers.Settings.xml ./ +COPY ./libplanet/stylecop.json ./ +COPY ./libplanet/src/Directory.Build.props ./src/ COPY ./libplanet/src/Libplanet/Libplanet.csproj ./Libplanet/ COPY ./libplanet/src/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/ COPY ./NineChronicles.Snapshot/NineChronicles.Snapshot.csproj ./NineChronicles.Snapshot/ diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index 2156d7e..4958cc9 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -2,6 +2,10 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /app ARG COMMIT +COPY ./libplanet/Directory.Build.props ./ +COPY ./libplanet/Menees.Analyzers.Settings.xml ./ +COPY ./libplanet/stylecop.json ./ +COPY ./libplanet/src/Directory.Build.props ./src/ COPY ./libplanet/src/Libplanet/Libplanet.csproj ./Libplanet/ COPY ./libplanet/src/Libplanet.RocksDBStore/Libplanet.RocksDBStore.csproj ./Libplanet.RocksDBStore/ COPY ./NineChronicles.Snapshot/NineChronicles.Snapshot.csproj ./NineChronicles.Snapshot/