diff --git a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj index 544bab587..0b04b5f0a 100644 --- a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj +++ b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj @@ -32,7 +32,7 @@ - + diff --git a/BTCPayServer.Data/BTCPayServer.Data.csproj b/BTCPayServer.Data/BTCPayServer.Data.csproj index 3ebf14f06..bbadfe0ec 100644 --- a/BTCPayServer.Data/BTCPayServer.Data.csproj +++ b/BTCPayServer.Data/BTCPayServer.Data.csproj @@ -3,11 +3,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/BTCPayServer.Rating/BTCPayServer.Rating.csproj b/BTCPayServer.Rating/BTCPayServer.Rating.csproj index 43cab0e2f..9f78b949a 100644 --- a/BTCPayServer.Rating/BTCPayServer.Rating.csproj +++ b/BTCPayServer.Rating/BTCPayServer.Rating.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/BTCPayServer.Tests/docker-compose.altcoins.yml b/BTCPayServer.Tests/docker-compose.altcoins.yml index f2468ea2b..b7cc238fc 100644 --- a/BTCPayServer.Tests/docker-compose.altcoins.yml +++ b/BTCPayServer.Tests/docker-compose.altcoins.yml @@ -100,7 +100,7 @@ services: custom: nbxplorer: - image: nicolasdorier/nbxplorer:2.5.3 + image: nicolasdorier/nbxplorer:2.5.4 restart: unless-stopped ports: - "32838:32838" diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index 6888ed530..bdf08b8e3 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -97,7 +97,7 @@ services: custom: nbxplorer: - image: nicolasdorier/nbxplorer:2.5.3 + image: nicolasdorier/nbxplorer:2.5.4 restart: unless-stopped ports: - "32838:32838" diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 489febc19..288aba8e9 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -51,8 +51,8 @@ - - + + @@ -77,8 +77,8 @@ - - + + diff --git a/BTCPayServer/Services/Wallets/Export/TransactionsExport.cs b/BTCPayServer/Services/Wallets/Export/TransactionsExport.cs index 43cac554e..3432c3b33 100644 --- a/BTCPayServer/Services/Wallets/Export/TransactionsExport.cs +++ b/BTCPayServer/Services/Wallets/Export/TransactionsExport.cs @@ -91,7 +91,7 @@ namespace BTCPayServer.Services.Wallets.Export { using StringWriter writer = new(); using var csvWriter = new CsvHelper.CsvWriter(writer, new CsvConfiguration(CultureInfo.InvariantCulture), true); - csvWriter.Configuration.RegisterClassMap(); + csvWriter.Context.RegisterClassMap(); csvWriter.WriteHeader(); csvWriter.NextRecord(); csvWriter.WriteRecords(invoices); @@ -105,7 +105,7 @@ namespace BTCPayServer.Services.Wallets.Export public ExportTransactionMap() { AutoMap(CultureInfo.InvariantCulture); - Map(m => m.Labels).ConvertUsing(row => row.Labels == null ? string.Empty : string.Join(", ", row.Labels)); + Map(m => m.Labels).Convert(row => row.Value.Labels == null ? string.Empty : string.Join(", ", row.Value.Labels)); } } diff --git a/Dockerfile b/Dockerfile index 68c7eb77b..e7f4f415e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.101-bookworm-slim AS builder +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.203-bookworm-slim AS builder ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 WORKDIR /source COPY nuget.config nuget.config @@ -21,7 +21,7 @@ ARG CONFIGURATION_NAME=Release ARG GIT_COMMIT RUN cd BTCPayServer && dotnet publish -p:GitCommit=${GIT_COMMIT} --output /app/ --configuration ${CONFIGURATION_NAME} -FROM mcr.microsoft.com/dotnet/aspnet:8.0.1-bookworm-slim +FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-bookworm-slim RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \ && rm -rf /var/lib/apt/lists/*