From 93cefced80eec2f848e90f329c3b1a477f7232c2 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 31 Oct 2018 13:03:12 +0900 Subject: [PATCH] bump .NET core and dependencies --- BTCPayServer.Tests/BTCPayServer.Tests.csproj | 4 ++-- BTCPayServer.Tests/Dockerfile | 2 +- BTCPayServer.Tests/docker-compose.yml | 2 +- BTCPayServer/BTCPayServer.csproj | 21 ++++++++++++------- .../Data/ApplicationDbContextFactory.cs | 1 - .../Payments/Bitcoin/NBXplorerListener.cs | 3 +-- Dockerfile | 4 ++-- global.json | 4 ++-- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/BTCPayServer.Tests/BTCPayServer.Tests.csproj b/BTCPayServer.Tests/BTCPayServer.Tests.csproj index c0c380b48..02ea797b2 100644 --- a/BTCPayServer.Tests/BTCPayServer.Tests.csproj +++ b/BTCPayServer.Tests/BTCPayServer.Tests.csproj @@ -10,8 +10,8 @@ - - + + all runtime; build; native; contentfiles; analyzers diff --git a/BTCPayServer.Tests/Dockerfile b/BTCPayServer.Tests/Dockerfile index 9724bd446..e63b9fbac 100644 --- a/BTCPayServer.Tests/Dockerfile +++ b/BTCPayServer.Tests/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.300-sdk-alpine3.7 +FROM microsoft/dotnet:2.1.403-sdk-alpine3.7 WORKDIR /app # caches restore result by copying csproj file separately COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index 356aa7b12..8364fe01a 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -69,7 +69,7 @@ services: nbxplorer: - image: nicolasdorier/nbxplorer:1.1.0.7 + image: nicolasdorier/nbxplorer:1.1.0.8 restart: unless-stopped ports: - "32838:32838" diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index a1f6fd58f..22af3b6b1 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -36,34 +36,39 @@ - + - - + - + + all + runtime; build; native; contentfiles; analyzers + - + - + - + + all + runtime; build; native; contentfiles; analyzers + - + diff --git a/BTCPayServer/Data/ApplicationDbContextFactory.cs b/BTCPayServer/Data/ApplicationDbContextFactory.cs index 58e8fee5d..4a21e99f2 100644 --- a/BTCPayServer/Data/ApplicationDbContextFactory.cs +++ b/BTCPayServer/Data/ApplicationDbContextFactory.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Threading.Tasks; using Hangfire; using Hangfire.MemoryStorage; -using Hangfire.PostgreSql; using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations; using JetBrains.Annotations; diff --git a/BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs b/BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs index f4471665c..c294a4f8b 100644 --- a/BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs +++ b/BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs @@ -149,8 +149,7 @@ namespace BTCPayServer.Payments.Bitcoin foreach (var output in evt.Outputs) { foreach (var txCoin in evt.TransactionData.Transaction.Outputs.AsCoins() - .Where(o => o.ScriptPubKey == output.ScriptPubKey) - .Select(o => output.Redeem == null ? o : o.ToScriptCoin(output.Redeem))) + .Where(o => o.ScriptPubKey == output.ScriptPubKey)) { var invoice = await _InvoiceRepository.GetInvoiceFromScriptPubKey(output.ScriptPubKey, network.CryptoCode); if (invoice != null) diff --git a/Dockerfile b/Dockerfile index e909132b7..c76491642 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.402-sdk-alpine3.7 AS builder +FROM microsoft/dotnet:2.1.403-sdk-alpine3.7 AS builder WORKDIR /source COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj # Cache some dependencies @@ -6,7 +6,7 @@ RUN dotnet restore COPY BTCPayServer/. . RUN dotnet publish --output /app/ --configuration Release -FROM microsoft/dotnet:2.1.4-aspnetcore-runtime-alpine3.7 +FROM microsoft/dotnet:2.1.5-aspnetcore-runtime-alpine3.7 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false RUN apk add --no-cache icu-libs diff --git a/global.json b/global.json index 455cd36d7..55e448dfe 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.1.402" + "version": "2.1.403" } -} \ No newline at end of file +}